mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
ipmi: Allow a size value to be passed for I/O space
PCI device I/O must be >= 8 bytes in length or they don't work. Allow the size to be passed in, the default size of 2 or 3 won't work. Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
parent
1739d54c8b
commit
79d29a9d06
7 changed files with 44 additions and 11 deletions
|
@ -189,7 +189,7 @@ static uint64_t ipmi_bt_ioport_read(void *opaque, hwaddr addr, unsigned size)
|
|||
IPMIBT *ib = iic->get_backend_data(ii);
|
||||
uint32_t ret = 0xff;
|
||||
|
||||
switch (addr & 3) {
|
||||
switch (addr & ib->size_mask) {
|
||||
case 0:
|
||||
ret = ib->control_reg;
|
||||
break;
|
||||
|
@ -208,6 +208,9 @@ static uint64_t ipmi_bt_ioport_read(void *opaque, hwaddr addr, unsigned size)
|
|||
case 2:
|
||||
ret = ib->mask_reg;
|
||||
break;
|
||||
default:
|
||||
ret = 0xff;
|
||||
break;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
@ -230,7 +233,7 @@ static void ipmi_bt_ioport_write(void *opaque, hwaddr addr, uint64_t val,
|
|||
IPMIInterfaceClass *iic = IPMI_INTERFACE_GET_CLASS(ii);
|
||||
IPMIBT *ib = iic->get_backend_data(ii);
|
||||
|
||||
switch (addr & 3) {
|
||||
switch (addr & ib->size_mask) {
|
||||
case 0:
|
||||
if (IPMI_BT_GET_CLR_WR(val)) {
|
||||
ib->inlen = 0;
|
||||
|
@ -285,6 +288,9 @@ static void ipmi_bt_ioport_write(void *opaque, hwaddr addr, uint64_t val,
|
|||
ipmi_bt_lower_irq(ib);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
/* Ignore. */
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -346,14 +352,19 @@ static void ipmi_bt_set_irq_enable(IPMIInterface *ii, int val)
|
|||
ib->irqs_enabled = val;
|
||||
}
|
||||
|
||||
static void ipmi_bt_init(IPMIInterface *ii, Error **errp)
|
||||
static void ipmi_bt_init(IPMIInterface *ii, unsigned int min_size, Error **errp)
|
||||
{
|
||||
IPMIInterfaceClass *iic = IPMI_INTERFACE_GET_CLASS(ii);
|
||||
IPMIBT *ib = iic->get_backend_data(ii);
|
||||
|
||||
if (min_size == 0) {
|
||||
min_size = 4;
|
||||
}
|
||||
ib->size_mask = min_size - 1;
|
||||
ib->io_length = 3;
|
||||
|
||||
memory_region_init_io(&ib->io, NULL, &ipmi_bt_io_ops, ii, "ipmi-bt", 3);
|
||||
memory_region_init_io(&ib->io, NULL, &ipmi_bt_io_ops, ii, "ipmi-bt",
|
||||
min_size);
|
||||
}
|
||||
|
||||
int ipmi_bt_vmstate_post_load(void *opaque, int version)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue