Add powernv10 I2C devices and tests
v5 cover Add powernv10 I2C devices and tests
This series of patches includes support, tests and fixes for adding PCA9552 and PCA9554 I2C devices to the powernv10 chip.
The PCA9552 device is used for PCIe slot hotplug power control and monitoring, while the PCA9554 device is used for presence detection of IBM CableCard devices. Both devices are required by the Power Hypervisor Firmware on the Power10 Ranier platform.
Changes from previous version:
- Removed two already merged patches
- Various formatting changes
- Capitalized "Rainier" in machine description string
- Changed powernv10-rainier parent to MACHINE_TYPE_NAME("powernv10")
Glenn Miles (9):
misc/pca9552: Fix inverted input status
misc/pca9552: Let external devices set pca9552 inputs ppc/pnv: New powernv10-rainier machine type
ppc/pnv: Add pca9552 to powernv10-rainier for PCIe hotplug power
control
ppc/pnv: Wire up pca9552 GPIO pins for PCIe hotplug power control ppc/pnv: Use resettable interface to reset child I2C buses
misc: Add a pca9554 GPIO device model
ppc/pnv: Add a pca9554 I2C device to powernv10-rainier ppc/pnv: Test pnv i2c master and connected devices
MAINTAINERS | 10 +- hw/misc/Kconfig | 4 + hw/misc/meson.build | 1 + hw/misc/pca9552.c | 58 ++- hw/misc/pca9554.c | 328 ++++++++++++++++ hw/ppc/Kconfig | 2 + hw/ppc/pnv.c | 72 +++- hw/ppc/pnv_i2c.c | 15 +- include/hw/misc/pca9552.h | 3 +- include/hw/misc/pca9554.h | 36 ++ include/hw/misc/pca9554_regs.h | 19 + include/hw/ppc/pnv.h | 1 + tests/qtest/meson.build | 1 + tests/qtest/pca9552-test.c | 6 +- tests/qtest/pnv-host-i2c-test.c | 650 ++++++++++++++++++++++++++++++++ 15 files changed, 1190 insertions(+), 16 deletions(-) create mode 100644 hw/misc/pca9554.c create mode 100644 include/hw/misc/pca9554.h create mode 100644 include/hw/misc/pca9554_regs.h create mode 100644 tests/qtest/pnv-host-i2c-test.c
Signature · 1 line
2.31.1
PATCH v5 1/9 misc/pca9552: Fix inverted input status
The pca9552 INPUT0 and INPUT1 registers are supposed to hold the logical values of the LED pins. A logical 0 should be seen in the INPUT0/1 registers for a pin when its corresponding LSn bits are set to 0, which is also the state needed for turning on an LED in a typical usage scenario. Existing code was doing the opposite and setting INPUT0/1 bit to a 1 when the LSn bit was set to 0, so this commit fixes that.
---
No change from previous version
hw/misc/pca9552.c | 18 +++++++++++++----- tests/qtest/pca9552-test.c | 6 +++--- 2 files changed, 16 insertions(+), 8 deletions(-)
hw/misc/pca9552.c +13 -5
@@ -36,7 +36,10 @@ typedef struct PCA955xClass PCA955xClass;DECLARE_CLASS_CHECKERS (PCA955xClass,PCA955X ,TYPE_PCA955X ) - +/* +* Note: The LED_ON and LED_OFF configuration values for the PCA955X +* chips are the reverse of the PCA953X family of chips. + */#define PCA9552_LED_ON 0x0#define PCA9552_LED_OFF 0x1#define PCA9552_LED_PWM0 0x2
@@ -112,13 +115,18 @@ static void pca955x_update_pin_input(PCA955xState *s)switch (config) {case PCA9552_LED_ON : -qemu_set_irq (s->gpio[i],1 ); - s->regs[input_reg] |=1 << input_shift; -break ; -case PCA9552_LED_OFF : +/* Pin is set to 0V to turn on LED */ qemu_set_irq (s->gpio[i],0 ); s->regs[input_reg] &= ~(1 << input_shift);break ; +case PCA9552_LED_OFF : +/* +* Pin is set to Hi-Z to turn off LED and +* pullup sets it to a logical 1. +*/ +qemu_set_irq (s->gpio[i],1 ); + s->regs[input_reg] |=1 << input_shift; +break ;case PCA9552_LED_PWM0 :case PCA9552_LED_PWM1 :/* TODO */
tests/qtest/pca9552-test.c +3 -3
@@ -60,7 +60,7 @@ static void send_and_receive(void *obj, void *data, QGuestAllocator *alloc) g_assert_cmphex(value, ==, 0x55); value =i2c_get8 (i2cdev,PCA9552_INPUT0 ); - g_assert_cmphex(value, ==, 0x0); + g_assert_cmphex(value, ==, 0xFF);pca9552_init (i2cdev);
@@ -68,13 +68,13 @@ static void send_and_receive(void *obj, void *data, QGuestAllocator *alloc) g_assert_cmphex(value, ==, 0x54); value =i2c_get8 (i2cdev,PCA9552_INPUT0 ); - g_assert_cmphex(value, ==, 0x01); + g_assert_cmphex(value, ==, 0xFE); value =i2c_get8 (i2cdev,PCA9552_LS3 ); g_assert_cmphex(value, ==, 0x54); value =i2c_get8 (i2cdev,PCA9552_INPUT1 ); - g_assert_cmphex(value, ==, 0x10); + g_assert_cmphex(value, ==, 0xEF); }static void pca9552_register_nodes (void )
Signature · 1 line
2.31.1
PATCH v5 2/9 misc/pca9552: Let external devices set pca9552 inputs
In reply to Glenn MilesAllow external devices to drive pca9552 input pins by adding input GPIO's to the model. This allows a device to connect its output GPIO's to the pca9552 input GPIO's.
In order for an external device to set the state of a pca9552 pin, the pin must first be configured for high impedance (LED is off). If the pca9552 pin is configured to drive the pin low (LED is on), then external input will be ignored.
Here is a table describing the logical state of a pca9552 pin given the state being driven by the pca9552 and an external device:
PCA9552
Configured
State
| Hi-Z | Low |
------+------+-----+
External Hi-Z | Hi | Low |
Device ------+------+-----+
State Low | Low | Low |
------+------+-----+---
No change from previous version
hw/misc/pca9552.c | 50 +++++++++++++++++++++++++++++++++------ include/hw/misc/pca9552.h | 3 ++- 2 files changed, 45 insertions(+), 8 deletions(-)
hw/misc/pca9552.c +43 -7
@@ -44,6 +44,8 @@ DECLARE_CLASS_CHECKERS(PCA955xClass, PCA955X,#define PCA9552_LED_OFF 0x1#define PCA9552_LED_PWM0 0x2#define PCA9552_LED_PWM1 0x3 +#define PCA9552_PIN_LOW 0x0 +#define PCA9552_PIN_HIZ 0x1static const char *led_state[] = {"on" ,"off" ,"pwm0" ,"pwm1" };
@@ -110,22 +112,27 @@ static void pca955x_update_pin_input(PCA955xState *s)for (i =0 ; i < k->pin_count; i++) {uint8_t input_reg =PCA9552_INPUT0 + (i /8 ); -uint8_t input_shift = (i %8 ); +uint8_t bit_mask =1 << (i %8 );uint8_t config =pca955x_pin_get_config (s, i); +uint8_t old_value = s->regs[input_reg] & bit_mask; +uint8_t new_value;switch (config) {case PCA9552_LED_ON :/* Pin is set to 0V to turn on LED */ -qemu_set_irq (s->gpio[i],0 ); - s->regs[input_reg] &= ~(1 << input_shift); + s->regs[input_reg] &= ~bit_mask;break ;case PCA9552_LED_OFF :/* * Pin is set to Hi-Z to turn off LED and -* pullup sets it to a logical 1. +* pullup sets it to a logical 1 unless +* external device drives it low. */ -qemu_set_irq (s->gpio[i],1 ); - s->regs[input_reg] |=1 << input_shift; +if (s->ext_state[i] ==PCA9552_PIN_LOW ) { + s->regs[input_reg] &= ~bit_mask; + }else { + s->regs[input_reg] |= bit_mask; + }break ;case PCA9552_LED_PWM0 :case PCA9552_LED_PWM1 :
@@ -133,6 +140,12 @@ static void pca955x_update_pin_input(PCA955xState *s)default :break ; } + +/* update irq state only if pin state changed */ + new_value = s->regs[input_reg] & bit_mask; +if (new_value != old_value) { +qemu_set_irq (s->gpio_out[i], !!new_value); + } } }
@@ -340,6 +353,7 @@ static const VMStateDescription pca9552_vmstate = {VMSTATE_UINT8 (len, PCA955xState),VMSTATE_UINT8 (pointer, PCA955xState),VMSTATE_UINT8_ARRAY (regs, PCA955xState,PCA955X_NR_REGS ), +VMSTATE_UINT8_ARRAY (ext_state, PCA955xState,PCA955X_PIN_COUNT_MAX ),VMSTATE_I2C_SLAVE (i2c, PCA955xState), VMSTATE_END_OF_LIST() }
@@ -358,6 +372,7 @@ static void pca9552_reset(DeviceState *dev) s->regs[PCA9552_LS2 ] =0x55 ; s->regs[PCA9552_LS3 ] =0x55 ; +memset (s->ext_state,PCA9552_PIN_HIZ ,PCA955X_PIN_COUNT_MAX );pca955x_update_pin_input (s); s->pointer =0xFF ;
@@ -380,6 +395,26 @@ static void pca955x_initfn(Object *obj) } } +static void pca955x_set_ext_state (PCA955xState *s,int pin,int level) +{ +if (s->ext_state[pin] != level) { +uint16_t pins_status =pca955x_pins_get_status (s); + s->ext_state[pin] = level; +pca955x_update_pin_input (s); +pca955x_display_pins_status (s, pins_status); + } +} + +static void pca955x_gpio_in_handler (void *opaque,int pin,int level) +{ + +PCA955xState *s =PCA955X (opaque); +PCA955xClass *k =PCA955X_GET_CLASS (s); + +assert ((pin >=0 ) && (pin < k->pin_count)); +pca955x_set_ext_state (s, pin, level); +} +static void pca955x_realize (DeviceState *dev,Error **errp) {PCA955xClass *k =PCA955X_GET_CLASS (dev);
@@ -389,7 +424,8 @@ static void pca955x_realize(DeviceState *dev, Error **errp) s->description =g_strdup ("pca-unspecified" ); } -qdev_init_gpio_out (dev, s->gpio, k->pin_count); +qdev_init_gpio_out (dev, s->gpio_out, k->pin_count); +qdev_init_gpio_in (dev, pca955x_gpio_in_handler, k->pin_count); }static Property pca955x_properties[] = {
include/hw/misc/pca9552.h +2 -1
@@ -30,7 +30,8 @@ struct PCA955xState {uint8_t pointer;uint8_t regs[PCA955X_NR_REGS ]; -qemu_irq gpio[PCA955X_PIN_COUNT_MAX ]; +qemu_irq gpio_out[PCA955X_PIN_COUNT_MAX ]; +uint8_t ext_state[PCA955X_PIN_COUNT_MAX ];char *description;/* For debugging purpose only */ };
Signature · 1 line
2.31.1
PATCH v5 3/9 ppc/pnv: New powernv10-rainier machine type
In reply to Glenn MilesCreate a new powernv machine type, powernv10-rainier, that will contain rainier-specific devices.
---
Changes from previous version:
- Formatting changes
- Capitalized "Rainier" in machine description string
- Changed powernv10-rainier parent to MACHINE_TYPE_NAME("powernv10")
hw/ppc/pnv.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
hw/ppc/pnv.c +22 -2
@@ -2251,7 +2251,7 @@ static void pnv_machine_power9_class_init(ObjectClass *oc, void *data)machine_class_allow_dynamic_sysbus_dev (mc,TYPE_PNV_PHB ); } -static void pnv_machine_power10_class_init (ObjectClass *oc,void *data) +static void pnv_machine_p10_common_class_init (ObjectClass *oc,void *data) {MachineClass *mc =MACHINE_CLASS (oc);PnvMachineClass *pmc =PNV_MACHINE_CLASS (oc);
@@ -2263,7 +2263,6 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data) { TYPE_PNV_PHB_ROOT_PORT, "version", "5" }, }; - mc->desc ="IBM PowerNV (Non-Virtualized) POWER10" ; mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("power10_v2.0" );compat_props_add (mc->compat_props, phb_compat,G_N_ELEMENTS (phb_compat));
@@ -2276,6 +2275,22 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)machine_class_allow_dynamic_sysbus_dev (mc,TYPE_PNV_PHB ); } +static void pnv_machine_power10_class_init (ObjectClass *oc,void *data) +{ +MachineClass *mc =MACHINE_CLASS (oc); + +pnv_machine_p10_common_class_init (oc, data); + mc->desc ="IBM PowerNV (Non-Virtualized) POWER10" ; +} + +static void pnv_machine_p10_rainier_class_init (ObjectClass *oc,void *data) +{ +MachineClass *mc =MACHINE_CLASS (oc); + +pnv_machine_p10_common_class_init (oc, data); + mc->desc ="IBM PowerNV (Non-Virtualized) POWER10 Rainier" ; +} +static bool pnv_machine_get_hb (Object *obj,Error **errp) {PnvMachineState *pnv =PNV_MACHINE (obj);
@@ -2381,6 +2396,11 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data) }static const TypeInfo types[] = { + { + .name =MACHINE_TYPE_NAME ("powernv10-rainier" ), + .parent =MACHINE_TYPE_NAME ("powernv10" ), + .class_init = pnv_machine_p10_rainier_class_init, + }, { .name =MACHINE_TYPE_NAME ("powernv10" ), .parent =TYPE_PNV_MACHINE ,
Signature · 1 line
2.31.1
Re: [PATCH v5 3/9] ppc/pnv: New powernv10-rainier machine type
Quoted 4 lines · Glenn Miles
Create a new powernv machine type, powernv10-rainier, that will contain rainier-specific devices.
Signed-off-by Glenn Miles <[email protected]>
Thanks,
C.
Quoted 66 lines
---
Changes from previous version:
- Formatting changes
- Capitalized "Rainier" in machine description string
- Changed powernv10-rainier parent toMACHINE_TYPE_NAME("powernv10")hw/ppc/pnv.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)hw/ppc/pnv.c +22
-2@@ -2251,7 +2251,7 @@ static void pnv_machine_power9_class_init(ObjectClass *oc, void *data)machine_class_allow_dynamic_sysbus_dev (mc,TYPE_PNV_PHB ); } -static void pnv_machine_power10_class_init (ObjectClass *oc,void *data) +static void pnv_machine_p10_common_class_init (ObjectClass *oc,void *data) {MachineClass *mc =MACHINE_CLASS (oc);PnvMachineClass *pmc =PNV_MACHINE_CLASS (oc);@@ -2263,7 +2263,6 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data) { TYPE_PNV_PHB_ROOT_PORT, "version", "5" }, }; - mc->desc ="IBM PowerNV (Non-Virtualized) POWER10" ; mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("power10_v2.0" );compat_props_add (mc->compat_props, phb_compat,G_N_ELEMENTS (phb_compat));@@ -2276,6 +2275,22 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)machine_class_allow_dynamic_sysbus_dev (mc,TYPE_PNV_PHB ); } +static void pnv_machine_power10_class_init (ObjectClass *oc,void *data) +{ +MachineClass *mc =MACHINE_CLASS (oc); + +pnv_machine_p10_common_class_init (oc, data); + mc->desc ="IBM PowerNV (Non-Virtualized) POWER10" ; +} + +static void pnv_machine_p10_rainier_class_init (ObjectClass *oc,void *data) +{ +MachineClass *mc =MACHINE_CLASS (oc); + +pnv_machine_p10_common_class_init (oc, data); + mc->desc ="IBM PowerNV (Non-Virtualized) POWER10 Rainier" ; +} +static bool pnv_machine_get_hb (Object *obj,Error **errp) {PnvMachineState *pnv =PNV_MACHINE (obj);@@ -2381,6 +2396,11 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data) }static const TypeInfo types[] = { + { + .name =MACHINE_TYPE_NAME ("powernv10-rainier" ), + .parent =MACHINE_TYPE_NAME ("powernv10" ), + .class_init = pnv_machine_p10_rainier_class_init, + }, { .name =MACHINE_TYPE_NAME ("powernv10" ), .parent =TYPE_PNV_MACHINE ,
PATCH v5 4/9 ppc/pnv: Add pca9552 to powernv10-rainier for PCIe hotplug power control
In reply to Glenn MilesThe Power Hypervisor code expects to see a pca9552 device connected to the 3rd PNV I2C engine on port 1 at I2C address 0x63 (or left- justified address of 0xC6). This is used by hypervisor code to control PCIe slot power during hotplug events.
---
Changes from previous version:
- Formatting change
hw/ppc/Kconfig | 1 + hw/ppc/pnv.c | 25 +++++++++++++++++++++++++ include/hw/ppc/pnv.h | 1 + 3 files changed, 27 insertions(+)
hw/ppc/Kconfig +1 -0
@@ -32,6 +32,7 @@ config POWERNV select XIVE select FDT_PPC select PCI_POWERNV + select PCA9552 config PPC405 bool
hw/ppc/pnv.c +25 -0
@@ -790,6 +790,7 @@ static void pnv_init(MachineState *machine)const char *bios_name = machine->firmware ?:FW_FILE_NAME ;PnvMachineState *pnv =PNV_MACHINE (machine);MachineClass *mc =MACHINE_GET_CLASS (machine); +PnvMachineClass *pmc =PNV_MACHINE_GET_CLASS (machine);char *fw_filename;long fw_size;uint64_t chip_ram_start =0 ;
@@ -979,6 +980,13 @@ static void pnv_init(MachineState *machine)*/ pnv->powerdown_notifier.notify = pnv_powerdown_notify;qemu_register_powerdown_notifier (&pnv->powerdown_notifier); + +/* +* Create/Connect any machine-specific I2C devices +*/ +if (pmc->i2c_init) { + pmc->i2c_init (pnv); + } }/*
@@ -1879,6 +1887,21 @@ static void pnv_chip_power10_realize(DeviceState *dev, Error **errp)qdev_get_gpio_in (DEVICE (&chip10->psi), PSIHB9_IRQ_SBE_I2C)); } + +} + +static void pnv_rainier_i2c_init (PnvMachineState *pnv) +{ +int i; +for (i =0 ; i < pnv->num_chips; i++) { +Pnv10Chip *chip10 =PNV10_CHIP (pnv->chips[i]); + +/* +* Add a PCA9552 I2C device for PCIe hotplug control +* to engine 2, bus 1, address 0x63 +*/ +i2c_slave_create_simple (chip10->i2c[2 ].busses[1 ],"pca9552" ,0x63 ); + } }static uint32_t pnv_chip_power10_xscom_pcba (PnvChip *chip,uint64_t addr)
@@ -2286,9 +2309,11 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)static void pnv_machine_p10_rainier_class_init (ObjectClass *oc,void *data) {MachineClass *mc =MACHINE_CLASS (oc); +PnvMachineClass *pmc =PNV_MACHINE_CLASS (oc);pnv_machine_p10_common_class_init (oc, data); mc->desc ="IBM PowerNV (Non-Virtualized) POWER10 Rainier" ; + pmc->i2c_init = pnv_rainier_i2c_init; }static bool pnv_machine_get_hb (Object *obj,Error **errp)
include/hw/ppc/pnv.h +1 -0
@@ -76,6 +76,7 @@ struct PnvMachineClass {int compat_size;void (*dt_power_mgt)(PnvMachineState *pnv,void *fdt); +void (*i2c_init)(PnvMachineState *pnv); };struct PnvMachineState {
Signature · 1 line
2.31.1
PATCH v5 5/9 ppc/pnv: Wire up pca9552 GPIO pins for PCIe hotplug power control
In reply to Glenn MilesFor power10-rainier, a pca9552 device is used for PCIe slot hotplug power control by the Power Hypervisor code. The code expects that some time after it enables power to a PCIe slot by asserting one of the pca9552 GPIO pins 0-4, it should see a "power good" signal asserted on one of pca9552 GPIO pins 5-9.
To simulate this behavior, we simply connect the GPIO outputs for pins 0-4 to the GPIO inputs for pins 5-9.
Each PCIe slot is assigned 3 GPIO pins on the pca9552 device, for control of up to 5 PCIe slots. The per-slot signal names are:
SLOTx_EN.......PHYP uses this as an output to enable
slot power. We connect this to the SLOTx_PG pin to simulate a PGOOD signal.
SLOTx_PG.......PHYP uses this as in input to detect
PGOOD for the slot. For our purposes we just connect this to the SLOTx_EN output.
SLOTx_Control..PHYP uses this as an output to prevent
a race condition in the real hotplug circuitry, but we can ignore this output for simulation.
---
No change from previous version
hw/ppc/pnv.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
hw/ppc/pnv.c +18 -1
@@ -1900,7 +1900,24 @@ static void pnv_rainier_i2c_init(PnvMachineState *pnv)* Add a PCA9552 I2C device for PCIe hotplug control * to engine 2, bus 1, address 0x63 */ -i2c_slave_create_simple (chip10->i2c[2 ].busses[1 ],"pca9552" ,0x63 ); +I2CSlave *hotplug =i2c_slave_create_simple (chip10->i2c[2 ].busses[1 ], +"pca9552" ,0x63 ); + +/* +* Connect PCA9552 GPIO pins 0-4 (SLOTx_EN) outputs to GPIO pins 5-9 +* (SLOTx_PG) inputs in order to fake the pgood state of PCIe slots +* after hypervisor code sets a SLOTx_EN pin high. +*/ +qdev_connect_gpio_out (DEVICE (hotplug),0 , +qdev_get_gpio_in (DEVICE (hotplug),5 )); +qdev_connect_gpio_out (DEVICE (hotplug),1 , +qdev_get_gpio_in (DEVICE (hotplug),6 )); +qdev_connect_gpio_out (DEVICE (hotplug),2 , +qdev_get_gpio_in (DEVICE (hotplug),7 )); +qdev_connect_gpio_out (DEVICE (hotplug),3 , +qdev_get_gpio_in (DEVICE (hotplug),8 )); +qdev_connect_gpio_out (DEVICE (hotplug),4 , +qdev_get_gpio_in (DEVICE (hotplug),9 )); } }
Signature · 1 line
2.31.1
Re: [PATCH v5 5/9] ppc/pnv: Wire up pca9552 GPIO pins for PCIe hotplug power control
Quoted 24 lines · Glenn Miles
For power10-rainier, a pca9552 device is used for PCIe slot hotplug power control by the Power Hypervisor code. The code expects that some time after it enables power to a PCIe slot by asserting one of the pca9552 GPIO pins 0-4, it should see a "power good" signal asserted on one of pca9552 GPIO pins 5-9.
To simulate this behavior, we simply connect the GPIO outputs for pins 0-4 to the GPIO inputs for pins 5-9.
Each PCIe slot is assigned 3 GPIO pins on the pca9552 device, for control of up to 5 PCIe slots. The per-slot signal names are:
SLOTx_EN.......PHYP uses this as an output to enable
slot power. We connect this to theSLOTx_PGpin to simulate a PGOOD signal.
SLOTx_PG.......PHYP uses this as in input to detect
PGOOD for the slot. For our purposes we just connect this to theSLOTx_ENoutput.
SLOTx_Control..PHYP uses this as an output to prevent
a race condition in the real hotplug circuitry, but we can ignore this output for simulation.
Quoted 1 line
Signed-off-by Glenn Miles <[email protected]>
Thanks,
C.
Quoted 37 lines
---
No change from previous version
hw/ppc/pnv.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)hw/ppc/pnv.c +18
-1@@ -1900,7 +1900,24 @@ static void pnv_rainier_i2c_init(PnvMachineState *pnv)* Add a PCA9552 I2C device for PCIe hotplug control * to engine 2, bus 1, address 0x63 */ -i2c_slave_create_simple (chip10->i2c[2 ].busses[1 ],"pca9552" ,0x63 ); +I2CSlave *hotplug =i2c_slave_create_simple (chip10->i2c[2 ].busses[1 ], +"pca9552" ,0x63 ); + +/* +* Connect PCA9552 GPIO pins 0-4 (SLOTx_EN) outputs to GPIO pins 5-9 +* (SLOTx_PG) inputs in order to fake the pgood state of PCIe slots +* after hypervisor code sets a SLOTx_EN pin high. +*/ +qdev_connect_gpio_out (DEVICE (hotplug),0 , +qdev_get_gpio_in (DEVICE (hotplug),5 )); +qdev_connect_gpio_out (DEVICE (hotplug),1 , +qdev_get_gpio_in (DEVICE (hotplug),6 )); +qdev_connect_gpio_out (DEVICE (hotplug),2 , +qdev_get_gpio_in (DEVICE (hotplug),7 )); +qdev_connect_gpio_out (DEVICE (hotplug),3 , +qdev_get_gpio_in (DEVICE (hotplug),8 )); +qdev_connect_gpio_out (DEVICE (hotplug),4 , +qdev_get_gpio_in (DEVICE (hotplug),9 )); } }
PATCH v5 6/9 ppc/pnv: Use resettable interface to reset child I2C buses
In reply to Glenn MilesThe QEMU I2C buses and devices use the resettable interface for resetting while the PNV I2C controller and parent buses and devices have not yet transitioned to this new interface and use the old reset strategy. This was preventing the I2C buses and devices wired to the PNV I2C controller from being reset.
The short term fix for this is to have the PNV I2C Controller's reset function explicitly call the resettable interface function, bus_cold_reset(), on all child I2C buses.
The long term fix should be to transition all PNV parent devices and buses to use the resettable interface so that all child buses and devices are automatically reset.
---
No change from previous version
hw/ppc/pnv_i2c.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
hw/ppc/pnv_i2c.c +14 -1
@@ -629,6 +629,19 @@ static int pnv_i2c_dt_xscom(PnvXScomInterface *dev, void *fdt,return 0 ; } +static void pnv_i2c_sys_reset (void *dev) +{ +int port; +PnvI2C *i2c =PNV_I2C (dev); + +pnv_i2c_reset (dev); + +/* reset all buses connected to this i2c controller */ +for (port =0 ; port < i2c->num_busses; port++) { +bus_cold_reset (BUS (i2c->busses[port])); + } +} +static void pnv_i2c_realize (DeviceState *dev,Error **errp) {PnvI2C *i2c =PNV_I2C (dev);
@@ -654,7 +667,7 @@ static void pnv_i2c_realize(DeviceState *dev, Error **errp)fifo8_create (&i2c->fifo,PNV_I2C_FIFO_SIZE ); -qemu_register_reset (pnv_i2c_reset, dev); +qemu_register_reset (pnv_i2c_sys_reset, dev);qdev_init_gpio_out (DEVICE (dev), &i2c->psi_irq,1 ); }
Signature · 1 line
2.31.1
PATCH v5 7/9 misc: Add a pca9554 GPIO device model
In reply to Glenn MilesSpecs are available here:
https://www.nxp.com/docs/en/data-sheet/PCA9554_9554A.pdf
This is a simple model supporting the basic registers for GPIO mode. The device also supports an interrupt output line but the model does not yet support this.
---
No change from previous version
MAINTAINERS | 10 +- hw/misc/pca9554.c | 328 +++++++++++++++++++++++++++++++++ include/hw/misc/pca9554.h | 36 ++++ include/hw/misc/pca9554_regs.h | 19 ++ 4 files changed, 391 insertions(+), 2 deletions(-) create mode 100644 hw/misc/pca9554.c create mode 100644 include/hw/misc/pca9554.h create mode 100644 include/hw/misc/pca9554_regs.h
MAINTAINERS +8 -2
@@ -1155,9 +1155,7 @@ R: Joel Stanley <[email protected]> L: [email protected] S: Maintained F: hw/*/*aspeed* -F: hw/misc/pca9552.c F: include/hw/*/*aspeed* -F: include/hw/misc/pca9552*.h F: hw/net/ftgmac100.c F: include/hw/net/ftgmac100.h F: docs/system/arm/aspeed.rst
@@ -1526,6 +1524,14 @@ F: include/hw/pci-host/pnv* F: pc-bios/skiboot.lid F: tests/qtest/pnv* +pca955x +M: Glenn Miles <[email protected]> +L: [email protected] +L: [email protected] +S: Odd Fixes +F: hw/misc/pca955*.c +F: include/hw/misc/pca955*.h + virtex_ml507 M: Edgar E. Iglesias <[email protected]> L: [email protected]
hw/misc/pca9554.c new file +328 -0
328 lines not on this page · raw message
include/hw/misc/pca9554.h new file +36 -0
@@ -0,0 +1,36 @@ +/* +* PCA9554 I/O port +* +* Copyright (c) 2023, IBM Corporation. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef PCA9554_H +#define PCA9554_H + +#include "hw/i2c/i2c.h" +#include "qom/object.h" + +#define TYPE_PCA9554 "pca9554" +typedef struct PCA9554State PCA9554State ; +DECLARE_INSTANCE_CHECKER (PCA9554State,PCA9554 , + TYPE_PCA9554) + +#define PCA9554_NR_REGS 4 +#define PCA9554_PIN_COUNT 8 + +struct PCA9554State { +/*< private >*/ +I2CSlave i2c; +/*< public >*/ + +uint8_t len; +uint8_t pointer; + +uint8_t regs[PCA9554_NR_REGS ]; +qemu_irq gpio_out[PCA9554_PIN_COUNT ]; +uint8_t ext_state[PCA9554_PIN_COUNT ]; +char *description;/* For debugging purpose only */ +}; + +#endif
include/hw/misc/pca9554_regs.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* PCA9554 I/O port registers +* +* Copyright (c) 2023, IBM Corporation. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef PCA9554_REGS_H +#define PCA9554_REGS_H + +/* +* Bits [0:1] are used to address a specific register. +*/ +#define PCA9554_INPUT 0/* read only input register */ +#define PCA9554_OUTPUT 1/* read/write pin output state */ +#define PCA9554_POLARITY 2/* Set polarity of input register */ +#define PCA9554_CONFIG 3/* Set pins as inputs our ouputs */ + +#endif
Signature · 1 line
2.31.1
Re: [PATCH v5 7/9] misc: Add a pca9554 GPIO device model
Quoted 9 lines · Glenn Miles
Specs are available here:
https://www.nxp.com/docs/en/data-sheet/PCA9554_9554A.pdfThis is a simple model supporting the basic registers for GPIO mode. The device also supports an interrupt output line but the model does not yet support this.
Reviewed-by Cédric Le Goater <[email protected]>
My R-b was on patch "ppc/pnv: Add a pca9554 I2C device to powernv10-rainier". Not on the pca9554 model itself.
Thanks,
C.
Quoted 444 lines
Signed-off-by Glenn Miles <[email protected]>---
No change from previous version
MAINTAINERS | 10 +- hw/misc/pca9554.c | 328 +++++++++++++++++++++++++++++++++ include/hw/misc/pca9554.h | 36 ++++ include/hw/misc/pca9554_regs.h | 19 ++ 4 files changed, 391 insertions(+), 2 deletions(-)create mode 100644
hw/misc/pca9554.ccreate mode 100644include/hw/misc/pca9554.hcreate mode 100644include/hw/misc/pca9554_regs.hMAINTAINERS +8
-2@@ -1155,9 +1155,7 @@ R: Joel Stanley <[email protected]> L: [email protected] S: Maintained F: hw/*/*aspeed* -F: hw/misc/pca9552.c F: include/hw/*/*aspeed* -F: include/hw/misc/pca9552*.h F: hw/net/ftgmac100.c F: include/hw/net/ftgmac100.h F: docs/system/arm/aspeed.rst@@ -1526,6 +1524,14 @@ F: include/hw/pci-host/pnv* F: pc-bios/skiboot.lid F: tests/qtest/pnv* +pca955x +M: Glenn Miles <[email protected]> +L: [email protected] +L: [email protected] +S: Odd Fixes +F: hw/misc/pca955*.c +F: include/hw/misc/pca955*.h + virtex_ml507 M: Edgar E. Iglesias <[email protected]> L: [email protected]hw/misc/pca9554.c new file +328
-0@@ -0,0 +1,328 @@ +/* +* PCA9554 I/O port +* +* Copyright (c) 2023, IBM Corporation. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "qemu/bitops.h" +#include "hw/qdev-properties.h" +#include "hw/misc/pca9554.h" +#include "hw/misc/pca9554_regs.h" +#include "hw/irq.h" +#include "migration/vmstate.h" +#include "qapi/error.h" +#include "qapi/visitor.h" +#include "trace.h" +#include "qom/object.h" + +struct PCA9554Class { +/*< private >*/ +I2CSlaveClass parent_class; +/*< public >*/ +}; +typedef struct PCA9554Class PCA9554Class ; + +DECLARE_CLASS_CHECKERS (PCA9554Class,PCA9554 , + TYPE_PCA9554) + +#define PCA9554_PIN_LOW 0x0 +#define PCA9554_PIN_HIZ 0x1 + +static const char *pin_state[] = {"low" ,"high" }; + +static void pca9554_update_pin_input (PCA9554State *s) +{ +int i; +uint8_t config = s->regs[PCA9554_CONFIG ]; +uint8_t output = s->regs[PCA9554_OUTPUT ]; +uint8_t internal_state = config | output; + +for (i =0 ; i <PCA9554_PIN_COUNT ; i++) { +uint8_t bit_mask =1 << i; +uint8_t internal_pin_state = (internal_state >> i) &0x1 ; +uint8_t old_value = s->regs[PCA9554_INPUT ] & bit_mask; +uint8_t new_value; + +switch (internal_pin_state) { +case PCA9554_PIN_LOW : + s->regs[PCA9554_INPUT ] &= ~bit_mask; +break ; +case PCA9554_PIN_HIZ : +/* +* pullup sets it to a logical 1 unless +* external device drives it low. +*/ +if (s->ext_state[i] ==PCA9554_PIN_LOW ) { + s->regs[PCA9554_INPUT ] &= ~bit_mask; + }else { + s->regs[PCA9554_INPUT ] |= bit_mask; + } +break ; +default : +break ; + } + +/* update irq state only if pin state changed */ + new_value = s->regs[PCA9554_INPUT ] & bit_mask; +if (new_value != old_value) { +if (new_value) { +/* changed from 0 to 1 */ +qemu_set_irq (s->gpio_out[i],1 ); + }else { +/* changed from 1 to 0 */ +qemu_set_irq (s->gpio_out[i],0 ); + } + } + } +} + +static uint8_t pca9554_read (PCA9554State *s,uint8_t reg) +{ +switch (reg) { +case PCA9554_INPUT : +return s->regs[PCA9554_INPUT ] ^ s->regs[PCA9554_POLARITY ]; +case PCA9554_OUTPUT : +case PCA9554_POLARITY : +case PCA9554_CONFIG : +return s->regs[reg]; +default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: unexpected read to register %d\n" , + __func__, reg); +return 0xFF ; + } +} + +static void pca9554_write (PCA9554State *s,uint8_t reg,uint8_t data) +{ +switch (reg) { +case PCA9554_OUTPUT : +case PCA9554_CONFIG : + s->regs[reg] = data; +pca9554_update_pin_input (s); +break ; +case PCA9554_POLARITY : + s->regs[reg] = data; +break ; +case PCA9554_INPUT : +default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: unexpected write to register %d\n" , + __func__, reg); + } +} + +static uint8_t pca9554_recv (I2CSlave *i2c) +{ +PCA9554State *s =PCA9554 (i2c); +uint8_t ret; + + ret =pca9554_read (s, s->pointer &0x3 ); + +return ret; +} + +static int pca9554_send (I2CSlave *i2c,uint8_t data) +{ +PCA9554State *s =PCA9554 (i2c); + +/* First byte sent by is the register address */ +if (s->len ==0 ) { + s->pointer = data; + s->len++; + }else { +pca9554_write (s, s->pointer &0x3 , data); + } + +return 0 ; +} + +static int pca9554_event (I2CSlave *i2c,enum i2c_event event) +{ +PCA9554State *s =PCA9554 (i2c); + + s->len =0 ; +return 0 ; +} + +static void pca9554_get_pin (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +PCA9554State *s =PCA9554 (obj); +int pin, rc; +uint8_t state; + + rc =sscanf (name,"pin%2d" , &pin); +if (rc !=1 ) { +error_setg (errp,"%s: error reading %s" , __func__, name); +return ; + } +if (pin <0 || pin >PCA9554_PIN_COUNT ) { +error_setg (errp,"%s invalid pin %s" , __func__, name); +return ; + } + + state =pca9554_read (s,PCA9554_CONFIG ); + state |=pca9554_read (s,PCA9554_OUTPUT ); + state = (state >> pin) &0x1 ; +visit_type_str (v, name, (char **)&pin_state[state], errp); +} + +static void pca9554_set_pin (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +PCA9554State *s =PCA9554 (obj); +int pin, rc, val; +uint8_t state, mask; +char *state_str; + +if (!visit_type_str (v, name, &state_str, errp)) { +return ; + } + rc =sscanf (name,"pin%2d" , &pin); +if (rc !=1 ) { +error_setg (errp,"%s: error reading %s" , __func__, name); +return ; + } +if (pin <0 || pin >PCA9554_PIN_COUNT ) { +error_setg (errp,"%s invalid pin %s" , __func__, name); +return ; + } + +for (state =0 ; state <ARRAY_SIZE (pin_state); state++) { +if (!strcmp (state_str, pin_state[state])) { +break ; + } + } +if (state >=ARRAY_SIZE (pin_state)) { +error_setg (errp,"%s invalid pin state %s" , __func__, state_str); +return ; + } + +/* First, modify the output register bit */ + val =pca9554_read (s,PCA9554_OUTPUT ); + mask =0x1 << pin; +if (state ==PCA9554_PIN_LOW ) { + val &= ~(mask); + }else { + val |= mask; + } +pca9554_write (s,PCA9554_OUTPUT , val); + +/* Then, clear the config register bit for output mode */ + val =pca9554_read (s,PCA9554_CONFIG ); + val &= ~mask; +pca9554_write (s,PCA9554_CONFIG , val); +} + +static const VMStateDescription pca9554_vmstate = { + .name ="PCA9554" , + .version_id =0 , + .minimum_version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT8 (len, PCA9554State), +VMSTATE_UINT8 (pointer, PCA9554State), +VMSTATE_UINT8_ARRAY (regs, PCA9554State,PCA9554_NR_REGS ), +VMSTATE_UINT8_ARRAY (ext_state, PCA9554State,PCA9554_PIN_COUNT ), +VMSTATE_I2C_SLAVE (i2c, PCA9554State), +VMSTATE_END_OF_LIST () + } +}; + +static void pca9554_reset (DeviceState *dev) +{ +PCA9554State *s =PCA9554 (dev); + + s->regs[PCA9554_INPUT ] =0xFF ; + s->regs[PCA9554_OUTPUT ] =0xFF ; + s->regs[PCA9554_POLARITY ] =0x0 ;/* No pins are inverted */ + s->regs[PCA9554_CONFIG ] =0xFF ;/* All pins are inputs */ + +memset (s->ext_state,PCA9554_PIN_HIZ ,PCA9554_PIN_COUNT ); +pca9554_update_pin_input (s); + + s->pointer =0x0 ; + s->len =0 ; +} + +static void pca9554_initfn (Object *obj) +{ +int pin; + +for (pin =0 ; pin <PCA9554_PIN_COUNT ; pin++) { +char *name; + + name =g_strdup_printf ("pin%d" , pin); +object_property_add (obj, name,"bool" , pca9554_get_pin, pca9554_set_pin, +NULL ,NULL ); +g_free (name); + } +} + +static void pca9554_set_ext_state (PCA9554State *s,int pin,int level) +{ +if (s->ext_state[pin] != level) { + s->ext_state[pin] = level; +pca9554_update_pin_input (s); + } +} + +static void pca9554_gpio_in_handler (void *opaque,int pin,int level) +{ + +PCA9554State *s =PCA9554 (opaque); + +assert ((pin >=0 ) && (pin <PCA9554_PIN_COUNT )); +pca9554_set_ext_state (s, pin, level); +} + +static void pca9554_realize (DeviceState *dev,Error **errp) +{ +PCA9554State *s =PCA9554 (dev); + +if (!s->description) { + s->description =g_strdup ("pca9554" ); + } + +qdev_init_gpio_out (dev, s->gpio_out,PCA9554_PIN_COUNT ); +qdev_init_gpio_in (dev, pca9554_gpio_in_handler,PCA9554_PIN_COUNT ); +} + +static Property pca9554_properties[] = { +DEFINE_PROP_STRING ("description" , PCA9554State, description), +DEFINE_PROP_END_OF_LIST (), +}; + +static void pca9554_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +I2CSlaveClass *k =I2C_SLAVE_CLASS (klass); + + k->event = pca9554_event; + k->recv = pca9554_recv; + k->send = pca9554_send; + dc->realize = pca9554_realize; + dc->reset = pca9554_reset; + dc->vmsd = &pca9554_vmstate; +device_class_set_props (dc, pca9554_properties); +} + +static const TypeInfo pca9554_info = { + .name =TYPE_PCA9554 , + .parent =TYPE_I2C_SLAVE , + .instance_init = pca9554_initfn, + .instance_size =sizeof (PCA9554State), + .class_init = pca9554_class_init, + .class_size =sizeof (PCA9554Class), + .abstract = false, +}; + +static void pca9554_register_types (void ) +{ +type_register_static (&pca9554_info); +} + +type_init (pca9554_register_types)include/hw/misc/pca9554.h new file +36
-0@@ -0,0 +1,36 @@ +/* +* PCA9554 I/O port +* +* Copyright (c) 2023, IBM Corporation. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef PCA9554_H +#define PCA9554_H + +#include "hw/i2c/i2c.h" +#include "qom/object.h" + +#define TYPE_PCA9554 "pca9554" +typedef struct PCA9554State PCA9554State ; +DECLARE_INSTANCE_CHECKER (PCA9554State,PCA9554 , + TYPE_PCA9554) + +#define PCA9554_NR_REGS 4 +#define PCA9554_PIN_COUNT 8 + +struct PCA9554State { +/*< private >*/ +I2CSlave i2c; +/*< public >*/ + +uint8_t len; +uint8_t pointer; + +uint8_t regs[PCA9554_NR_REGS ]; +qemu_irq gpio_out[PCA9554_PIN_COUNT ]; +uint8_t ext_state[PCA9554_PIN_COUNT ]; +char *description;/* For debugging purpose only */ +}; + +#endif include/hw/misc/pca9554_regs.h new file +19
-0@@ -0,0 +1,19 @@ +/* +* PCA9554 I/O port registers +* +* Copyright (c) 2023, IBM Corporation. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef PCA9554_REGS_H +#define PCA9554_REGS_H + +/* +* Bits [0:1] are used to address a specific register. +*/ +#define PCA9554_INPUT 0/* read only input register */ +#define PCA9554_OUTPUT 1/* read/write pin output state */ +#define PCA9554_POLARITY 2/* Set polarity of input register */ +#define PCA9554_CONFIG 3/* Set pins as inputs our ouputs */ + +#endif
Re: [PATCH v5 7/9] misc: Add a pca9554 GPIO device model
Quoted 11 lines · Cédric Le Goater
Quoted 9 lines · Glenn Miles
Specs are available here:
https://www.nxp.com/docs/en/data-sheet/PCA9554_9554A.pdfThis is a simple model supporting the basic registers for GPIO mode. The device also supports an interrupt output line but the model does not yet support this.
Reviewed-by Cédric Le Goater <[email protected]>
Quoted 8 lines
My R-b was on patch "ppc/pnv: Add a pca9554 I2C device to powernv10- rainier".
Not on the pca9554 model itself.Thanks,
C.
Yikes! Sorry about that. I wonder if there's a good tool out there to help with tracking this type of information.
Thanks,
Glenn
Quoted 459 lines
Quoted 459 lines
Signed-off-by Glenn Miles <[email protected]>---
No change from previous version
MAINTAINERS | 10 +- hw/misc/pca9554.c | 328 +++++++++++++++++++++++++++++++++ include/hw/misc/pca9554.h | 36 ++++ include/hw/misc/pca9554_regs.h | 19 ++ 4 files changed, 391 insertions(+), 2 deletions(-)create mode 100644
hw/misc/pca9554.ccreate mode 100644include/hw/misc/pca9554.hcreate mode 100644include/hw/misc/pca9554_regs.hMAINTAINERS +8
-2@@ -1155,9 +1155,7 @@ R: Joel Stanley <[email protected]> L: [email protected] S: Maintained F: hw/*/*aspeed* -F: hw/misc/pca9552.c F: include/hw/*/*aspeed* -F: include/hw/misc/pca9552*.h F: hw/net/ftgmac100.c F: include/hw/net/ftgmac100.h F: docs/system/arm/aspeed.rst@@ -1526,6 +1524,14 @@ F: include/hw/pci-host/pnv* F: pc-bios/skiboot.lid F: tests/qtest/pnv* +pca955x +M: Glenn Miles <[email protected]> +L: [email protected] +L: [email protected] +S: Odd Fixes +F: hw/misc/pca955*.c +F: include/hw/misc/pca955*.h + virtex_ml507 M: Edgar E. Iglesias <[email protected]> L: [email protected]hw/misc/pca9554.c new file +94
-0@@ -0,0 +1,328 @@ +/* +* PCA9554 I/O port +* +* Copyright (c) 2023, IBM Corporation. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "qemu/bitops.h" +#include "hw/qdev-properties.h" +#include "hw/misc/pca9554.h" +#include "hw/misc/pca9554_regs.h" +#include "hw/irq.h" +#include "migration/vmstate.h" +#include "qapi/error.h" +#include "qapi/visitor.h" +#include "trace.h" +#include "qom/object.h" + +struct PCA9554Class { +/*< private >*/ +I2CSlaveClass parent_class; +/*< public >*/ +}; +typedef struct PCA9554Class PCA9554Class ; + +DECLARE_CLASS_CHECKERS (PCA9554Class,PCA9554 , + TYPE_PCA9554) + +#define PCA9554_PIN_LOW 0x0 +#define PCA9554_PIN_HIZ 0x1 + +static const char *pin_state[] = {"low" ,"high" }; + +static void pca9554_update_pin_input (PCA9554State *s) +{ +int i; +uint8_t config = s->regs[PCA9554_CONFIG ]; +uint8_t output = s->regs[PCA9554_OUTPUT ]; +uint8_t internal_state = config | output; + +for (i =0 ; i <PCA9554_PIN_COUNT ; i++) { +uint8_t bit_mask =1 << i; +uint8_t internal_pin_state = (internal_state >> i) &0x1 ; +uint8_t old_value = s->regs[PCA9554_INPUT ] & bit_mask; +uint8_t new_value; + +switch (internal_pin_state) { +case PCA9554_PIN_LOW : + s->regs[PCA9554_INPUT ] &= ~bit_mask; +break ; +case PCA9554_PIN_HIZ : +/* +* pullup sets it to a logical 1 unless +* external device drives it low. +*/ +if (s->ext_state[i] ==PCA9554_PIN_LOW ) { + s->regs[PCA9554_INPUT ] &= ~bit_mask; + }else { + s->regs[PCA9554_INPUT ] |= bit_mask; + } +break ; +default : +break ; + } + +/* update irq state only if pin state changed */ + new_value = s->regs[PCA9554_INPUT ] & bit_mask; +if (new_value != old_value) { +if (new_value) { +/* changed from 0 to 1 */ +qemu_set_irq (s->gpio_out[i],1 ); + }else { +/* changed from 1 to 0 */ +qemu_set_irq (s->gpio_out[i],0 ); + } + } + } +} + +static uint8_t pca9554_read (PCA9554State *s,uint8_t reg) +{ +switch (reg) { +case PCA9554_INPUT : +return s->regs[PCA9554_INPUT ] ^ s->regs[PCA9554_POLARITY ]; +case PCA9554_OUTPUT : +case PCA9554_POLARITY : +case PCA9554_CONFIG : +return s->regs[reg]; +default : + qemu_log_mask(LOG_GUEST_ERROR, "%s: unexpected read toregister %d\n",
hw/misc/pca9554.c new file +6
-0+ __func__, reg); +return 0xFF ; + } +} + +static void pca9554_write(PCA9554State *s, uint8_t reg, uint8_tdata)
hw/misc/pca9554.c new file +13
-0+{ +switch (reg) { +case PCA9554_OUTPUT : +case PCA9554_CONFIG : + s->regs[reg] = data; +pca9554_update_pin_input (s); +break ; +case PCA9554_POLARITY : + s->regs[reg] = data; +break ; +case PCA9554_INPUT : +default : + qemu_log_mask(LOG_GUEST_ERROR, "%s: unexpected write toregister %d\n",
hw/misc/pca9554.c new file +38
-0+ __func__, reg); + } +} + +static uint8_t pca9554_recv (I2CSlave *i2c) +{ +PCA9554State *s =PCA9554 (i2c); +uint8_t ret; + + ret =pca9554_read (s, s->pointer &0x3 ); + +return ret; +} + +static int pca9554_send (I2CSlave *i2c,uint8_t data) +{ +PCA9554State *s =PCA9554 (i2c); + +/* First byte sent by is the register address */ +if (s->len ==0 ) { + s->pointer = data; + s->len++; + }else { +pca9554_write (s, s->pointer &0x3 , data); + } + +return 0 ; +} + +static int pca9554_event (I2CSlave *i2c,enum i2c_event event) +{ +PCA9554State *s =PCA9554 (i2c); + + s->len =0 ; +return 0 ; +} + +static void pca9554_get_pin(Object *obj, Visitor *v, const char*name,
hw/misc/pca9554.c new file +23
-0+ void *opaque, Error **errp) +{ + PCA9554State *s = PCA9554(obj); +int pin, rc; +uint8_t state; + + rc =sscanf (name,"pin%2d" , &pin); +if (rc !=1 ) { +error_setg (errp,"%s: error reading %s" , __func__, name); +return ; + } +if (pin <0 || pin >PCA9554_PIN_COUNT ) { +error_setg (errp,"%s invalid pin %s" , __func__, name); +return ; + } + + state =pca9554_read (s,PCA9554_CONFIG ); + state |=pca9554_read (s,PCA9554_OUTPUT ); + state = (state >> pin) &0x1 ; +visit_type_str (v, name, (char **)&pin_state[state], errp); +} + +static void pca9554_set_pin(Object *obj, Visitor *v, const char*name,
hw/misc/pca9554.c new file +27
-0+ void *opaque, Error **errp) +{ + PCA9554State *s = PCA9554(obj); +int pin, rc, val; +uint8_t state, mask; +char *state_str; + +if (!visit_type_str (v, name, &state_str, errp)) { +return ; + } + rc =sscanf (name,"pin%2d" , &pin); +if (rc !=1 ) { +error_setg (errp,"%s: error reading %s" , __func__, name); +return ; + } +if (pin <0 || pin >PCA9554_PIN_COUNT ) { +error_setg (errp,"%s invalid pin %s" , __func__, name); +return ; + } + +for (state =0 ; state <ARRAY_SIZE (pin_state); state++) { +if (!strcmp (state_str, pin_state[state])) { +break ; + } + } +if (state >=ARRAY_SIZE (pin_state)) { + error_setg(errp, "%s invalid pin state %s", __func__,
state_str);hw/misc/pca9554.c new file +28
-0+return ; + } + +/* First, modify the output register bit */ + val =pca9554_read (s,PCA9554_OUTPUT ); + mask =0x1 << pin; +if (state ==PCA9554_PIN_LOW ) { + val &= ~(mask); + }else { + val |= mask; + } +pca9554_write (s,PCA9554_OUTPUT , val); + +/* Then, clear the config register bit for output mode */ + val =pca9554_read (s,PCA9554_CONFIG ); + val &= ~mask; +pca9554_write (s,PCA9554_CONFIG , val); +} + +static const VMStateDescription pca9554_vmstate = { + .name ="PCA9554" , + .version_id =0 , + .minimum_version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT8 (len, PCA9554State), +VMSTATE_UINT8 (pointer, PCA9554State), +VMSTATE_UINT8_ARRAY (regs, PCA9554State,PCA9554_NR_REGS ), + VMSTATE_UINT8_ARRAY(ext_state, PCA9554State,
PCA9554_PIN_COUNT),hw/misc/pca9554.c new file +30
-0+VMSTATE_I2C_SLAVE (i2c, PCA9554State), + VMSTATE_END_OF_LIST() + } +}; + +static void pca9554_reset (DeviceState *dev) +{ +PCA9554State *s =PCA9554 (dev); + + s->regs[PCA9554_INPUT ] =0xFF ; + s->regs[PCA9554_OUTPUT ] =0xFF ; + s->regs[PCA9554_POLARITY ] =0x0 ;/* No pins are inverted */ + s->regs[PCA9554_CONFIG ] =0xFF ;/* All pins are inputs */ + +memset (s->ext_state,PCA9554_PIN_HIZ ,PCA9554_PIN_COUNT ); +pca9554_update_pin_input (s); + + s->pointer =0x0 ; + s->len =0 ; +} + +static void pca9554_initfn (Object *obj) +{ +int pin; + +for (pin =0 ; pin <PCA9554_PIN_COUNT ; pin++) { +char *name; + + name =g_strdup_printf ("pin%d" , pin); + object_property_add(obj, name, "bool", pca9554_get_pin,
pca9554_set_pin,hw/misc/pca9554.c new file +6
-0+ NULL, NULL); +g_free (name); + } +} + +static void pca9554_set_ext_state(PCA9554State *s, int pin, intlevel)
hw/misc/pca9554.c new file +8
-0+{ +if (s->ext_state[pin] != level) { + s->ext_state[pin] = level; +pca9554_update_pin_input (s); + } +} + +static void pca9554_gpio_in_handler(void *opaque, int pin, intlevel)
hw/misc/pca9554.c new file +18
-0+{ + +PCA9554State *s =PCA9554 (opaque); + +assert ((pin >=0 ) && (pin <PCA9554_PIN_COUNT )); +pca9554_set_ext_state (s, pin, level); +} + +static void pca9554_realize (DeviceState *dev,Error **errp) +{ +PCA9554State *s =PCA9554 (dev); + +if (!s->description) { + s->description =g_strdup ("pca9554" ); + } + +qdev_init_gpio_out (dev, s->gpio_out,PCA9554_PIN_COUNT ); + qdev_init_gpio_in(dev, pca9554_gpio_in_handler,
PCA9554_PIN_COUNT);hw/misc/pca9554.c new file +37
-0+} + +static Property pca9554_properties[] = { +DEFINE_PROP_STRING ("description" , PCA9554State, description), +DEFINE_PROP_END_OF_LIST (), +}; + +static void pca9554_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +I2CSlaveClass *k =I2C_SLAVE_CLASS (klass); + + k->event = pca9554_event; + k->recv = pca9554_recv; + k->send = pca9554_send; + dc->realize = pca9554_realize; + dc->reset = pca9554_reset; + dc->vmsd = &pca9554_vmstate; +device_class_set_props (dc, pca9554_properties); +} + +static const TypeInfo pca9554_info = { + .name =TYPE_PCA9554 , + .parent =TYPE_I2C_SLAVE , + .instance_init = pca9554_initfn, + .instance_size =sizeof (PCA9554State), + .class_init = pca9554_class_init, + .class_size =sizeof (PCA9554Class), + .abstract = false, +}; + +static void pca9554_register_types (void ) +{ +type_register_static (&pca9554_info); +} + +type_init (pca9554_register_types)include/hw/misc/pca9554.h new file +36
-0@@ -0,0 +1,36 @@ +/* +* PCA9554 I/O port +* +* Copyright (c) 2023, IBM Corporation. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef PCA9554_H +#define PCA9554_H + +#include "hw/i2c/i2c.h" +#include "qom/object.h" + +#define TYPE_PCA9554 "pca9554" +typedef struct PCA9554State PCA9554State ; +DECLARE_INSTANCE_CHECKER (PCA9554State,PCA9554 , + TYPE_PCA9554) + +#define PCA9554_NR_REGS 4 +#define PCA9554_PIN_COUNT 8 + +struct PCA9554State { +/*< private >*/ +I2CSlave i2c; +/*< public >*/ + +uint8_t len; +uint8_t pointer; + +uint8_t regs[PCA9554_NR_REGS ]; +qemu_irq gpio_out[PCA9554_PIN_COUNT ]; +uint8_t ext_state[PCA9554_PIN_COUNT ]; +char *description;/* For debugging purpose only */ +}; + +#endif include/hw/misc/pca9554_regs.h new file +19
-0@@ -0,0 +1,19 @@ +/* +* PCA9554 I/O port registers +* +* Copyright (c) 2023, IBM Corporation. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef PCA9554_REGS_H +#define PCA9554_REGS_H + +/* +* Bits [0:1] are used to address a specific register. +*/ +#define PCA9554_INPUT 0/* read only input register */ +#define PCA9554_OUTPUT 1/* read/write pin output state */ +#define PCA9554_POLARITY 2/* Set polarity of input register */ +#define PCA9554_CONFIG 3/* Set pins as inputs our ouputs */ + +#endif
Re: [PATCH v5 7/9] misc: Add a pca9554 GPIO device model
In reply to Glenn MilesQuoted 11 lines · Glenn Miles
Specs are available here:
https://www.nxp.com/docs/en/data-sheet/PCA9554_9554A.pdfThis is a simple model supporting the basic registers for GPIO mode. The device also supports an interrupt output line but the model does not yet support this.
Reviewed-by Cédric Le Goater <[email protected]>Signed-off-by Glenn Miles <[email protected]>---
Thanks,
C.
Quoted 442 lines
No change from previous version
MAINTAINERS | 10 +- hw/misc/pca9554.c | 328 +++++++++++++++++++++++++++++++++ include/hw/misc/pca9554.h | 36 ++++ include/hw/misc/pca9554_regs.h | 19 ++ 4 files changed, 391 insertions(+), 2 deletions(-)create mode 100644
hw/misc/pca9554.ccreate mode 100644include/hw/misc/pca9554.hcreate mode 100644include/hw/misc/pca9554_regs.hMAINTAINERS +8
-2@@ -1155,9 +1155,7 @@ R: Joel Stanley <[email protected]> L: [email protected] S: Maintained F: hw/*/*aspeed* -F: hw/misc/pca9552.c F: include/hw/*/*aspeed* -F: include/hw/misc/pca9552*.h F: hw/net/ftgmac100.c F: include/hw/net/ftgmac100.h F: docs/system/arm/aspeed.rst@@ -1526,6 +1524,14 @@ F: include/hw/pci-host/pnv* F: pc-bios/skiboot.lid F: tests/qtest/pnv* +pca955x +M: Glenn Miles <[email protected]> +L: [email protected] +L: [email protected] +S: Odd Fixes +F: hw/misc/pca955*.c +F: include/hw/misc/pca955*.h + virtex_ml507 M: Edgar E. Iglesias <[email protected]> L: [email protected]hw/misc/pca9554.c new file +328
-0@@ -0,0 +1,328 @@ +/* +* PCA9554 I/O port +* +* Copyright (c) 2023, IBM Corporation. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "qemu/bitops.h" +#include "hw/qdev-properties.h" +#include "hw/misc/pca9554.h" +#include "hw/misc/pca9554_regs.h" +#include "hw/irq.h" +#include "migration/vmstate.h" +#include "qapi/error.h" +#include "qapi/visitor.h" +#include "trace.h" +#include "qom/object.h" + +struct PCA9554Class { +/*< private >*/ +I2CSlaveClass parent_class; +/*< public >*/ +}; +typedef struct PCA9554Class PCA9554Class ; + +DECLARE_CLASS_CHECKERS (PCA9554Class,PCA9554 , + TYPE_PCA9554) + +#define PCA9554_PIN_LOW 0x0 +#define PCA9554_PIN_HIZ 0x1 + +static const char *pin_state[] = {"low" ,"high" }; + +static void pca9554_update_pin_input (PCA9554State *s) +{ +int i; +uint8_t config = s->regs[PCA9554_CONFIG ]; +uint8_t output = s->regs[PCA9554_OUTPUT ]; +uint8_t internal_state = config | output; + +for (i =0 ; i <PCA9554_PIN_COUNT ; i++) { +uint8_t bit_mask =1 << i; +uint8_t internal_pin_state = (internal_state >> i) &0x1 ; +uint8_t old_value = s->regs[PCA9554_INPUT ] & bit_mask; +uint8_t new_value; + +switch (internal_pin_state) { +case PCA9554_PIN_LOW : + s->regs[PCA9554_INPUT ] &= ~bit_mask; +break ; +case PCA9554_PIN_HIZ : +/* +* pullup sets it to a logical 1 unless +* external device drives it low. +*/ +if (s->ext_state[i] ==PCA9554_PIN_LOW ) { + s->regs[PCA9554_INPUT ] &= ~bit_mask; + }else { + s->regs[PCA9554_INPUT ] |= bit_mask; + } +break ; +default : +break ; + } + +/* update irq state only if pin state changed */ + new_value = s->regs[PCA9554_INPUT ] & bit_mask; +if (new_value != old_value) { +if (new_value) { +/* changed from 0 to 1 */ +qemu_set_irq (s->gpio_out[i],1 ); + }else { +/* changed from 1 to 0 */ +qemu_set_irq (s->gpio_out[i],0 ); + } + } + } +} + +static uint8_t pca9554_read (PCA9554State *s,uint8_t reg) +{ +switch (reg) { +case PCA9554_INPUT : +return s->regs[PCA9554_INPUT ] ^ s->regs[PCA9554_POLARITY ]; +case PCA9554_OUTPUT : +case PCA9554_POLARITY : +case PCA9554_CONFIG : +return s->regs[reg]; +default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: unexpected read to register %d\n" , + __func__, reg); +return 0xFF ; + } +} + +static void pca9554_write (PCA9554State *s,uint8_t reg,uint8_t data) +{ +switch (reg) { +case PCA9554_OUTPUT : +case PCA9554_CONFIG : + s->regs[reg] = data; +pca9554_update_pin_input (s); +break ; +case PCA9554_POLARITY : + s->regs[reg] = data; +break ; +case PCA9554_INPUT : +default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: unexpected write to register %d\n" , + __func__, reg); + } +} + +static uint8_t pca9554_recv (I2CSlave *i2c) +{ +PCA9554State *s =PCA9554 (i2c); +uint8_t ret; + + ret =pca9554_read (s, s->pointer &0x3 ); + +return ret; +} + +static int pca9554_send (I2CSlave *i2c,uint8_t data) +{ +PCA9554State *s =PCA9554 (i2c); + +/* First byte sent by is the register address */ +if (s->len ==0 ) { + s->pointer = data; + s->len++; + }else { +pca9554_write (s, s->pointer &0x3 , data); + } + +return 0 ; +} + +static int pca9554_event (I2CSlave *i2c,enum i2c_event event) +{ +PCA9554State *s =PCA9554 (i2c); + + s->len =0 ; +return 0 ; +} + +static void pca9554_get_pin (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +PCA9554State *s =PCA9554 (obj); +int pin, rc; +uint8_t state; + + rc =sscanf (name,"pin%2d" , &pin); +if (rc !=1 ) { +error_setg (errp,"%s: error reading %s" , __func__, name); +return ; + } +if (pin <0 || pin >PCA9554_PIN_COUNT ) { +error_setg (errp,"%s invalid pin %s" , __func__, name); +return ; + } + + state =pca9554_read (s,PCA9554_CONFIG ); + state |=pca9554_read (s,PCA9554_OUTPUT ); + state = (state >> pin) &0x1 ; +visit_type_str (v, name, (char **)&pin_state[state], errp); +} + +static void pca9554_set_pin (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +PCA9554State *s =PCA9554 (obj); +int pin, rc, val; +uint8_t state, mask; +char *state_str; + +if (!visit_type_str (v, name, &state_str, errp)) { +return ; + } + rc =sscanf (name,"pin%2d" , &pin); +if (rc !=1 ) { +error_setg (errp,"%s: error reading %s" , __func__, name); +return ; + } +if (pin <0 || pin >PCA9554_PIN_COUNT ) { +error_setg (errp,"%s invalid pin %s" , __func__, name); +return ; + } + +for (state =0 ; state <ARRAY_SIZE (pin_state); state++) { +if (!strcmp (state_str, pin_state[state])) { +break ; + } + } +if (state >=ARRAY_SIZE (pin_state)) { +error_setg (errp,"%s invalid pin state %s" , __func__, state_str); +return ; + } + +/* First, modify the output register bit */ + val =pca9554_read (s,PCA9554_OUTPUT ); + mask =0x1 << pin; +if (state ==PCA9554_PIN_LOW ) { + val &= ~(mask); + }else { + val |= mask; + } +pca9554_write (s,PCA9554_OUTPUT , val); + +/* Then, clear the config register bit for output mode */ + val =pca9554_read (s,PCA9554_CONFIG ); + val &= ~mask; +pca9554_write (s,PCA9554_CONFIG , val); +} + +static const VMStateDescription pca9554_vmstate = { + .name ="PCA9554" , + .version_id =0 , + .minimum_version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT8 (len, PCA9554State), +VMSTATE_UINT8 (pointer, PCA9554State), +VMSTATE_UINT8_ARRAY (regs, PCA9554State,PCA9554_NR_REGS ), +VMSTATE_UINT8_ARRAY (ext_state, PCA9554State,PCA9554_PIN_COUNT ), +VMSTATE_I2C_SLAVE (i2c, PCA9554State), +VMSTATE_END_OF_LIST () + } +}; + +static void pca9554_reset (DeviceState *dev) +{ +PCA9554State *s =PCA9554 (dev); + + s->regs[PCA9554_INPUT ] =0xFF ; + s->regs[PCA9554_OUTPUT ] =0xFF ; + s->regs[PCA9554_POLARITY ] =0x0 ;/* No pins are inverted */ + s->regs[PCA9554_CONFIG ] =0xFF ;/* All pins are inputs */ + +memset (s->ext_state,PCA9554_PIN_HIZ ,PCA9554_PIN_COUNT ); +pca9554_update_pin_input (s); + + s->pointer =0x0 ; + s->len =0 ; +} + +static void pca9554_initfn (Object *obj) +{ +int pin; + +for (pin =0 ; pin <PCA9554_PIN_COUNT ; pin++) { +char *name; + + name =g_strdup_printf ("pin%d" , pin); +object_property_add (obj, name,"bool" , pca9554_get_pin, pca9554_set_pin, +NULL ,NULL ); +g_free (name); + } +} + +static void pca9554_set_ext_state (PCA9554State *s,int pin,int level) +{ +if (s->ext_state[pin] != level) { + s->ext_state[pin] = level; +pca9554_update_pin_input (s); + } +} + +static void pca9554_gpio_in_handler (void *opaque,int pin,int level) +{ + +PCA9554State *s =PCA9554 (opaque); + +assert ((pin >=0 ) && (pin <PCA9554_PIN_COUNT )); +pca9554_set_ext_state (s, pin, level); +} + +static void pca9554_realize (DeviceState *dev,Error **errp) +{ +PCA9554State *s =PCA9554 (dev); + +if (!s->description) { + s->description =g_strdup ("pca9554" ); + } + +qdev_init_gpio_out (dev, s->gpio_out,PCA9554_PIN_COUNT ); +qdev_init_gpio_in (dev, pca9554_gpio_in_handler,PCA9554_PIN_COUNT ); +} + +static Property pca9554_properties[] = { +DEFINE_PROP_STRING ("description" , PCA9554State, description), +DEFINE_PROP_END_OF_LIST (), +}; + +static void pca9554_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +I2CSlaveClass *k =I2C_SLAVE_CLASS (klass); + + k->event = pca9554_event; + k->recv = pca9554_recv; + k->send = pca9554_send; + dc->realize = pca9554_realize; + dc->reset = pca9554_reset; + dc->vmsd = &pca9554_vmstate; +device_class_set_props (dc, pca9554_properties); +} + +static const TypeInfo pca9554_info = { + .name =TYPE_PCA9554 , + .parent =TYPE_I2C_SLAVE , + .instance_init = pca9554_initfn, + .instance_size =sizeof (PCA9554State), + .class_init = pca9554_class_init, + .class_size =sizeof (PCA9554Class), + .abstract = false, +}; + +static void pca9554_register_types (void ) +{ +type_register_static (&pca9554_info); +} + +type_init (pca9554_register_types)include/hw/misc/pca9554.h new file +36
-0@@ -0,0 +1,36 @@ +/* +* PCA9554 I/O port +* +* Copyright (c) 2023, IBM Corporation. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef PCA9554_H +#define PCA9554_H + +#include "hw/i2c/i2c.h" +#include "qom/object.h" + +#define TYPE_PCA9554 "pca9554" +typedef struct PCA9554State PCA9554State ; +DECLARE_INSTANCE_CHECKER (PCA9554State,PCA9554 , + TYPE_PCA9554) + +#define PCA9554_NR_REGS 4 +#define PCA9554_PIN_COUNT 8 + +struct PCA9554State { +/*< private >*/ +I2CSlave i2c; +/*< public >*/ + +uint8_t len; +uint8_t pointer; + +uint8_t regs[PCA9554_NR_REGS ]; +qemu_irq gpio_out[PCA9554_PIN_COUNT ]; +uint8_t ext_state[PCA9554_PIN_COUNT ]; +char *description;/* For debugging purpose only */ +}; + +#endif include/hw/misc/pca9554_regs.h new file +19
-0@@ -0,0 +1,19 @@ +/* +* PCA9554 I/O port registers +* +* Copyright (c) 2023, IBM Corporation. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef PCA9554_REGS_H +#define PCA9554_REGS_H + +/* +* Bits [0:1] are used to address a specific register. +*/ +#define PCA9554_INPUT 0/* read only input register */ +#define PCA9554_OUTPUT 1/* read/write pin output state */ +#define PCA9554_POLARITY 2/* Set polarity of input register */ +#define PCA9554_CONFIG 3/* Set pins as inputs our ouputs */ + +#endif
PATCH v5 8/9 ppc/pnv: Add a pca9554 I2C device to powernv10-rainier
In reply to Glenn MilesFor powernv10-rainier, the Power Hypervisor code expects to see a pca9554 device connected to the 3rd PNV I2C engine on port 1 at I2C address 0x25 (or left-justified address of 0x4A). This is used by the hypervisor code to detect if a "Cable Card" is present.
---
No change from previous version
hw/misc/Kconfig | 4 ++++ hw/misc/meson.build | 1 + hw/ppc/Kconfig | 1 + hw/ppc/pnv.c | 6 ++++++ 4 files changed, 12 insertions(+)
hw/misc/Kconfig +4 -0
@@ -34,6 +34,10 @@ config PCA9552 bool depends on I2C +config PCA9554 + bool + depends on I2C + config I2C_ECHO bool default y if TEST_DEVICES
hw/misc/meson.build +1 -0
@@ -4,6 +4,7 @@ system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmcoreinfo.c')) system_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c')) system_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c')) system_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c')) +system_ss.add(when: 'CONFIG_PCA9554', if_true: files('pca9554.c')) system_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c')) system_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) system_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c'))
hw/ppc/Kconfig +1 -0
@@ -33,6 +33,7 @@ config POWERNV select FDT_PPC select PCI_POWERNV select PCA9552 + select PCA9554 config PPC405 bool
hw/ppc/pnv.c +6 -0
@@ -1918,6 +1918,12 @@ static void pnv_rainier_i2c_init(PnvMachineState *pnv) qdev_get_gpio_in(DEVICE(hotplug), 8));qdev_connect_gpio_out (DEVICE (hotplug),4 ,qdev_get_gpio_in (DEVICE (hotplug),9 )); + +/* +* Add a PCA9554 I2C device for cable card presence detection +* to engine 2, bus 1, address 0x25 +*/ +i2c_slave_create_simple (chip10->i2c[2 ].busses[1 ],"pca9554" ,0x25 ); } }
Signature · 1 line
2.31.1
Re: [PATCH v5 8/9] ppc/pnv: Add a pca9554 I2C device to powernv10-rainier
Quoted 6 lines · Glenn Miles
For powernv10-rainier, the Power Hypervisor code expects to see a pca9554 device connected to the 3rd PNV I2C engine on port 1 at I2C address
0x25(or left-justified address of0x4A). This is used by the hypervisor code to detect if a "Cable Card" is present.Signed-off-by Glenn Miles <[email protected]>
Thanks,
C.
Quoted 66 lines
---
No change from previous version
hw/misc/Kconfig | 4 ++++ hw/misc/meson.build | 1 + hw/ppc/Kconfig | 1 + hw/ppc/pnv.c | 6 ++++++ 4 files changed, 12 insertions(+)hw/misc/Kconfig +4
-0@@ -34,6 +34,10 @@ config PCA9552 bool depends on I2C +config PCA9554 + bool + depends on I2C + config I2C_ECHO bool default y if TEST_DEVICEShw/misc/meson.build +1
-0@@ -4,6 +4,7 @@ system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('vmcoreinfo.c')) system_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugexit.c')) system_ss.add(when: 'CONFIG_ISA_TESTDEV', if_true: files('pc-testdev.c')) system_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c')) +system_ss.add(when: 'CONFIG_PCA9554', if_true: files('pca9554.c')) system_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c')) system_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) system_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c'))hw/ppc/Kconfig +1
-0@@ -33,6 +33,7 @@ config POWERNV select FDT_PPC select PCI_POWERNV select PCA9552 + select PCA9554 config PPC405 boolhw/ppc/pnv.c +6
-0@@ -1918,6 +1918,12 @@ static void pnv_rainier_i2c_init(PnvMachineState *pnv) qdev_get_gpio_in(DEVICE(hotplug), 8));qdev_connect_gpio_out (DEVICE (hotplug),4 ,qdev_get_gpio_in (DEVICE (hotplug),9 )); + +/* +* Add a PCA9554 I2C device for cable card presence detection +* to engine 2, bus 1, address 0x25 +*/ +i2c_slave_create_simple (chip10->i2c[2 ].busses[1 ],"pca9554" ,0x25 ); } }
PATCH v5 9/9 ppc/pnv: Test pnv i2c master and connected devices
In reply to Glenn MilesTests the following for both P9 and P10:
- I2C master POR status
- I2C master status after immediate reset
Tests the following for powernv10-ranier only:
- Config pca9552 hotplug device pins as inputs then Read the INPUT0/1 registers to verify all pins are high
- Connected GPIO pin tests of P10 PCA9552 device. Tests output of pins 0-4 affect input of pins 5-9 respectively.
- PCA9554 GPIO pins test. Tests input and ouput functionality.
---
No change from previous version
tests/qtest/meson.build | 1 + tests/qtest/pnv-host-i2c-test.c | 650 ++++++++++++++++++++++++++++++++ 2 files changed, 651 insertions(+) create mode 100644 tests/qtest/pnv-host-i2c-test.c
tests/qtest/meson.build +1 -0
@@ -163,6 +163,7 @@ qtests_ppc64 = \ qtests_ppc + \ (config_all_devices.has_key('CONFIG_PSERIES') ? ['device-plug-test'] : []) + \ (config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-xscom-test'] : []) + \ + (config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-host-i2c-test'] : []) + \ (config_all_devices.has_key('CONFIG_PSERIES') ? ['rtas-test'] : []) + \ (slirp.found() ? ['pxe-test'] : []) + \ (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \
tests/qtest/pnv-host-i2c-test.c new file +650 -0
650 lines not on this page · raw message
Signature · 1 line
2.31.1
Quoted 8 lines · Glenn Miles
This series of patches includes support, tests and fixes for adding PCA9552 and PCA9554 I2C devices to the powernv10 chip.
The PCA9552 device is used for PCIe slot hotplug power control and monitoring, while the PCA9554 device is used for presence detection of IBM CableCard devices. Both devices are required by the Power Hypervisor Firmware on the Power10 Ranier platform.
Quoted 5 lines
Changes from previous version:
- Removed two already merged patches
- Various formatting changes
- Capitalized "Rainier" in machine description string
- Changed powernv10-rainier parent toMACHINE_TYPE_NAME("powernv10")
Nick,
could this series go through the ppc-next queue ?
Thanks,
C.
Quoted 34 lines
Glenn Miles (9):
misc/pca9552: Fix inverted input status
misc/pca9552: Let external devices set pca9552 inputs ppc/pnv: New powernv10-rainier machine type
ppc/pnv: Add pca9552 to powernv10-rainier for PCIe hotplug power
control
ppc/pnv: Wire up pca9552 GPIO pins for PCIe hotplug power control ppc/pnv: Use resettable interface to reset child I2C buses
misc: Add a pca9554 GPIO device model
ppc/pnv: Add a pca9554 I2C device to powernv10-rainier ppc/pnv: Test pnv i2c master and connected devicesMAINTAINERS | 10 +- hw/misc/Kconfig | 4 + hw/misc/meson.build | 1 + hw/misc/pca9552.c | 58 ++- hw/misc/pca9554.c | 328 ++++++++++++++++ hw/ppc/Kconfig | 2 + hw/ppc/pnv.c | 72 +++- hw/ppc/pnv_i2c.c | 15 +- include/hw/misc/pca9552.h | 3 +- include/hw/misc/pca9554.h | 36 ++ include/hw/misc/pca9554_regs.h | 19 + include/hw/ppc/pnv.h | 1 + tests/qtest/meson.build | 1 + tests/qtest/pca9552-test.c | 6 +- tests/qtest/pnv-host-i2c-test.c | 650 ++++++++++++++++++++++++++++++++ 15 files changed, 1190 insertions(+), 16 deletions(-)create mode 100644
hw/misc/pca9554.ccreate mode 100644include/hw/misc/pca9554.hcreate mode 100644include/hw/misc/pca9554_regs.hcreate mode 100644tests/qtest/pnv-host-i2c-test.c
Quoted 16 lines · Cédric Le Goater
Quoted 8 lines · Glenn Miles
This series of patches includes support, tests and fixes for adding PCA9552 and PCA9554 I2C devices to the powernv10 chip.
The PCA9552 device is used for PCIe slot hotplug power control and monitoring, while the PCA9554 device is used for presence detection of IBM CableCard devices. Both devices are required by the Power Hypervisor Firmware on the Power10 Ranier platform.
Quoted 5 lines
Changes from previous version:
- Removed two already merged patches
- Various formatting changes
- Capitalized "Rainier" in machine description string
- Changed powernv10-rainier parent toMACHINE_TYPE_NAME("powernv10")
Quoted 3 lines
Nick,
could this series go through the ppc-next queue ?
Sure, for after 8.2. I'll start gathering up patches and push out a test tree before then.
Are patches 1/2 okay with that? Patch 1 looks a bit like a bug fix...
Thanks,
Nick
Quoted 43 lines
Thanks,
C.
Quoted 34 lines
Glenn Miles (9):
misc/pca9552: Fix inverted input status
misc/pca9552: Let external devices set pca9552 inputs ppc/pnv: New powernv10-rainier machine type
ppc/pnv: Add pca9552 to powernv10-rainier for PCIe hotplug power
control
ppc/pnv: Wire up pca9552 GPIO pins for PCIe hotplug power control ppc/pnv: Use resettable interface to reset child I2C buses
misc: Add a pca9554 GPIO device model
ppc/pnv: Add a pca9554 I2C device to powernv10-rainier ppc/pnv: Test pnv i2c master and connected devicesMAINTAINERS | 10 +- hw/misc/Kconfig | 4 + hw/misc/meson.build | 1 + hw/misc/pca9552.c | 58 ++- hw/misc/pca9554.c | 328 ++++++++++++++++ hw/ppc/Kconfig | 2 + hw/ppc/pnv.c | 72 +++- hw/ppc/pnv_i2c.c | 15 +- include/hw/misc/pca9552.h | 3 +- include/hw/misc/pca9554.h | 36 ++ include/hw/misc/pca9554_regs.h | 19 + include/hw/ppc/pnv.h | 1 + tests/qtest/meson.build | 1 + tests/qtest/pca9552-test.c | 6 +- tests/qtest/pnv-host-i2c-test.c | 650 ++++++++++++++++++++++++++++++++ 15 files changed, 1190 insertions(+), 16 deletions(-)create mode 100644
hw/misc/pca9554.ccreate mode 100644include/hw/misc/pca9554.hcreate mode 100644include/hw/misc/pca9554_regs.hcreate mode 100644tests/qtest/pnv-host-i2c-test.c
Quoted 19 lines · Nicholas Piggin
Quoted 18 lines · Cédric Le Goater
Quoted 8 lines · Glenn Miles
This series of patches includes support, tests and fixes for adding PCA9552 and PCA9554 I2C devices to the powernv10 chip.
The PCA9552 device is used for PCIe slot hotplug power control and monitoring, while the PCA9554 device is used for presence detection of IBM CableCard devices. Both devices are required by the Power Hypervisor Firmware on the Power10 Ranier platform.
Quoted 5 lines
Changes from previous version:
- Removed two already merged patches
- Various formatting changes
- Capitalized "Rainier" in machine description string
- Changed powernv10-rainier parent toMACHINE_TYPE_NAME("powernv10")Nick,
Quoted 7 lines
Quoted 1 line
could this series go through the ppc-next queue ?
Sure, for after 8.2. I'll start gathering up patches and push out a test tree before then.
Are patches 1/2 okay with that? Patch 1 looks a bit like a bug fix...
yes but since they are only relevant for the subsequent patches, it is better to keep the series as a whole I think.
Thanks,
C.