| Message ID | 5196B32D.7060501@assembler.cz |
|---|---|
| State | Superseded |
| Headers | show |
Dear Linux folks, Am Samstag, den 18.05.2013, 00:46 +0200 schrieb Rudolf Marek: > Attached patch adds support for secondary SMBus of AMD SB800 and new AMD FCH > chipsets. The base address of secondary SMBus is different from SB700 and it is > stored on similar place as SB800 primary SMBus. > > More verbose info: > > Probing function was just modified to read the SMBus base from address 0x28 or > from original 0x2c. The secondary bus does not provide IRQ information. > > I think the SB700 has same secondary controller, so revision/IRQ information > should not be printed too. This can be fixed in some other patch. > > Chipset datasheet can be found here: > http://support.amd.com/us/Embedded_TechDocs/45482.pdf > > Tested on SB800 and FCH boards. > > Tested-by: Paul Menzel <paulepanter@users.sourceforge.net> > ASRock E350M1 with SB800 Below are my detailed test results according to Rudolf’s instructions, he kindly gave me. > i2c-0 smbus SMBus PIIX4 adapter at 0b00 SMBus adapter > i2c-9 smbus SMBus PIIX4 adapter at 8060 SMBus adapter > > I dont know if 8060 is correct, can you do please? > > isadump 0xcd6 0xcd7 $ sudo isadump 0xcd6 0xcd7 WARNING! Running this program can cause system crashes, data loss and worse! I will probe address register 0xcd6 and data register 0xcd7. Continue? [Y/n] 0 1 2 3 4 5 6 7 8 9 a b c d e f 00: 0e 00 4f 4a 00 04 00 02 34 05 04 01 06 21 43 55 10: ff 0f 00 00 ff 0f 00 00 00 00 00 00 00 00 00 00 20: 00 00 d1 fe 01 00 d8 fe 65 80 00 00 01 0b 00 00 30: 00 00 00 00 07 00 c0 fe 00 00 00 00 00 00 00 00 40: 00 00 00 00 00 00 00 80 f1 00 c0 fe 03 00 00 00 50: 1f 00 d0 fe 90 00 00 97 01 ff 15 66 00 05 00 00 60: 00 08 04 08 08 08 10 08 20 08 00 00 00 fe 08 00 70: 00 00 00 00 17 00 00 04 ff ff 00 00 85 01 e0 a0 80: 1f 1a 00 20 00 00 00 00 30 10 00 00 9e 00 80 00 90: 02 05 02 0b 01 00 10 00 00 10 00 10 00 00 00 00 a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 b0: 00 00 00 00 00 0b 05 05 08 00 08 40 02 00 73 00 c0: f9 0b 78 40 3c 00 00 00 0c 40 28 00 ff ff ff ff d0: 00 00 30 00 00 00 00 00 15 00 19 00 01 00 10 03 e0: d8 0c 00 00 00 00 00 02 00 00 00 01 03 02 00 4f f0: 9c 03 00 00 00 00 00 21 6c 27 00 00 00 00 00 00 > Also you could now invoke > > i2cdetect 9 > > To detect i2c devices on the second bus. $ sudo i2cdetect 9 WARNING! This program can confuse your I2C bus, cause data loss and worse! I will probe file /dev/i2c-9. I will probe address range 0x03-0x77. Continue? [Y/n] 0 1 2 3 4 5 6 7 8 9 a b c d e f 00: -- -- -- -- -- -- -- -- -- -- -- -- -- 10: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 20: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 30: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 40: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 50: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 60: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 70: -- -- -- -- -- -- -- -- It looks like no devices on the second bus are found. Here is the output from device i2c-0 for comparison. $ sudo i2cdetect 0 WARNING! This program can confuse your I2C bus, cause data loss and worse! I will probe file /dev/i2c-0. I will probe address range 0x03-0x77. Continue? [Y/n] 0 1 2 3 4 5 6 7 8 9 a b c d e f 00: -- -- -- -- -- -- -- -- -- -- -- -- -- 10: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 20: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 30: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 40: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 50: 50 -- 52 -- -- -- -- -- -- -- -- -- -- -- -- -- 60: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 70: -- -- -- -- -- -- -- -- > Signed-off-by: Rudolf Marek <r.marek@assembler.cz> Rudolf, it looks like your patch could also update the i2c files under `Documentation`. At least there are some patches doing that. Thanks, Paul
> > To detect i2c devices on the second bus. > > $ sudo i2cdetect 9 > WARNING! This program can confuse your I2C bus, cause data loss and worse! > I will probe file /dev/i2c-9. > I will probe address range 0x03-0x77. > Continue? [Y/n] > 0 1 2 3 4 5 6 7 8 9 a b c d e f > 00: -- -- -- -- -- -- -- -- -- -- -- -- -- > 10: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- > 20: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- > 30: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- > 40: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- > 50: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- > 60: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- > 70: -- -- -- -- -- -- -- -- Do you know if there should be something connected? > Rudolf, it looks like your patch could also update the i2c files under > `Documentation`. At least there are some patches doing that. Do you mean 'busses/i2c-piix4'?
> Do you know if there should be something connected? In Paul case, most likely not. In my case there is a voltage controller for the DDR3 voltage regulator. I asked Paul test it on his SB800 system, I have the Hudson successor.. >> Rudolf, it looks like your patch could also update the i2c files under >> `Documentation`. At least there are some patches doing that. > > Do you mean 'busses/i2c-piix4'? Yes he means that. I will add documentation to the patch. Thanks Rudolf -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jun 11, 2013 at 09:47:12PM +0200, Rudolf Marek wrote: > >Do you know if there should be something connected? > > In Paul case, most likely not. In my case there is a voltage > controller for the DDR3 voltage regulator. I asked Paul test it on > his SB800 system, I have the Hudson successor.. > > >>Rudolf, it looks like your patch could also update the i2c files under > >>`Documentation`. At least there are some patches doing that. > > > >Do you mean 'busses/i2c-piix4'? > > Yes he means that. I will add documentation to the patch. OK, so I will wait for V2. Thanks!
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 39ab78c..7145d3c 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c @@ -231,11 +231,11 @@ static int piix4_setup(struct pci_dev *PIIX4_dev, } static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, - const struct pci_device_id *id) + const struct pci_device_id *id, u8 aux) { unsigned short piix4_smba; unsigned short smba_idx = 0xcd6; - u8 smba_en_lo, smba_en_hi, i2ccfg, i2ccfg_offset = 0x10, smb_en = 0x2c; + u8 smba_en_lo, smba_en_hi, i2ccfg, i2ccfg_offset = 0x10, smb_en; /* SB800 and later SMBus does not support forcing address */ if (force || force_addr) { @@ -245,6 +245,8 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, } /* Determine the address of the SMBus areas */ + smb_en = (aux) ? 0x28 : 0x2c; + if (!request_region(smba_idx, 2, "smba_idx")) { dev_err(&PIIX4_dev->dev, "SMBus base address index region " "0x%x already in use!\n", smba_idx); @@ -272,6 +274,13 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, return -EBUSY; } + /* Aux SMBus does not support IRQ information */ + if (aux) { + dev_info(&PIIX4_dev->dev, + "SMBus Host Controller at 0x%x\n", piix4_smba); + return piix4_smba; + } + /* Request the SMBus I2C bus config region */ if (!request_region(piix4_smba + i2ccfg_offset, 1, "i2ccfg")) { dev_err(&PIIX4_dev->dev, "SMBus I2C bus config region " @@ -596,7 +605,7 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id) dev->revision >= 0x40) || dev->vendor == PCI_VENDOR_ID_AMD) /* base address location etc changed in SB800 */ - retval = piix4_setup_sb800(dev, id); + retval = piix4_setup_sb800(dev, id, 0); else retval = piix4_setup(dev, id); @@ -610,17 +619,29 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id) return retval; /* Check for auxiliary SMBus on some AMD chipsets */ + retval = -ENODEV; + if (dev->vendor == PCI_VENDOR_ID_ATI && - dev->device == PCI_DEVICE_ID_ATI_SBX00_SMBUS && - dev->revision < 0x40) { - retval = piix4_setup_aux(dev, id, 0x58); - 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, &piix4_aux_adapter); + dev->device == PCI_DEVICE_ID_ATI_SBX00_SMBUS) { + if (dev->revision < 0x40) { + retval = piix4_setup_aux(dev, id, 0x58); + } else { + /* SB800 added aux bus too */ + retval = piix4_setup_sb800(dev, id, 1); } } + if (dev->vendor == PCI_VENDOR_ID_AMD && + dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) { + retval = piix4_setup_sb800(dev, id, 1); + } + + 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, &piix4_aux_adapter); + } + return 0; }