All of lore.kernel.org
 help / color / mirror / Atom feed
* [lm-sensors] nForce 430 SMBus
@ 2006-04-07 23:07 Mark Rages
  2006-04-08 13:00 ` Rudolf Marek
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: Mark Rages @ 2006-04-07 23:07 UTC (permalink / raw)
  To: lm-sensors

Hi,

I've got an "Asus A8N-VM CSM nForce 430/GeForce 6150" motherboard.

I want to access the SMBus for hardware hacking purposes.

I can read the sensors through the w83627ehf SuperIO, through the
i2c-isa interface.

But I get nothing from eeprom/decode-dimms.pl ("Number of SDRAM DIMMs
detected and decoded: 0").

I'm guessing I need to get this interface working:

00:0a.1 SMBus: nVidia Corporation MCP51 SMBus (rev a2)
        Subsystem: nVidia Corporation: Unknown device cb84

This has PCI ID 10de:0264.

I tried hacking adding this ID to the nforce2 driver, but I still
can't get anything from decode-dimms.pl.

What do I need to do?

Regards,
Mark
markrages at gmail
--
You think that it is a secret, but it never has been one.
  - fortune cookie


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [lm-sensors] nForce 430 SMBus
  2006-04-07 23:07 [lm-sensors] nForce 430 SMBus Mark Rages
@ 2006-04-08 13:00 ` Rudolf Marek
  2006-04-08 13:53 ` Mark Rages
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Rudolf Marek @ 2006-04-08 13:00 UTC (permalink / raw)
  To: lm-sensors


> 
> What do I need to do?

Hello, please provide the dsdt.bin file:
cat /proc/acpi/dsdt >dsdt.bin

Send it to me and CC to list.

Thanks,
Regards
Rudolf


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [lm-sensors] nForce 430 SMBus
  2006-04-07 23:07 [lm-sensors] nForce 430 SMBus Mark Rages
  2006-04-08 13:00 ` Rudolf Marek
@ 2006-04-08 13:53 ` Mark Rages
  2006-04-08 15:04 ` Mark Rages
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Mark Rages @ 2006-04-08 13:53 UTC (permalink / raw)
  To: lm-sensors

Ok, here it is.

On 4/8/06, Rudolf Marek <r.marek at sh.cvut.cz> wrote:
>
> >
> > What do I need to do?
>
> Hello, please provide the dsdt.bin file:
> cat /proc/acpi/dsdt >dsdt.bin
>
> Send it to me and CC to list.
>
> Thanks,
> Regards
> Rudolf
>


--
You think that it is a secret, but it never has been one.
  - fortune cookie
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dsdt.bin
Type: application/octet-stream
Size: 21970 bytes
Desc: not available
Url : http://lists.lm-sensors.org/pipermail/lm-sensors/attachments/20060408/2ec3107a/dsdt-0001.bin

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [lm-sensors] nForce 430 SMBus
  2006-04-07 23:07 [lm-sensors] nForce 430 SMBus Mark Rages
  2006-04-08 13:00 ` Rudolf Marek
  2006-04-08 13:53 ` Mark Rages
@ 2006-04-08 15:04 ` Mark Rages
  2006-04-08 15:14 ` Jean Delvare
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Mark Rages @ 2006-04-08 15:04 UTC (permalink / raw)
  To: lm-sensors

On 4/7/06, Mark Rages <markrages at gmail.com> wrote:
> I'm guessing I need to get this interface working:
>
> 00:0a.1 SMBus: nVidia Corporation MCP51 SMBus (rev a2)
>         Subsystem: nVidia Corporation: Unknown device cb84
>
> This has PCI ID 10de:0264.
>
> I tried hacking adding this ID to the nforce2 driver, but I still
> can't get anything from decode-dimms.pl.
>
> What do I need to do?

Replying to myself.

I noticed that the lspci -v output looks like this:

