[rdc] add a new southbridge driver which registers the gpio and watchdog platform devices

This also fixes the watchdog logic and abstracts the access to the RDC321x
southbridge PCI configuration register space. Based on a patch by Bernhard Loos.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19972 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/Makefile

@@ -1,5 +1,5 @@
 #
 # Makefile for the RDC321x specific parts of the kernel
 #
-obj-$(CONFIG_X86_RDC321X)        := gpio.o platform.o
+obj-$(CONFIG_X86_RDC321X)        := gpio.o platform.o pci.o
 

target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/gpio.c

@@ -1,8 +1,8 @@
 /*
- *  GPIO support for RDC SoC R3210/R8610
+ * RDC321x GPIO driver
  *
- *  Copyright (C) 2007, Florian Fainelli <florian@openwrt.org>
+ * Copyright (C) 2008, Volker Weiss <dev@tintuc.de>
- *  Copyright (C) 2008, Volker Weiss <dev@tintuc.de>
+ * Copyright (C) 2007-2010 Florian Fainelli <florian@openwrt.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,121 +19,100 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
-
-
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <linux/types.h>
 #include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/platform_device.h>
+#include <linux/pci.h>
 #include <linux/gpio.h>
 
-#include <asm/rdc321x_gpio.h>
 #include <asm/rdc321x_defs.h>
 
+struct rdc321x_gpio {
+	spinlock_t	lock;
+	u32 		data_reg[2];
+} rdc321x_gpio_dev;
 
-/* spin lock to protect our private copy of GPIO data register plus
+extern int rdc321x_pci_write(int reg, u32 val);
-   the access to PCI conf registers. */
+extern int rdc321x_pci_read(int reg, u32 *val);
-static DEFINE_SPINLOCK(gpio_lock);
-
-/* copy of GPIO data registers */
-static u32 gpio_data_reg1;
-static u32 gpio_data_reg2;
-
-static inline void rdc321x_conf_write(unsigned addr, u32 value)
-{
-	outl((1 << 31) | (7 << 11) | addr, RDC3210_CFGREG_ADDR);
-	outl(value, RDC3210_CFGREG_DATA);
-}
-
-static inline void rdc321x_conf_or(unsigned addr, u32 value)
-{
-	outl((1 << 31) | (7 << 11) | addr, RDC3210_CFGREG_ADDR);
-	value |= inl(RDC3210_CFGREG_DATA);
-	outl(value, RDC3210_CFGREG_DATA);
-}
-
-static inline u32 rdc321x_conf_read(unsigned addr)
-{
-	outl((1 << 31) | (7 << 11) | addr, RDC3210_CFGREG_ADDR);
-
-	return inl(RDC3210_CFGREG_DATA);
-}
-
-/* configure pin as GPIO */
-static void rdc321x_configure_gpio(unsigned gpio)
-{
-	unsigned long flags;
-
-	spin_lock_irqsave(&gpio_lock, flags);
-	rdc321x_conf_or(gpio < 32
-		? RDC321X_GPIO_CTRL_REG1 : RDC321X_GPIO_CTRL_REG2,
-		1 << (gpio & 0x1f));
-	spin_unlock_irqrestore(&gpio_lock, flags);
-}
 
 /* read GPIO pin */
 static int rdc_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
 {
-	u32 reg;
+	u32 value = 0;
-	unsigned long flags;
+	int reg;
 
-	spin_lock_irqsave(&gpio_lock, flags);
+	reg = gpio < 32 ? RDC321X_GPIO_DATA_REG1 : RDC321X_GPIO_DATA_REG2;
-	reg = rdc321x_conf_read(gpio < 32
-		? RDC321X_GPIO_DATA_REG1 : RDC321X_GPIO_DATA_REG2);
-	spin_unlock_irqrestore(&gpio_lock, flags);
 
-	return (1 << (gpio & 0x1f)) & reg ? 1 : 0;
+	spin_lock(&rdc321x_gpio_dev.lock);
+	rdc321x_pci_write(reg, rdc321x_gpio_dev.data_reg[gpio < 32 ? 0 : 1]);
+	rdc321x_pci_read(reg, &value);
+	spin_unlock(&rdc321x_gpio_dev.lock);
+
+	return (1 << (gpio & 0x1f)) & value ? 1 : 0;
+}
+
+static void rdc_gpio_set_value_impl(struct gpio_chip *chip,
+				unsigned gpio, int value)
+{
+	int reg = (gpio < 32) ? 0 : 1;
+
+	if (value)
+		rdc321x_gpio_dev.data_reg[reg] |= 1 << (gpio & 0x1f);
+	else
+		rdc321x_gpio_dev.data_reg[reg] &= ~(1 << (gpio & 0x1f));
+
+	rdc321x_pci_write(reg ? RDC321X_GPIO_DATA_REG2 : RDC321X_GPIO_DATA_REG1,
+			       rdc321x_gpio_dev.data_reg[reg]);
 }
 
 /* set GPIO pin to value */
 static void rdc_gpio_set_value(struct gpio_chip *chip,
 				unsigned gpio, int value)
 {
-	unsigned long flags;
+	spin_lock(&rdc321x_gpio_dev.lock);
+	rdc_gpio_set_value_impl(chip, gpio, value);
+	spin_unlock(&rdc321x_gpio_dev.lock);
+}
+
+static int rdc_gpio_config(struct gpio_chip *chip,
+				unsigned gpio, int value)
+{
+	int err;
 	u32 reg;
 
-	reg = 1 << (gpio & 0x1f);
+	spin_lock(&rdc321x_gpio_dev.lock);
-	if (gpio < 32) {
+	err = rdc321x_pci_read(gpio < 32 ? RDC321X_GPIO_CTRL_REG1 : RDC321X_GPIO_CTRL_REG2,
-		spin_lock_irqsave(&gpio_lock, flags);
+										&reg);
-		if (value)
+	if (err)
-			gpio_data_reg1 |= reg;
+		goto unlock;
-		else
+
-			gpio_data_reg1 &= ~reg;
+	reg |= 1 << (gpio & 0x1f);
-		rdc321x_conf_write(RDC321X_GPIO_DATA_REG1, gpio_data_reg1);
+
-		spin_unlock_irqrestore(&gpio_lock, flags);
+	err = rdc321x_pci_write(gpio < 32 ? RDC321X_GPIO_CTRL_REG1 : RDC321X_GPIO_CTRL_REG2,
-	} else {
+										reg);
-		spin_lock_irqsave(&gpio_lock, flags);
+	if (err)
-		if (value)
+		goto unlock;
-			gpio_data_reg2 |= reg;
+
-		else
+	rdc_gpio_set_value_impl(chip, gpio, value);
-			gpio_data_reg2 &= ~reg;
+
-		rdc321x_conf_write(RDC321X_GPIO_DATA_REG2, gpio_data_reg2);
+unlock:
-		spin_unlock_irqrestore(&gpio_lock, flags);
+	spin_unlock(&rdc321x_gpio_dev.lock);
-	}
+
+	return err;
 }
 
 /* configure GPIO pin as input */
 static int rdc_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
 {
-	rdc321x_configure_gpio(gpio);
+	return rdc_gpio_config(chip, gpio, 1);
-
-	return 0;
-}
-
-/* configure GPIO pin as output and set value */
-static int rdc_gpio_direction_output(struct gpio_chip *chip,
-				unsigned gpio, int value)
-{
-	rdc321x_configure_gpio(gpio);
-	gpio_set_value(gpio, value);
-
-	return 0;
 }
 
 static struct gpio_chip rdc321x_gpio_chip = {
 	.label			= "rdc321x-gpio",
 	.direction_input	= rdc_gpio_direction_input,
-	.direction_output	= rdc_gpio_direction_output,
+	.direction_output	= rdc_gpio_config,
 	.get			= rdc_gpio_get_value,
 	.set			= rdc_gpio_set_value,
 	.base			= 0,
@@ -142,17 +121,54 @@ static struct gpio_chip rdc321x_gpio_chip = {
 
 /* initially setup the 2 copies of the gpio data registers.
    This function is called before the platform setup code. */
-static int __init rdc321x_gpio_setup(void)
+static int __devinit rdc321x_gpio_probe(struct platform_device *pdev)
 {
+	int err;
+
 	/* this might not be, what others (BIOS, bootloader, etc.)
 	   wrote to these registers before, but it's a good guess. Still
 	   better than just using 0xffffffff. */
+	err = rdc321x_pci_read(RDC321X_GPIO_DATA_REG1, &rdc321x_gpio_dev.data_reg[0]);
+	if (err)
+		return err;
 
-	gpio_data_reg1 = rdc321x_conf_read(RDC321X_GPIO_DATA_REG1);
+	err = rdc321x_pci_read(RDC321X_GPIO_DATA_REG2, &rdc321x_gpio_dev.data_reg[1]);
-	gpio_data_reg2 = rdc321x_conf_read(RDC321X_GPIO_DATA_REG2);
+	if (err)
+		return err;
+
+	spin_lock_init(&rdc321x_gpio_dev.lock);
 
 	printk(KERN_INFO "rdc321x: registering %d GPIOs\n", rdc321x_gpio_chip.ngpio);
 	return gpiochip_add(&rdc321x_gpio_chip);
 }
 
-arch_initcall(rdc321x_gpio_setup);
+static int __devexit rdc321x_gpio_remove(struct platform_device *pdev)
+{
+	gpiochip_remove(&rdc321x_gpio_chip);
+	return 0;
+}
+
+static struct platform_driver rdc321x_gpio_driver = {
+	.driver.name	= "rdc321x-gpio",
+	.driver.owner	= THIS_MODULE,
+	.probe		= rdc321x_gpio_probe,
+	.remove		= __devexit_p(rdc321x_gpio_remove),
+};
+
+static int __init rdc321x_gpio_init(void)
+{
+	return platform_driver_register(&rdc321x_gpio_driver);
+}
+
+static void __exit rdc321x_gpio_exit(void)
+{
+	platform_driver_unregister(&rdc321x_gpio_driver);
+}
+
+module_init(rdc321x_gpio_init);
+module_exit(rdc321x_gpio_exit);
+
+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
+MODULE_DESCRIPTION("RDC321x GPIO driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:rdc321x-gpio");

target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/pci.c

@@ -0,0 +1,110 @@
+/*
+ * RDC321x southbrige driver
+ *
+ * Copyright (C) 2007-2010 Florian Fainelli <florian@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/pci.h>
+
+#include <asm/rdc321x_defs.h>
+
+static struct pci_dev *rdc321x_sb_pdev;
+
+/*
+ * Unlocked PCI configuration space accessors
+ */
+int rdc321x_pci_read(int reg, u32 *val)
+{
+	int err;
+
+	err = pci_read_config_dword(rdc321x_sb_pdev, reg, val);
+	if (err)
+		return err;
+
+	return err;
+}
+EXPORT_SYMBOL(rdc321x_pci_read);
+
+int rdc321x_pci_write(int reg, u32 val)
+{
+	int err;
+
+	err = pci_write_config_dword(rdc321x_sb_pdev, reg, val);
+	if (err)
+		return err;
+
+	return err;
+}
+EXPORT_SYMBOL(rdc321x_pci_write);
+
+static struct platform_device rdc321x_wdt_device = {
+	.name	= "rdc321x-wdt"
+};
+
+static struct platform_device rdc321x_gpio_device = {
+	.name	= "rdc321x-gpio"
+};
+
+static int __devinit rdc321x_sb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+	int err;
+
+	err = pci_enable_device(pdev);
+	if (err) {
+		printk(KERN_ERR "failed to enable device\n");
+		return err;
+	}
+
+	rdc321x_sb_pdev = pdev;
+
+	err = platform_device_register(&rdc321x_wdt_device);
+	if (err) {
+		dev_err(&pdev->dev, "failed to register watchdog\n");
+		return err;
+	}
+
+	err = platform_device_register(&rdc321x_gpio_device);
+	if (err) {
+		dev_err(&pdev->dev, "failed to register gpiochip\n");
+		return err;
+	}
+	dev_info(&rdc321x_sb_pdev->dev, "RDC321x southhridge registered\n");
+
+	return err;
+}
+
+static struct pci_device_id rdc321x_sb_table[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030) },
+	{}
+};
+
+static struct pci_driver rdc321x_sb_driver = {
+	.name = "RDC3210 Southbridge",
+	.id_table = rdc321x_sb_table,
+	.probe = rdc321x_sb_probe
+};
+
+static int __init rdc321x_sb_init(void)
+{
+	return pci_register_driver(&rdc321x_sb_driver);
+}
+
+device_initcall(rdc321x_sb_init);

