Skip to contentSkip to conversation

i2c: scx200_acb - add cs5535 support

PATCH New Ben Gardner 2 participants 6 messages Dec 19, 2005 – Dec 20, 2005

Subsystems (2)
I2C subsystem host drivers SCx200 CPU support
lore
Share & tools
lore

Ben Gardner

author
#0 lore raw

PATCH 5/7 i2c: scx200_acb - add cs5535 support

Add support for the CS5535 and CS5536 Geode companion devices.

Signed-off-by: Ben Gardner <bgardner at wabtec.com> -------------- next part --------------

 drivers/i2c/busses/scx200_acb.c |   57 ++++++++++++++++++++++++++++++----------
 1 files changed, 43 insertions(+), 14 deletions(-)
drivers/i2c/busses/scx200_acb.c +43 -14
@@ -2,6 +2,7 @@
     Copyright (c) 2001,2002 Christer Weinigel <wingel at nano-system.com>
 
     National Semiconductor SCx200 ACCESS.bus support
+    Also supports the AMD CS5535 and AMD CS5536
 
     Based on i2c-keywest.c which is:
         Copyright (c) 2001 Benjamin Herrenschmidt <benh at kernel.crashing.org>

@@ -31,6 +32,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <asm/io.h>
+#include <asm/msr.h>
 
 #include <linux/scx200.h>
 

@@ -423,7 +425,7 @@ static int scx200_acb_probe(struct scx20
 	return 0;
 }
 