00:0a.1 SMBus: nVidia Corporation MCP51 SMBus (rev a2)
        Subsystem: nVidia Corporation: Unknown device cb84
        Flags: 66Mhz, fast devsel, IRQ 5
        I/O ports at 0600 [sized]
        I/O ports at 0700 [sized]
        Capabilities: [44] Power Management version 2

The hacked i2c-nforce2 wasn't working because the call to
pci_read_config_word() was returning 0x00 for the iobase .

I made another quick hack to i2c-nforce2 to hardcode iobase=0x600 for
the first smbus interface and iobase=0x700 for the second smbus
interface.

Now the modules load and decode-dimms.pl is working.

I'm not much of a kernel hacker, so tell me if you need any more information.

Regards,
Mark
markrages at gmail
--
You think that it is a secret, but it never has been one.
  - fortune cookie


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [lm-sensors] nForce 430 SMBus
  2006-04-07 23:07 [lm-sensors] nForce 430 SMBus Mark Rages
                   ` (2 preceding siblings ...)
  2006-04-08 15:04 ` Mark Rages
@ 2006-04-08 15:14 ` Jean Delvare
  2006-04-08 16:06 ` Mark Rages
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Jean Delvare @ 2006-04-08 15:14 UTC (permalink / raw)
  To: lm-sensors

Hi Mark,

> I noticed that the lspci -v output looks like this:
> 
> 00:0a.1 SMBus: nVidia Corporation MCP51 SMBus (rev a2)
>         Subsystem: nVidia Corporation: Unknown device cb84
>         Flags: 66Mhz, fast devsel, IRQ 5
>         I/O ports at 0600 [sized]
>         I/O ports at 0700 [sized]
>         Capabilities: [44] Power Management version 2
> 
> The hacked i2c-nforce2 wasn't working because the call to
> pci_read_config_word() was returning 0x00 for the iobase .
> 
> I made another quick hack to i2c-nforce2 to hardcode iobase=0x600 for
> the first smbus interface and iobase=0x700 for the second smbus
> interface.
> 
> Now the modules load and decode-dimms.pl is working.
> 
> I'm not much of a kernel hacker, so tell me if you need any more information.

Hey, good work. lease provide the output of (as root):
  lspci -s 00:0a.1 -xxx

Thanks,
-- 
Jean Delvare


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [lm-sensors] nForce 430 SMBus
  2006-04-07 23:07 [lm-sensors] nForce 430 SMBus Mark Rages
                   ` (3 preceding siblings ...)
  2006-04-08 15:14 ` Jean Delvare
@ 2006-04-08 16:06 ` Mark Rages
  2006-04-08 18:42 ` Jean Delvare
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Mark Rages @ 2006-04-08 16:06 UTC (permalink / raw)
  To: lm-sensors

On 4/8/06, Jean Delvare <khali at linux-fr.org> wrote:
>
> Hey, good work. lease provide the output of (as root):
>   lspci -s 00:0a.1 -xxx
>

Here it is:
 lspci -s 00:0a.1 -xxx
00:0a.1 SMBus: nVidia Corporation MCP51 SMBus (rev a2)
00: de 10 64 02 01 00 b0 00 a2 00 05 0c 00 00 80 00
10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
20: 01 06 00 00 01 07 00 00 00 00 00 00 de 10 84 cb
30: 00 00 00 00 44 00 00 00 00 00 00 00 05 01 00 00
40: de 10 84 cb 01 00 02 c0 00 00 00 00 00 00 00 00
50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
60: 01 05 00 00 01 08 00 00 01 09 00 00 00 00 00 00
70: 01 00 00 00 00 00 b8 fe 00 00 fe fe 01 20 00 00
80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
90: 00 00 00 00 00 00 00 00 00 00 00 00 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 00 00 00 00 00 00 00 00 00 00 00
c0: d4 30 80 00 00 00 00 00 00 00 00 00 00 00 00 00
d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
e0: 10 10 04 00 00 a0 90 00 80 30 00 00 41 44 44 11
f0: 5a ff 5f bf 00 00 00 c0 10 00 00 00 00 00 00 00