target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c

@@ -95,13 +95,6 @@ static struct platform_device rdc321x_leds = {
 	}
 };
 
-/* Watchdog */
-static struct platform_device rdc321x_wdt = {
-	.name = "rdc321x-wdt",
-	.id = -1,
-	.num_resources = 0,
-};
-
 /* Button */
 static struct gpio_keys_button rdc321x_gpio_btn[] = {
 	{
@@ -128,7 +121,6 @@ static struct platform_device rdc321x_button = {
 static struct platform_device *rdc321x_devs[] = {
 	&rdc_flash_device,
 	&rdc321x_leds,
-	&rdc321x_wdt,
 	&rdc321x_button,
 };
 

target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c

@@ -0,0 +1,278 @@
+/*
+ * RDC321x watchdog driver
+ *
+ * Copyright (C) 2007-2010 Florian Fainelli <florian@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <linux/miscdevice.h>
+#include <linux/platform_device.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/timer.h>
+#include <linux/watchdog.h>
+#include <linux/uaccess.h>
+#include <linux/pci.h>
+
+#include <asm/rdc321x_defs.h>
+
+extern int rdc321x_pci_write(int reg, u32 val);
+extern int rdc321x_pci_read(int reg, u32 *val);
+
+#define RDC321X_WDT_REG	0x00000044
+
+#define RDC_WDT_EN	0x00800000 /* Enable bit */
+#define RDC_WDT_WDTIRQ	0x00400000 /* Create WDT IRQ before CPU reset */
+#define RDC_WDT_NMIIRQ	0x00200000 /* Create NMI IRQ before CPU reset */
+#define RDC_WDT_RST	0x00100000 /* Reset wdt */
+#define RDC_WDT_NIF	0x00080000 /* NMI interrupt occured */
+#define RDC_WDT_WIF	0x00040000 /* WDT interrupt occured */
+#define RDC_WDT_IRT	0x00000700 /* IRQ Routing table */
+#define RDC_WDT_CNT	0x0000007F /* WDT count */
+
+/* default counter value (2.34 s) */
+#define RDC_WDT_DFLT_CNT 0x00000040
+
+#define RDC_WDT_SETUP (RDC_WDT_EN | RDC_WDT_NMIIRQ | RDC_WDT_RST | RDC_WDT_DFLT_CNT)
+
+/* some device data */
+static struct {
+	struct timer_list timer;
+	int seconds_left;
+	int total_seconds;
+	bool inuse;
+	bool running;
+	bool close_expected;
+} rdc321x_wdt_dev;
+
+static struct watchdog_info ident = {
+	.options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
+	.identity = "RDC321x WDT",
+};
+
+/* generic helper functions */
+static void rdc321x_wdt_timer(unsigned long unused)
+{
+	if (!rdc321x_wdt_dev.running) {
+		rdc321x_pci_write(RDC321X_WDT_REG, 0);
+		return;
+	}
+
+	rdc321x_wdt_dev.seconds_left--;
+
+	if (rdc321x_wdt_dev.seconds_left < 1)
+		return;
+
+	rdc321x_pci_write(RDC321X_WDT_REG, RDC_WDT_SETUP);
+
+	mod_timer(&rdc321x_wdt_dev.timer, HZ * 2 + jiffies);
+}
+
+static void rdc321x_wdt_reset(void)
+{
+	rdc321x_wdt_dev.seconds_left = rdc321x_wdt_dev.total_seconds;
+}
+
+static void rdc321x_wdt_start(void)
+{
+	if (rdc321x_wdt_dev.running)
+		return;
+
+	rdc321x_wdt_dev.seconds_left = rdc321x_wdt_dev.total_seconds;
+
+	rdc321x_wdt_dev.running = true;
+
+	rdc321x_wdt_timer(0);
+
+	return;
+}
+
+static int rdc321x_wdt_stop(void)
+{
+	if (WATCHDOG_NOWAYOUT)
+		return -ENOSYS;
+
+	rdc321x_wdt_dev.running = false;
+
+	return 0;
+}
+
+/* filesystem operations */
+static int rdc321x_wdt_open(struct inode *inode, struct file *file)
+{
+	if (xchg(&rdc321x_wdt_dev.inuse, true))
+		return -EBUSY;
+
+	return nonseekable_open(inode, file);
+}
+
+static int rdc321x_wdt_release(struct inode *inode, struct file *file)
+{
+	if (rdc321x_wdt_dev.close_expected)
+		rdc321x_wdt_stop();
+
+	rdc321x_wdt_dev.inuse = false;
+
+	return 0;
+}
+
+static long rdc321x_wdt_ioctl(struct file *file, unsigned int cmd,
+				unsigned long arg)
+{
+	void __user *argp = (void __user *)arg;
+	int value;
+
+	switch (cmd) {
+		case WDIOC_KEEPALIVE:
+			rdc321x_wdt_reset();
+			break;
+		case WDIOC_GETSUPPORT:
+			if (copy_to_user(argp, &ident, sizeof(ident)))
+				return -EFAULT;
+			break;
+		case WDIOC_SETTIMEOUT:
+			if (copy_from_user(&rdc321x_wdt_dev.total_seconds, argp, sizeof(int)))
+				return -EFAULT;
+			rdc321x_wdt_dev.seconds_left = rdc321x_wdt_dev.total_seconds;
+			break;
+		case WDIOC_GETTIMEOUT:
+			if (copy_to_user(argp, &rdc321x_wdt_dev.total_seconds, sizeof(int)))
+				return -EFAULT;
+			break;
+		case WDIOC_GETTIMELEFT:
+			if (copy_to_user(argp, &rdc321x_wdt_dev.seconds_left, sizeof(int)))
+				return -EFAULT;
+			break;
+		case WDIOC_SETOPTIONS:
+			if (copy_from_user(&value, argp, sizeof(int)))
+				return -EFAULT;
+			switch (value) {
+				case WDIOS_ENABLECARD:
+					rdc321x_wdt_start();
+					break;
+				case WDIOS_DISABLECARD:
+					return rdc321x_wdt_stop();
+			default:
+				return -EINVAL;
+		}
+		break;
+	default:
+		return -EINVAL;
+	}
+	return 0;
+}
+
+static ssize_t rdc321x_wdt_write(struct file *file, const char __user *buf,
+				size_t count, loff_t *ppos)
+{
+	size_t i;
+ 
+	if (!count)
+		return -EIO;
+
+	rdc321x_wdt_dev.close_expected = false;
+
+	for (i = 0; i != count; i++) {
+		char c;
+
+		if (get_user(c, buf + i))
+			return -EFAULT;
+
+		if (c == 'V') {
+			rdc321x_wdt_dev.close_expected = true;
+			break;
+		}
+	}
+
+	rdc321x_wdt_reset();
+
+	return count;
+}
+
+static const struct file_operations rdc321x_wdt_fops = {
+	.llseek		= no_llseek,
+	.unlocked_ioctl	= rdc321x_wdt_ioctl,
+	.open		= rdc321x_wdt_open,
+	.write		= rdc321x_wdt_write,
+	.release	= rdc321x_wdt_release,
+};
+
+static struct miscdevice rdc321x_wdt_misc = {
+	.minor	= WATCHDOG_MINOR,
+	.name	= "watchdog",
+	.fops	= &rdc321x_wdt_fops,
+};
+
+static int __init rdc321x_wdt_probe(struct platform_device *pdev)
+{
+	int err;
+
+	err = rdc321x_pci_write(RDC321X_WDT_REG, 0);
+	if (err)
+		return err;
+
+	rdc321x_wdt_dev.running = false;
+	rdc321x_wdt_dev.close_expected = false;
+	rdc321x_wdt_dev.inuse = 0;
+	setup_timer(&rdc321x_wdt_dev.timer, rdc321x_wdt_timer, 0);
+	rdc321x_wdt_dev.total_seconds = 100;
+
+	err = misc_register(&rdc321x_wdt_misc);
+	if (err < 0) {
+		printk(KERN_ERR PFX "watchdog: misc_register failed\n");
+		return err;
+	}
+
+	panic_on_unrecovered_nmi = 1;
+	dev_info(&pdev->dev, "watchdog inig success\n");
+
+	return 0;
+}
+
+static int __devexit rdc321x_wdt_remove(struct platform_device *pdev)
+{
+	if (rdc321x_wdt_dev.inuse)
+		rdc321x_wdt_dev.inuse = 0;
+	misc_deregister(&rdc321x_wdt_misc);
+	return 0;
+}
+
+static struct platform_driver rdc321x_wdt_driver = {
+	.driver.name	= "rdc321x-wdt",
+	.driver.owner	= THIS_MODULE,
+	.probe		= rdc321x_wdt_probe,
+	.remove		= __devexit_p(rdc321x_wdt_remove),
+};
+
+static int __init rdc321x_wdt_init(void)
+{
+	return platform_driver_register(&rdc321x_wdt_driver);
+}
+
+static void __exit rdc321x_wdt_exit(void)
+{
+	platform_driver_unregister(&rdc321x_wdt_driver);
+}
+
+module_init(rdc321x_wdt_init);
+module_exit(rdc321x_wdt_exit);
+
+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
+MODULE_DESCRIPTION("RDC321x Watchdog driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:rdc321x-wdt");