Commit 45726b6e authored by Corey Minyard's avatar Corey Minyard Committed by Paolo Bonzini
Browse files

i2c: pm_smbus: Add the ability to force block transfer enable 



The PIIX4 hardware has block transfer buffer always enabled in
the hardware, but the i801 does not.  Add a parameter to pm_smbus_init
to force on the block transfer so the PIIX4 handler can enable this
by default, as it was disabled by default before.

Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1534796770-10295-9-git-send-email-minyard@acm.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 12bd93c1

hw/acpi/piix4.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp) 
    pci_conf[0x90] = s->smb_io_base | 1;

    pci_conf[0x91] = s->smb_io_base >> 8;

    pci_conf[0xd2] = 0x09;

    pm_smbus_init(DEVICE(dev), &s->smb);

    pm_smbus_init(DEVICE(dev), &s->smb, true);

    memory_region_set_enabled(&s->smb.io, pci_conf[0xd2] & 1);

    memory_region_add_subregion(pci_address_space_io(dev),

                                s->smb_io_base, &s->smb.io);

hw/i2c/pm_smbus.c

+4 −1
Original line number Diff line number Diff line
@@ -402,11 +402,14 @@ static const MemoryRegionOps pm_smbus_ops = { 
    .endianness = DEVICE_LITTLE_ENDIAN,

};



void pm_smbus_init(DeviceState *parent, PMSMBus *smb)

void pm_smbus_init(DeviceState *parent, PMSMBus *smb, bool force_aux_blk)

{

    smb->op_done = true;

    smb->reset = pm_smbus_reset;

    smb->smbus = i2c_init_bus(parent, "i2c");

    if (force_aux_blk) {

        smb->smb_auxctl |= AUX_BLK;

    }

    memory_region_init_io(&smb->io, OBJECT(parent), &pm_smbus_ops, smb,

                          "pm-smbus", 64);

}

hw/i2c/smbus_ich9.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static void ich9_smbus_realize(PCIDevice *d, Error **errp) 
    pci_set_byte(d->config + ICH9_SMB_HOSTC, 0);

    /* TODO bar0, bar1: 64bit BAR support*/



    pm_smbus_init(&d->qdev, &s->smb);

    pm_smbus_init(&d->qdev, &s->smb, false);

    pci_register_bar(d, ICH9_SMB_SMB_BASE_BAR, PCI_BASE_ADDRESS_SPACE_IO,

                     &s->smb.io);

}

hw/isa/vt82c686.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp) 
    pci_conf[0x90] = s->smb_io_base | 1;

    pci_conf[0x91] = s->smb_io_base >> 8;

    pci_conf[0xd2] = 0x90;

    pm_smbus_init(&s->dev.qdev, &s->smb);

    pm_smbus_init(&s->dev.qdev, &s->smb, false);

    memory_region_add_subregion(get_system_io(), s->smb_io_base, &s->smb.io);



    apm_init(dev, &s->apm, NULL, s);

include/hw/i2c/pm_smbus.h

+1 −1
Original line number Diff line number Diff line
@@ -33,6 +33,6 @@ typedef struct PMSMBus { 
    bool op_done;

} PMSMBus;



void pm_smbus_init(DeviceState *parent, PMSMBus *smb);

void pm_smbus_init(DeviceState *parent, PMSMBus *smb, bool force_aux_blk);



#endif /* PM_SMBUS_H */