[package] block-extroot: r20784 reverted r20735, add it back (#7104)

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

diff --git a/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c b/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c
index 092a80e..6ff765e 100644 (file)
--- a/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c
+++ b/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c
@@ -4,10 +4,11 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
-#include <asm/ifxmips/ifxmips.h>
-#include <asm/ifxmips/ifxmips_irq.h>
 #include <asm/addrspace.h>
 #include <linux/vmalloc.h>
+#include <ifxmips.h>
+#include <ifxmips_irq.h>
+#include <ifxmips_cgu.h>
 
 #define IFXMIPS_PCI_MEM_BASE    0x18000000
 #define IFXMIPS_PCI_MEM_SIZE    0x02000000
@@ -17,26 +18,30 @@
 extern int ifxmips_pci_read_config_dword(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val);
 extern int ifxmips_pci_write_config_dword(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val);
 
-struct pci_ops ifxmips_pci_ops = {
+struct pci_ops ifxmips_pci_ops =
+{
        .read = ifxmips_pci_read_config_dword,
        .write = ifxmips_pci_write_config_dword
 };
 
-static struct resource pci_io_resource = {
+static struct resource pci_io_resource =
+{
        .name = "io pci IO space",
        .start = IFXMIPS_PCI_IO_BASE,
        .end = IFXMIPS_PCI_IO_BASE + IFXMIPS_PCI_IO_SIZE - 1,
        .flags = IORESOURCE_IO
 };
 
-static struct resource pci_mem_resource = {
+static struct resource pci_mem_resource =
+{
        .name = "ext pci memory space",
        .start = IFXMIPS_PCI_MEM_BASE,
        .end = IFXMIPS_PCI_MEM_BASE + IFXMIPS_PCI_MEM_SIZE - 1,
        .flags = IORESOURCE_MEM
 };
 
-static struct pci_controller ifxmips_pci_controller = {
+static struct pci_controller ifxmips_pci_controller =
+{
        .pci_ops = &ifxmips_pci_ops,
        .mem_resource = &pci_mem_resource,
        .mem_offset     = 0x00000000UL,
@@ -44,13 +49,32 @@ static struct pci_controller ifxmips_pci_controller = {
        .io_offset      = 0x00000000UL,
 };
 
+/* the cpu can can generate the 33Mhz or rely on an external clock the cgu needs the
+   proper setting, otherwise the cpu hangs. we have no way of runtime detecting this */
 u32 ifxmips_pci_mapped_cfg;
+int ifxmips_pci_external_clock = 0;
+
+/* Since the PCI REQ pins can be reused for other functionality, make it possible
+   to exclude those from interpretation by the PCI controller */
+int ifxmips_pci_req_mask = 0xf;
+
+static int __init
+ifxmips_pci_set_external_clk(char *str)
+{
+       printk("cgu: setting up external pci clock\n");
+       ifxmips_pci_external_clock = 1;
+       return 1;
+}
+__setup("pci_external_clk", ifxmips_pci_set_external_clk);
 
-int pcibios_plat_dev_init(struct pci_dev *dev){
+int
+pcibios_plat_dev_init(struct pci_dev *dev)
+{
        u8 pin;
 
        pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
-       switch(pin) {
+       switch(pin)
+       {
                case 0:
                        break;
                case 1:
@@ -69,12 +93,24 @@ int pcibios_plat_dev_init(struct pci_dev *dev){
        return 0;
 }
 
-static void __init ifxmips_pci_startup (void){
+static u32 calc_bar11mask(void)
+{
+       u32 mem, bar11mask;
+
+       /* BAR11MASK value depends on available memory on system. */
+       mem = num_physpages * PAGE_SIZE;
+       bar11mask = (0x0ffffff0 & ~((1 << (fls(mem) -1)) -1)) | 8;
+
+       return bar11mask;
+}
+
+static void __init
+ifxmips_pci_startup(void)
+{
        u32 temp_buffer;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_CGU_IFCCR) & ~0xf00000, IFXMIPS_CGU_IFCCR);
-       ifxmips_w32(ifxmips_r32(IFXMIPS_CGU_IFCCR) | 0x800000, IFXMIPS_CGU_IFCCR);
-       ifxmips_w32(ifxmips_r32(IFXMIPS_CGU_IFCCR) | (1 << 16), IFXMIPS_CGU_IFCCR);
-       ifxmips_w32((1 << 31) | (1 << 30), IFXMIPS_CGU_PCICR);
+
+       cgu_setup_pci_clk(ifxmips_pci_external_clock);
+
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P1_OUT) | (1 << 5), IFXMIPS_GPIO_P1_OUT);
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P1_OD) | (1 << 5), IFXMIPS_GPIO_P1_OD);
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P1_DIR) | (1 << 5), IFXMIPS_GPIO_P1_DIR);
@@ -94,7 +130,7 @@ static void __init ifxmips_pci_startup (void){
 
        /* enable external 2 PCI masters */
        temp_buffer = ifxmips_r32(PCI_CR_PC_ARB);
-       temp_buffer &= (~(0xf << 16));
+       temp_buffer &= (~(ifxmips_pci_req_mask << 16));
        /* enable internal arbiter */
        temp_buffer |= (1 << INTERNAL_ARB_ENABLE_BIT);
        /* enable internal PCI master reqest */
@@ -117,7 +153,7 @@ static void __init ifxmips_pci_startup (void){
        ifxmips_w32(0x19800000, PCI_CR_FCI_ADDR_MAP6);
        ifxmips_w32(0x19c00000, PCI_CR_FCI_ADDR_MAP7);
        ifxmips_w32(0x1ae00000, PCI_CR_FCI_ADDR_MAP11hg);
-       ifxmips_w32(0x0e000008, PCI_CR_BAR11MASK);
+       ifxmips_w32(calc_bar11mask(), PCI_CR_BAR11MASK);
        ifxmips_w32(0, PCI_CR_PCI_ADDR_MAP11);
        ifxmips_w32(0, PCI_CS_BASE_ADDR1);
 #ifdef CONFIG_SWAP_IO_SPACE
@@ -138,8 +174,10 @@ static void __init ifxmips_pci_startup (void){
        ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P1_OUT) | (1 << 5), IFXMIPS_GPIO_P1_OUT);
 }
 
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin){
-       switch (slot) {
+int __init
+pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin){
+       switch(slot)
+       {
                case 13:
                        /* IDSEL = AD29 --> USB Host Controller */
                        return (INT_NUM_IM1_IRL0 + 17);
@@ -152,13 +190,14 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin){
        }
 }
 
-int pcibios_init(void){
+int __init
+pcibios_init(void)
+{
        extern int pci_probe_only;
 
        pci_probe_only = 0;
-       printk ("PCI: Probing PCI hardware on host bus 0.\n");
+       printk("PCI: Probing PCI hardware on host bus 0.\n");
        ifxmips_pci_startup ();
-       //      IFXMIPS_PCI_REG32(PCI_CR_CLK_CTRL_REG) &= (~8);
        ifxmips_pci_mapped_cfg = (u32)ioremap_nocache(0x17000000, 0x800 * 16);
        printk("IFXMips PCI mapped to 0x%08lX\n", (unsigned long)ifxmips_pci_mapped_cfg);
        ifxmips_pci_controller.io_map_base = (unsigned long)ioremap(IFXMIPS_PCI_IO_BASE, IFXMIPS_PCI_IO_SIZE - 1);