diff options
author | Ganesan Ramalingam <ganesanr@netlogicmicro.com> | 2011-08-23 04:06:10 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-12-07 17:04:54 -0500 |
commit | f32671a867523e830887983891d99d3ac4842ccf (patch) | |
tree | d9c4c35b9a0ddb8cea352752dd5e6152b977ffc1 /arch | |
parent | b66f953cd00e7c309c33ea35acd95b13a027050f (diff) |
MIPS: Netlogic: Add basic MSI support for XLR/XLS
Add basic support for MSI.
Signed-off-by: Ganesan Ramalingam <ganesanr@netlogicmicro.com>
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2730/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/Kconfig | 1 | ||||
-rw-r--r-- | arch/mips/include/asm/netlogic/xlr/msidef.h | 84 | ||||
-rw-r--r-- | arch/mips/netlogic/xlr/irq.c | 5 | ||||
-rw-r--r-- | arch/mips/pci/pci-xlr.c | 51 |
4 files changed, 140 insertions, 1 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index d46f1da18a3c..04ac89c6ab68 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -776,6 +776,7 @@ config NLM_XLR_BOARD | |||
776 | select CEVT_R4K | 776 | select CEVT_R4K |
777 | select CSRC_R4K | 777 | select CSRC_R4K |
778 | select IRQ_CPU | 778 | select IRQ_CPU |
779 | select ARCH_SUPPORTS_MSI | ||
779 | select ZONE_DMA if 64BIT | 780 | select ZONE_DMA if 64BIT |
780 | select SYNC_R4K | 781 | select SYNC_R4K |
781 | select SYS_HAS_EARLY_PRINTK | 782 | select SYS_HAS_EARLY_PRINTK |
diff --git a/arch/mips/include/asm/netlogic/xlr/msidef.h b/arch/mips/include/asm/netlogic/xlr/msidef.h new file mode 100644 index 000000000000..7e39d40be4f5 --- /dev/null +++ b/arch/mips/include/asm/netlogic/xlr/msidef.h | |||
@@ -0,0 +1,84 @@ | |||
1 | /* | ||
2 | * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights | ||
3 | * reserved. | ||
4 | * | ||
5 | * This software is available to you under a choice of one of two | ||
6 | * licenses. You may choose to be licensed under the terms of the GNU | ||
7 | * General Public License (GPL) Version 2, available from the file | ||
8 | * COPYING in the main directory of this source tree, or the NetLogic | ||
9 | * license below: | ||
10 | * | ||
11 | * Redistribution and use in source and binary forms, with or without | ||
12 | * modification, are permitted provided that the following conditions | ||
13 | * are met: | ||
14 | * | ||
15 | * 1. Redistributions of source code must retain the above copyright | ||
16 | * notice, this list of conditions and the following disclaimer. | ||
17 | * 2. Redistributions in binary form must reproduce the above copyright | ||
18 | * notice, this list of conditions and the following disclaimer in | ||
19 | * the documentation and/or other materials provided with the | ||
20 | * distribution. | ||
21 | * | ||
22 | * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``AS IS'' AND ANY EXPRESS OR | ||
23 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
24 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
25 | * ARE DISCLAIMED. IN NO EVENT SHALL NETLOGIC OR CONTRIBUTORS BE LIABLE | ||
26 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
27 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
28 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR | ||
29 | * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | ||
30 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE | ||
31 | * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN | ||
32 | * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
33 | */ | ||
34 | |||
35 | #ifndef ASM_RMI_MSIDEF_H | ||
36 | #define ASM_RMI_MSIDEF_H | ||
37 | |||
38 | /* | ||
39 | * Constants for Intel APIC based MSI messages. | ||
40 | * Adapted for the RMI XLR using identical defines | ||
41 | */ | ||
42 | |||
43 | /* | ||
44 | * Shifts for MSI data | ||
45 | */ | ||
46 | |||
47 | #define MSI_DATA_VECTOR_SHIFT 0 | ||
48 | #define MSI_DATA_VECTOR_MASK 0x000000ff | ||
49 | #define MSI_DATA_VECTOR(v) (((v) << MSI_DATA_VECTOR_SHIFT) & \ | ||
50 | MSI_DATA_VECTOR_MASK) | ||
51 | |||
52 | #define MSI_DATA_DELIVERY_MODE_SHIFT 8 | ||
53 | #define MSI_DATA_DELIVERY_FIXED (0 << MSI_DATA_DELIVERY_MODE_SHIFT) | ||
54 | #define MSI_DATA_DELIVERY_LOWPRI (1 << MSI_DATA_DELIVERY_MODE_SHIFT) | ||
55 | |||
56 | #define MSI_DATA_LEVEL_SHIFT 14 | ||
57 | #define MSI_DATA_LEVEL_DEASSERT (0 << MSI_DATA_LEVEL_SHIFT) | ||
58 | #define MSI_DATA_LEVEL_ASSERT (1 << MSI_DATA_LEVEL_SHIFT) | ||
59 | |||
60 | #define MSI_DATA_TRIGGER_SHIFT 15 | ||
61 | #define MSI_DATA_TRIGGER_EDGE (0 << MSI_DATA_TRIGGER_SHIFT) | ||
62 | #define MSI_DATA_TRIGGER_LEVEL (1 << MSI_DATA_TRIGGER_SHIFT) | ||
63 | |||
64 | /* | ||
65 | * Shift/mask fields for msi address | ||
66 | */ | ||
67 | |||
68 | #define MSI_ADDR_BASE_HI 0 | ||
69 | #define MSI_ADDR_BASE_LO 0xfee00000 | ||
70 | |||
71 | #define MSI_ADDR_DEST_MODE_SHIFT 2 | ||
72 | #define MSI_ADDR_DEST_MODE_PHYSICAL (0 << MSI_ADDR_DEST_MODE_SHIFT) | ||
73 | #define MSI_ADDR_DEST_MODE_LOGICAL (1 << MSI_ADDR_DEST_MODE_SHIFT) | ||
74 | |||
75 | #define MSI_ADDR_REDIRECTION_SHIFT 3 | ||
76 | #define MSI_ADDR_REDIRECTION_CPU (0 << MSI_ADDR_REDIRECTION_SHIFT) | ||
77 | #define MSI_ADDR_REDIRECTION_LOWPRI (1 << MSI_ADDR_REDIRECTION_SHIFT) | ||
78 | |||
79 | #define MSI_ADDR_DEST_ID_SHIFT 12 | ||
80 | #define MSI_ADDR_DEST_ID_MASK 0x00ffff0 | ||
81 | #define MSI_ADDR_DEST_ID(dest) (((dest) << MSI_ADDR_DEST_ID_SHIFT) & \ | ||
82 | MSI_ADDR_DEST_ID_MASK) | ||
83 | |||
84 | #endif /* ASM_RMI_MSIDEF_H */ | ||
diff --git a/arch/mips/netlogic/xlr/irq.c b/arch/mips/netlogic/xlr/irq.c index 521bb7377eb0..fc822c8f0817 100644 --- a/arch/mips/netlogic/xlr/irq.c +++ b/arch/mips/netlogic/xlr/irq.c | |||
@@ -38,9 +38,14 @@ | |||
38 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
39 | #include <linux/spinlock.h> | 39 | #include <linux/spinlock.h> |
40 | #include <linux/mm.h> | 40 | #include <linux/mm.h> |
41 | #include <linux/msi.h> | ||
42 | #include <linux/irq.h> | ||
43 | #include <linux/irqdesc.h> | ||
44 | #include <linux/pci.h> | ||
41 | 45 | ||
42 | #include <asm/mipsregs.h> | 46 | #include <asm/mipsregs.h> |
43 | 47 | ||
48 | #include <asm/netlogic/xlr/msidef.h> | ||
44 | #include <asm/netlogic/xlr/iomap.h> | 49 | #include <asm/netlogic/xlr/iomap.h> |
45 | #include <asm/netlogic/xlr/pic.h> | 50 | #include <asm/netlogic/xlr/pic.h> |
46 | #include <asm/netlogic/xlr/xlr.h> | 51 | #include <asm/netlogic/xlr/xlr.h> |
diff --git a/arch/mips/pci/pci-xlr.c b/arch/mips/pci/pci-xlr.c index 38fece16c435..87404d0034d2 100644 --- a/arch/mips/pci/pci-xlr.c +++ b/arch/mips/pci/pci-xlr.c | |||
@@ -36,12 +36,16 @@ | |||
36 | #include <linux/pci.h> | 36 | #include <linux/pci.h> |
37 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
38 | #include <linux/init.h> | 38 | #include <linux/init.h> |
39 | #include <linux/msi.h> | ||
39 | #include <linux/mm.h> | 40 | #include <linux/mm.h> |
41 | #include <linux/irq.h> | ||
42 | #include <linux/irqdesc.h> | ||
40 | #include <linux/console.h> | 43 | #include <linux/console.h> |
41 | 44 | ||
42 | #include <asm/io.h> | 45 | #include <asm/io.h> |
43 | 46 | ||
44 | #include <asm/netlogic/interrupt.h> | 47 | #include <asm/netlogic/interrupt.h> |
48 | #include <asm/netlogic/xlr/msidef.h> | ||
45 | #include <asm/netlogic/xlr/iomap.h> | 49 | #include <asm/netlogic/xlr/iomap.h> |
46 | #include <asm/netlogic/xlr/pic.h> | 50 | #include <asm/netlogic/xlr/pic.h> |
47 | #include <asm/netlogic/xlr/xlr.h> | 51 | #include <asm/netlogic/xlr/xlr.h> |
@@ -150,7 +154,7 @@ struct pci_controller nlm_pci_controller = { | |||
150 | .io_offset = 0x00000000UL, | 154 | .io_offset = 0x00000000UL, |
151 | }; | 155 | }; |
152 | 156 | ||
153 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | 157 | static int get_irq_vector(const struct pci_dev *dev) |
154 | { | 158 | { |
155 | if (!nlm_chip_is_xls()) | 159 | if (!nlm_chip_is_xls()) |
156 | return PIC_PCIX_IRQ; /* for XLR just one IRQ*/ | 160 | return PIC_PCIX_IRQ; /* for XLR just one IRQ*/ |
@@ -182,6 +186,51 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | |||
182 | return 0; | 186 | return 0; |
183 | } | 187 | } |
184 | 188 | ||
189 | #ifdef CONFIG_PCI_MSI | ||
190 | void destroy_irq(unsigned int irq) | ||
191 | { | ||
192 | /* nothing to do yet */ | ||
193 | } | ||
194 | |||
195 | void arch_teardown_msi_irq(unsigned int irq) | ||
196 | { | ||
197 | destroy_irq(irq); | ||
198 | } | ||
199 | |||
200 | int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) | ||
201 | { | ||
202 | struct msi_msg msg; | ||
203 | int irq, ret; | ||
204 | |||
205 | irq = get_irq_vector(dev); | ||
206 | if (irq <= 0) | ||
207 | return 1; | ||
208 | |||
209 | msg.address_hi = MSI_ADDR_BASE_HI; | ||
210 | msg.address_lo = MSI_ADDR_BASE_LO | | ||
211 | MSI_ADDR_DEST_MODE_PHYSICAL | | ||
212 | MSI_ADDR_REDIRECTION_CPU; | ||
213 | |||
214 | msg.data = MSI_DATA_TRIGGER_EDGE | | ||
215 | MSI_DATA_LEVEL_ASSERT | | ||
216 | MSI_DATA_DELIVERY_FIXED; | ||
217 | |||
218 | ret = irq_set_msi_desc(irq, desc); | ||
219 | if (ret < 0) { | ||
220 | destroy_irq(irq); | ||
221 | return ret; | ||
222 | } | ||
223 | |||
224 | write_msi_msg(irq, &msg); | ||
225 | return 0; | ||
226 | } | ||
227 | #endif | ||
228 | |||
229 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | ||
230 | { | ||
231 | return get_irq_vector(dev); | ||
232 | } | ||
233 | |||
185 | /* Do platform specific device initialization at pci_enable_device() time */ | 234 | /* Do platform specific device initialization at pci_enable_device() time */ |
186 | int pcibios_plat_dev_init(struct pci_dev *dev) | 235 | int pcibios_plat_dev_init(struct pci_dev *dev) |
187 | { | 236 | { |