mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53: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
|
@ -232,7 +232,7 @@ static uint64_t ipmi_kcs_ioport_read(void *opaque, hwaddr addr, unsigned size)
|
|||
IPMIKCS *ik = iic->get_backend_data(ii);
|
||||
uint32_t ret;
|
||||
|
||||
switch (addr & 1) {
|
||||
switch (addr & ik->size_mask) {
|
||||
case 0:
|
||||
ret = ik->data_out_reg;
|
||||
IPMI_KCS_SET_OBF(ik->status_reg, 0);
|
||||
|
@ -243,6 +243,7 @@ static uint64_t ipmi_kcs_ioport_read(void *opaque, hwaddr addr, unsigned size)
|
|||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
ret = ik->status_reg;
|
||||
if (ik->atn_irq_set) {
|
||||
|
@ -252,6 +253,9 @@ static uint64_t ipmi_kcs_ioport_read(void *opaque, hwaddr addr, unsigned size)
|
|||
}
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
ret = 0xff;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
@ -267,7 +271,7 @@ static void ipmi_kcs_ioport_write(void *opaque, hwaddr addr, uint64_t val,
|
|||
return;
|
||||
}
|
||||
|
||||
switch (addr & 1) {
|
||||
switch (addr & ik->size_mask) {
|
||||
case 0:
|
||||
ik->data_in_reg = val;
|
||||
break;
|
||||
|
@ -275,6 +279,10 @@ static void ipmi_kcs_ioport_write(void *opaque, hwaddr addr, uint64_t val,
|
|||
case 1:
|
||||
ik->cmd_reg = val;
|
||||
break;
|
||||
|
||||
default:
|
||||
/* Ignore. */
|
||||
break;
|
||||
}
|
||||
IPMI_KCS_SET_IBF(ik->status_reg, 1);
|
||||
ipmi_kcs_signal(ik, ii);
|
||||
|
@ -321,13 +329,20 @@ static void ipmi_kcs_set_irq_enable(IPMIInterface *ii, int val)
|
|||
ik->irqs_enabled = val;
|
||||
}
|
||||
|
||||
static void ipmi_kcs_init(IPMIInterface *ii, Error **errp)
|
||||
/* min_size must be a power of 2. */
|
||||
static void ipmi_kcs_init(IPMIInterface *ii, unsigned int min_size,
|
||||
Error **errp)
|
||||
{
|
||||
IPMIInterfaceClass *iic = IPMI_INTERFACE_GET_CLASS(ii);
|
||||
IPMIKCS *ik = iic->get_backend_data(ii);
|
||||
|
||||
if (min_size == 0) {
|
||||
min_size = 2;
|
||||
}
|
||||
ik->size_mask = min_size - 1;
|
||||
ik->io_length = 2;
|
||||
memory_region_init_io(&ik->io, NULL, &ipmi_kcs_io_ops, ii, "ipmi-kcs", 2);
|
||||
memory_region_init_io(&ik->io, NULL, &ipmi_kcs_io_ops, ii, "ipmi-kcs",
|
||||
min_size);
|
||||
}
|
||||
|
||||
int ipmi_kcs_vmstate_post_load(void *opaque, int version)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue