ramips: convert 'config_access' function to void

[openwrt.git] / target / linux / ramips / files / arch / mips / pci / pci-rt288x.c

diff --git a/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c b/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
index 8baefc3..e297419 100644 (file)
--- a/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
+++ b/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
@@ -1,78 +1,156 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/types.h>
 #include <linux/pci.h>

-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/version.h>
-#include <asm/pci.h>
-#include <asm/io.h>
-#include <asm/mach-rt288x/rt288x.h>
-#include <asm/mach-rt288x/rt288x_pci.h>
+#include <linux/io.h>

 #include <linux/init.h>
 #include <linux/init.h>

-#include <linux/mod_devicetable.h>

 
 

-#ifdef CONFIG_PCI
+#include <asm/mach-ralink/rt288x.h>
+#include <asm/mach-ralink/rt288x_regs.h>

 
 

-extern int pci_config_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val);
-extern int pci_config_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val);
+#define RT2880_PCI_SLOT1_BASE          0x20000000

 
 

-struct pci_ops rt2880_pci_ops = {
-       .read =  pci_config_read,
-       .write = pci_config_write,
+#define RT2880_PCI_REG_PCICFG_ADDR     0x00
+#define RT2880_PCI_REG_PCIMSK_ADDR     0x0c
+#define RT2880_PCI_REG_BAR0SETUP_ADDR  0x10
+#define RT2880_PCI_REG_IMBASEBAR0_ADDR 0x18
+#define RT2880_PCI_REG_CONFIG_ADDR     0x20
+#define RT2880_PCI_REG_CONFIG_DATA     0x24
+#define RT2880_PCI_REG_MEMBASE         0x28
+#define RT2880_PCI_REG_IOBASE          0x2c
+#define RT2880_PCI_REG_ID              0x30
+#define RT2880_PCI_REG_CLASS           0x34
+#define RT2880_PCI_REG_SUBID           0x38
+#define RT2880_PCI_REG_ARBCTL          0x80
+
+#define PCI_ACCESS_READ  0
+#define PCI_ACCESS_WRITE 1
+
+void __iomem *rt2880_pci_base;
+
+static u32 rt2880_pci_reg_read(u32 reg)
+{
+       return readl(rt2880_pci_base + reg);
+}
+
+static void rt2880_pci_reg_write(u32 val, u32 reg)
+{
+       writel(val, rt2880_pci_base + reg);
+}
+
+static void config_access(unsigned char access_type, struct pci_bus *bus,
+                         unsigned int devfn, unsigned char where, u32 *data)
+{
+       unsigned int slot = PCI_SLOT(devfn);
+       unsigned int address;
+       u8 func = PCI_FUNC(devfn);
+
+       address = (bus->number << 16) | (slot << 11) | (func << 8) |
+                 (where & 0xfc) | 0x80000000;
+
+       rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);
+       if (access_type == PCI_ACCESS_WRITE)
+               rt2880_pci_reg_write(*data, RT2880_PCI_REG_CONFIG_DATA);
+       else
+               *data = rt2880_pci_reg_read(RT2880_PCI_REG_CONFIG_DATA);
+}
+
+static int rt2880_pci_config_read(struct pci_bus *bus, unsigned int devfn,
+                                 int where, int size, u32 *val)
+{
+       u32 data = 0;
+
+       config_access(PCI_ACCESS_READ, bus, devfn, where, &data);
+
+       if (size == 1)
+               *val = (data >> ((where & 3) << 3)) & 0xff;
+       else if (size == 2)
+               *val = (data >> ((where & 3) << 3)) & 0xffff;
+       else
+               *val = data;
+
+       return PCIBIOS_SUCCESSFUL;
+}
+
+static int rt2880_pci_config_write(struct pci_bus *bus, unsigned int devfn,
+                                  int where, int size, u32 val)
+{
+       u32 data = 0;
+
+       if (size == 4) {
+               data = val;
+       } else {
+               config_access(PCI_ACCESS_READ, bus, devfn, where, &data);
+               if (size == 1)
+                       data = (data & ~(0xff << ((where & 3) << 3))) |
+                              (val << ((where & 3) << 3));
+               else if (size == 2)
+                       data = (data & ~(0xffff << ((where & 3) << 3))) |
+                              (val << ((where & 3) << 3));
+       }
+
+       config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data);
+
+       return PCIBIOS_SUCCESSFUL;
+}
+
+static struct pci_ops rt2880_pci_ops = {
+       .read   = rt2880_pci_config_read,
+       .write  = rt2880_pci_config_write,

 };
 
 };
 

-static struct resource pci_io_resource = {
-       .name = "pci MEM space",
-       .start = 0x20000000,
-       .end = 0x2FFFFFFF,
-       .flags = IORESOURCE_MEM,
+static struct resource rt2880_pci_io_resource = {
+       .name   = "PCI MEM space",
+       .start  = 0x20000000,
+       .end    = 0x2FFFFFFF,
+       .flags  = IORESOURCE_MEM,

 };
 
 };
 

-static struct resource pci_mem_resource = {
-       .name = "pci IO space",
-       .start = 0x00460000,
-       .end = 0x0046FFFF,
-       .flags = IORESOURCE_IO,
+static struct resource rt2880_pci_mem_resource = {
+       .name   = "PCI IO space",
+       .start  = 0x00460000,
+       .end    = 0x0046FFFF,
+       .flags  = IORESOURCE_IO,

 };
 
 };
 

-struct pci_controller rt2880_controller = {
-       .pci_ops = &rt2880_pci_ops,
-       .mem_resource = &pci_io_resource,
-       .io_resource = &pci_mem_resource,
-       .mem_offset = 0x00000000UL,
-       .io_offset = 0x00000000UL,
+static struct pci_controller rt2880_pci_controller = {
+       .pci_ops        = &rt2880_pci_ops,
+       .mem_resource   = &rt2880_pci_io_resource,
+       .io_resource    = &rt2880_pci_mem_resource,

 };
 
 };
 

-void inline
-read_config(unsigned long bus, unsigned long dev, unsigned long func,
-       unsigned long reg, unsigned long *val)
+void inline read_config(unsigned long bus, unsigned long dev,
+                       unsigned long func, unsigned long reg,
+                       unsigned long *val)

 {
 {

-       unsigned long address =
-               (bus << 16) | (dev << 11) | (func << 8) | (reg & 0xfc) | 0x80000000;
-       writel(address, RT2880_PCI_CONFIG_ADDR);
-       *val = readl(RT2880_PCI_CONFIG_DATA);
+       unsigned long address;
+
+       address = (bus << 16) | (dev << 11) | (func << 8) | (reg & 0xfc) |
+                 0x80000000;
+       rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);
+       *val = rt2880_pci_reg_read(RT2880_PCI_REG_CONFIG_DATA);

 }
 
 }
 

-void inline
-write_config(unsigned long bus, unsigned long dev, unsigned long func,
-       unsigned long reg, unsigned long val)
+void inline write_config(unsigned long bus, unsigned long dev,
+                        unsigned long func, unsigned long reg,
+                        unsigned long val)

 {
 {

-       unsigned long address =
-               (bus << 16) | (dev << 11) | (func << 8) | (reg & 0xfc) | 0x80000000;
-       writel(address, RT2880_PCI_CONFIG_ADDR);
-       writel(val, RT2880_PCI_CONFIG_DATA);
+       unsigned long address;
+
+       address = (bus << 16) | (dev << 11) | (func << 8) | (reg & 0xfc) |
+                 0x80000000;
+       rt2880_pci_reg_write(address, RT2880_PCI_REG_CONFIG_ADDR);
+       rt2880_pci_reg_write(val, RT2880_PCI_REG_CONFIG_DATA);

 }
 
 }
 

-int __init
-pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

 {
        u16 cmd;
        unsigned long val;
        int irq = -1;
 {
        u16 cmd;
        unsigned long val;
        int irq = -1;

+

        if (dev->bus->number != 0)
                return 0;
 
        if (dev->bus->number != 0)
                return 0;
 

-       switch(PCI_SLOT(dev->devfn))
-       {
+       switch (PCI_SLOT(dev->devfn)) {

        case 0x00:
                write_config(0, 0, 0, PCI_BASE_ADDRESS_0, 0x08000000);
                read_config(0, 0, 0, PCI_BASE_ADDRESS_0, &val);
        case 0x00:
                write_config(0, 0, 0, PCI_BASE_ADDRESS_0, 0x08000000);
                read_config(0, 0, 0, PCI_BASE_ADDRESS_0, &val);


@@ -81,7 +159,8 @@ pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
                irq = RT288X_CPU_IRQ_PCI;
                break;
        default:
                irq = RT288X_CPU_IRQ_PCI;
                break;
        default:

-               printk("%s:%s[%d] trying to alloc unknown pci irq\n", __FILE__, __func__, __LINE__);
+               printk("%s:%s[%d] trying to alloc unknown pci irq\n",
+                      __FILE__, __func__, __LINE__);

                BUG();
                break;
        }
                BUG();
                break;
        }


@@ -89,38 +168,42 @@ pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
        pci_write_config_byte((struct pci_dev*)dev, PCI_CACHE_LINE_SIZE, 0x14);
        pci_write_config_byte((struct pci_dev*)dev, PCI_LATENCY_TIMER, 0xFF);
        pci_read_config_word((struct pci_dev*)dev, PCI_COMMAND, &cmd);
        pci_write_config_byte((struct pci_dev*)dev, PCI_CACHE_LINE_SIZE, 0x14);
        pci_write_config_byte((struct pci_dev*)dev, PCI_LATENCY_TIMER, 0xFF);
        pci_read_config_word((struct pci_dev*)dev, PCI_COMMAND, &cmd);

-       cmd = cmd | PCI_COMMAND_MASTER | PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
-               PCI_COMMAND_INVALIDATE | PCI_COMMAND_FAST_BACK | PCI_COMMAND_SERR |
-               PCI_COMMAND_WAIT | PCI_COMMAND_PARITY;
+       cmd |= PCI_COMMAND_MASTER | PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
+              PCI_COMMAND_INVALIDATE | PCI_COMMAND_FAST_BACK |
+              PCI_COMMAND_SERR | PCI_COMMAND_WAIT | PCI_COMMAND_PARITY;

        pci_write_config_word((struct pci_dev*)dev, PCI_COMMAND, cmd);
        pci_write_config_word((struct pci_dev*)dev, PCI_COMMAND, cmd);

-       pci_write_config_byte((struct pci_dev*)dev, PCI_INTERRUPT_LINE, dev->irq);
+       pci_write_config_byte((struct pci_dev*)dev, PCI_INTERRUPT_LINE,
+                             dev->irq);

        return irq;
 }
 
        return irq;
 }
 

