From: Andrew Cooks <andrew.cooks@opengear.com>
To: Jean Delvare <jdelvare@suse.com>,
Wolfram Sang <wsa@the-dreams.de>,
linux-i2c@vger.kernel.org (open list:I2C/SMBUS CONTROLLER
DRIVERS FOR PC), linux-kernel@vger.kernel.org (open list)
Cc: Andrew Cooks <andrew.cooks@opengear.com>
Subject: [PATCH v4 3/3] i2c: piix4: add ACPI support
Date: Wed, 31 Jan 2018 07:40:30 +1000 [thread overview]
Message-ID: <d197d95d77afa2054ff1b2c593dae7939030e24b.1517285239.git.andrew.cooks@opengear.com> (raw)
In-Reply-To: <cover.1517285239.git.andrew.cooks@opengear.com>
Enable the i2c-piix4 SMBus controller driver to enumerate I2C slave
devices using ACPI. It builds on the related I2C mux device work
in commit 8eb5c87a92c0 ("i2c: add ACPI support for I2C mux ports")
In the i2c-piix4 driver the adapters are enumerated as:
Main SMBus adapter Port 0, Port 2, ..., aux port (i.e., ASF adapter)
However, in the AMD BKDG documentation[1], the implied order of ports is:
Main SMBus adapter Port 0, ASF adapter, Port 2, Port 3, ...
This ordering difference is unfortunate, and we assume that ACPI
developers will use the Linux ordering, as follows:
Device(SBUS) {
Name(_ADR, 0x00140000)
Name(_HID, "SMB0001")
Device(CH00) {
Name(_ADR, 0) // main SMBus adapter, Port 0
Name (_STR, Unicode ("Main SMBus adapter, Port 0"))
}
Device(CH01) {
Name(_ADR, 1) // main SMBus Port 2 (Port 1 label is undefined)
Name (_STR, Unicode ("Main SMBus adapter, Port 2"))
}
Device (CH02) {
Name(_ADR, 2) // ASF adapter (what Linux calls 'aux port')
Name (_STR, Unicode ("AUX / ASF SMBus adapter"))
}
}
[1] 52740 BIOS and Kernel Developer's Guide (BKDG) for AMD Family 16h
Models 30h-3Fh Processors
Signed-off-by: Andrew Cooks <andrew.cooks@opengear.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/i2c/busses/i2c-piix4.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 01f1610..9a6cdc8 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -837,6 +837,12 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
/* set up the sysfs linkage to our parent device */
adap->dev.parent = &dev->dev;
+ if (has_acpi_companion(&dev->dev)) {
+ acpi_preset_companion(&adap->dev,
+ ACPI_COMPANION(&dev->dev),
+ piix4_adapter_count);
+ }
+
snprintf(adap->name, sizeof(adap->name),
"SMBus PIIX4 adapter%s at %04x", name, smba);
--
2.7.4
prev parent reply other threads:[~2018-01-30 21:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-30 21:40 [PATCH v4 0/3] Enable ACPI-defined peripherals on i2c-piix4 SMBus Andrew Cooks
2018-01-30 21:40 ` [PATCH v4 1/3] i2c: piix4: Fix port selection for AMD Family 16h Model 30h Andrew Cooks
2018-02-19 20:41 ` Andrew Cooks
2018-01-30 21:40 ` [PATCH v4 2/3] i2c: piix4: fix probing of reserved ports on AMD Andrew Cooks
2018-01-30 21:40 ` Andrew Cooks [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d197d95d77afa2054ff1b2c593dae7939030e24b.1517285239.git.andrew.cooks@opengear.com \
--to=andrew.cooks@opengear.com \
--cc=jdelvare@suse.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).