--
You think that it is a secret, but it never has been one.
  - fortune cookie


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [lm-sensors] nForce 430 SMBus
  2006-04-07 23:07 [lm-sensors] nForce 430 SMBus Mark Rages
                   ` (4 preceding siblings ...)
  2006-04-08 16:06 ` Mark Rages
@ 2006-04-08 18:42 ` Jean Delvare
  2006-04-09  6:44 ` Rudolf Marek
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Jean Delvare @ 2006-04-08 18:42 UTC (permalink / raw)
  To: lm-sensors

Hi Mark,

> > Hey, good work. lease provide the output of (as root):
> >   lspci -s 00:0a.1 -xxx
> 
> Here it is:
>  lspci -s 00:0a.1 -xxx
> 00:0a.1 SMBus: nVidia Corporation MCP51 SMBus (rev a2)
> 00: de 10 64 02 01 00 b0 00 a2 00 05 0c 00 00 80 00
> 10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
> 20: 01 06 00 00 01 07 00 00 00 00 00 00 de 10 84 cb
> 30: 00 00 00 00 44 00 00 00 00 00 00 00 05 01 00 00
> 40: de 10 84 cb 01 00 02 c0 00 00 00 00 00 00 00 00
> 50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
> 60: 01 05 00 00 01 08 00 00 01 09 00 00 00 00 00 00
> 70: 01 00 00 00 00 00 b8 fe 00 00 fe fe 01 20 00 00

OK, that explains it. The driver was looking for the base I/O addresses
at (non-standard registers) 0x50 and 0x54. You have them at (standard
registers) 0x20 and 0x24.

I did some search and it seems that previous nforce4 devices had each
address listed twice (once in the non-standard register and once in the
standard register). Original nforce2 devices had only the non-standard
ones though, which explains why the driver was using them.

So my guess is that Nvidia tried to move to the standard register,
which isn't a bad thing, and kept the old ones around for some times
for compatibility purposes (not a bad idea either.) And your device is
the first one without that compatibility measure, so the driver broke.

I modified the driver so that it'll check the standard register first,
and fallback to the non-standard one when needed (older devices.) Patch
follows:

Add support for the new nForce4 MCP51 (also known as nForce 410 or
430) to the i2c-nforce2 driver. Some code changes were required because
the base I/O address registers have changed in this version. Standard
BARs are now being used, while the original nForce2 chips used
non-standard ones.

Signed-off-by: Jean Delvare <khali at linux-fr.org>
---
 drivers/i2c/busses/i2c-nforce2.c |   18 +++++++++++++-----
 include/linux/pci_ids.h          |    1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

--- linux-2.6.17-rc1.orig/drivers/i2c/busses/i2c-nforce2.c	2006-03-27 18:18:57.000000000 +0200
+++ linux-2.6.17-rc1/drivers/i2c/busses/i2c-nforce2.c	2006-04-08 20:29:13.000000000 +0200
@@ -31,6 +31,7 @@
     nForce3 250Gb MCP		00E4
     nForce4 MCP			0052
     nForce4 MCP-04		0034
+    nForce4 MCP51		0264
 
     This driver supports the 2 SMBuses that are included in the MCP of the
     nForce2/3/4 chipsets.
@@ -259,6 +260,7 @@
 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SMBUS) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE4_SMBUS) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS) },
 	{ 0 }
 };
 
