Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Ganesan Ramalingam and committed by
Ralf Baechle
f32671a8 b66f953c

+140 -1
+1
arch/mips/Kconfig
··· 776 776 select CEVT_R4K 777 777 select CSRC_R4K 778 778 select IRQ_CPU 779 + select ARCH_SUPPORTS_MSI 779 780 select ZONE_DMA if 64BIT 780 781 select SYNC_R4K 781 782 select SYS_HAS_EARLY_PRINTK
+84
arch/mips/include/asm/netlogic/xlr/msidef.h
··· 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 */
+5
arch/mips/netlogic/xlr/irq.c
··· 38 38 #include <linux/interrupt.h> 39 39 #include <linux/spinlock.h> 40 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 46 #include <asm/mipsregs.h> 43 47 48 + #include <asm/netlogic/xlr/msidef.h> 44 49 #include <asm/netlogic/xlr/iomap.h> 45 50 #include <asm/netlogic/xlr/pic.h> 46 51 #include <asm/netlogic/xlr/xlr.h>
+50 -1
arch/mips/pci/pci-xlr.c
··· 36 36 #include <linux/pci.h> 37 37 #include <linux/kernel.h> 38 38 #include <linux/init.h> 39 + #include <linux/msi.h> 39 40 #include <linux/mm.h> 41 + #include <linux/irq.h> 42 + #include <linux/irqdesc.h> 40 43 #include <linux/console.h> 41 44 42 45 #include <asm/io.h> 43 46 44 47 #include <asm/netlogic/interrupt.h> 48 + #include <asm/netlogic/xlr/msidef.h> 45 49 #include <asm/netlogic/xlr/iomap.h> 46 50 #include <asm/netlogic/xlr/pic.h> 47 51 #include <asm/netlogic/xlr/xlr.h> ··· 154 150 .io_offset = 0x00000000UL, 155 151 }; 156 152 157 - int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 153 + static int get_irq_vector(const struct pci_dev *dev) 158 154 { 159 155 if (!nlm_chip_is_xls()) 160 156 return PIC_PCIX_IRQ; /* for XLR just one IRQ*/ ··· 184 180 } 185 181 WARN(1, "Unexpected devfn %d\n", dev->bus->self->devfn); 186 182 return 0; 183 + } 184 + 185 + #ifdef CONFIG_PCI_MSI 186 + void destroy_irq(unsigned int irq) 187 + { 188 + /* nothing to do yet */ 189 + } 190 + 191 + void arch_teardown_msi_irq(unsigned int irq) 192 + { 193 + destroy_irq(irq); 194 + } 195 + 196 + int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) 197 + { 198 + struct msi_msg msg; 199 + int irq, ret; 200 + 201 + irq = get_irq_vector(dev); 202 + if (irq <= 0) 203 + return 1; 204 + 205 + msg.address_hi = MSI_ADDR_BASE_HI; 206 + msg.address_lo = MSI_ADDR_BASE_LO | 207 + MSI_ADDR_DEST_MODE_PHYSICAL | 208 + MSI_ADDR_REDIRECTION_CPU; 209 + 210 + msg.data = MSI_DATA_TRIGGER_EDGE | 211 + MSI_DATA_LEVEL_ASSERT | 212 + MSI_DATA_DELIVERY_FIXED; 213 + 214 + ret = irq_set_msi_desc(irq, desc); 215 + if (ret < 0) { 216 + destroy_irq(irq); 217 + return ret; 218 + } 219 + 220 + write_msi_msg(irq, &msg); 221 + return 0; 222 + } 223 + #endif 224 + 225 + int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 226 + { 227 + return get_irq_vector(dev); 187 228 } 188 229 189 230 /* Do platform specific device initialization at pci_enable_device() time */