Commit 79d29a9d authored by Corey Minyard's avatar Corey Minyard
Browse files

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: default avatarCorey Minyard <cminyard@mvista.com>
parent 1739d54c

hw/ipmi/ipmi_bt.c

+15 −4
Original line number Diff line number Diff line
@@ -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)

hw/ipmi/ipmi_kcs.c

+19 −4
Original line number Diff line number Diff line
@@ -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)

hw/ipmi/isa_ipmi_bt.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void isa_ipmi_bt_realize(DeviceState *dev, Error **errp) 
    iib->bt.bmc->intf = ii;

    iib->bt.opaque = iib;



    iic->init(ii, errp);

    iic->init(ii, 0, errp);

    if (*errp)

        return;

hw/ipmi/isa_ipmi_kcs.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static void ipmi_isa_realize(DeviceState *dev, Error **errp) 
    iik->kcs.bmc->intf = ii;

    iik->kcs.opaque = iik;



    iic->init(ii, errp);

    iic->init(ii, 0, errp);

    if (*errp)

        return;

include/hw/ipmi/ipmi.h

+6 −1
Original line number Diff line number Diff line
@@ -118,7 +118,12 @@ typedef struct IPMIInterface IPMIInterface; 
typedef struct IPMIInterfaceClass {

    InterfaceClass parent;



    void (*init)(struct IPMIInterface *s, Error **errp);

    /*

     * min_size is the requested I/O size and must be a power of 2.

     * This is so PCI (or other busses) can request a bigger range.

     * Use 0 for the default.

     */

    void (*init)(struct IPMIInterface *s, unsigned int min_size, Error **errp);



    /*

     * Perform various operations on the hardware.  If checkonly is