@@ -267,17 +269,20 @@
 
 
 static int __devinit nforce2_probe_smb (struct pci_dev *dev, int reg,
-	struct nforce2_smbus *smbus, char *name)
+	int alt_reg, struct nforce2_smbus *smbus, char *name)
 {
 	u16 iobase;
 	int error;
 
-	if (pci_read_config_word(dev, reg, &iobase) != PCIBIOS_SUCCESSFUL) {
+	/* Older incarnations of the device used non-standard BARs */
+	if (pci_read_config_word(dev, reg, &iobase) != PCIBIOS_SUCCESSFUL
+	 || (!iobase && pci_read_config_word(dev, alt_reg, &iobase)
+			!= PCIBIOS_SUCCESSFUL)) {
 		dev_err(&smbus->adapter.dev, "Error reading PCI config for %s\n", name);
 		return -1;
 	}
 	smbus->dev  = dev;
-	smbus->base = iobase & 0xfffc;
+	smbus->base = iobase & PCI_BASE_ADDRESS_IO_MASK;
 	smbus->size = 8;
 
 	if (!request_region(smbus->base, smbus->size, nforce2_driver.name)) {
@@ -313,12 +318,15 @@
 	pci_set_drvdata(dev, smbuses);
 
 	/* SMBus adapter 1 */
-	res1 = nforce2_probe_smb (dev, NFORCE_PCI_SMB1, &smbuses[0], "SMB1");
+	res1 = nforce2_probe_smb(dev, PCI_BASE_ADDRESS_4, NFORCE_PCI_SMB1,
+				 &smbuses[0], "SMB1");
 	if (res1 < 0) {
 		dev_err(&dev->dev, "Error probing SMB1.\n");
 		smbuses[0].base = 0;	/* to have a check value */
 	}
-	res2 = nforce2_probe_smb (dev, NFORCE_PCI_SMB2, &smbuses[1], "SMB2");
+	/* SMBus adapter 2 */
+	res2 = nforce2_probe_smb(dev, PCI_BASE_ADDRESS_5, NFORCE_PCI_SMB2,
+				 &smbuses[1], "SMB2");
 	if (res2 < 0) {
 		dev_err(&dev->dev, "Error probing SMB2.\n");
 		smbuses[1].base = 0;	/* to have a check value */
--- linux-2.6.17-rc1.orig/include/linux/pci_ids.h	2006-04-03 20:50:44.000000000 +0200
+++ linux-2.6.17-rc1/include/linux/pci_ids.h	2006-04-08 18:46:22.000000000 +0200
@@ -1124,6 +1124,7 @@
 #define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL	0x0258
 #define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL	0x0259
 #define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL	0x025B
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS	0x0264
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE	0x0265
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA	0x0266
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2	0x0267


Mark (McKnight), can you please try it too? It should work for you too.

Other users of i2c-nforce2 are invited to test that patch too, just to
make sure I did not accidentally break the older chips.

Thanks,
-- 
Jean Delvare


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [lm-sensors] nForce 430 SMBus
  2006-04-07 23:07 [lm-sensors] nForce 430 SMBus Mark Rages
                   ` (5 preceding siblings ...)
  2006-04-08 18:42 ` Jean Delvare
@ 2006-04-09  6:44 ` Rudolf Marek
  2006-04-12 15:35 ` Mark McKnight
  2006-04-13 10:49 ` Jean Delvare
  8 siblings, 0 replies; 10+ messages in thread
From: Rudolf Marek @ 2006-04-09  6:44 UTC (permalink / raw)
  To: lm-sensors

Mark Rages wrote:
> Ok, here it is.

Bad luck, due to sensors on ISA there is even no smbus definition
it seems. But hey you found it out anyway ;)

Regards
Rudolf



^ permalink raw reply	[flat|nested] 10+ messages in thread

* [lm-sensors] nForce 430 SMBus
  2006-04-07 23:07 [lm-sensors] nForce 430 SMBus Mark Rages
                   ` (6 preceding siblings ...)
  2006-04-09  6:44 ` Rudolf Marek
@ 2006-04-12 15:35 ` Mark McKnight
  2006-04-13 10:49 ` Jean Delvare
  8 siblings, 0 replies; 10+ messages in thread
From: Mark McKnight @ 2006-04-12 15:35 UTC (permalink / raw)
  To: lm-sensors

Hi Jean,

>OK, that explains it. The driver was looking for the base I/O addresses
>at (non-standard registers) 0x50 and 0x54. You have them at (standard
>registers) 0x20 and 0x24.

>I did some search and it seems that previous nforce4 devices had each
>address listed twice (once in the non-standard register and once in the
>standard register). Original nforce2 devices had only the non-standard
>ones though, which explains why the driver was using them.

>So my guess is that Nvidia tried to move to the standard register,
>which isn't a bad thing, and kept the old ones around for some times
>for compatibility purposes (not a bad idea either.) And your device is
>the first one without that compatibility measure, so the driver broke.

---clipped message and patch

>Mark (McKnight), can you please try it too? It should work for you too.

I tried it on Ubuntu 2.6.15 and it works as expected. I'm now displaying cpu temp and fan speed in the gnome panel. 

>Other users of i2c-nforce2 are invited to test that patch too, just to
>make sure I did not accidentally break the older chips.

>Thanks,
-- 
>Jean Delvare

I'd also like to thank lm-sensor developers past and present for sensors-detect. I found it a very useful utility.

Mark Mcknight

		
---------------------------------
7 bucks a month. This is Huge Yahoo! Music Unlimited  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.lm-sensors.org/pipermail/lm-sensors/attachments/20060412/2eddacc4/attachment.html

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [lm-sensors] nForce 430 SMBus
  2006-04-07 23:07 [lm-sensors] nForce 430 SMBus Mark Rages
                   ` (7 preceding siblings ...)
  2006-04-12 15:35 ` Mark McKnight
@ 2006-04-13 10:49 ` Jean Delvare
  8 siblings, 0 replies; 10+ messages in thread
From: Jean Delvare @ 2006-04-13 10:49 UTC (permalink / raw)
  To: lm-sensors

Hi Mark and Mark,

> > Mark (McKnight), can you please try it too? It should work for you too.
> 
> I tried it on Ubuntu 2.6.15 and it works as expected. I'm now
> displaying cpu temp and fan speed in the gnome panel.

OK, great! Thanks for testing.

Since then, I've come up with a slightly different patch which seems to
be technically more correct. Testers would be welcome. As before,
testers for older devices are just as welcome as testers for the new
one, so as to make sure I didn't break anything.


Add support for the new nForce4 MCP51 (also known as nForce 410 or
430) to the i2c-nforce2 driver. Some code changes were required because
the base I/O address registers have changed in this version. Standard
BARs are now being used, while the original nForce2 chips used
non-standard ones.

Signed-off-by: Jean Delvare <khali at linux-fr.org>
---
 Documentation/i2c/busses/i2c-nforce2 |    1 +
 drivers/i2c/busses/i2c-nforce2.c     |   36 ++++++++++++++++++++++++----------
 include/linux/pci_ids.h              |    1 +
 3 files changed, 27 insertions(+), 11 deletions(-)

--- linux-2.6.17-rc1.orig/drivers/i2c/busses/i2c-nforce2.c	2006-04-13 12:32:15.000000000 +0200
+++ linux-2.6.17-rc1/drivers/i2c/busses/i2c-nforce2.c	2006-04-13 12:46:44.000000000 +0200
@@ -31,6 +31,7 @@
     nForce3 250Gb MCP		00E4
     nForce4 MCP			0052
     nForce4 MCP-04		0034
+    nForce4 MCP51		0264
 
     This driver supports the 2 SMBuses that are included in the MCP of the
     nForce2/3/4 chipsets.
@@ -64,6 +65,7 @@
 
 /*
  * nVidia nForce2 SMBus control register definitions
+ * (Newer incarnations use standard BAR 4 and 5 instead)
  */
 #define NFORCE_PCI_SMB1	0x50
 #define NFORCE_PCI_SMB2	0x54
@@ -259,6 +261,7 @@
 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SMBUS) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE4_SMBUS) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SMBUS) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS) },
 	{ 0 }
 };
 
