aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 23:32:43 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 23:32:43 -0400
commit0c23664ee8c42f247dba7ceb620baabd892cef88 (patch)
treee3f37e3260bd938b293cfb8f70f8969b19539973 /include
parent6ec129c3a2f8b38bc37e42348470ccfcb7460146 (diff)
parent127cda1e8cc282de1ca7a9dcc3866841977b9fcc (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Optimize fault kprobe handling just like powerpc. [SPARC]: Wire up utimensat syscall. [SPARC64]: Fix request_irq() ignored result warnings in PCI controller code. [SPARC64]: Kill asm-sparc64/pbm.h [ATYFB]: Fix sparc includes. [QLA2XXX]: Fix build on sparc. [SPARC64]: Removal of trivial pci_controller_info uses. [SPARC64]: Move index info pci_pbm_info. [SPARC64]: Move {setup,teardown}_msi_irq into pci_pbm_info. [SPARC64]: Move pci_ops into pci_pbm_info. [SPARC64] SBUS: Error interrupt registry cleanups. [SPARC64] PCI: Use root list of pbm's instead of pci_controller_info's [SPARC64] PCI: Kill PROM_PCIRNG_MAX and PROM_PCIIMAP_MAX. [SPARC64] PCI: Use common routine to fetch PBM properties.
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc/unistd.h3
-rw-r--r--include/asm-sparc64/kdebug.h16
-rw-r--r--include/asm-sparc64/kprobes.h1
-rw-r--r--include/asm-sparc64/pbm.h152
-rw-r--r--include/asm-sparc64/unistd.h3
5 files changed, 18 insertions, 157 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
index e43ed1d63a9d..da9bdc5e5526 100644
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
@@ -326,8 +326,9 @@
326#define __NR_move_pages 307 326#define __NR_move_pages 307
327#define __NR_getcpu 308 327#define __NR_getcpu 308
328#define __NR_epoll_pwait 309 328#define __NR_epoll_pwait 309
329#define __NR_utimensat 310
329 330
330#define NR_SYSCALLS 310 331#define NR_SYSCALLS 311
331 332
332#ifdef __KERNEL__ 333#ifdef __KERNEL__
333#define __ARCH_WANT_IPC_PARSE_VERSION 334#define __ARCH_WANT_IPC_PARSE_VERSION
diff --git a/include/asm-sparc64/kdebug.h b/include/asm-sparc64/kdebug.h
index f8032e73f384..627e3396a5f0 100644
--- a/include/asm-sparc64/kdebug.h
+++ b/include/asm-sparc64/kdebug.h
@@ -7,8 +7,19 @@
7 7
8struct pt_regs; 8struct pt_regs;
9 9
10extern int register_page_fault_notifier(struct notifier_block *); 10/*
11extern int unregister_page_fault_notifier(struct notifier_block *); 11 * These are only here because kprobes.c wants them to implement a
12 * blatant layering violation. Will hopefully go away soon once all
13 * architectures are updated.
14 */
15static inline int register_page_fault_notifier(struct notifier_block *nb)
16{
17 return 0;
18}
19static inline int unregister_page_fault_notifier(struct notifier_block *nb)
20{
21 return 0;
22}
12 23
13extern void bad_trap(struct pt_regs *, long); 24extern void bad_trap(struct pt_regs *, long);
14 25
@@ -20,7 +31,6 @@ enum die_val {
20 DIE_DIE, 31 DIE_DIE,
21 DIE_TRAP, 32 DIE_TRAP,
22 DIE_TRAP_TL1, 33 DIE_TRAP_TL1,
23 DIE_GPF,
24 DIE_CALL, 34 DIE_CALL,
25 DIE_PAGE_FAULT, 35 DIE_PAGE_FAULT,
26}; 36};
diff --git a/include/asm-sparc64/kprobes.h b/include/asm-sparc64/kprobes.h
index becc38fa06c5..a331b7b0dff2 100644
--- a/include/asm-sparc64/kprobes.h
+++ b/include/asm-sparc64/kprobes.h
@@ -43,4 +43,5 @@ struct kprobe_ctlblk {
43 43
44extern int kprobe_exceptions_notify(struct notifier_block *self, 44extern int kprobe_exceptions_notify(struct notifier_block *self,
45 unsigned long val, void *data); 45 unsigned long val, void *data);
46extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
46#endif /* _SPARC64_KPROBES_H */ 47#endif /* _SPARC64_KPROBES_H */
diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h
deleted file mode 100644
index c008cecca149..000000000000
--- a/include/asm-sparc64/pbm.h
+++ /dev/null
@@ -1,152 +0,0 @@
1/* pbm.h: UltraSparc PCI controller software state.
2 *
3 * Copyright (C) 1997, 1998, 1999, 2007 David S. Miller (davem@davemloft.net)
4 */
5
6#ifndef __SPARC64_PBM_H
7#define __SPARC64_PBM_H
8
9#include <linux/types.h>
10#include <linux/pci.h>
11#include <linux/ioport.h>
12#include <linux/spinlock.h>
13#include <linux/msi.h>
14
15#include <asm/io.h>
16#include <asm/page.h>
17#include <asm/oplib.h>
18#include <asm/prom.h>
19#include <asm/of_device.h>
20#include <asm/iommu.h>
21
22/* The abstraction used here is that there are PCI controllers,
23 * each with one (Sabre) or two (PSYCHO/SCHIZO) PCI bus modules
24 * underneath. Each PCI bus module uses an IOMMU (shared by both
25 * PBMs of a controller, or per-PBM), and if a streaming buffer
26 * is present, each PCI bus module has it's own. (ie. the IOMMU
27 * might be shared between PBMs, the STC is never shared)
28 * Furthermore, each PCI bus module controls it's own autonomous
29 * PCI bus.
30 */
31
32extern void pci_iommu_table_init(struct iommu *iommu, int tsbsize, u32 dma_offset, u32 dma_addr_mask);
33
34#define PCI_STC_FLUSHFLAG_INIT(STC) \
35 (*((STC)->strbuf_flushflag) = 0UL)
36#define PCI_STC_FLUSHFLAG_SET(STC) \
37 (*((STC)->strbuf_flushflag) != 0UL)
38
39/* There can be quite a few ranges and interrupt maps on a PCI
40 * segment. Thus...
41 */
42#define PROM_PCIRNG_MAX 64
43#define PROM_PCIIMAP_MAX 64
44
45struct pci_controller_info;
46
47struct pci_pbm_info {
48 /* PCI controller we sit under. */
49 struct pci_controller_info *parent;
50
51 /* Physical address base of controller registers. */
52 unsigned long controller_regs;
53
54 /* Physical address base of PBM registers. */
55 unsigned long pbm_regs;
56
57 /* Physical address of DMA sync register, if any. */
58 unsigned long sync_reg;
59
60 /* Opaque 32-bit system bus Port ID. */
61 u32 portid;
62
63 /* Opaque 32-bit handle used for hypervisor calls. */
64 u32 devhandle;
65
66 /* Chipset version information. */
67 int chip_type;
68#define PBM_CHIP_TYPE_SABRE 1
69#define PBM_CHIP_TYPE_PSYCHO 2
70#define PBM_CHIP_TYPE_SCHIZO 3
71#define PBM_CHIP_TYPE_SCHIZO_PLUS 4
72#define PBM_CHIP_TYPE_TOMATILLO 5
73 int chip_version;
74 int chip_revision;
75
76 /* Name used for top-level resources. */
77 char *name;
78
79 /* OBP specific information. */
80 struct device_node *prom_node;
81 u64 ino_bitmap;
82
83 /* PBM I/O and Memory space resources. */
84 struct resource io_space;
85 struct resource mem_space;
86
87 /* Base of PCI Config space, can be per-PBM or shared. */
88 unsigned long config_space;
89
90 /* State of 66MHz capabilities on this PBM. */
91 int is_66mhz_capable;
92 int all_devs_66mhz;
93
94#ifdef CONFIG_PCI_MSI
95 /* MSI info. */
96 u32 msiq_num;
97 u32 msiq_ent_count;
98 u32 msiq_first;
99 u32 msiq_first_devino;
100 u32 msi_num;
101 u32 msi_first;
102 u32 msi_data_mask;
103 u32 msix_data_width;
104 u64 msi32_start;
105 u64 msi64_start;
106 u32 msi32_len;
107 u32 msi64_len;
108 void *msi_queues;
109 unsigned long *msi_bitmap;
110#endif /* !(CONFIG_PCI_MSI) */
111
112 /* This PBM's streaming buffer. */
113 struct strbuf stc;
114
115 /* IOMMU state, potentially shared by both PBM segments. */
116 struct iommu *iommu;
117
118 /* Now things for the actual PCI bus probes. */
119 unsigned int pci_first_busno;
120 unsigned int pci_last_busno;
121 struct pci_bus *pci_bus;
122};
123
124struct pci_controller_info {
125 /* List of all PCI controllers. */
126 struct pci_controller_info *next;
127
128 /* Each controller gets a unique index, used mostly for
129 * error logging purposes.
130 */
131 int index;
132
133 /* The PCI bus modules controlled by us. */
134 struct pci_pbm_info pbm_A;
135 struct pci_pbm_info pbm_B;
136
137 /* Operations which are controller specific. */
138 void (*scan_bus)(struct pci_controller_info *);
139
140#ifdef CONFIG_PCI_MSI
141 int (*setup_msi_irq)(unsigned int *virt_irq_p, struct pci_dev *pdev,
142 struct msi_desc *entry);
143 void (*teardown_msi_irq)(unsigned int virt_irq, struct pci_dev *pdev);
144#endif
145
146 /* Now things for the actual PCI bus probes. */
147 struct pci_ops *pci_ops;
148 unsigned int pci_first_busno;
149 unsigned int pci_last_busno;
150};
151
152#endif /* !(__SPARC64_PBM_H) */
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index e2dcb87e0c62..fcd627594f4c 100644
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -328,8 +328,9 @@
328#define __NR_move_pages 307 328#define __NR_move_pages 307
329#define __NR_getcpu 308 329#define __NR_getcpu 308
330#define __NR_epoll_pwait 309 330#define __NR_epoll_pwait 309
331#define __NR_utimensat 310
331 332
332#define NR_SYSCALLS 310 333#define NR_SYSCALLS 311
333 334
334#ifdef __KERNEL__ 335#ifdef __KERNEL__
335/* sysconf options, for SunOS compatibility */ 336/* sysconf options, for SunOS compatibility */
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-24 22:22:35 -0500