[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/8] ppc/pnv: PNV I2C engines assigned incorrect XSCOM address
From: |
Glenn Miles |
Subject: |
[PATCH v2 3/8] ppc/pnv: PNV I2C engines assigned incorrect XSCOM addresses |
Date: |
Fri, 10 Nov 2023 13:49:20 -0600 |
The PNV I2C engines for power9 and power10 were being assigned a base
XSCOM address that was off by one I2C engine's address range such
that engine 0 had engine 1's address and so on. The xscom address
assignment was being based on the device tree engine numbering, which
starts at 1. Rather than changing the device tree numbering to start
with 0, the addressing was changed to be based on the existing device
tree numbers minus one.
Signed-off-by: Glenn Miles <milesg@linux.vnet.ibm.com>
---
hw/ppc/pnv.c | 6 ++++--
hw/ppc/pnv_i2c.c | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 0b24d7d8ed..516434bc9c 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -1623,7 +1623,8 @@ static void pnv_chip_power9_realize(DeviceState *dev,
Error **errp)
return;
}
pnv_xscom_add_subregion(chip, PNV9_XSCOM_I2CM_BASE +
- chip9->i2c[i].engine * PNV9_XSCOM_I2CM_SIZE,
+ (chip9->i2c[i].engine - 1) *
+ PNV9_XSCOM_I2CM_SIZE,
&chip9->i2c[i].xscom_regs);
qdev_connect_gpio_out(DEVICE(&chip9->i2c[i]), 0,
qdev_get_gpio_in(DEVICE(&chip9->psi),
@@ -1871,7 +1872,8 @@ static void pnv_chip_power10_realize(DeviceState *dev,
Error **errp)
return;
}
pnv_xscom_add_subregion(chip, PNV10_XSCOM_I2CM_BASE +
- chip10->i2c[i].engine * PNV10_XSCOM_I2CM_SIZE,
+ (chip10->i2c[i].engine - 1) *
+ PNV10_XSCOM_I2CM_SIZE,
&chip10->i2c[i].xscom_regs);
qdev_connect_gpio_out(DEVICE(&chip10->i2c[i]), 0,
qdev_get_gpio_in(DEVICE(&chip10->psi),
diff --git a/hw/ppc/pnv_i2c.c b/hw/ppc/pnv_i2c.c
index f75e59e709..b2c738da50 100644
--- a/hw/ppc/pnv_i2c.c
+++ b/hw/ppc/pnv_i2c.c
@@ -593,7 +593,7 @@ static int pnv_i2c_dt_xscom(PnvXScomInterface *dev, void
*fdt,
int i2c_offset;
const char i2c_compat[] = "ibm,power8-i2cm\0ibm,power9-i2cm";
uint32_t i2c_pcba = PNV9_XSCOM_I2CM_BASE +
- i2c->engine * PNV9_XSCOM_I2CM_SIZE;
+ (i2c->engine - 1) * PNV9_XSCOM_I2CM_SIZE;
uint32_t reg[2] = {
cpu_to_be32(i2c_pcba),
cpu_to_be32(PNV9_XSCOM_I2CM_SIZE)
--
2.31.1
- [PATCH v2 0/8] Add powernv10 I2C devices and tests, Glenn Miles, 2023/11/10
- [PATCH v2 1/8] ppc/pnv: Add pca9552 to powernv10 for PCIe hotplug power control, Glenn Miles, 2023/11/10
- [PATCH v2 7/8] ppc/pnv: Add a pca9554 I2C device to powernv10, Glenn Miles, 2023/11/10
- [PATCH v2 5/8] ppc/pnv: Use resettable interface to reset child I2C buses, Glenn Miles, 2023/11/10
- [PATCH v2 2/8] ppc/pnv: Wire up pca9552 GPIO pins for PCIe hotplug power control, Glenn Miles, 2023/11/10
- [PATCH v2 3/8] ppc/pnv: PNV I2C engines assigned incorrect XSCOM addresses,
Glenn Miles <=
- [PATCH v2 8/8] ppc/pnv: Test pnv i2c master and connected devices, Glenn Miles, 2023/11/10
- [PATCH v2 4/8] ppc/pnv: Fix PNV I2C invalid status after reset, Glenn Miles, 2023/11/10
[PATCH v2 6/8] misc: Add a pca9554 GPIO device model, Glenn Miles, 2023/11/10