@@ -266,19 +269,29 @@
 MODULE_DEVICE_TABLE (pci, nforce2_ids);
 
 
-static int __devinit nforce2_probe_smb (struct pci_dev *dev, int reg,
-	struct nforce2_smbus *smbus, char *name)
+static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar,
+	int alt_reg, struct nforce2_smbus *smbus, const char *name)
 {
-	u16 iobase;
 	int error;
 
-	if (pci_read_config_word(dev, reg, &iobase) != PCIBIOS_SUCCESSFUL) {
-		dev_err(&smbus->adapter.dev, "Error reading PCI config for %s\n", name);
-		return -1;
+	smbus->base = pci_resource_start(dev, bar);
+	if (smbus->base) {
+		smbus->size = pci_resource_len(dev, bar);
+	} else {
+		/* Older incarnations of the device used non-standard BARs */
+		u16 iobase;
+
+		if (pci_read_config_word(dev, alt_reg, &iobase)
+		    != PCIBIOS_SUCCESSFUL) {
+			dev_err(&dev->dev, "Error reading PCI config for %s\n",
+				name);
+			return -1;
+		}
+
+		smbus->base = iobase & PCI_BASE_ADDRESS_IO_MASK;
+		smbus->size = 8;
 	}
-	smbus->dev  = dev;
-	smbus->base = iobase & 0xfffc;
-	smbus->size = 8;
+	smbus->dev = dev;
 
 	if (!request_region(smbus->base, smbus->size, nforce2_driver.name)) {
 		dev_err(&smbus->adapter.dev, "Error requesting region %02x .. %02X for %s\n",
@@ -313,12 +326,13 @@
 	pci_set_drvdata(dev, smbuses);
 
 	/* SMBus adapter 1 */
-	res1 = nforce2_probe_smb (dev, NFORCE_PCI_SMB1, &smbuses[0], "SMB1");
+	res1 = nforce2_probe_smb(dev, 4, NFORCE_PCI_SMB1, &smbuses[0], "SMB1");
 	if (res1 < 0) {
 		dev_err(&dev->dev, "Error probing SMB1.\n");
 		smbuses[0].base = 0;	/* to have a check value */
 	}
-	res2 = nforce2_probe_smb (dev, NFORCE_PCI_SMB2, &smbuses[1], "SMB2");
+	/* SMBus adapter 2 */
+	res2 = nforce2_probe_smb(dev, 5, NFORCE_PCI_SMB2, &smbuses[1], "SMB2");
 	if (res2 < 0) {
 		dev_err(&dev->dev, "Error probing SMB2.\n");
 		smbuses[1].base = 0;	/* to have a check value */
--- linux-2.6.17-rc1.orig/include/linux/pci_ids.h	2006-04-13 12:32:15.000000000 +0200
+++ linux-2.6.17-rc1/include/linux/pci_ids.h	2006-04-13 12:39:47.000000000 +0200
@@ -1124,6 +1124,7 @@
 #define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL	0x0258
 #define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL	0x0259
 #define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL	0x025B
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS	0x0264
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE	0x0265
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA	0x0266
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2	0x0267
--- linux-2.6.17-rc1.orig/Documentation/i2c/busses/i2c-nforce2	2006-04-13 12:32:15.000000000 +0200
+++ linux-2.6.17-rc1/Documentation/i2c/busses/i2c-nforce2	2006-04-13 12:39:47.000000000 +0200
@@ -7,6 +7,7 @@
   * nForce3 250Gb MCP          10de:00E4 
   * nForce4 MCP                10de:0052
   * nForce4 MCP-04             10de:0034
+  * nForce4 MCP51              10de:0264
 
 Datasheet: not publically available, but seems to be similar to the
            AMD-8111 SMBus 2.0 adapter.

> I'd also like to thank lm-sensor developers past and present for
> sensors-detect. I found it a very useful utility.

Thanks :')

-- 
Jean Delvare


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2006-04-13 10:49 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-07 23:07 [lm-sensors] nForce 430 SMBus Mark Rages
2006-04-08 13:00 ` Rudolf Marek
2006-04-08 13:53 ` Mark Rages
2006-04-08 15:04 ` Mark Rages
2006-04-08 15:14 ` Jean Delvare
2006-04-08 16:06 ` Mark Rages
2006-04-08 18:42 ` Jean Delvare
2006-04-09  6:44 ` Rudolf Marek
2006-04-12 15:35 ` Mark McKnight
2006-04-13 10:49 ` Jean Delvare

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.