[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/19] i2c:pm_smbus: Add the ability to force block
From: |
minyard |
Subject: |
[Qemu-devel] [PATCH 09/19] i2c:pm_smbus: Add the ability to force block transfer enable |
Date: |
Fri, 30 Dec 2016 09:21:40 -0600 |
From: Corey Minyard <address@hidden>
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: Corey Minyard <address@hidden>
---
hw/acpi/piix4.c | 2 +-
hw/i2c/pm_smbus.c | 5 ++++-
hw/i2c/smbus_ich9.c | 2 +-
hw/isa/vt82c686.c | 2 +-
include/hw/i2c/pm_smbus.h | 2 +-
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index d64b53b..b23605b 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -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);
diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c
index 8838360..4f8046e 100644
--- a/hw/i2c/pm_smbus.c
+++ b/hw/i2c/pm_smbus.c
@@ -401,11 +401,14 @@ const VMStateDescription pmsmb_vmstate = {
}
};
-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);
}
diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
index 5bc34de..e9b07c9 100644
--- a/hw/i2c/smbus_ich9.c
+++ b/hw/i2c/smbus_ich9.c
@@ -89,7 +89,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);
}
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 41d5254..3e905c6 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -362,7 +362,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);
diff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h
index cfe596f..471345e 100644
--- a/include/hw/i2c/pm_smbus.h
+++ b/include/hw/i2c/pm_smbus.h
@@ -33,7 +33,7 @@ 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);
extern const VMStateDescription pmsmb_vmstate;
--
2.7.4
- [Qemu-devel] [PATCH 01/18] Patch set to get full IPMI over SMBus, minyard, 2016/12/30
- [Qemu-devel] [PATCH 02/19] i2c-smbus: Use a int for return, minyard, 2016/12/30
- [Qemu-devel] [PATCH 05/19] i2c:pm_smbus: Make the I2C block read command read-only, minyard, 2016/12/30
- [Qemu-devel] [PATCH 17/19] i2c: Allow SMBus device to NAK start events, minyard, 2016/12/30
- [Qemu-devel] [PATCH 01/19] i2c: Allow I2C devices to NAK start events, minyard, 2016/12/30
- [Qemu-devel] [PATCH 03/19] i2c:pm_smbus: Clean up some style issues, minyard, 2016/12/30
- [Qemu-devel] [PATCH 08/19] i2c:pm_smbus: Add interrupt handling, minyard, 2016/12/30
- [Qemu-devel] [PATCH 09/19] i2c:pm_smbus: Add the ability to force block transfer enable,
minyard <=
- [Qemu-devel] [PATCH 16/19] isa: Add an irq device., minyard, 2016/12/30
- [Qemu-devel] [PATCH 19/19] ipmi_smbus: Add alert capability to the IPMI SSIF code, minyard, 2016/12/30
- [Qemu-devel] [PATCH 04/19] i2c:pm_smbus: Fix the semantics of block I2C transfers, minyard, 2016/12/30
- [Qemu-devel] [PATCH 12/19] ipmi: Fix SSIF ACPI handling to use the right CRS, minyard, 2016/12/30
- [Qemu-devel] [PATCH 06/19] i2c:pm_smbus: Add block transfer capability, minyard, 2016/12/30
- [Qemu-devel] [PATCH 07/19] i2c:pm_smbus: Fix state transfer, minyard, 2016/12/30
- [Qemu-devel] [PATCH 11/19] acpi: Add i2c serial bus CRS handling, minyard, 2016/12/30
- [Qemu-devel] [PATCH 15/19] hw: Add an IRQ interface, minyard, 2016/12/30
- [Qemu-devel] [PATCH 13/19] pc: Add _enabled to the end of some boolean flags, minyard, 2016/12/30
- [Qemu-devel] [PATCH 14/19] pc: Add an SMB0 ACPI device to q35, minyard, 2016/12/30