diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 19:38:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 19:38:06 -0500 |
commit | dbfc985195410dad803c845743c63cd73bd1fe32 (patch) | |
tree | 6bf6dbecb92539285ebb89948e63e691a0947941 /arch/mips/pci | |
parent | 7c508e50be47737b9a72d0f15c3ef1146925e2d2 (diff) | |
parent | 606d62fa02cf1da43c6e21521650fff07a2e56d1 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (71 commits)
MIPS: Lasat: Fix botched changes to sysctl code.
RTC: rtc-cmos.c: Fix warning on MIPS
MIPS: Cleanup random differences beween lmo and Linus' kernel.
MIPS: No longer hardwire CONFIG_EMBEDDED to y
MIPS: Fix and enhance built-in kernel command line
MIPS: eXcite: Remove platform.
MIPS: Loongson: Cleanups of serial port support
MIPS: Lemote 2F: Suspend CS5536 MFGPT Timer
MIPS: Excite: move iodev_remove to .devexit.text
MIPS: Lasat: Convert to proc_fops / seq_file
MIPS: Cleanup signal code initialization
MIPS: Modularize COP2 handling
MIPS: Move EARLY_PRINTK to Kconfig.debug
MIPS: Yeeloong 2F: Cleanup reset logic using the new ec_write function
MIPS: Yeeloong 2F: Add LID open event as the wakeup event
MIPS: Yeeloong 2F: Add basic EC operations
MIPS: Move several variables from .bss to .init.data
MIPS: Tracing: Make function graph tracer work with -mmcount-ra-address
MIPS: Tracing: Reserve $12(t0) for mcount-ra-address of gcc 4.5
MIPS: Tracing: Make ftrace for MIPS work without -fno-omit-frame-pointer
...
Diffstat (limited to 'arch/mips/pci')
-rw-r--r-- | arch/mips/pci/Makefile | 4 | ||||
-rw-r--r-- | arch/mips/pci/fixup-excite.c | 36 | ||||
-rw-r--r-- | arch/mips/pci/fixup-fuloong2e.c | 5 | ||||
-rw-r--r-- | arch/mips/pci/fixup-lemote2f.c | 160 | ||||
-rw-r--r-- | arch/mips/pci/ops-bonito64.c | 7 | ||||
-rw-r--r-- | arch/mips/pci/ops-loongson2.c | 208 | ||||
-rw-r--r-- | arch/mips/pci/pci-excite.c | 149 |
7 files changed, 373 insertions, 196 deletions
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile index 91bfe73a7f60..c9209ca6c8e7 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile | |||
@@ -22,13 +22,13 @@ obj-$(CONFIG_BCM63XX) += pci-bcm63xx.o fixup-bcm63xx.o \ | |||
22 | # | 22 | # |
23 | # These are still pretty much in the old state, watch, go blind. | 23 | # These are still pretty much in the old state, watch, go blind. |
24 | # | 24 | # |
25 | obj-$(CONFIG_BASLER_EXCITE) += ops-titan.o pci-excite.o fixup-excite.o | ||
26 | obj-$(CONFIG_LASAT) += pci-lasat.o | 25 | obj-$(CONFIG_LASAT) += pci-lasat.o |
27 | obj-$(CONFIG_MIPS_COBALT) += fixup-cobalt.o | 26 | obj-$(CONFIG_MIPS_COBALT) += fixup-cobalt.o |
28 | obj-$(CONFIG_SOC_AU1500) += fixup-au1000.o ops-au1000.o | 27 | obj-$(CONFIG_SOC_AU1500) += fixup-au1000.o ops-au1000.o |
29 | obj-$(CONFIG_SOC_AU1550) += fixup-au1000.o ops-au1000.o | 28 | obj-$(CONFIG_SOC_AU1550) += fixup-au1000.o ops-au1000.o |
30 | obj-$(CONFIG_SOC_PNX8550) += fixup-pnx8550.o ops-pnx8550.o | 29 | obj-$(CONFIG_SOC_PNX8550) += fixup-pnx8550.o ops-pnx8550.o |
31 | obj-$(CONFIG_LEMOTE_FULOONG2E) += fixup-fuloong2e.o ops-bonito64.o | 30 | obj-$(CONFIG_LEMOTE_FULOONG2E) += fixup-fuloong2e.o ops-loongson2.o |
31 | obj-$(CONFIG_LEMOTE_MACH2F) += fixup-lemote2f.o ops-loongson2.o | ||
32 | obj-$(CONFIG_MIPS_MALTA) += fixup-malta.o | 32 | obj-$(CONFIG_MIPS_MALTA) += fixup-malta.o |
33 | obj-$(CONFIG_PMC_MSP7120_GW) += fixup-pmcmsp.o ops-pmcmsp.o | 33 | obj-$(CONFIG_PMC_MSP7120_GW) += fixup-pmcmsp.o ops-pmcmsp.o |
34 | obj-$(CONFIG_PMC_MSP7120_EVAL) += fixup-pmcmsp.o ops-pmcmsp.o | 34 | obj-$(CONFIG_PMC_MSP7120_EVAL) += fixup-pmcmsp.o ops-pmcmsp.o |
diff --git a/arch/mips/pci/fixup-excite.c b/arch/mips/pci/fixup-excite.c deleted file mode 100644 index cd64d9f177c4..000000000000 --- a/arch/mips/pci/fixup-excite.c +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2004 by Basler Vision Technologies AG | ||
3 | * Author: Thomas Koeller <thomas.koeller@baslerweb.com> | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License as published by | ||
7 | * the Free Software Foundation; either version 2 of the License, or | ||
8 | * (at your option) any later version. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
18 | */ | ||
19 | #include <linux/kernel.h> | ||
20 | #include <linux/init.h> | ||
21 | #include <linux/pci.h> | ||
22 | #include <excite.h> | ||
23 | |||
24 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | ||
25 | { | ||
26 | if (pin == 0) | ||
27 | return -1; | ||
28 | |||
29 | return USB_IRQ; /* USB controller is the only PCI device */ | ||
30 | } | ||
31 | |||
32 | /* Do platform specific device initialization at pci_enable_device() time */ | ||
33 | int pcibios_plat_dev_init(struct pci_dev *dev) | ||
34 | { | ||
35 | return 0; | ||
36 | } | ||
diff --git a/arch/mips/pci/fixup-fuloong2e.c b/arch/mips/pci/fixup-fuloong2e.c index 0c4c7a81213f..4f6d8da07f93 100644 --- a/arch/mips/pci/fixup-fuloong2e.c +++ b/arch/mips/pci/fixup-fuloong2e.c | |||
@@ -13,7 +13,8 @@ | |||
13 | */ | 13 | */ |
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
16 | #include <asm/mips-boards/bonito64.h> | 16 | |
17 | #include <loongson.h> | ||
17 | 18 | ||
18 | /* South bridge slot number is set by the pci probe process */ | 19 | /* South bridge slot number is set by the pci probe process */ |
19 | static u8 sb_slot = 5; | 20 | static u8 sb_slot = 5; |
@@ -35,7 +36,7 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | |||
35 | break; | 36 | break; |
36 | } | 37 | } |
37 | } else { | 38 | } else { |
38 | irq = BONITO_IRQ_BASE + 25 + pin; | 39 | irq = LOONGSON_IRQ_BASE + 25 + pin; |
39 | } | 40 | } |
40 | return irq; | 41 | return irq; |
41 | 42 | ||
diff --git a/arch/mips/pci/fixup-lemote2f.c b/arch/mips/pci/fixup-lemote2f.c new file mode 100644 index 000000000000..caf2edeb02f0 --- /dev/null +++ b/arch/mips/pci/fixup-lemote2f.c | |||
@@ -0,0 +1,160 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2008 Lemote Technology | ||
3 | * Copyright (C) 2004 ICT CAS | ||
4 | * Author: Li xiaoyu, lixy@ict.ac.cn | ||
5 | * | ||
6 | * Copyright (C) 2007 Lemote, Inc. | ||
7 | * Author: Fuxin Zhang, zhangfx@lemote.com | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify it | ||
10 | * under the terms of the GNU General Public License as published by the | ||
11 | * Free Software Foundation; either version 2 of the License, or (at your | ||
12 | * option) any later version. | ||
13 | */ | ||
14 | #include <linux/init.h> | ||
15 | #include <linux/pci.h> | ||
16 | |||
17 | #include <loongson.h> | ||
18 | #include <cs5536/cs5536.h> | ||
19 | #include <cs5536/cs5536_pci.h> | ||
20 | |||
21 | /* PCI interrupt pins | ||
22 | * | ||
23 | * These should not be changed, or you should consider loongson2f interrupt | ||
24 | * register and your pci card dispatch | ||
25 | */ | ||
26 | |||
27 | #define PCIA 4 | ||
28 | #define PCIB 5 | ||
29 | #define PCIC 6 | ||
30 | #define PCID 7 | ||
31 | |||
32 | /* all the pci device has the PCIA pin, check the datasheet. */ | ||
33 | static char irq_tab[][5] __initdata = { | ||
34 | /* INTA INTB INTC INTD */ | ||
35 | {0, 0, 0, 0, 0}, /* 11: Unused */ | ||
36 | {0, 0, 0, 0, 0}, /* 12: Unused */ | ||
37 | {0, 0, 0, 0, 0}, /* 13: Unused */ | ||
38 | {0, 0, 0, 0, 0}, /* 14: Unused */ | ||
39 | {0, 0, 0, 0, 0}, /* 15: Unused */ | ||
40 | {0, 0, 0, 0, 0}, /* 16: Unused */ | ||
41 | {0, PCIA, 0, 0, 0}, /* 17: RTL8110-0 */ | ||
42 | {0, PCIB, 0, 0, 0}, /* 18: RTL8110-1 */ | ||
43 | {0, PCIC, 0, 0, 0}, /* 19: SiI3114 */ | ||
44 | {0, PCID, 0, 0, 0}, /* 20: 3-ports nec usb */ | ||
45 | {0, PCIA, PCIB, PCIC, PCID}, /* 21: PCI-SLOT */ | ||
46 | {0, 0, 0, 0, 0}, /* 22: Unused */ | ||
47 | {0, 0, 0, 0, 0}, /* 23: Unused */ | ||
48 | {0, 0, 0, 0, 0}, /* 24: Unused */ | ||
49 | {0, 0, 0, 0, 0}, /* 25: Unused */ | ||
50 | {0, 0, 0, 0, 0}, /* 26: Unused */ | ||
51 | {0, 0, 0, 0, 0}, /* 27: Unused */ | ||
52 | }; | ||
53 | |||
54 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | ||
55 | { | ||
56 | int virq; | ||
57 | |||
58 | if ((PCI_SLOT(dev->devfn) != PCI_IDSEL_CS5536) | ||
59 | && (PCI_SLOT(dev->devfn) < 32)) { | ||
60 | virq = irq_tab[slot][pin]; | ||
61 | printk(KERN_INFO "slot: %d, pin: %d, irq: %d\n", slot, pin, | ||
62 | virq + LOONGSON_IRQ_BASE); | ||
63 | if (virq != 0) | ||
64 | return LOONGSON_IRQ_BASE + virq; | ||
65 | else | ||
66 | return 0; | ||
67 | } else if (PCI_SLOT(dev->devfn) == PCI_IDSEL_CS5536) { /* cs5536 */ | ||
68 | switch (PCI_FUNC(dev->devfn)) { | ||
69 | case 2: | ||
70 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, | ||
71 | CS5536_IDE_INTR); | ||
72 | return CS5536_IDE_INTR; /* for IDE */ | ||
73 | case 3: | ||
74 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, | ||
75 | CS5536_ACC_INTR); | ||
76 | return CS5536_ACC_INTR; /* for AUDIO */ | ||
77 | case 4: /* for OHCI */ | ||
78 | case 5: /* for EHCI */ | ||
79 | case 6: /* for UDC */ | ||
80 | case 7: /* for OTG */ | ||
81 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, | ||
82 | CS5536_USB_INTR); | ||
83 | return CS5536_USB_INTR; | ||
84 | } | ||
85 | return dev->irq; | ||
86 | } else { | ||
87 | printk(KERN_INFO " strange pci slot number.\n"); | ||
88 | return 0; | ||
89 | } | ||
90 | } | ||
91 | |||
92 | /* Do platform specific device initialization at pci_enable_device() time */ | ||
93 | int pcibios_plat_dev_init(struct pci_dev *dev) | ||
94 | { | ||
95 | return 0; | ||
96 | } | ||
97 | |||
98 | /* CS5536 SPEC. fixup */ | ||
99 | static void __init loongson_cs5536_isa_fixup(struct pci_dev *pdev) | ||
100 | { | ||
101 | /* the uart1 and uart2 interrupt in PIC is enabled as default */ | ||
102 | pci_write_config_dword(pdev, PCI_UART1_INT_REG, 1); | ||
103 | pci_write_config_dword(pdev, PCI_UART2_INT_REG, 1); | ||
104 | } | ||
105 | |||
106 | static void __init loongson_cs5536_ide_fixup(struct pci_dev *pdev) | ||
107 | { | ||
108 | /* setting the mutex pin as IDE function */ | ||
109 | pci_write_config_dword(pdev, PCI_IDE_CFG_REG, | ||
110 | CS5536_IDE_FLASH_SIGNATURE); | ||
111 | } | ||
112 | |||
113 | static void __init loongson_cs5536_acc_fixup(struct pci_dev *pdev) | ||
114 | { | ||
115 | /* enable the AUDIO interrupt in PIC */ | ||
116 | pci_write_config_dword(pdev, PCI_ACC_INT_REG, 1); | ||
117 | |||
118 | pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0xc0); | ||
119 | } | ||
120 | |||
121 | static void __init loongson_cs5536_ohci_fixup(struct pci_dev *pdev) | ||
122 | { | ||
123 | /* enable the OHCI interrupt in PIC */ | ||
124 | /* THE OHCI, EHCI, UDC, OTG are shared with interrupt in PIC */ | ||
125 | pci_write_config_dword(pdev, PCI_OHCI_INT_REG, 1); | ||
126 | } | ||
127 | |||
128 | static void __init loongson_cs5536_ehci_fixup(struct pci_dev *pdev) | ||
129 | { | ||
130 | u32 hi, lo; | ||
131 | |||
132 | /* Serial short detect enable */ | ||
133 | _rdmsr(USB_MSR_REG(USB_CONFIG), &hi, &lo); | ||
134 | _wrmsr(USB_MSR_REG(USB_CONFIG), (1 << 1) | (1 << 2) | (1 << 3), lo); | ||
135 | |||
136 | /* setting the USB2.0 micro frame length */ | ||
137 | pci_write_config_dword(pdev, PCI_EHCI_FLADJ_REG, 0x2000); | ||
138 | } | ||
139 | |||
140 | static void __init loongson_nec_fixup(struct pci_dev *pdev) | ||
141 | { | ||
142 | unsigned int val; | ||
143 | |||
144 | pci_read_config_dword(pdev, 0xe0, &val); | ||
145 | /* Only 2 port be used */ | ||
146 | pci_write_config_dword(pdev, 0xe0, (val & ~3) | 0x2); | ||
147 | } | ||
148 | |||
149 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, | ||
150 | loongson_cs5536_isa_fixup); | ||
151 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_OHC, | ||
152 | loongson_cs5536_ohci_fixup); | ||
153 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_EHC, | ||
154 | loongson_cs5536_ehci_fixup); | ||
155 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO, | ||
156 | loongson_cs5536_acc_fixup); | ||
157 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_IDE, | ||
158 | loongson_cs5536_ide_fixup); | ||
159 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB, | ||
160 | loongson_nec_fixup); | ||
diff --git a/arch/mips/pci/ops-bonito64.c b/arch/mips/pci/ops-bonito64.c index 54e55e7a2431..1b3e03f20c54 100644 --- a/arch/mips/pci/ops-bonito64.c +++ b/arch/mips/pci/ops-bonito64.c | |||
@@ -29,13 +29,8 @@ | |||
29 | #define PCI_ACCESS_READ 0 | 29 | #define PCI_ACCESS_READ 0 |
30 | #define PCI_ACCESS_WRITE 1 | 30 | #define PCI_ACCESS_WRITE 1 |
31 | 31 | ||
32 | #ifdef CONFIG_LEMOTE_FULOONG2E | ||
33 | #define CFG_SPACE_REG(offset) (void *)CKSEG1ADDR(BONITO_PCICFG_BASE | (offset)) | ||
34 | #define ID_SEL_BEGIN 11 | ||
35 | #else | ||
36 | #define CFG_SPACE_REG(offset) (void *)CKSEG1ADDR(_pcictrl_bonito_pcicfg + (offset)) | 32 | #define CFG_SPACE_REG(offset) (void *)CKSEG1ADDR(_pcictrl_bonito_pcicfg + (offset)) |
37 | #define ID_SEL_BEGIN 10 | 33 | #define ID_SEL_BEGIN 10 |
38 | #endif | ||
39 | #define MAX_DEV_NUM (31 - ID_SEL_BEGIN) | 34 | #define MAX_DEV_NUM (31 - ID_SEL_BEGIN) |
40 | 35 | ||
41 | 36 | ||
@@ -77,10 +72,8 @@ static int bonito64_pcibios_config_access(unsigned char access_type, | |||
77 | addrp = CFG_SPACE_REG(addr & 0xffff); | 72 | addrp = CFG_SPACE_REG(addr & 0xffff); |
78 | if (access_type == PCI_ACCESS_WRITE) { | 73 | if (access_type == PCI_ACCESS_WRITE) { |
79 | writel(cpu_to_le32(*data), addrp); | 74 | writel(cpu_to_le32(*data), addrp); |
80 | #ifndef CONFIG_LEMOTE_FULOONG2E | ||
81 | /* Wait till done */ | 75 | /* Wait till done */ |
82 | while (BONITO_PCIMSTAT & 0xF); | 76 | while (BONITO_PCIMSTAT & 0xF); |
83 | #endif | ||
84 | } else { | 77 | } else { |
85 | *data = le32_to_cpu(readl(addrp)); | 78 | *data = le32_to_cpu(readl(addrp)); |
86 | } | 79 | } |
diff --git a/arch/mips/pci/ops-loongson2.c b/arch/mips/pci/ops-loongson2.c new file mode 100644 index 000000000000..aa5d3da27212 --- /dev/null +++ b/arch/mips/pci/ops-loongson2.c | |||
@@ -0,0 +1,208 @@ | |||
1 | /* | ||
2 | * fuloong2e specific PCI support. | ||
3 | * | ||
4 | * Copyright (C) 1999, 2000, 2004 MIPS Technologies, Inc. | ||
5 | * All rights reserved. | ||
6 | * Authors: Carsten Langgaard <carstenl@mips.com> | ||
7 | * Maciej W. Rozycki <macro@mips.com> | ||
8 | * | ||
9 | * Copyright (C) 2009 Lemote Inc. | ||
10 | * Author: Wu Zhangjin <wuzj@lemote.com> | ||
11 | * | ||
12 | * This program is free software; you can distribute it and/or modify it | ||
13 | * under the terms of the GNU General Public License (Version 2) as | ||
14 | * published by the Free Software Foundation. | ||
15 | */ | ||
16 | #include <linux/types.h> | ||
17 | #include <linux/pci.h> | ||
18 | #include <linux/kernel.h> | ||
19 | #include <linux/init.h> | ||
20 | |||
21 | #include <loongson.h> | ||
22 | |||
23 | #ifdef CONFIG_CS5536 | ||
24 | #include <cs5536/cs5536_pci.h> | ||
25 | #include <cs5536/cs5536.h> | ||
26 | #endif | ||
27 | |||
28 | #define PCI_ACCESS_READ 0 | ||
29 | #define PCI_ACCESS_WRITE 1 | ||
30 | |||
31 | #define CFG_SPACE_REG(offset) \ | ||
32 | (void *)CKSEG1ADDR(LOONGSON_PCICFG_BASE | (offset)) | ||
33 | #define ID_SEL_BEGIN 11 | ||
34 | #define MAX_DEV_NUM (31 - ID_SEL_BEGIN) | ||
35 | |||
36 | |||
37 | static int loongson_pcibios_config_access(unsigned char access_type, | ||
38 | struct pci_bus *bus, | ||
39 | unsigned int devfn, int where, | ||
40 | u32 *data) | ||
41 | { | ||
42 | u32 busnum = bus->number; | ||
43 | u32 addr, type; | ||
44 | u32 dummy; | ||
45 | void *addrp; | ||
46 | int device = PCI_SLOT(devfn); | ||
47 | int function = PCI_FUNC(devfn); | ||
48 | int reg = where & ~3; | ||
49 | |||
50 | if (busnum == 0) { | ||
51 | /* board-specific part,currently,only fuloong2f,yeeloong2f | ||
52 | * use CS5536, fuloong2e use via686b, gdium has no | ||
53 | * south bridge | ||
54 | */ | ||
55 | #ifdef CONFIG_CS5536 | ||
56 | /* cs5536_pci_conf_read4/write4() will call _rdmsr/_wrmsr() to | ||
57 | * access the regsters PCI_MSR_ADDR, PCI_MSR_DATA_LO, | ||
58 | * PCI_MSR_DATA_HI, which is bigger than PCI_MSR_CTRL, so, it | ||
59 | * will not go this branch, but the others. so, no calling dead | ||
60 | * loop here. | ||
61 | */ | ||
62 | if ((PCI_IDSEL_CS5536 == device) && (reg < PCI_MSR_CTRL)) { | ||
63 | switch (access_type) { | ||
64 | case PCI_ACCESS_READ: | ||
65 | *data = cs5536_pci_conf_read4(function, reg); | ||
66 | break; | ||
67 | case PCI_ACCESS_WRITE: | ||
68 | cs5536_pci_conf_write4(function, reg, *data); | ||
69 | break; | ||
70 | } | ||
71 | return 0; | ||
72 | } | ||
73 | #endif | ||
74 | /* Type 0 configuration for onboard PCI bus */ | ||
75 | if (device > MAX_DEV_NUM) | ||
76 | return -1; | ||
77 | |||
78 | addr = (1 << (device + ID_SEL_BEGIN)) | (function << 8) | reg; | ||
79 | type = 0; | ||
80 | } else { | ||
81 | /* Type 1 configuration for offboard PCI bus */ | ||
82 | addr = (busnum << 16) | (device << 11) | (function << 8) | reg; | ||
83 | type = 0x10000; | ||
84 | } | ||
85 | |||
86 | /* Clear aborts */ | ||
87 | LOONGSON_PCICMD |= LOONGSON_PCICMD_MABORT_CLR | \ | ||
88 | LOONGSON_PCICMD_MTABORT_CLR; | ||
89 | |||
90 | LOONGSON_PCIMAP_CFG = (addr >> 16) | type; | ||
91 | |||
92 | /* Flush Bonito register block */ | ||
93 | dummy = LOONGSON_PCIMAP_CFG; | ||
94 | mmiowb(); | ||
95 | |||
96 | addrp = CFG_SPACE_REG(addr & 0xffff); | ||
97 | if (access_type == PCI_ACCESS_WRITE) | ||
98 | writel(cpu_to_le32(*data), addrp); | ||
99 | else | ||
100 | *data = le32_to_cpu(readl(addrp)); | ||
101 | |||
102 | /* Detect Master/Target abort */ | ||
103 | if (LOONGSON_PCICMD & (LOONGSON_PCICMD_MABORT_CLR | | ||
104 | LOONGSON_PCICMD_MTABORT_CLR)) { | ||
105 | /* Error occurred */ | ||
106 | |||
107 | /* Clear bits */ | ||
108 | LOONGSON_PCICMD |= (LOONGSON_PCICMD_MABORT_CLR | | ||
109 | LOONGSON_PCICMD_MTABORT_CLR); | ||
110 | |||
111 | return -1; | ||
112 | } | ||
113 | |||
114 | return 0; | ||
115 | |||
116 | } | ||
117 | |||
118 | |||
119 | /* | ||
120 | * We can't address 8 and 16 bit words directly. Instead we have to | ||
121 | * read/write a 32bit word and mask/modify the data we actually want. | ||
122 | */ | ||
123 | static int loongson_pcibios_read(struct pci_bus *bus, unsigned int devfn, | ||
124 | int where, int size, u32 *val) | ||
125 | { | ||
126 | u32 data = 0; | ||
127 | |||
128 | if ((size == 2) && (where & 1)) | ||
129 | return PCIBIOS_BAD_REGISTER_NUMBER; | ||
130 | else if ((size == 4) && (where & 3)) | ||
131 | return PCIBIOS_BAD_REGISTER_NUMBER; | ||
132 | |||
133 | if (loongson_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, where, | ||
134 | &data)) | ||
135 | return -1; | ||
136 | |||
137 | if (size == 1) | ||
138 | *val = (data >> ((where & 3) << 3)) & 0xff; | ||
139 | else if (size == 2) | ||
140 | *val = (data >> ((where & 3) << 3)) & 0xffff; | ||
141 | else | ||
142 | *val = data; | ||
143 | |||
144 | return PCIBIOS_SUCCESSFUL; | ||
145 | } | ||
146 | |||
147 | static int loongson_pcibios_write(struct pci_bus *bus, unsigned int devfn, | ||
148 | int where, int size, u32 val) | ||
149 | { | ||
150 | u32 data = 0; | ||
151 | |||
152 | if ((size == 2) && (where & 1)) | ||
153 | return PCIBIOS_BAD_REGISTER_NUMBER; | ||
154 | else if ((size == 4) && (where & 3)) | ||
155 | return PCIBIOS_BAD_REGISTER_NUMBER; | ||
156 | |||
157 | if (size == 4) | ||
158 | data = val; | ||
159 | else { | ||
160 | if (loongson_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, | ||
161 | where, &data)) | ||
162 | return -1; | ||
163 | |||
164 | if (size == 1) | ||
165 | data = (data & ~(0xff << ((where & 3) << 3))) | | ||
166 | (val << ((where & 3) << 3)); | ||
167 | else if (size == 2) | ||
168 | data = (data & ~(0xffff << ((where & 3) << 3))) | | ||
169 | (val << ((where & 3) << 3)); | ||
170 | } | ||
171 | |||
172 | if (loongson_pcibios_config_access(PCI_ACCESS_WRITE, bus, devfn, where, | ||
173 | &data)) | ||
174 | return -1; | ||
175 | |||
176 | return PCIBIOS_SUCCESSFUL; | ||
177 | } | ||
178 | |||
179 | struct pci_ops loongson_pci_ops = { | ||
180 | .read = loongson_pcibios_read, | ||
181 | .write = loongson_pcibios_write | ||
182 | }; | ||
183 | |||
184 | #ifdef CONFIG_CS5536 | ||
185 | void _rdmsr(u32 msr, u32 *hi, u32 *lo) | ||
186 | { | ||
187 | struct pci_bus bus = { | ||
188 | .number = PCI_BUS_CS5536 | ||
189 | }; | ||
190 | u32 devfn = PCI_DEVFN(PCI_IDSEL_CS5536, 0); | ||
191 | loongson_pcibios_write(&bus, devfn, PCI_MSR_ADDR, 4, msr); | ||
192 | loongson_pcibios_read(&bus, devfn, PCI_MSR_DATA_LO, 4, lo); | ||
193 | loongson_pcibios_read(&bus, devfn, PCI_MSR_DATA_HI, 4, hi); | ||
194 | } | ||
195 | EXPORT_SYMBOL(_rdmsr); | ||
196 | |||
197 | void _wrmsr(u32 msr, u32 hi, u32 lo) | ||
198 | { | ||
199 | struct pci_bus bus = { | ||
200 | .number = PCI_BUS_CS5536 | ||
201 | }; | ||
202 | u32 devfn = PCI_DEVFN(PCI_IDSEL_CS5536, 0); | ||
203 | loongson_pcibios_write(&bus, devfn, PCI_MSR_ADDR, 4, msr); | ||
204 | loongson_pcibios_write(&bus, devfn, PCI_MSR_DATA_LO, 4, lo); | ||
205 | loongson_pcibios_write(&bus, devfn, PCI_MSR_DATA_HI, 4, hi); | ||
206 | } | ||
207 | EXPORT_SYMBOL(_wrmsr); | ||
208 | #endif | ||
diff --git a/arch/mips/pci/pci-excite.c b/arch/mips/pci/pci-excite.c deleted file mode 100644 index 8a56876afcc6..000000000000 --- a/arch/mips/pci/pci-excite.c +++ /dev/null | |||
@@ -1,149 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2004 by Basler Vision Technologies AG | ||
3 | * Author: Thomas Koeller <thomas.koeller@baslerweb.com> | ||
4 | * Based on the PMC-Sierra Yosemite board support by Ralf Baechle. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | #include <linux/init.h> | ||
21 | #include <linux/kernel.h> | ||
22 | #include <linux/types.h> | ||
23 | #include <linux/pci.h> | ||
24 | #include <linux/bitops.h> | ||
25 | #include <asm/rm9k-ocd.h> | ||
26 | #include <excite.h> | ||
27 | |||
28 | |||
29 | extern struct pci_ops titan_pci_ops; | ||
30 | |||
31 | |||
32 | static struct resource | ||
33 | mem_resource = { | ||
34 | .name = "PCI memory", | ||
35 | .start = EXCITE_PHYS_PCI_MEM, | ||
36 | .end = EXCITE_PHYS_PCI_MEM + EXCITE_SIZE_PCI_MEM - 1, | ||
37 | .flags = IORESOURCE_MEM | ||
38 | }, | ||
39 | io_resource = { | ||
40 | .name = "PCI I/O", | ||
41 | .start = EXCITE_PHYS_PCI_IO, | ||
42 | .end = EXCITE_PHYS_PCI_IO + EXCITE_SIZE_PCI_IO - 1, | ||
43 | .flags = IORESOURCE_IO | ||
44 | }; | ||
45 | |||
46 | |||
47 | static struct pci_controller bx_controller = { | ||
48 | .pci_ops = &titan_pci_ops, | ||
49 | .mem_resource = &mem_resource, | ||
50 | .mem_offset = 0x00000000UL, | ||
51 | .io_resource = &io_resource, | ||
52 | .io_offset = 0x00000000UL | ||
53 | }; | ||
54 | |||
55 | |||
56 | static char | ||
57 | iopage_failed[] __initdata = "Cannot allocate PCI I/O page", | ||
58 | modebits_no_pci[] __initdata = "PCI is not configured in mode bits"; | ||
59 | |||
60 | #define RM9000x2_OCD_HTSC 0x0604 | ||
61 | #define RM9000x2_OCD_HTBHL 0x060c | ||
62 | #define RM9000x2_OCD_PCIHRST 0x078c | ||
63 | |||
64 | #define RM9K_OCD_MODEBIT1 0x00d4 /* (MODEBIT1) Mode Bit 1 */ | ||
65 | #define RM9K_OCD_CPHDCR 0x00f4 /* CPU-PCI/HT Data Control. */ | ||
66 | |||
67 | #define PCISC_FB2B 0x00000200 | ||
68 | #define PCISC_MWICG 0x00000010 | ||
69 | #define PCISC_EMC 0x00000004 | ||
70 | #define PCISC_ERMA 0x00000002 | ||
71 | |||
72 | |||
73 | |||
74 | static int __init basler_excite_pci_setup(void) | ||
75 | { | ||
76 | const unsigned int fullbars = memsize / (256 << 20); | ||
77 | unsigned int i; | ||
78 | |||
79 | /* Check modebits to see if PCI is really enabled. */ | ||
80 | if (!((ocd_readl(RM9K_OCD_MODEBIT1) >> (47-32)) & 0x1)) | ||
81 | panic(modebits_no_pci); | ||
82 | |||
83 | if (NULL == request_mem_region(EXCITE_PHYS_PCI_IO, EXCITE_SIZE_PCI_IO, | ||
84 | "Memory-mapped PCI I/O page")) | ||
85 | panic(iopage_failed); | ||
86 | |||
87 | /* Enable PCI 0 as master for config cycles */ | ||
88 | ocd_writel(PCISC_EMC | PCISC_ERMA, RM9000x2_OCD_HTSC); | ||
89 | |||
90 | |||
91 | /* Set up latency timer */ | ||
92 | ocd_writel(0x8008, RM9000x2_OCD_HTBHL); | ||
93 | |||
94 | /* Setup host IO and Memory space */ | ||
95 | ocd_writel((EXCITE_PHYS_PCI_IO >> 4) | 1, LKB7); | ||
96 | ocd_writel(((EXCITE_SIZE_PCI_IO >> 4) & 0x7fffff00) - 0x100, LKM7); | ||
97 | ocd_writel((EXCITE_PHYS_PCI_MEM >> 4) | 1, LKB8); | ||
98 | ocd_writel(((EXCITE_SIZE_PCI_MEM >> 4) & 0x7fffff00) - 0x100, LKM8); | ||
99 | |||
100 | /* Set up PCI BARs to map all installed memory */ | ||
101 | for (i = 0; i < 6; i++) { | ||
102 | const unsigned int bar = 0x610 + i * 4; | ||
103 | |||
104 | if (i < fullbars) { | ||
105 | ocd_writel(0x10000000 * i, bar); | ||
106 | ocd_writel(0x01000000 * i, bar + 0x140); | ||
107 | ocd_writel(0x0ffff029, bar + 0x100); | ||
108 | continue; | ||
109 | } | ||
110 | |||
111 | if (i == fullbars) { | ||
112 | int o; | ||
113 | u32 mask; | ||
114 | |||
115 | const unsigned long rem = memsize - i * 0x10000000; | ||
116 | if (!rem) { | ||
117 | ocd_writel(0x00000000, bar + 0x100); | ||
118 | continue; | ||
119 | } | ||
120 | |||
121 | o = ffs(rem) - 1; | ||
122 | if (rem & ~(0x1 << o)) | ||
123 | o++; | ||
124 | mask = ((0x1 << o) & 0x0ffff000) - 0x1000; | ||
125 | ocd_writel(0x10000000 * i, bar); | ||
126 | ocd_writel(0x01000000 * i, bar + 0x140); | ||
127 | ocd_writel(0x00000029 | mask, bar + 0x100); | ||
128 | continue; | ||
129 | } | ||
130 | |||
131 | ocd_writel(0x00000000, bar + 0x100); | ||
132 | } | ||
133 | |||
134 | /* Finally, enable the PCI interrupt */ | ||
135 | #if USB_IRQ > 7 | ||
136 | set_c0_intcontrol(1 << USB_IRQ); | ||
137 | #else | ||
138 | set_c0_status(1 << (USB_IRQ + 8)); | ||
139 | #endif | ||
140 | |||
141 | ioport_resource.start = EXCITE_PHYS_PCI_IO; | ||
142 | ioport_resource.end = EXCITE_PHYS_PCI_IO + EXCITE_SIZE_PCI_IO - 1; | ||
143 | set_io_port_base((unsigned long) ioremap_nocache(EXCITE_PHYS_PCI_IO, EXCITE_SIZE_PCI_IO)); | ||
144 | register_pci_controller(&bx_controller); | ||
145 | return 0; | ||
146 | } | ||
147 | |||
148 | |||
149 | arch_initcall(basler_excite_pci_setup); | ||