diff options
Diffstat (limited to 'arch/mips/include/asm/netlogic/common.h')
-rw-r--r-- | arch/mips/include/asm/netlogic/common.h | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/arch/mips/include/asm/netlogic/common.h b/arch/mips/include/asm/netlogic/common.h index bb68c3398c80..c281f03eb312 100644 --- a/arch/mips/include/asm/netlogic/common.h +++ b/arch/mips/include/asm/netlogic/common.h | |||
@@ -84,7 +84,6 @@ nlm_set_nmi_handler(void *handler) | |||
84 | */ | 84 | */ |
85 | void nlm_init_boot_cpu(void); | 85 | void nlm_init_boot_cpu(void); |
86 | unsigned int nlm_get_cpu_frequency(void); | 86 | unsigned int nlm_get_cpu_frequency(void); |
87 | void nlm_node_init(int node); | ||
88 | extern struct plat_smp_ops nlm_smp_ops; | 87 | extern struct plat_smp_ops nlm_smp_ops; |
89 | extern char nlm_reset_entry[], nlm_reset_entry_end[]; | 88 | extern char nlm_reset_entry[], nlm_reset_entry_end[]; |
90 | 89 | ||
@@ -94,26 +93,16 @@ extern struct dma_map_ops nlm_swiotlb_dma_ops; | |||
94 | extern unsigned int nlm_threads_per_core; | 93 | extern unsigned int nlm_threads_per_core; |
95 | extern cpumask_t nlm_cpumask; | 94 | extern cpumask_t nlm_cpumask; |
96 | 95 | ||
97 | struct nlm_soc_info { | ||
98 | unsigned long coremask; /* cores enabled on the soc */ | ||
99 | unsigned long ebase; | ||
100 | uint64_t irqmask; | ||
101 | uint64_t sysbase; /* only for XLP */ | ||
102 | uint64_t picbase; | ||
103 | spinlock_t piclock; | ||
104 | }; | ||
105 | |||
106 | #define nlm_get_node(i) (&nlm_nodes[i]) | ||
107 | #ifdef CONFIG_CPU_XLR | ||
108 | #define nlm_current_node() (&nlm_nodes[0]) | ||
109 | #else | ||
110 | #define nlm_current_node() (&nlm_nodes[nlm_nodeid()]) | ||
111 | #endif | ||
112 | |||
113 | struct irq_data; | 96 | struct irq_data; |
114 | uint64_t nlm_pci_irqmask(int node); | 97 | uint64_t nlm_pci_irqmask(int node); |
98 | void nlm_setup_pic_irq(int node, int picirq, int irq, int irt); | ||
115 | void nlm_set_pic_extra_ack(int node, int irq, void (*xack)(struct irq_data *)); | 99 | void nlm_set_pic_extra_ack(int node, int irq, void (*xack)(struct irq_data *)); |
116 | 100 | ||
101 | #ifdef CONFIG_PCI_MSI | ||
102 | void nlm_dispatch_msi(int node, int lirq); | ||
103 | void nlm_dispatch_msix(int node, int msixirq); | ||
104 | #endif | ||
105 | |||
117 | /* | 106 | /* |
118 | * The NR_IRQs is divided between nodes, each of them has a separate irq space | 107 | * The NR_IRQs is divided between nodes, each of them has a separate irq space |
119 | */ | 108 | */ |
@@ -122,7 +111,6 @@ static inline int nlm_irq_to_xirq(int node, int irq) | |||
122 | return node * NR_IRQS / NLM_NR_NODES + irq; | 111 | return node * NR_IRQS / NLM_NR_NODES + irq; |
123 | } | 112 | } |
124 | 113 | ||
125 | extern struct nlm_soc_info nlm_nodes[NLM_NR_NODES]; | ||
126 | extern int nlm_cpu_ready[]; | 114 | extern int nlm_cpu_ready[]; |
127 | #endif | 115 | #endif |
128 | #endif /* _NETLOGIC_COMMON_H_ */ | 116 | #endif /* _NETLOGIC_COMMON_H_ */ |