-int
-init_rt2880pci(void)
+static int __init rt2880_pci_init(void)

 {
        unsigned long val = 0;
        int i;
 {
        unsigned long val = 0;
        int i;

-       writel(0, RT2880_PCI_PCICFG_ADDR);
+
+       rt2880_pci_base = ioremap_nocache(RT2880_PCI_BASE, PAGE_SIZE);
+
+       rt2880_pci_reg_write(0, RT2880_PCI_REG_PCICFG_ADDR);

        for(i = 0; i < 0xfffff; i++) {}
        for(i = 0; i < 0xfffff; i++) {}

-       writel(0x79, RT2880_PCI_ARBCTL);
-       writel(0x07FF0001, RT2880_PCI_BAR0SETUP_ADDR);
-       writel(RT2880_PCI_SLOT1_BASE, RT2880_PCI_MEMBASE);
-       writel(0x00460000, RT2880_PCI_IOBASE);
-       writel(0x08000000, RT2880_PCI_IMBASEBAR0_ADDR);
-       writel(0x08021814, RT2880_PCI_ID);
-       writel(0x00800001, RT2880_PCI_CLASS);
-       writel(0x28801814, RT2880_PCI_SUBID);
-       writel(0x000c0000, RT2880_PCI_PCIMSK_ADDR);
+
+       rt2880_pci_reg_write(0x79, RT2880_PCI_REG_ARBCTL);
+       rt2880_pci_reg_write(0x07FF0001, RT2880_PCI_REG_BAR0SETUP_ADDR);
+       rt2880_pci_reg_write(RT2880_PCI_SLOT1_BASE, RT2880_PCI_REG_MEMBASE);
+       rt2880_pci_reg_write(0x00460000, RT2880_PCI_REG_IOBASE);
+       rt2880_pci_reg_write(0x08000000, RT2880_PCI_REG_IMBASEBAR0_ADDR);
+       rt2880_pci_reg_write(0x08021814, RT2880_PCI_REG_ID);
+       rt2880_pci_reg_write(0x00800001, RT2880_PCI_REG_CLASS);
+       rt2880_pci_reg_write(0x28801814, RT2880_PCI_REG_SUBID);
+       rt2880_pci_reg_write(0x000c0000, RT2880_PCI_REG_PCIMSK_ADDR);

        write_config(0, 0, 0, PCI_BASE_ADDRESS_0, 0x08000000);
        read_config(0, 0, 0, PCI_BASE_ADDRESS_0, &val);
        write_config(0, 0, 0, PCI_BASE_ADDRESS_0, 0x08000000);
        read_config(0, 0, 0, PCI_BASE_ADDRESS_0, &val);

-       register_pci_controller(&rt2880_controller);
+
+       register_pci_controller(&rt2880_pci_controller);

        return 0;
 }
 
        return 0;
 }
 

-int
-pcibios_plat_dev_init(struct pci_dev *dev)
+int pcibios_plat_dev_init(struct pci_dev *dev)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -129,6 +212,4 @@ struct pci_fixup pcibios_fixups[] = {
        {0}
 };
 
        {0}
 };
 

-arch_initcall(init_rt2880pci);
-
-#endif
+arch_initcall(rt2880_pci_init);