-static int  __init scx200_acb_create(int base, int index)
+static int  __init scx200_acb_create(const char *text, int base, int index)
 {
 	struct scx200_acb_iface	*iface;
 	struct i2c_adapter	*adapter;

@@ -438,7 +440,7 @@ static int  __init scx200_acb_create(int
 
 	adapter = &iface->adapter;
 	i2c_set_adapdata(adapter, iface);
-	snprintf(adapter->name, I2C_NAME_SIZE, "SCx200 ACB%d", index);
+	snprintf(adapter->name, I2C_NAME_SIZE, "%s ACB%d", text, index);
 	adapter->owner = THIS_MODULE;
 	adapter->id    = I2C_HW_SMBUS_SCX200;
 	adapter->algo  = &scx200_acb_algorithm;

@@ -446,8 +448,9 @@ static int  __init scx200_acb_create(int
 
 	init_MUTEX(&iface->sem);
 
-	snprintf(description, sizeof(description),
-		 "NatSemi SCx200 ACCESS.bus [%s]", adapter->name);
+	snprintf(description, sizeof(description), "%s ACCESS.bus [%s]",
+		 text, adapter->name);
+
 	if (request_region(base, 8, description) = 0) {
 		dev_err(&adapter->dev, "can't allocate io 0x%x-0x%x\n",
 			base, base + 8-1);

@@ -490,24 +493,50 @@ static struct pci_device_id scx200[] = {
 	{ },
 };
 
+static struct pci_device_id divil_pci[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_NS,  PCI_DEVICE_ID_NS_CS5535_ISA) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
+	{ } /* NULL entry */
+};
+
+#define MSR_LBAR_SMB		0x5140000B
+
+static int scx200_add_cs553x(void)
+{
+	u32	low, hi;
+	u32	smb_base;
+
+	/* Grab & reserve the SMB I/O range */
+	rdmsr(MSR_LBAR_SMB, low, hi);
+
+	/* Check the IO mask and whether SMB is enabled */
+	if (hi != 0x0000F001) {
+		printk(KERN_WARNING NAME ": SMBus not enabled\n");
+		return -ENODEV;
+	}
+
+	/* SMBus IO size is 8 bytes */
+	smb_base = low & 0x0000FFF8;
+
+	return scx200_acb_create("CS5535", smb_base, 0);
+}
+
 static int __init scx200_acb_init(void)
 {
 	int	i;
-	int	rc;
+	int	rc = -ENODEV;
 
 	pr_debug(NAME ": NatSemi SCx200 ACCESS.bus Driver\n");
 
 	/* Verify that this really is a SCx200 processor */
-	if (pci_dev_present(scx200) = 0)
-		return -ENODEV;
+	if (pci_dev_present(scx200)) {
+		for (i = 0; i < MAX_DEVICES; ++i) {
+			if (base[i] > 0)
+				rc = scx200_acb_create("SCx200", base[i], i);
+		}
+	} else if (pci_dev_present(divil_pci))
+		rc = scx200_add_cs553x();
 
-	rc = -ENXIO;
-	for (i = 0; i < MAX_DEVICES; ++i) {
-		if (base[i] > 0)
-			rc = scx200_acb_create(base[i], i);
-	}
-	if (scx200_acb_list)
-		return 0;
 	return rc;
 }
#1 lore raw

PATCH 5/7 i2c: scx200_acb - add cs5535 support

Hi Ben,

Quoted 1 line

Add support for the CS5535 and CS5536 Geode companion devices.

Breaks compilation:

CC [M] drivers/i2c/busses/scx200_acb.o
drivers/i2c/busses/scx200_acb.c:497: error: `PCI_DEVICE_ID_NS_CS5535_ISA' undeclared here (not in a function) drivers/i2c/busses/scx200_acb.c:497: error: initializer element is not constant drivers/i2c/busses/scx200_acb.c:497: error: (near initialization for divil_pci[0].device') drivers/i2c/busses/scx200_acb.c:497: error: initializer element is not constant drivers/i2c/busses/scx200_acb.c:497: error: (near initialization for divil_pci[0]') drivers/i2c/busses/scx200_acb.c:498: error: `PCI_DEVICE_ID_AMD_CS5536_ISA' undeclared here (not in a function) drivers/i2c/busses/scx200_acb.c:498: error: initializer element is not constant drivers/i2c/busses/scx200_acb.c:498: error: (near initialization for divil_pci[1].device') drivers/i2c/busses/scx200_acb.c:498: error: initializer element is not constant drivers/i2c/busses/scx200_acb.c:498: error: (near initialization for divil_pci[1]') drivers/i2c/busses/scx200_acb.c:499: error: initializer element is not constant drivers/i2c/busses/scx200_acb.c:499: error: (near initialization for `divil_pci[2]') distcc[10014] ERROR: compile drivers/i2c/busses/scx200_acb.c on localhost failed
make[3]: *** [drivers/i2c/busses/scx200_acb.o] Error 1
make[2]: *** [drivers/i2c/busses] Error 2
make[1]: *** [drivers/i2c] Error 2
make: *** [drivers] Error 2

Please provide an updated patch.

Signature · 1 line
Jean Delvare
author
#2 lore raw

PATCH 5/7 i2c: scx200_acb - add cs5535 support

In reply to Ben Gardner

Hi Jean,

Those macros are defined in 2.6.15-rc5-mm3 as:
#define PCI_DEVICE_ID_NS_CS5535_ISA 0x002b
#define PCI_DEVICE_ID_AMD_CS5536_ISA 0x2090

The -mm patch that defines the NS macro is:
i386-gpio-driver-for-amd-cs5535-cs5536.patch

I'm not sure which patch defines the AMD macro.

Ben

Quoted 30 lines · Jean Delvare

Hi Ben,

Quoted 1 line

Add support for the CS5535 and CS5536 Geode companion devices.

Breaks compilation:

CC [M] drivers/i2c/busses/scx200_acb.o
drivers/i2c/busses/scx200_acb.c:497: error: `PCI_DEVICE_ID_NS_CS5535_ISA' undeclared here (not in a function) drivers/i2c/busses/scx200_acb.c:497: error: initializer element is not constant drivers/i2c/busses/scx200_acb.c:497: error: (near initialization for divil_pci[0].device') drivers/i2c/busses/scx200_acb.c:497: error: initializer element is not constant drivers/i2c/busses/scx200_acb.c:497: error: (near initialization for divil_pci[0]') drivers/i2c/busses/scx200_acb.c:498: error: `PCI_DEVICE_ID_AMD_CS5536_ISA' undeclared here (not in a function) drivers/i2c/busses/scx200_acb.c:498: error: initializer element is not constant drivers/i2c/busses/scx200_acb.c:498: error: (near initialization for divil_pci[1].device') drivers/i2c/busses/scx200_acb.c:498: error: initializer element is not constant drivers/i2c/busses/scx200_acb.c:498: error: (near initialization for divil_pci[1]') drivers/i2c/busses/scx200_acb.c:499: error: initializer element is not constant drivers/i2c/busses/scx200_acb.c:499: error: (near initialization for `divil_pci[2]') distcc[10014] ERROR: compile drivers/i2c/busses/scx200_acb.c on localhost failed
make[3]: *** [drivers/i2c/busses/scx200_acb.o] Error 1
make[2]: *** [drivers/i2c/busses] Error 2
make[1]: *** [drivers/i2c] Error 2
make: *** [drivers] Error 2

Please provide an updated patch.

--
Jean Delvare

#3 lore raw

PATCH 5/7 i2c: scx200_acb - add cs5535 support

In reply to Ben Gardner

Hi Ben,

Quoted 8 lines

Those macros are defined in 2.6.15-rc5-mm3 as:
#define PCI_DEVICE_ID_NS_CS5535_ISA 0x002b
#define PCI_DEVICE_ID_AMD_CS5536_ISA 0x2090

The -mm patch that defines the NS macro is:
i386-gpio-driver-for-amd-cs5535-cs5536.patch

I'm not sure which patch defines the AMD macro.

git-libata-all.patch

Anyway, patch looks OK, and so do patches 4, 6 and 7. Just one question:

Quoted 1 line

+static struct pci_device_id divil_pci[] = {

Why "divil"?

As the respin of patch 1 prevents most of the next patches to apply, you'll have to provide a new set of patches. Patch 2 seems to need significant rework too anyway.

Thanks,

Signature · 1 line
Jean Delvare
author
#4 lore raw

PATCH 5/7 i2c: scx200_acb - add cs5535 support

In reply to Ben Gardner

Hi Jean,

Quoted 6 lines · Jean Delvare

(...)
Anyway, patch looks OK, and so do patches 4, 6 and 7. Just one question:

Quoted 1 line

+static struct pci_device_id divil_pci[] = {

Why "divil"?

DIVIL (DIVerse Integrated Logic) is the name of the component/block in the CS5535 & CS5536 chips that contains the SMBus controller (as well as the GPIO, ACPI, IRQ controller, etc)

Quoted 3 lines

As the respin of patch 1 prevents most of the next patches to apply, you'll have to provide a new set of patches. Patch 2 seems to need significant rework too anyway.

Will do.

Thanks,
Ben

author
#5 lore raw

PATCH 5/7 i2c: scx200_acb - add cs5535 support

In reply to Ben Gardner

scx200_acb: Add support for the CS5535/CS5536

Signed-off-by Ben Gardner <bgardner at wabtec.com>

---
This is the second version of the series.
-------------- next part --------------

 drivers/i2c/busses/scx200_acb.c |   57 ++++++++++++++++++++++++++++++----------
 1 files changed, 43 insertions(+), 14 deletions(-)
drivers/i2c/busses/scx200_acb.c +43 -14
@@ -2,6 +2,7 @@
     Copyright (c) 2001,2002 Christer Weinigel <wingel at nano-system.com>
 
     National Semiconductor SCx200 ACCESS.bus support
+    Also supports the AMD CS5535 and AMD CS5536
 
     Based on i2c-keywest.c which is:
         Copyright (c) 2001 Benjamin Herrenschmidt <benh at kernel.crashing.org>

@@ -31,6 +32,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <asm/io.h>
+#include <asm/msr.h>
 
 #include <linux/scx200.h>
 

@@ -416,7 +418,7 @@ static int scx200_acb_probe(struct scx20
 	return 0;
 }
 
-static int  __init scx200_acb_create(int base, int index)
+static int  __init scx200_acb_create(const char *text, int base, int index)
 {
 	struct scx200_acb_iface *iface;
 	struct i2c_adapter *adapter;

@@ -432,7 +434,7 @@ static int  __init scx200_acb_create(int
 
 	adapter = &iface->adapter;
 	i2c_set_adapdata(adapter, iface);
-	snprintf(adapter->name, I2C_NAME_SIZE, "SCx200 ACB%d", index);
+	snprintf(adapter->name, I2C_NAME_SIZE, "%s ACB%d", text, index);
 	adapter->owner = THIS_MODULE;
 	adapter->id = I2C_HW_SMBUS_SCX200;
 	adapter->algo = &scx200_acb_algorithm;

@@ -440,8 +442,9 @@ static int  __init scx200_acb_create(int
 
 	init_MUTEX(&iface->sem);
 
-	snprintf(description, sizeof(description),
-		 "NatSemi SCx200 ACCESS.bus [%s]", adapter->name);
+	snprintf(description, sizeof(description), "%s ACCESS.bus [%s]",
+		 text, adapter->name);
+
 	if (request_region(base, 8, description) = 0) {
 		printk(KERN_ERR NAME ": can't allocate io 0x%x-0x%x\n",
 			base, base + 8-1);

@@ -485,24 +488,50 @@ static struct pci_device_id scx200[] = {
 	{ },
 };
 
+static struct pci_device_id divil_pci[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_NS,  PCI_DEVICE_ID_NS_CS5535_ISA) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
+	{ } /* NULL entry */
+};
+
+#define MSR_LBAR_SMB		0x5140000B
+
+static int scx200_add_cs553x(void)
+{
+	u32	low, hi;
+	u32	smb_base;
+
+	/* Grab & reserve the SMB I/O range */
+	rdmsr(MSR_LBAR_SMB, low, hi);
+
+	/* Check the IO mask and whether SMB is enabled */
+	if (hi != 0x0000F001) {
+		printk(KERN_WARNING NAME ": SMBus not enabled\n");
+		return -ENODEV;
+	}
+
+	/* SMBus IO size is 8 bytes */
+	smb_base = low & 0x0000FFF8;
+
+	return scx200_acb_create("CS5535", smb_base, 0);
+}
+
 static int __init scx200_acb_init(void)
 {
 	int i;
-	int rc;
+	int	rc = -ENODEV;
 
 	pr_debug(NAME ": NatSemi SCx200 ACCESS.bus Driver\n");
 
 	/* Verify that this really is a SCx200 processor */
-	if (pci_dev_present(scx200) = 0)
-		return -ENODEV;
+	if (pci_dev_present(scx200)) {
+		for (i = 0; i < MAX_DEVICES; ++i) {
+			if (base[i] > 0)
+				rc = scx200_acb_create("SCx200", base[i], i);
+		}
+	} else if (pci_dev_present(divil_pci))
+		rc = scx200_add_cs553x();
 
-	rc = -ENXIO;
-	for (i = 0; i < MAX_DEVICES; ++i) {
-		if (base[i] > 0)
-			rc = scx200_acb_create(base[i], i);
-	}
-	if (scx200_acb_list)
-		return 0;
 	return rc;
 }