* [PATCH v2 0/5] Introduce AMD ASF Controller Support to the i2c-piix4 driver
@ 2024-09-04 10:57 Shyam Sundar S K
2024-09-04 10:57 ` [PATCH v2 1/5] i2c: piix4: Allow more than two algo selection for SMBus Shyam Sundar S K
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Shyam Sundar S K @ 2024-09-04 10:57 UTC (permalink / raw)
To: Jean Delvare, Andi Shyti; +Cc: linux-i2c, Sanket.Goswami, Shyam Sundar S K
The AMD ASF (Alert Standard Format) function block is essentially an SMBus
controller with built-in ASF functionality. It features two pins SCL1 and
SDA1 that facilitate communication with other SMBus devices. This dual
capability allows the ASF controller to issue generic SMBus packets and
communicate with the DASH controller using MCTP over ASF. Additionally,
the ASF controller supports remote commands defined by the ASF
specification, such as shutdown, reset, power-up, and power-down, without
requiring any software interaction.
The concept is to enable a remote system to communicate with the target
system over the network. The local network controller, such as an Ethernet
MAC, receives remote packets and relays the commands to the FCH
(Fusion Controller Hub) through the ASF. Examples of these commands
include shutdown and reset. Since ASF uses the SMBus protocol, this
controller can be configured as a secondary SMBus controller.
This series of updates is focused on integrating the capabilities of AMD's
ASF (Alert Standard Format) controller into the i2c-piix4 driver.
v2:
----
- Change function signature from u8 to enum
- Use default case in switch
- Use acpi_dev_get_resources() and drop devm_kzalloc() usage
- Fix LKP reported issues
- Address other minor remarks from Andy and Andi Shyti
Shyam Sundar S K (5):
i2c: piix4: Allow more than two algo selection for SMBus
i2c: piix4: Add i2c_algorithm operations to support AMD ASF with SMBus
i2c: piix4: Add ACPI support for ASF SMBus device
i2c: piix4: Adjust the SMBus debug message
i2c: piix4: Clear remote IRR bit to get successive interrupt
drivers/i2c/busses/Kconfig | 1 +
drivers/i2c/busses/i2c-piix4.c | 395 ++++++++++++++++++++++++++++++++-
2 files changed, 387 insertions(+), 9 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 1/5] i2c: piix4: Allow more than two algo selection for SMBus
2024-09-04 10:57 [PATCH v2 0/5] Introduce AMD ASF Controller Support to the i2c-piix4 driver Shyam Sundar S K
@ 2024-09-04 10:57 ` Shyam Sundar S K
2024-09-04 10:57 ` [PATCH v2 2/5] i2c: piix4: Add i2c_algorithm operations to support AMD ASF with SMBus Shyam Sundar S K
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Shyam Sundar S K @ 2024-09-04 10:57 UTC (permalink / raw)
To: Jean Delvare, Andi Shyti; +Cc: linux-i2c, Sanket.Goswami, Shyam Sundar S K
The current implementation of the piix4 driver has a limitation in that it
only supports two algorithms for the I2C adapter:
- SB800 Algorithm: This is used for newer AMD chipsets.
- Legacy PIIX4 Algorithm: This is used for older systems.
The selection between these two algorithms is controlled by a boolean
parameter in the piix4_add_adapter() function. This means that the driver
can only toggle between these two options, which limits its flexibility.
AMD's SMBus (System Management Bus) implementation supports additional
functionalities, such as ASF (Alert Standard Format). ASF is a protocol
used for system management and monitoring, which can be part of the SoC
(System on Chip). To support ASF or any other future algorithms, the
driver needs to be more flexible in its algorithm selection.
The proposed change involves modifying the piix4_add_adapter() function to
accommodate more than just two algorithm selections. Instead of using a
boolean parameter to select between two algorithms, the function signature
will be updated to allow for multiple algorithm options.
Co-developed-by: Sanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/i2c/busses/i2c-piix4.c | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 4e32d57ae0bf..d56083e58a2d 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -165,6 +165,11 @@ struct sb800_mmio_cfg {
bool use_mmio;
};
+enum piix4_algo {
+ PIIX4_SB800,
+ PIIX4_SMBUS,
+};
+
struct i2c_piix4_adapdata {
unsigned short smba;
@@ -173,6 +178,7 @@ struct i2c_piix4_adapdata {
bool notify_imc;
u8 port; /* Port number, shifted */
struct sb800_mmio_cfg mmio_cfg;
+ u8 algo_select;
};
static int piix4_sb800_region_request(struct device *dev,
@@ -929,7 +935,7 @@ static struct i2c_adapter *piix4_aux_adapter;
static int piix4_adapter_count;
static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
- bool sb800_main, u8 port, bool notify_imc,
+ enum piix4_algo algo, u8 port, bool notify_imc,
u8 hw_port_nr, const char *name,
struct i2c_adapter **padap)
{
@@ -945,8 +951,18 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
adap->owner = THIS_MODULE;
adap->class = I2C_CLASS_HWMON;
- adap->algo = sb800_main ? &piix4_smbus_algorithm_sb800
- : &smbus_algorithm;
+
+ switch (algo) {
+ case PIIX4_SMBUS:
+ adap->algo = &smbus_algorithm;
+ break;
+ case PIIX4_SB800:
+ adap->algo = &piix4_smbus_algorithm_sb800;
+ break;
+ default:
+ dev_err(&dev->dev, "Unsupported SMBus algorithm\n");
+ return -EINVAL;
+ }
adapdata = kzalloc(sizeof(*adapdata), GFP_KERNEL);
if (adapdata == NULL) {
@@ -957,7 +973,7 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
adapdata->mmio_cfg.use_mmio = piix4_sb800_use_mmio(dev);
adapdata->smba = smba;
- adapdata->sb800_main = sb800_main;
+ adapdata->algo_select = algo;
adapdata->port = port << piix4_port_shift_sb800;
adapdata->notify_imc = notify_imc;
@@ -1013,7 +1029,7 @@ static int piix4_add_adapters_sb800(struct pci_dev *dev, unsigned short smba,
for (port = 0; port < piix4_adapter_count; port++) {
u8 hw_port_nr = port == 0 ? 0 : port + 1;
- retval = piix4_add_adapter(dev, smba, true, port, notify_imc,
+ retval = piix4_add_adapter(dev, smba, PIIX4_SB800, port, notify_imc,
hw_port_nr,
piix4_main_port_names_sb800[port],
&piix4_main_adapters[port]);
@@ -1085,7 +1101,7 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
return retval;
/* Try to register main SMBus adapter, give up if we can't */
- retval = piix4_add_adapter(dev, retval, false, 0, false, 0,
+ retval = piix4_add_adapter(dev, retval, PIIX4_SMBUS, 0, false, 0,
"", &piix4_main_adapters[0]);
if (retval < 0)
return retval;
@@ -1114,7 +1130,7 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
if (retval > 0) {
/* Try to add the aux adapter if it exists,
* piix4_add_adapter will clean up if this fails */
- piix4_add_adapter(dev, retval, false, 0, false, 1,
+ piix4_add_adapter(dev, retval, PIIX4_SMBUS, 0, false, 1,
is_sb800 ? piix4_aux_port_name_sb800 : "",
&piix4_aux_adapter);
}
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 2/5] i2c: piix4: Add i2c_algorithm operations to support AMD ASF with SMBus
2024-09-04 10:57 [PATCH v2 0/5] Introduce AMD ASF Controller Support to the i2c-piix4 driver Shyam Sundar S K
2024-09-04 10:57 ` [PATCH v2 1/5] i2c: piix4: Allow more than two algo selection for SMBus Shyam Sundar S K
@ 2024-09-04 10:57 ` Shyam Sundar S K
2024-09-04 10:57 ` [PATCH v2 3/5] i2c: piix4: Add ACPI support for ASF SMBus device Shyam Sundar S K
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Shyam Sundar S K @ 2024-09-04 10:57 UTC (permalink / raw)
To: Jean Delvare, Andi Shyti; +Cc: linux-i2c, Sanket.Goswami, Shyam Sundar S K
Implement the i2c_algorithm operations to enable support for AMD ASF
(Alert Standard Format) with SMBus. This enhancement includes:
- Adding functionality to identify and select the supported ASF functions.
- Implementing mechanisms for registering and deregistering I2C slave
devices.
- Providing support for data transfer operations over ASF.
These changes will extend the piix4 driver to accommodate the additional
capabilities provided by AMD's ASF Controller.
Additionally, include a 'select' Kconfig entry for CONFIG_I2C_PIIX4, as
the current patch utilizes reg_slave and unreg_slave callbacks, which are
controlled by IS_ENABLED(CONFIG_I2C_SLAVE).
Co-developed-by: Sanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/i2c/busses/Kconfig | 1 +
drivers/i2c/busses/i2c-piix4.c | 184 +++++++++++++++++++++++++++++++++
2 files changed, 185 insertions(+)
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index a22f9125322a..10ad839bf4a2 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -197,6 +197,7 @@ config I2C_PIIX4
tristate "Intel PIIX4 and compatible (ATI/AMD/Serverworks/Broadcom/SMSC)"
depends on PCI && HAS_IOPORT
select I2C_SMBUS
+ select I2C_SLAVE
help
If you say yes to this option, support will be included for the Intel
PIIX4 family of mainboard I2C interfaces. Specifically, the following
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index d56083e58a2d..003cb04312cf 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -50,6 +50,22 @@
#define SMBSLVEVT (0xA + piix4_smba)
#define SMBSLVDAT (0xC + piix4_smba)
+/* SB800 ASF register bits */
+#define SB800_ASF_SLV_LISTN 0
+#define SB800_ASF_SLV_INTR 1
+#define SB800_ASF_SLV_RST 4
+#define SB800_ASF_PEC_SP 5
+#define SB800_ASF_DATA_EN 7
+#define SB800_ASF_MSTR_EN 16
+#define SB800_ASF_CLK_EN 17
+
+/* SB800 ASF address offsets */
+#define ASFLISADDR (9 + piix4_smba)
+#define ASFSTA (0xA + piix4_smba)
+#define ASFSLVSTA (0xD + piix4_smba)
+#define ASFDATABNKSEL (0x13 + piix4_smba)
+#define ASFSLVEN (0x15 + piix4_smba)
+
/* count for request_region */
#define SMBIOSIZE 9
@@ -101,6 +117,7 @@
#define SB800_PIIX4_FCH_PM_ADDR 0xFED80300
#define SB800_PIIX4_FCH_PM_SIZE 8
+#define SB800_ASF_BLOCK_MAX_BYTES 72
/* insmod parameters */
@@ -168,6 +185,7 @@ struct sb800_mmio_cfg {
enum piix4_algo {
PIIX4_SB800,
PIIX4_SMBUS,
+ SMBUS_ASF,
};
struct i2c_piix4_adapdata {
@@ -179,6 +197,7 @@ struct i2c_piix4_adapdata {
u8 port; /* Port number, shifted */
struct sb800_mmio_cfg mmio_cfg;
u8 algo_select;
+ struct i2c_client *slave;
};
static int piix4_sb800_region_request(struct device *dev,
@@ -887,6 +906,168 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16 addr,
return retval;
}
+static void sb800_asf_update_bits(unsigned short piix4_smba, u8 bit, unsigned long offset, bool set)
+{
+ unsigned long reg;
+
+ reg = inb_p(offset);
+ if (set)
+ set_bit(bit, ®);
+ else
+ clear_bit(bit, ®);
+ outb_p(reg, offset);
+}
+
+static void sb800_asf_update_bytes(struct i2c_piix4_adapdata *adap, u8 bit, bool set)
+{
+ unsigned long reg;
+
+ reg = ioread32(adap->mmio_cfg.addr);
+ if (set)
+ set_bit(bit, ®);
+ else
+ clear_bit(bit, ®);
+ iowrite32(reg, adap->mmio_cfg.addr);
+}
+
+static void sb800_asf_setup_slave(struct i2c_piix4_adapdata *adap)
+{
+ unsigned short piix4_smba = adap->smba;
+
+ /* Reset both host and slave before setting up */
+ outb_p(0, SMBHSTSTS);
+ outb_p(0, ASFSLVSTA);
+ outb_p(0, ASFSTA);
+
+ /* Update slave address */
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_SLV_LISTN, ASFLISADDR, true);
+ /* Enable slave and set the clock */
+ sb800_asf_update_bytes(adap, SB800_ASF_MSTR_EN, false);
+ sb800_asf_update_bytes(adap, SB800_ASF_CLK_EN, true);
+ /* Enable slave interrupt */
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_SLV_INTR, ASFSLVEN, true);
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_SLV_RST, ASFSLVEN, false);
+ /* Enable PEC and PEC append */
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_DATA_EN, SMBHSTCNT, true);
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_PEC_SP, SMBHSTCNT, true);
+}
+
+static s32 sb800_asf_access(struct i2c_adapter *adap, u16 addr, u8 command, u8 *data)
+{
+ struct i2c_piix4_adapdata *adapdata = i2c_get_adapdata(adap);
+ unsigned short piix4_smba = adapdata->smba;
+ u8 len;
+ int i;
+
+ outb_p((addr << 1), SMBHSTADD);
+ outb_p(command, SMBHSTCMD);
+ len = data[0];
+ if (len == 0 || len > SB800_ASF_BLOCK_MAX_BYTES)
+ return -EINVAL;
+
+ outb_p(len, SMBHSTDAT0);
+ inb_p(SMBHSTCNT); /* Reset SMBBLKDAT */
+ for (i = 1; i <= len; i++)
+ outb_p(data[i], SMBBLKDAT);
+
+ outb_p(PIIX4_BLOCK_DATA, SMBHSTCNT);
+ /* Enable PEC and PEC append */
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_DATA_EN, SMBHSTCNT, true);
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_PEC_SP, SMBHSTCNT, true);
+
+ return piix4_transaction(adap);
+}
+
+static int sb800_asf_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
+{
+ struct i2c_piix4_adapdata *adapdata = i2c_get_adapdata(adap);
+ unsigned short piix4_smba = adapdata->smba;
+ u8 asf_data[SB800_ASF_BLOCK_MAX_BYTES];
+ struct i2c_msg *dev_msgs = msgs;
+ u8 prev_port;
+ int ret;
+
+ if (msgs->flags & I2C_M_RD) {
+ dev_err(&adap->dev, "Read not supported\n");
+ return -EOPNOTSUPP;
+ }
+
+ /* Exclude the receive header and PEC */
+ if (msgs->len > SB800_ASF_BLOCK_MAX_BYTES - 3) {
+ dev_err(&adap->dev, "ASF max message length exceeded\n");
+ return -EOPNOTSUPP;
+ }
+
+ asf_data[0] = dev_msgs->len;
+ memcpy(asf_data + 1, dev_msgs[0].buf, dev_msgs->len);
+
+ ret = piix4_sb800_region_request(&adap->dev, &adapdata->mmio_cfg);
+ if (ret)
+ return ret;
+
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_SLV_RST, ASFSLVEN, true);
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_SLV_LISTN, ASFLISADDR, false);
+ /* Clear ASF slave status */
+ outb_p(0, ASFSLVSTA);
+
+ /* Enable ASF SMBus master function */
+ sb800_asf_update_bytes(adapdata, SB800_ASF_MSTR_EN, true);
+ prev_port = piix4_sb800_port_sel(adapdata->port, &adapdata->mmio_cfg);
+ ret = sb800_asf_access(adap, msgs->addr, msgs[0].buf[0], asf_data);
+ piix4_sb800_port_sel(prev_port, &adapdata->mmio_cfg);
+ sb800_asf_setup_slave(adapdata);
+ piix4_sb800_region_release(&adap->dev, &adapdata->mmio_cfg);
+ return ret;
+}
+
+static int sb800_asf_reg_slave(struct i2c_client *slave)
+{
+ struct i2c_piix4_adapdata *adapdata = i2c_get_adapdata(slave->adapter);
+ unsigned short piix4_smba = adapdata->smba;
+ int ret;
+ u8 reg;
+
+ if (adapdata->slave)
+ return -EBUSY;
+
+ ret = piix4_sb800_region_request(&slave->dev, &adapdata->mmio_cfg);
+ if (ret)
+ return ret;
+
+ reg = (slave->addr << 1) | BIT(0);
+ outb_p(reg, ASFLISADDR);
+
+ sb800_asf_setup_slave(adapdata);
+ adapdata->slave = slave;
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_DATA_EN, ASFDATABNKSEL, false);
+ piix4_sb800_region_release(&slave->dev, &adapdata->mmio_cfg);
+ return 0;
+}
+
+static int sb800_asf_unreg_slave(struct i2c_client *slave)
+{
+ struct i2c_piix4_adapdata *adapdata = i2c_get_adapdata(slave->adapter);
+ unsigned short piix4_smba = adapdata->smba;
+
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_SLV_INTR, ASFSLVEN, false);
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_SLV_RST, ASFSLVEN, true);
+ adapdata->slave = NULL;
+ return 0;
+}
+
+static u32 sb800_asf_func(struct i2c_adapter *adapter)
+{
+ return I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_BYTE |
+ I2C_FUNC_SLAVE | I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | I2C_FUNC_SMBUS_PEC;
+}
+
+static const struct i2c_algorithm sb800_asf_smbus_algorithm = {
+ .master_xfer = sb800_asf_xfer,
+ .reg_slave = sb800_asf_reg_slave,
+ .unreg_slave = sb800_asf_unreg_slave,
+ .functionality = sb800_asf_func,
+};
+
static u32 piix4_func(struct i2c_adapter *adapter)
{
return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
@@ -959,6 +1140,9 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
case PIIX4_SB800:
adap->algo = &piix4_smbus_algorithm_sb800;
break;
+ case SMBUS_ASF:
+ adap->algo = &sb800_asf_smbus_algorithm;
+ break;
default:
dev_err(&dev->dev, "Unsupported SMBus algorithm\n");
return -EINVAL;
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 3/5] i2c: piix4: Add ACPI support for ASF SMBus device
2024-09-04 10:57 [PATCH v2 0/5] Introduce AMD ASF Controller Support to the i2c-piix4 driver Shyam Sundar S K
2024-09-04 10:57 ` [PATCH v2 1/5] i2c: piix4: Allow more than two algo selection for SMBus Shyam Sundar S K
2024-09-04 10:57 ` [PATCH v2 2/5] i2c: piix4: Add i2c_algorithm operations to support AMD ASF with SMBus Shyam Sundar S K
@ 2024-09-04 10:57 ` Shyam Sundar S K
2024-09-04 14:49 ` Andy Shevchenko
` (2 more replies)
2024-09-04 10:57 ` [PATCH v2 4/5] i2c: piix4: Adjust the SMBus debug message Shyam Sundar S K
2024-09-04 10:57 ` [PATCH v2 5/5] i2c: piix4: Clear remote IRR bit to get successive interrupt Shyam Sundar S K
4 siblings, 3 replies; 9+ messages in thread
From: Shyam Sundar S K @ 2024-09-04 10:57 UTC (permalink / raw)
To: Jean Delvare, Andi Shyti
Cc: linux-i2c, Sanket.Goswami, Shyam Sundar S K, Andy Shevchenko
The AMD ASF controller is presented to the operating system as an ACPI
device. The piix4 driver can obtain the ASF handle through ACPI to
retrieve information about the ASF controller's attributes, such as the
ASF address space and interrupt number, and to handle ASF interrupts.
Currently, the piix4 driver assumes that a specific port address is
designated for AUX operations. However, with the introduction of ASF, the
same port address may also be used by the ASF controller. Therefore, a
check needs to be added to ensure that if ASF is advertised and enabled in
ACPI, the AUX port is not set up.
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Co-developed-by: Sanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/i2c/busses/i2c-piix4.c | 166 ++++++++++++++++++++++++++++++++-
1 file changed, 165 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 003cb04312cf..3bcf2e8b24e7 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -60,9 +60,12 @@
#define SB800_ASF_CLK_EN 17
/* SB800 ASF address offsets */
+#define ASFINDEX (7 + piix4_smba)
#define ASFLISADDR (9 + piix4_smba)
#define ASFSTA (0xA + piix4_smba)
#define ASFSLVSTA (0xD + piix4_smba)
+#define ASFDATARWPTR (0x11 + piix4_smba)
+#define ASFSETDATARDPTR (0x12 + piix4_smba)
#define ASFDATABNKSEL (0x13 + piix4_smba)
#define ASFSLVEN (0x15 + piix4_smba)
@@ -118,6 +121,8 @@
#define SB800_PIIX4_FCH_PM_ADDR 0xFED80300
#define SB800_PIIX4_FCH_PM_SIZE 8
#define SB800_ASF_BLOCK_MAX_BYTES 72
+#define SB800_ASF_ERROR_STATUS 0xE
+#define SB800_ASF_ACPI_PATH "\\_SB.ASFC"
/* insmod parameters */
@@ -182,6 +187,11 @@ struct sb800_mmio_cfg {
bool use_mmio;
};
+struct sb800_asf_data {
+ unsigned short addr;
+ int irq;
+};
+
enum piix4_algo {
PIIX4_SB800,
PIIX4_SMBUS,
@@ -198,6 +208,8 @@ struct i2c_piix4_adapdata {
struct sb800_mmio_cfg mmio_cfg;
u8 algo_select;
struct i2c_client *slave;
+ bool is_asf;
+ struct delayed_work work_buf;
};
static int piix4_sb800_region_request(struct device *dev,
@@ -906,6 +918,66 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16 addr,
return retval;
}
+static void sb800_asf_process_slave(struct work_struct *work)
+{
+ struct i2c_piix4_adapdata *adapdata = container_of(work, struct i2c_piix4_adapdata,
+ work_buf.work);
+ unsigned short piix4_smba = adapdata->smba;
+ u8 data[SB800_ASF_BLOCK_MAX_BYTES];
+ u8 bank, reg, cmd = 0;
+ u8 len, val = 0;
+ int i;
+
+ /* Read slave status register */
+ reg = inb_p(ASFSLVSTA);
+
+ /* Check if no error bits are set in slave status register */
+ if (!(reg & SB800_ASF_ERROR_STATUS)) {
+ /* Read data bank */
+ reg = inb_p(ASFDATABNKSEL);
+ bank = (reg & BIT(3)) >> 3;
+
+ /* Set read data bank */
+ if (bank) {
+ reg = reg | BIT(4);
+ reg = reg & (~BIT(3));
+ } else {
+ reg = reg & (~BIT(4));
+ reg = reg & (~BIT(2));
+ }
+
+ /* Read command register */
+ outb_p(reg, ASFDATABNKSEL);
+ cmd = inb_p(ASFINDEX);
+ len = inb_p(ASFDATARWPTR);
+ for (i = 0; i < len; i++)
+ data[i] = inb_p(ASFINDEX);
+
+ /* Clear data bank status */
+ if (bank) {
+ reg = reg | BIT(3);
+ outb_p(reg, ASFDATABNKSEL);
+ } else {
+ reg = reg | BIT(2);
+ outb_p(reg, ASFDATABNKSEL);
+ }
+ } else {
+ /* Set bank as full */
+ reg = reg | (BIT(3) | BIT(2));
+ outb_p(reg, ASFDATABNKSEL);
+ }
+
+ outb_p(0, ASFSETDATARDPTR);
+ if (!(cmd & BIT(0))) {
+ i2c_slave_event(adapdata->slave, I2C_SLAVE_WRITE_REQUESTED, &val);
+ for (i = 0; i < len; i++) {
+ val = data[i];
+ i2c_slave_event(adapdata->slave, I2C_SLAVE_WRITE_RECEIVED, &val);
+ }
+ i2c_slave_event(adapdata->slave, I2C_SLAVE_STOP, &val);
+ }
+}
+
static void sb800_asf_update_bits(unsigned short piix4_smba, u8 bit, unsigned long offset, bool set)
{
unsigned long reg;
@@ -1195,6 +1267,88 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
return 0;
}
+static irqreturn_t sb800_asf_irq_handler(int irq, void *ptr)
+{
+ struct i2c_piix4_adapdata *adapdata = (struct i2c_piix4_adapdata *)ptr;
+ unsigned short piix4_smba = adapdata->smba;
+ u8 slave_int = inb_p(ASFSTA);
+
+ if ((slave_int & BIT(6))) {
+ /* Slave Interrupt */
+ outb_p(slave_int | BIT(6), ASFSTA);
+ schedule_delayed_work(&adapdata->work_buf, HZ);
+ } else {
+ /* Master Interrupt */
+ sb800_asf_update_bits(piix4_smba, SB800_ASF_SLV_INTR, SMBHSTSTS, true);
+ }
+
+ return IRQ_HANDLED;
+}
+
+static int sb800_asf_acpi_resource_cb(struct acpi_resource *resource, void *context)
+{
+ struct sb800_asf_data *data = context;
+
+ switch (resource->type) {
+ case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
+ data->irq = resource->data.extended_irq.interrupts[0];
+ break;
+ case ACPI_RESOURCE_TYPE_IO:
+ data->addr = resource->data.io.minimum;
+ break;
+ }
+
+ return 0;
+}
+
+static int sb800_asf_add_adap(struct pci_dev *dev)
+{
+ struct i2c_piix4_adapdata *adapdata;
+ struct sb800_asf_data data;
+ struct acpi_device *adev;
+ LIST_HEAD(res_list);
+ acpi_status status;
+ acpi_handle handle;
+ int ret;
+
+ status = acpi_get_handle(NULL, SB800_ASF_ACPI_PATH, &handle);
+ if (ACPI_FAILURE(status))
+ return -ENODEV;
+
+ adev = acpi_fetch_acpi_dev(handle);
+ if (!adev)
+ return -ENODEV;
+
+ ret = acpi_dev_get_resources(adev, &res_list, sb800_asf_acpi_resource_cb, &data);
+ if (ret < 0) {
+ dev_err(&dev->dev, "Error getting ASF ACPI resource: %d\n", ret);
+ return ret;
+ }
+
+ acpi_dev_free_resource_list(&res_list);
+ ret = piix4_add_adapter(dev, data.addr, SMBUS_ASF, piix4_adapter_count, false, 0,
+ piix4_main_port_names_sb800[piix4_adapter_count],
+ &piix4_main_adapters[piix4_adapter_count]);
+ if (ret) {
+ dev_err(&dev->dev, "Failed to add ASF adapter: %d\n", ret);
+ return -ENODEV;
+ }
+
+ adapdata = i2c_get_adapdata(piix4_main_adapters[piix4_adapter_count]);
+ ret = devm_request_irq(&dev->dev, data.irq, sb800_asf_irq_handler, IRQF_SHARED,
+ "sb800_smbus_asf", adapdata);
+ if (ret) {
+ dev_err(&dev->dev, "Unable to request irq: %d for use\n", data.irq);
+ return ret;
+ }
+
+ INIT_DELAYED_WORK(&adapdata->work_buf, sb800_asf_process_slave);
+ adapdata->is_asf = true;
+ /* Increment the adapter count by 1 as ASF is added to the list */
+ piix4_adapter_count += 1;
+ return 1;
+}
+
static int piix4_add_adapters_sb800(struct pci_dev *dev, unsigned short smba,
bool notify_imc)
{
@@ -1243,6 +1397,7 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
int retval;
bool is_sb800 = false;
+ bool is_asf = false;
if ((dev->vendor == PCI_VENDOR_ID_ATI &&
dev->device == PCI_DEVICE_ID_ATI_SBX00_SMBUS &&
@@ -1279,6 +1434,10 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
retval = piix4_add_adapters_sb800(dev, retval, notify_imc);
if (retval < 0)
return retval;
+
+ /* Check if ASF is enabled in SB800 */
+ if (sb800_asf_add_adap(dev))
+ is_asf = true;
} else {
retval = piix4_setup(dev, id);
if (retval < 0)
@@ -1308,7 +1467,9 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id)
if (dev->vendor == PCI_VENDOR_ID_AMD &&
(dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS ||
dev->device == PCI_DEVICE_ID_AMD_KERNCZ_SMBUS)) {
- retval = piix4_setup_sb800(dev, id, 1);
+ /* Do not setup AUX port if ASF is enabled */
+ if (!is_asf)
+ retval = piix4_setup_sb800(dev, id, 1);
}
if (retval > 0) {
@@ -1326,6 +1487,9 @@ static void piix4_adap_remove(struct i2c_adapter *adap)
{
struct i2c_piix4_adapdata *adapdata = i2c_get_adapdata(adap);
+ if (adapdata->is_asf)
+ cancel_delayed_work_sync(&adapdata->work_buf);
+
if (adapdata->smba) {
i2c_del_adapter(adap);
if (adapdata->port == (0 << piix4_port_shift_sb800))
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 4/5] i2c: piix4: Adjust the SMBus debug message
2024-09-04 10:57 [PATCH v2 0/5] Introduce AMD ASF Controller Support to the i2c-piix4 driver Shyam Sundar S K
` (2 preceding siblings ...)
2024-09-04 10:57 ` [PATCH v2 3/5] i2c: piix4: Add ACPI support for ASF SMBus device Shyam Sundar S K
@ 2024-09-04 10:57 ` Shyam Sundar S K
2024-09-04 10:57 ` [PATCH v2 5/5] i2c: piix4: Clear remote IRR bit to get successive interrupt Shyam Sundar S K
4 siblings, 0 replies; 9+ messages in thread
From: Shyam Sundar S K @ 2024-09-04 10:57 UTC (permalink / raw)
To: Jean Delvare, Andi Shyti; +Cc: linux-i2c, Sanket.Goswami, Shyam Sundar S K
With the addition of ASF, the current adapter information must now
correctly print the SMBus node details, whether it pertains to PIIX4 or
ASF. Update the driver to reflect this change accordingly.
Co-developed-by: Sanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/i2c/busses/i2c-piix4.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 3bcf2e8b24e7..789dbe832012 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -1194,6 +1194,7 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
{
struct i2c_adapter *adap;
struct i2c_piix4_adapdata *adapdata;
+ const char *node = "PIIX4";
int retval;
adap = kzalloc(sizeof(*adap), GFP_KERNEL);
@@ -1213,6 +1214,7 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
adap->algo = &piix4_smbus_algorithm_sb800;
break;
case SMBUS_ASF:
+ node = "ASF";
adap->algo = &sb800_asf_smbus_algorithm;
break;
default:
@@ -1243,7 +1245,7 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
}
snprintf(adap->name, sizeof(adap->name),
- "SMBus PIIX4 adapter%s at %04x", name, smba);
+ "SMBus %s adapter%s at %04x", node, name, smba);
i2c_set_adapdata(adap, adapdata);
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 5/5] i2c: piix4: Clear remote IRR bit to get successive interrupt
2024-09-04 10:57 [PATCH v2 0/5] Introduce AMD ASF Controller Support to the i2c-piix4 driver Shyam Sundar S K
` (3 preceding siblings ...)
2024-09-04 10:57 ` [PATCH v2 4/5] i2c: piix4: Adjust the SMBus debug message Shyam Sundar S K
@ 2024-09-04 10:57 ` Shyam Sundar S K
4 siblings, 0 replies; 9+ messages in thread
From: Shyam Sundar S K @ 2024-09-04 10:57 UTC (permalink / raw)
To: Jean Delvare, Andi Shyti; +Cc: linux-i2c, Sanket.Goswami, Shyam Sundar S K
To ensure successive interrupts upon packet reception, it is necessary to
clear the remote IRR bit by writing the interrupt number to the EOI
register. The base address for this operation is provided by the BIOS and
retrieved by the driver by traversing the ASF object's namespace.
Co-developed-by: Sanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
---
drivers/i2c/busses/i2c-piix4.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 789dbe832012..9337e9899330 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -188,6 +188,8 @@ struct sb800_mmio_cfg {
};
struct sb800_asf_data {
+ resource_size_t eoi_addr;
+ resource_size_t eoi_sz;
unsigned short addr;
int irq;
};
@@ -199,6 +201,7 @@ enum piix4_algo {
};
struct i2c_piix4_adapdata {
+ void __iomem *eoi_base;
unsigned short smba;
/* SB800 */
@@ -1284,6 +1287,7 @@ static irqreturn_t sb800_asf_irq_handler(int irq, void *ptr)
sb800_asf_update_bits(piix4_smba, SB800_ASF_SLV_INTR, SMBHSTSTS, true);
}
+ iowrite32(irq, adapdata->eoi_base);
return IRQ_HANDLED;
}
@@ -1298,6 +1302,10 @@ static int sb800_asf_acpi_resource_cb(struct acpi_resource *resource, void *cont
case ACPI_RESOURCE_TYPE_IO:
data->addr = resource->data.io.minimum;
break;
+ case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
+ data->eoi_addr = resource->data.fixed_memory32.address;
+ data->eoi_sz = resource->data.fixed_memory32.address_length;
+ break;
}
return 0;
@@ -1345,6 +1353,9 @@ static int sb800_asf_add_adap(struct pci_dev *dev)
}
INIT_DELAYED_WORK(&adapdata->work_buf, sb800_asf_process_slave);
+ adapdata->eoi_base = devm_ioremap(&dev->dev, data.eoi_addr, data.eoi_sz);
+ if (!adapdata->eoi_base)
+ return -ENOMEM;
adapdata->is_asf = true;
/* Increment the adapter count by 1 as ASF is added to the list */
piix4_adapter_count += 1;
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/5] i2c: piix4: Add ACPI support for ASF SMBus device
2024-09-04 10:57 ` [PATCH v2 3/5] i2c: piix4: Add ACPI support for ASF SMBus device Shyam Sundar S K
@ 2024-09-04 14:49 ` Andy Shevchenko
2024-09-05 9:28 ` kernel test robot
2024-09-05 9:39 ` kernel test robot
2 siblings, 0 replies; 9+ messages in thread
From: Andy Shevchenko @ 2024-09-04 14:49 UTC (permalink / raw)
To: Shyam Sundar S K; +Cc: Jean Delvare, Andi Shyti, linux-i2c, Sanket.Goswami
On Wed, Sep 04, 2024 at 04:27:29PM +0530, Shyam Sundar S K wrote:
> The AMD ASF controller is presented to the operating system as an ACPI
> device. The piix4 driver can obtain the ASF handle through ACPI to
> retrieve information about the ASF controller's attributes, such as the
> ASF address space and interrupt number, and to handle ASF interrupts.
>
> Currently, the piix4 driver assumes that a specific port address is
> designated for AUX operations. However, with the introduction of ASF, the
> same port address may also be used by the ASF controller. Therefore, a
> check needs to be added to ensure that if ASF is advertised and enabled in
> ACPI, the AUX port is not set up.
> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Use --cc parameter when sending, instead of this, or alternatively move this
line...
> Co-developed-by: Sanket Goswami <Sanket.Goswami@amd.com>
> Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> ---
...to be somewhere here. It will the same effect for you and me
(in case you use `git send-email`).
> drivers/i2c/busses/i2c-piix4.c | 166 ++++++++++++++++++++++++++++++++-
...
> +struct sb800_asf_data {
> + unsigned short addr;
> + int irq;
> +};
> struct i2c_piix4_adapdata {
> struct sb800_mmio_cfg mmio_cfg;
> u8 algo_select;
> struct i2c_client *slave;
> + bool is_asf;
> + struct delayed_work work_buf;
> };
Side note, always run `pahole` when adding new data structures or modifying
existing ones. It might save memory on the running systems.
...
> +static void sb800_asf_process_slave(struct work_struct *work)
> +{
> + struct i2c_piix4_adapdata *adapdata = container_of(work, struct i2c_piix4_adapdata,
> + work_buf.work);
Better split is
struct i2c_piix4_adapdata *adapdata =
container_of(work, struct i2c_piix4_adapdata, work_buf.work);
> + unsigned short piix4_smba = adapdata->smba;
> + u8 data[SB800_ASF_BLOCK_MAX_BYTES];
> + u8 bank, reg, cmd = 0;
> + u8 len, val = 0;
> + int i;
> +
> + /* Read slave status register */
> + reg = inb_p(ASFSLVSTA);
> +
> + /* Check if no error bits are set in slave status register */
> + if (!(reg & SB800_ASF_ERROR_STATUS)) {
Why not use positive conditional? (This will require to swap if/else branches)
> + /* Read data bank */
> + reg = inb_p(ASFDATABNKSEL);
> + bank = (reg & BIT(3)) >> 3;
> +
> + /* Set read data bank */
> + if (bank) {
> + reg = reg | BIT(4);
> + reg = reg & (~BIT(3));
> + } else {
> + reg = reg & (~BIT(4));
> + reg = reg & (~BIT(2));
In all these three cases the outer parentheses are redundant.
> + }
> +
> + /* Read command register */
> + outb_p(reg, ASFDATABNKSEL);
> + cmd = inb_p(ASFINDEX);
> + len = inb_p(ASFDATARWPTR);
> + for (i = 0; i < len; i++)
> + data[i] = inb_p(ASFINDEX);
> +
> + /* Clear data bank status */
> + if (bank) {
> + reg = reg | BIT(3);
> + outb_p(reg, ASFDATABNKSEL);
> + } else {
> + reg = reg | BIT(2);
> + outb_p(reg, ASFDATABNKSEL);
> + }
> + } else {
> + /* Set bank as full */
> + reg = reg | (BIT(3) | BIT(2));
GENMASK() ?
> + outb_p(reg, ASFDATABNKSEL);
> + }
> +
> + outb_p(0, ASFSETDATARDPTR);
> + if (!(cmd & BIT(0))) {
if (cmd & BIT(0))
return;
?
> + i2c_slave_event(adapdata->slave, I2C_SLAVE_WRITE_REQUESTED, &val);
> + for (i = 0; i < len; i++) {
> + val = data[i];
> + i2c_slave_event(adapdata->slave, I2C_SLAVE_WRITE_RECEIVED, &val);
> + }
> + i2c_slave_event(adapdata->slave, I2C_SLAVE_STOP, &val);
> + }
> +}
...
> +static irqreturn_t sb800_asf_irq_handler(int irq, void *ptr)
> +{
> + struct i2c_piix4_adapdata *adapdata = (struct i2c_piix4_adapdata *)ptr;
Unneeded explicit casting.
> + unsigned short piix4_smba = adapdata->smba;
> + u8 slave_int = inb_p(ASFSTA);
> +
> + if ((slave_int & BIT(6))) {
Too many parentheses
> + /* Slave Interrupt */
> + outb_p(slave_int | BIT(6), ASFSTA);
> + schedule_delayed_work(&adapdata->work_buf, HZ);
> + } else {
> + /* Master Interrupt */
> + sb800_asf_update_bits(piix4_smba, SB800_ASF_SLV_INTR, SMBHSTSTS, true);
> + }
> +
> + return IRQ_HANDLED;
> +}
...
> +static int sb800_asf_acpi_resource_cb(struct acpi_resource *resource, void *context)
> +{
> + struct sb800_asf_data *data = context;
> +
> + switch (resource->type) {
> + case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
> + data->irq = resource->data.extended_irq.interrupts[0];
> + break;
> + case ACPI_RESOURCE_TYPE_IO:
> + data->addr = resource->data.io.minimum;
> + break;
> + }
> +
> + return 0;
> +}
Why do you still need this callback? What for?
...
> +static int sb800_asf_add_adap(struct pci_dev *dev)
> +{
> + struct i2c_piix4_adapdata *adapdata;
> + struct sb800_asf_data data;
> + struct acpi_device *adev;
> + LIST_HEAD(res_list);
> + acpi_status status;
> + acpi_handle handle;
> + int ret;
> +
> + status = acpi_get_handle(NULL, SB800_ASF_ACPI_PATH, &handle);
> + if (ACPI_FAILURE(status))
> + return -ENODEV;
> +
> + adev = acpi_fetch_acpi_dev(handle);
> + if (!adev)
> + return -ENODEV;
> +
> + ret = acpi_dev_get_resources(adev, &res_list, sb800_asf_acpi_resource_cb, &data);
..., NULL, NULL):
> + if (ret < 0) {
> + dev_err(&dev->dev, "Error getting ASF ACPI resource: %d\n", ret);
> + return ret;
> + }
Here iterate over the resources and take the ones you need by their respective
types.
> + acpi_dev_free_resource_list(&res_list);
> + ret = piix4_add_adapter(dev, data.addr, SMBUS_ASF, piix4_adapter_count, false, 0,
> + piix4_main_port_names_sb800[piix4_adapter_count],
> + &piix4_main_adapters[piix4_adapter_count]);
> + if (ret) {
> + dev_err(&dev->dev, "Failed to add ASF adapter: %d\n", ret);
> + return -ENODEV;
> + }
> +
> + adapdata = i2c_get_adapdata(piix4_main_adapters[piix4_adapter_count]);
> + ret = devm_request_irq(&dev->dev, data.irq, sb800_asf_irq_handler, IRQF_SHARED,
> + "sb800_smbus_asf", adapdata);
> + if (ret) {
> + dev_err(&dev->dev, "Unable to request irq: %d for use\n", data.irq);
> + return ret;
> + }
> +
> + INIT_DELAYED_WORK(&adapdata->work_buf, sb800_asf_process_slave);
> + adapdata->is_asf = true;
> + /* Increment the adapter count by 1 as ASF is added to the list */
> + piix4_adapter_count += 1;
++ also suffice.
> + return 1;
> +}
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/5] i2c: piix4: Add ACPI support for ASF SMBus device
2024-09-04 10:57 ` [PATCH v2 3/5] i2c: piix4: Add ACPI support for ASF SMBus device Shyam Sundar S K
2024-09-04 14:49 ` Andy Shevchenko
@ 2024-09-05 9:28 ` kernel test robot
2024-09-05 9:39 ` kernel test robot
2 siblings, 0 replies; 9+ messages in thread
From: kernel test robot @ 2024-09-05 9:28 UTC (permalink / raw)
To: Shyam Sundar S K, Jean Delvare, Andi Shyti
Cc: llvm, oe-kbuild-all, linux-i2c, Sanket.Goswami, Shyam Sundar S K,
Andy Shevchenko
Hi Shyam,
kernel test robot noticed the following build errors:
[auto build test ERROR on andi-shyti/i2c/i2c-host]
[also build test ERROR on linus/master v6.11-rc6 next-20240904]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Shyam-Sundar-S-K/i2c-piix4-Allow-more-than-two-algo-selection-for-SMBus/20240904-190034
base: https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c/i2c-host
patch link: https://lore.kernel.org/r/20240904105731.2246235-4-Shyam-sundar.S-k%40amd.com
patch subject: [PATCH v2 3/5] i2c: piix4: Add ACPI support for ASF SMBus device
config: arm-randconfig-003-20240905 (https://download.01.org/0day-ci/archive/20240905/202409051719.oja4MkJZ-lkp@intel.com/config)
compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project 05f5a91d00b02f4369f46d076411c700755ae041)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240905/202409051719.oja4MkJZ-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202409051719.oja4MkJZ-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from drivers/i2c/busses/i2c-piix4.c:26:
In file included from include/linux/pci.h:1646:
In file included from include/linux/dmapool.h:14:
In file included from include/linux/scatterlist.h:8:
In file included from include/linux/mm.h:2228:
include/linux/vmstat.h:517:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
>> drivers/i2c/busses/i2c-piix4.c:1318:9: error: call to undeclared function 'acpi_fetch_acpi_dev'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
1318 | adev = acpi_fetch_acpi_dev(handle);
| ^
drivers/i2c/busses/i2c-piix4.c:1318:9: note: did you mean 'acpi_match_acpi_device'?
include/linux/acpi.h:932:44: note: 'acpi_match_acpi_device' declared here
932 | static inline const struct acpi_device_id *acpi_match_acpi_device(
| ^
>> drivers/i2c/busses/i2c-piix4.c:1318:7: error: incompatible integer to pointer conversion assigning to 'struct acpi_device *' from 'int' [-Wint-conversion]
1318 | adev = acpi_fetch_acpi_dev(handle);
| ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/i2c/busses/i2c-piix4.c:1322:8: error: call to undeclared function 'acpi_dev_get_resources'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
1322 | ret = acpi_dev_get_resources(adev, &res_list, sb800_asf_acpi_resource_cb, &data);
| ^
drivers/i2c/busses/i2c-piix4.c:1322:8: note: did you mean 'acpi_get_event_resources'?
include/acpi/acpixf.h:809:9: note: 'acpi_get_event_resources' declared here
809 | acpi_get_event_resources(acpi_handle device_handle,
| ^
include/acpi/platform/aclinux.h:93:21: note: expanded from macro 'ACPI_EXTERNAL_RETURN_STATUS'
93 | static ACPI_INLINE prototype {return(AE_NOT_CONFIGURED);}
| ^
>> drivers/i2c/busses/i2c-piix4.c:1328:2: error: call to undeclared function 'acpi_dev_free_resource_list'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
1328 | acpi_dev_free_resource_list(&res_list);
| ^
drivers/i2c/busses/i2c-piix4.c:1328:2: note: did you mean 'pci_free_resource_list'?
include/linux/pci.h:1496:6: note: 'pci_free_resource_list' declared here
1496 | void pci_free_resource_list(struct list_head *resources);
| ^
1 warning and 4 errors generated.
vim +/acpi_fetch_acpi_dev +1318 drivers/i2c/busses/i2c-piix4.c
1303
1304 static int sb800_asf_add_adap(struct pci_dev *dev)
1305 {
1306 struct i2c_piix4_adapdata *adapdata;
1307 struct sb800_asf_data data;
1308 struct acpi_device *adev;
1309 LIST_HEAD(res_list);
1310 acpi_status status;
1311 acpi_handle handle;
1312 int ret;
1313
1314 status = acpi_get_handle(NULL, SB800_ASF_ACPI_PATH, &handle);
1315 if (ACPI_FAILURE(status))
1316 return -ENODEV;
1317
> 1318 adev = acpi_fetch_acpi_dev(handle);
1319 if (!adev)
1320 return -ENODEV;
1321
> 1322 ret = acpi_dev_get_resources(adev, &res_list, sb800_asf_acpi_resource_cb, &data);
1323 if (ret < 0) {
1324 dev_err(&dev->dev, "Error getting ASF ACPI resource: %d\n", ret);
1325 return ret;
1326 }
1327
> 1328 acpi_dev_free_resource_list(&res_list);
1329 ret = piix4_add_adapter(dev, data.addr, SMBUS_ASF, piix4_adapter_count, false, 0,
1330 piix4_main_port_names_sb800[piix4_adapter_count],
1331 &piix4_main_adapters[piix4_adapter_count]);
1332 if (ret) {
1333 dev_err(&dev->dev, "Failed to add ASF adapter: %d\n", ret);
1334 return -ENODEV;
1335 }
1336
1337 adapdata = i2c_get_adapdata(piix4_main_adapters[piix4_adapter_count]);
1338 ret = devm_request_irq(&dev->dev, data.irq, sb800_asf_irq_handler, IRQF_SHARED,
1339 "sb800_smbus_asf", adapdata);
1340 if (ret) {
1341 dev_err(&dev->dev, "Unable to request irq: %d for use\n", data.irq);
1342 return ret;
1343 }
1344
1345 INIT_DELAYED_WORK(&adapdata->work_buf, sb800_asf_process_slave);
1346 adapdata->is_asf = true;
1347 /* Increment the adapter count by 1 as ASF is added to the list */
1348 piix4_adapter_count += 1;
1349 return 1;
1350 }
1351
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/5] i2c: piix4: Add ACPI support for ASF SMBus device
2024-09-04 10:57 ` [PATCH v2 3/5] i2c: piix4: Add ACPI support for ASF SMBus device Shyam Sundar S K
2024-09-04 14:49 ` Andy Shevchenko
2024-09-05 9:28 ` kernel test robot
@ 2024-09-05 9:39 ` kernel test robot
2 siblings, 0 replies; 9+ messages in thread
From: kernel test robot @ 2024-09-05 9:39 UTC (permalink / raw)
To: Shyam Sundar S K, Jean Delvare, Andi Shyti
Cc: oe-kbuild-all, linux-i2c, Sanket.Goswami, Shyam Sundar S K,
Andy Shevchenko
Hi Shyam,
kernel test robot noticed the following build errors:
[auto build test ERROR on andi-shyti/i2c/i2c-host]
[also build test ERROR on linus/master v6.11-rc6 next-20240904]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Shyam-Sundar-S-K/i2c-piix4-Allow-more-than-two-algo-selection-for-SMBus/20240904-190034
base: https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c/i2c-host
patch link: https://lore.kernel.org/r/20240904105731.2246235-4-Shyam-sundar.S-k%40amd.com
patch subject: [PATCH v2 3/5] i2c: piix4: Add ACPI support for ASF SMBus device
config: parisc-allmodconfig (https://download.01.org/0day-ci/archive/20240905/202409051743.1sRmenx6-lkp@intel.com/config)
compiler: hppa-linux-gcc (GCC) 14.1.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240905/202409051743.1sRmenx6-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202409051743.1sRmenx6-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/i2c/busses/i2c-piix4.c: In function 'sb800_asf_add_adap':
drivers/i2c/busses/i2c-piix4.c:1318:16: error: implicit declaration of function 'acpi_fetch_acpi_dev'; did you mean 'acpi_match_acpi_device'? [-Wimplicit-function-declaration]
1318 | adev = acpi_fetch_acpi_dev(handle);
| ^~~~~~~~~~~~~~~~~~~
| acpi_match_acpi_device
>> drivers/i2c/busses/i2c-piix4.c:1318:14: error: assignment to 'struct acpi_device *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
1318 | adev = acpi_fetch_acpi_dev(handle);
| ^
drivers/i2c/busses/i2c-piix4.c:1322:15: error: implicit declaration of function 'acpi_dev_get_resources'; did you mean 'acpi_get_event_resources'? [-Wimplicit-function-declaration]
1322 | ret = acpi_dev_get_resources(adev, &res_list, sb800_asf_acpi_resource_cb, &data);
| ^~~~~~~~~~~~~~~~~~~~~~
| acpi_get_event_resources
drivers/i2c/busses/i2c-piix4.c:1328:9: error: implicit declaration of function 'acpi_dev_free_resource_list'; did you mean 'pci_free_resource_list'? [-Wimplicit-function-declaration]
1328 | acpi_dev_free_resource_list(&res_list);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
| pci_free_resource_list
vim +1318 drivers/i2c/busses/i2c-piix4.c
1303
1304 static int sb800_asf_add_adap(struct pci_dev *dev)
1305 {
1306 struct i2c_piix4_adapdata *adapdata;
1307 struct sb800_asf_data data;
1308 struct acpi_device *adev;
1309 LIST_HEAD(res_list);
1310 acpi_status status;
1311 acpi_handle handle;
1312 int ret;
1313
1314 status = acpi_get_handle(NULL, SB800_ASF_ACPI_PATH, &handle);
1315 if (ACPI_FAILURE(status))
1316 return -ENODEV;
1317
> 1318 adev = acpi_fetch_acpi_dev(handle);
1319 if (!adev)
1320 return -ENODEV;
1321
1322 ret = acpi_dev_get_resources(adev, &res_list, sb800_asf_acpi_resource_cb, &data);
1323 if (ret < 0) {
1324 dev_err(&dev->dev, "Error getting ASF ACPI resource: %d\n", ret);
1325 return ret;
1326 }
1327
1328 acpi_dev_free_resource_list(&res_list);
1329 ret = piix4_add_adapter(dev, data.addr, SMBUS_ASF, piix4_adapter_count, false, 0,
1330 piix4_main_port_names_sb800[piix4_adapter_count],
1331 &piix4_main_adapters[piix4_adapter_count]);
1332 if (ret) {
1333 dev_err(&dev->dev, "Failed to add ASF adapter: %d\n", ret);
1334 return -ENODEV;
1335 }
1336
1337 adapdata = i2c_get_adapdata(piix4_main_adapters[piix4_adapter_count]);
1338 ret = devm_request_irq(&dev->dev, data.irq, sb800_asf_irq_handler, IRQF_SHARED,
1339 "sb800_smbus_asf", adapdata);
1340 if (ret) {
1341 dev_err(&dev->dev, "Unable to request irq: %d for use\n", data.irq);
1342 return ret;
1343 }
1344
1345 INIT_DELAYED_WORK(&adapdata->work_buf, sb800_asf_process_slave);
1346 adapdata->is_asf = true;
1347 /* Increment the adapter count by 1 as ASF is added to the list */
1348 piix4_adapter_count += 1;
1349 return 1;
1350 }
1351
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-09-05 9:39 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-04 10:57 [PATCH v2 0/5] Introduce AMD ASF Controller Support to the i2c-piix4 driver Shyam Sundar S K
2024-09-04 10:57 ` [PATCH v2 1/5] i2c: piix4: Allow more than two algo selection for SMBus Shyam Sundar S K
2024-09-04 10:57 ` [PATCH v2 2/5] i2c: piix4: Add i2c_algorithm operations to support AMD ASF with SMBus Shyam Sundar S K
2024-09-04 10:57 ` [PATCH v2 3/5] i2c: piix4: Add ACPI support for ASF SMBus device Shyam Sundar S K
2024-09-04 14:49 ` Andy Shevchenko
2024-09-05 9:28 ` kernel test robot
2024-09-05 9:39 ` kernel test robot
2024-09-04 10:57 ` [PATCH v2 4/5] i2c: piix4: Adjust the SMBus debug message Shyam Sundar S K
2024-09-04 10:57 ` [PATCH v2 5/5] i2c: piix4: Clear remote IRR bit to get successive interrupt Shyam Sundar S K
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox