diff options
Diffstat (limited to 'arch/ia64')
39 files changed, 3960 insertions, 1168 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 945c15a0722b..1642375fb14e 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -63,8 +63,6 @@ config IA64_GENERIC | |||
63 | select ACPI | 63 | select ACPI |
64 | select NUMA | 64 | select NUMA |
65 | select ACPI_NUMA | 65 | select ACPI_NUMA |
66 | select VIRTUAL_MEM_MAP | ||
67 | select DISCONTIGMEM | ||
68 | help | 66 | help |
69 | This selects the system type of your hardware. A "generic" kernel | 67 | This selects the system type of your hardware. A "generic" kernel |
70 | will run on any supported IA-64 system. However, if you configure | 68 | will run on any supported IA-64 system. However, if you configure |
@@ -176,40 +174,6 @@ config IA64_L1_CACHE_SHIFT | |||
176 | default "6" if ITANIUM | 174 | default "6" if ITANIUM |
177 | 175 | ||
178 | # align cache-sensitive data to 64 bytes | 176 | # align cache-sensitive data to 64 bytes |
179 | config NUMA | ||
180 | bool "NUMA support" | ||
181 | depends on !IA64_HP_SIM | ||
182 | default y if IA64_SGI_SN2 | ||
183 | select ACPI_NUMA | ||
184 | help | ||
185 | Say Y to compile the kernel to support NUMA (Non-Uniform Memory | ||
186 | Access). This option is for configuring high-end multiprocessor | ||
187 | server systems. If in doubt, say N. | ||
188 | |||
189 | config VIRTUAL_MEM_MAP | ||
190 | bool "Virtual mem map" | ||
191 | default y if !IA64_HP_SIM | ||
192 | help | ||
193 | Say Y to compile the kernel with support for a virtual mem map. | ||
194 | This code also only takes effect if a memory hole of greater than | ||
195 | 1 Gb is found during boot. You must turn this option on if you | ||
196 | require the DISCONTIGMEM option for your machine. If you are | ||
197 | unsure, say Y. | ||
198 | |||
199 | config HOLES_IN_ZONE | ||
200 | bool | ||
201 | default y if VIRTUAL_MEM_MAP | ||
202 | |||
203 | config ARCH_DISCONTIGMEM_ENABLE | ||
204 | bool "Discontiguous memory support" | ||
205 | depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP | ||
206 | default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA | ||
207 | help | ||
208 | Say Y to support efficient handling of discontiguous physical memory, | ||
209 | for architectures which are either NUMA (Non-Uniform Memory Access) | ||
210 | or have huge holes in the physical address space for other reasons. | ||
211 | See <file:Documentation/vm/numa> for more. | ||
212 | |||
213 | config IA64_CYCLONE | 177 | config IA64_CYCLONE |
214 | bool "Cyclone (EXA) Time Source support" | 178 | bool "Cyclone (EXA) Time Source support" |
215 | help | 179 | help |
@@ -232,8 +196,10 @@ config IA64_SGI_SN_XP | |||
232 | based on a network adapter and DMA messaging. | 196 | based on a network adapter and DMA messaging. |
233 | 197 | ||
234 | config FORCE_MAX_ZONEORDER | 198 | config FORCE_MAX_ZONEORDER |
235 | int | 199 | int "MAX_ORDER (11 - 17)" if !HUGETLB_PAGE |
236 | default "18" | 200 | range 11 17 if !HUGETLB_PAGE |
201 | default "17" if HUGETLB_PAGE | ||
202 | default "11" | ||
237 | 203 | ||
238 | config SMP | 204 | config SMP |
239 | bool "Symmetric multi-processing support" | 205 | bool "Symmetric multi-processing support" |
@@ -254,8 +220,8 @@ config SMP | |||
254 | If you don't know what to do here, say N. | 220 | If you don't know what to do here, say N. |
255 | 221 | ||
256 | config NR_CPUS | 222 | config NR_CPUS |
257 | int "Maximum number of CPUs (2-512)" | 223 | int "Maximum number of CPUs (2-1024)" |
258 | range 2 512 | 224 | range 2 1024 |
259 | depends on SMP | 225 | depends on SMP |
260 | default "64" | 226 | default "64" |
261 | help | 227 | help |
@@ -298,6 +264,58 @@ config PREEMPT | |||
298 | 264 | ||
299 | source "mm/Kconfig" | 265 | source "mm/Kconfig" |
300 | 266 | ||
267 | config ARCH_SELECT_MEMORY_MODEL | ||
268 | def_bool y | ||
269 | |||
270 | config ARCH_DISCONTIGMEM_ENABLE | ||
271 | def_bool y | ||
272 | help | ||
273 | Say Y to support efficient handling of discontiguous physical memory, | ||
274 | for architectures which are either NUMA (Non-Uniform Memory Access) | ||
275 | or have huge holes in the physical address space for other reasons. | ||
276 | See <file:Documentation/vm/numa> for more. | ||
277 | |||
278 | config ARCH_FLATMEM_ENABLE | ||
279 | def_bool y | ||
280 | |||
281 | config ARCH_SPARSEMEM_ENABLE | ||
282 | def_bool y | ||
283 | depends on ARCH_DISCONTIGMEM_ENABLE | ||
284 | |||
285 | config ARCH_DISCONTIGMEM_DEFAULT | ||
286 | def_bool y if (IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) | ||
287 | depends on ARCH_DISCONTIGMEM_ENABLE | ||
288 | |||
289 | config NUMA | ||
290 | bool "NUMA support" | ||
291 | depends on !IA64_HP_SIM && !FLATMEM | ||
292 | default y if IA64_SGI_SN2 | ||
293 | help | ||
294 | Say Y to compile the kernel to support NUMA (Non-Uniform Memory | ||
295 | Access). This option is for configuring high-end multiprocessor | ||
296 | server systems. If in doubt, say N. | ||
297 | |||
298 | # VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent. | ||
299 | # VIRTUAL_MEM_MAP has been retained for historical reasons. | ||
300 | config VIRTUAL_MEM_MAP | ||
301 | bool "Virtual mem map" | ||
302 | depends on !SPARSEMEM | ||
303 | default y if !IA64_HP_SIM | ||
304 | help | ||
305 | Say Y to compile the kernel with support for a virtual mem map. | ||
306 | This code also only takes effect if a memory hole of greater than | ||
307 | 1 Gb is found during boot. You must turn this option on if you | ||
308 | require the DISCONTIGMEM option for your machine. If you are | ||
309 | unsure, say Y. | ||
310 | |||
311 | config HOLES_IN_ZONE | ||
312 | bool | ||
313 | default y if VIRTUAL_MEM_MAP | ||
314 | |||
315 | config HAVE_ARCH_EARLY_PFN_TO_NID | ||
316 | def_bool y | ||
317 | depends on NEED_MULTIPLE_NODES | ||
318 | |||
301 | config IA32_SUPPORT | 319 | config IA32_SUPPORT |
302 | bool "Support for Linux/x86 binaries" | 320 | bool "Support for Linux/x86 binaries" |
303 | help | 321 | help |
diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsur_defconfig index 3b65cbb31b1d..b40672bb3ab0 100644 --- a/arch/ia64/configs/bigsur_defconfig +++ b/arch/ia64/configs/bigsur_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.10-rc2 | 3 | # Linux kernel version: 2.6.14-rc1 |
4 | # Mon Nov 29 13:27:48 2004 | 4 | # Wed Sep 14 15:18:49 2005 |
5 | # | 5 | # |
6 | 6 | ||
7 | # | 7 | # |
@@ -10,34 +10,40 @@ | |||
10 | CONFIG_EXPERIMENTAL=y | 10 | CONFIG_EXPERIMENTAL=y |
11 | CONFIG_CLEAN_COMPILE=y | 11 | CONFIG_CLEAN_COMPILE=y |
12 | CONFIG_LOCK_KERNEL=y | 12 | CONFIG_LOCK_KERNEL=y |
13 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
13 | 14 | ||
14 | # | 15 | # |
15 | # General setup | 16 | # General setup |
16 | # | 17 | # |
17 | CONFIG_LOCALVERSION="" | 18 | CONFIG_LOCALVERSION="" |
19 | CONFIG_LOCALVERSION_AUTO=y | ||
18 | CONFIG_SWAP=y | 20 | CONFIG_SWAP=y |
19 | CONFIG_SYSVIPC=y | 21 | CONFIG_SYSVIPC=y |
20 | CONFIG_POSIX_MQUEUE=y | 22 | CONFIG_POSIX_MQUEUE=y |
21 | # CONFIG_BSD_PROCESS_ACCT is not set | 23 | # CONFIG_BSD_PROCESS_ACCT is not set |
22 | CONFIG_SYSCTL=y | 24 | CONFIG_SYSCTL=y |
23 | # CONFIG_AUDIT is not set | 25 | # CONFIG_AUDIT is not set |
24 | CONFIG_LOG_BUF_SHIFT=16 | ||
25 | CONFIG_HOTPLUG=y | 26 | CONFIG_HOTPLUG=y |
26 | CONFIG_KOBJECT_UEVENT=y | 27 | CONFIG_KOBJECT_UEVENT=y |
27 | # CONFIG_IKCONFIG is not set | 28 | # CONFIG_IKCONFIG is not set |
29 | # CONFIG_CPUSETS is not set | ||
30 | CONFIG_INITRAMFS_SOURCE="" | ||
28 | # CONFIG_EMBEDDED is not set | 31 | # CONFIG_EMBEDDED is not set |
29 | CONFIG_KALLSYMS=y | 32 | CONFIG_KALLSYMS=y |
30 | # CONFIG_KALLSYMS_ALL is not set | 33 | # CONFIG_KALLSYMS_ALL is not set |
31 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 34 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
35 | CONFIG_PRINTK=y | ||
36 | CONFIG_BUG=y | ||
37 | CONFIG_BASE_FULL=y | ||
32 | CONFIG_FUTEX=y | 38 | CONFIG_FUTEX=y |
33 | CONFIG_EPOLL=y | 39 | CONFIG_EPOLL=y |
34 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
35 | CONFIG_SHMEM=y | 40 | CONFIG_SHMEM=y |
36 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 41 | CONFIG_CC_ALIGN_FUNCTIONS=0 |
37 | CONFIG_CC_ALIGN_LABELS=0 | 42 | CONFIG_CC_ALIGN_LABELS=0 |
38 | CONFIG_CC_ALIGN_LOOPS=0 | 43 | CONFIG_CC_ALIGN_LOOPS=0 |
39 | CONFIG_CC_ALIGN_JUMPS=0 | 44 | CONFIG_CC_ALIGN_JUMPS=0 |
40 | # CONFIG_TINY_SHMEM is not set | 45 | # CONFIG_TINY_SHMEM is not set |
46 | CONFIG_BASE_SMALL=0 | ||
41 | 47 | ||
42 | # | 48 | # |
43 | # Loadable module support | 49 | # Loadable module support |
@@ -58,12 +64,15 @@ CONFIG_IA64=y | |||
58 | CONFIG_64BIT=y | 64 | CONFIG_64BIT=y |
59 | CONFIG_MMU=y | 65 | CONFIG_MMU=y |
60 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 66 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
67 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
61 | CONFIG_TIME_INTERPOLATION=y | 68 | CONFIG_TIME_INTERPOLATION=y |
62 | CONFIG_EFI=y | 69 | CONFIG_EFI=y |
63 | CONFIG_GENERIC_IOMAP=y | 70 | CONFIG_GENERIC_IOMAP=y |
71 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
64 | # CONFIG_IA64_GENERIC is not set | 72 | # CONFIG_IA64_GENERIC is not set |
65 | CONFIG_IA64_DIG=y | 73 | CONFIG_IA64_DIG=y |
66 | # CONFIG_IA64_HP_ZX1 is not set | 74 | # CONFIG_IA64_HP_ZX1 is not set |
75 | # CONFIG_IA64_HP_ZX1_SWIOTLB is not set | ||
67 | # CONFIG_IA64_SGI_SN2 is not set | 76 | # CONFIG_IA64_SGI_SN2 is not set |
68 | # CONFIG_IA64_HP_SIM is not set | 77 | # CONFIG_IA64_HP_SIM is not set |
69 | CONFIG_ITANIUM=y | 78 | CONFIG_ITANIUM=y |
@@ -72,17 +81,30 @@ CONFIG_ITANIUM=y | |||
72 | # CONFIG_IA64_PAGE_SIZE_8KB is not set | 81 | # CONFIG_IA64_PAGE_SIZE_8KB is not set |
73 | CONFIG_IA64_PAGE_SIZE_16KB=y | 82 | CONFIG_IA64_PAGE_SIZE_16KB=y |
74 | # CONFIG_IA64_PAGE_SIZE_64KB is not set | 83 | # CONFIG_IA64_PAGE_SIZE_64KB is not set |
84 | # CONFIG_HZ_100 is not set | ||
85 | CONFIG_HZ_250=y | ||
86 | # CONFIG_HZ_1000 is not set | ||
87 | CONFIG_HZ=250 | ||
75 | CONFIG_IA64_BRL_EMU=y | 88 | CONFIG_IA64_BRL_EMU=y |
76 | CONFIG_IA64_L1_CACHE_SHIFT=6 | 89 | CONFIG_IA64_L1_CACHE_SHIFT=6 |
77 | # CONFIG_NUMA is not set | 90 | # CONFIG_NUMA is not set |
78 | # CONFIG_VIRTUAL_MEM_MAP is not set | 91 | # CONFIG_VIRTUAL_MEM_MAP is not set |
79 | # CONFIG_IA64_CYCLONE is not set | 92 | # CONFIG_IA64_CYCLONE is not set |
80 | CONFIG_IOSAPIC=y | 93 | CONFIG_IOSAPIC=y |
94 | # CONFIG_IA64_SGI_SN_XP is not set | ||
81 | CONFIG_FORCE_MAX_ZONEORDER=18 | 95 | CONFIG_FORCE_MAX_ZONEORDER=18 |
82 | CONFIG_SMP=y | 96 | CONFIG_SMP=y |
83 | CONFIG_NR_CPUS=2 | 97 | CONFIG_NR_CPUS=2 |
84 | # CONFIG_HOTPLUG_CPU is not set | 98 | # CONFIG_HOTPLUG_CPU is not set |
99 | # CONFIG_SCHED_SMT is not set | ||
85 | CONFIG_PREEMPT=y | 100 | CONFIG_PREEMPT=y |
101 | CONFIG_SELECT_MEMORY_MODEL=y | ||
102 | CONFIG_FLATMEM_MANUAL=y | ||
103 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
104 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
105 | CONFIG_FLATMEM=y | ||
106 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
107 | # CONFIG_SPARSEMEM_STATIC is not set | ||
86 | CONFIG_HAVE_DEC_LOCK=y | 108 | CONFIG_HAVE_DEC_LOCK=y |
87 | CONFIG_IA32_SUPPORT=y | 109 | CONFIG_IA32_SUPPORT=y |
88 | CONFIG_COMPAT=y | 110 | CONFIG_COMPAT=y |
@@ -95,6 +117,7 @@ CONFIG_IA64_PALINFO=y | |||
95 | # | 117 | # |
96 | CONFIG_EFI_VARS=y | 118 | CONFIG_EFI_VARS=y |
97 | CONFIG_EFI_PCDP=y | 119 | CONFIG_EFI_PCDP=y |
120 | # CONFIG_DELL_RBU is not set | ||
98 | CONFIG_BINFMT_ELF=y | 121 | CONFIG_BINFMT_ELF=y |
99 | CONFIG_BINFMT_MISC=m | 122 | CONFIG_BINFMT_MISC=m |
100 | 123 | ||
@@ -102,18 +125,26 @@ CONFIG_BINFMT_MISC=m | |||
102 | # Power management and ACPI | 125 | # Power management and ACPI |
103 | # | 126 | # |
104 | CONFIG_PM=y | 127 | CONFIG_PM=y |
105 | CONFIG_ACPI=y | 128 | # CONFIG_PM_DEBUG is not set |
106 | 129 | ||
107 | # | 130 | # |
108 | # ACPI (Advanced Configuration and Power Interface) Support | 131 | # ACPI (Advanced Configuration and Power Interface) Support |
109 | # | 132 | # |
133 | CONFIG_ACPI=y | ||
110 | CONFIG_ACPI_BUTTON=m | 134 | CONFIG_ACPI_BUTTON=m |
111 | CONFIG_ACPI_FAN=m | 135 | CONFIG_ACPI_FAN=m |
112 | CONFIG_ACPI_PROCESSOR=m | 136 | CONFIG_ACPI_PROCESSOR=m |
113 | CONFIG_ACPI_THERMAL=m | 137 | CONFIG_ACPI_THERMAL=m |
138 | CONFIG_ACPI_BLACKLIST_YEAR=0 | ||
114 | # CONFIG_ACPI_DEBUG is not set | 139 | # CONFIG_ACPI_DEBUG is not set |
115 | CONFIG_ACPI_POWER=y | 140 | CONFIG_ACPI_POWER=y |
116 | CONFIG_ACPI_SYSTEM=y | 141 | CONFIG_ACPI_SYSTEM=y |
142 | # CONFIG_ACPI_CONTAINER is not set | ||
143 | |||
144 | # | ||
145 | # CPU Frequency scaling | ||
146 | # | ||
147 | # CONFIG_CPU_FREQ is not set | ||
117 | 148 | ||
118 | # | 149 | # |
119 | # Bus options (PCI, PCMCIA) | 150 | # Bus options (PCI, PCMCIA) |
@@ -122,7 +153,7 @@ CONFIG_PCI=y | |||
122 | CONFIG_PCI_DOMAINS=y | 153 | CONFIG_PCI_DOMAINS=y |
123 | # CONFIG_PCI_MSI is not set | 154 | # CONFIG_PCI_MSI is not set |
124 | CONFIG_PCI_LEGACY_PROC=y | 155 | CONFIG_PCI_LEGACY_PROC=y |
125 | CONFIG_PCI_NAMES=y | 156 | # CONFIG_PCI_DEBUG is not set |
126 | 157 | ||
127 | # | 158 | # |
128 | # PCI Hotplug Support | 159 | # PCI Hotplug Support |
@@ -135,8 +166,70 @@ CONFIG_PCI_NAMES=y | |||
135 | # CONFIG_PCCARD is not set | 166 | # CONFIG_PCCARD is not set |
136 | 167 | ||
137 | # | 168 | # |
138 | # PC-card bridges | 169 | # Networking |
170 | # | ||
171 | CONFIG_NET=y | ||
172 | |||
173 | # | ||
174 | # Networking options | ||
175 | # | ||
176 | CONFIG_PACKET=y | ||
177 | CONFIG_PACKET_MMAP=y | ||
178 | CONFIG_UNIX=y | ||
179 | # CONFIG_NET_KEY is not set | ||
180 | CONFIG_INET=y | ||
181 | # CONFIG_IP_MULTICAST is not set | ||
182 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
183 | CONFIG_IP_FIB_HASH=y | ||
184 | # CONFIG_IP_PNP is not set | ||
185 | # CONFIG_NET_IPIP is not set | ||
186 | # CONFIG_NET_IPGRE is not set | ||
187 | # CONFIG_ARPD is not set | ||
188 | # CONFIG_SYN_COOKIES is not set | ||
189 | # CONFIG_INET_AH is not set | ||
190 | # CONFIG_INET_ESP is not set | ||
191 | # CONFIG_INET_IPCOMP is not set | ||
192 | # CONFIG_INET_TUNNEL is not set | ||
193 | CONFIG_INET_DIAG=y | ||
194 | CONFIG_INET_TCP_DIAG=y | ||
195 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
196 | CONFIG_TCP_CONG_BIC=y | ||
197 | # CONFIG_IPV6 is not set | ||
198 | # CONFIG_NETFILTER is not set | ||
199 | |||
200 | # | ||
201 | # DCCP Configuration (EXPERIMENTAL) | ||
202 | # | ||
203 | # CONFIG_IP_DCCP is not set | ||
204 | |||
205 | # | ||
206 | # SCTP Configuration (EXPERIMENTAL) | ||
207 | # | ||
208 | # CONFIG_IP_SCTP is not set | ||
209 | # CONFIG_ATM is not set | ||
210 | # CONFIG_BRIDGE is not set | ||
211 | # CONFIG_VLAN_8021Q is not set | ||
212 | # CONFIG_DECNET is not set | ||
213 | # CONFIG_LLC2 is not set | ||
214 | # CONFIG_IPX is not set | ||
215 | # CONFIG_ATALK is not set | ||
216 | # CONFIG_X25 is not set | ||
217 | # CONFIG_LAPB is not set | ||
218 | # CONFIG_NET_DIVERT is not set | ||
219 | # CONFIG_ECONET is not set | ||
220 | # CONFIG_WAN_ROUTER is not set | ||
221 | # CONFIG_NET_SCHED is not set | ||
222 | # CONFIG_NET_CLS_ROUTE is not set | ||
223 | |||
224 | # | ||
225 | # Network testing | ||
139 | # | 226 | # |
227 | # CONFIG_NET_PKTGEN is not set | ||
228 | # CONFIG_NETFILTER_NETLINK is not set | ||
229 | # CONFIG_HAMRADIO is not set | ||
230 | # CONFIG_IRDA is not set | ||
231 | # CONFIG_BT is not set | ||
232 | # CONFIG_IEEE80211 is not set | ||
140 | 233 | ||
141 | # | 234 | # |
142 | # Device Drivers | 235 | # Device Drivers |
@@ -151,6 +244,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
151 | # CONFIG_DEBUG_DRIVER is not set | 244 | # CONFIG_DEBUG_DRIVER is not set |
152 | 245 | ||
153 | # | 246 | # |
247 | # Connector - unified userspace <-> kernelspace linker | ||
248 | # | ||
249 | # CONFIG_CONNECTOR is not set | ||
250 | |||
251 | # | ||
154 | # Memory Technology Devices (MTD) | 252 | # Memory Technology Devices (MTD) |
155 | # | 253 | # |
156 | # CONFIG_MTD is not set | 254 | # CONFIG_MTD is not set |
@@ -163,7 +261,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
163 | # | 261 | # |
164 | # Plug and Play support | 262 | # Plug and Play support |
165 | # | 263 | # |
166 | # CONFIG_PNP is not set | 264 | CONFIG_PNP=y |
265 | # CONFIG_PNP_DEBUG is not set | ||
266 | |||
267 | # | ||
268 | # Protocols | ||
269 | # | ||
270 | CONFIG_PNPACPI=y | ||
167 | 271 | ||
168 | # | 272 | # |
169 | # Block devices | 273 | # Block devices |
@@ -172,14 +276,15 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
172 | # CONFIG_BLK_CPQ_CISS_DA is not set | 276 | # CONFIG_BLK_CPQ_CISS_DA is not set |
173 | # CONFIG_BLK_DEV_DAC960 is not set | 277 | # CONFIG_BLK_DEV_DAC960 is not set |
174 | # CONFIG_BLK_DEV_UMEM is not set | 278 | # CONFIG_BLK_DEV_UMEM is not set |
279 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
175 | CONFIG_BLK_DEV_LOOP=m | 280 | CONFIG_BLK_DEV_LOOP=m |
176 | CONFIG_BLK_DEV_CRYPTOLOOP=m | 281 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
177 | CONFIG_BLK_DEV_NBD=m | 282 | CONFIG_BLK_DEV_NBD=m |
178 | # CONFIG_BLK_DEV_SX8 is not set | 283 | # CONFIG_BLK_DEV_SX8 is not set |
179 | # CONFIG_BLK_DEV_UB is not set | 284 | # CONFIG_BLK_DEV_UB is not set |
180 | CONFIG_BLK_DEV_RAM=m | 285 | CONFIG_BLK_DEV_RAM=m |
286 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
181 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 287 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
182 | CONFIG_INITRAMFS_SOURCE="" | ||
183 | # CONFIG_CDROM_PKTCDVD is not set | 288 | # CONFIG_CDROM_PKTCDVD is not set |
184 | 289 | ||
185 | # | 290 | # |
@@ -189,6 +294,7 @@ CONFIG_IOSCHED_NOOP=y | |||
189 | CONFIG_IOSCHED_AS=y | 294 | CONFIG_IOSCHED_AS=y |
190 | CONFIG_IOSCHED_DEADLINE=y | 295 | CONFIG_IOSCHED_DEADLINE=y |
191 | CONFIG_IOSCHED_CFQ=y | 296 | CONFIG_IOSCHED_CFQ=y |
297 | # CONFIG_ATA_OVER_ETH is not set | ||
192 | 298 | ||
193 | # | 299 | # |
194 | # ATA/ATAPI/MFM/RLL support | 300 | # ATA/ATAPI/MFM/RLL support |
@@ -211,7 +317,8 @@ CONFIG_BLK_DEV_IDEFLOPPY=m | |||
211 | # | 317 | # |
212 | # IDE chipset support/bugfixes | 318 | # IDE chipset support/bugfixes |
213 | # | 319 | # |
214 | CONFIG_IDE_GENERIC=m | 320 | # CONFIG_IDE_GENERIC is not set |
321 | # CONFIG_BLK_DEV_IDEPNP is not set | ||
215 | CONFIG_BLK_DEV_IDEPCI=y | 322 | CONFIG_BLK_DEV_IDEPCI=y |
216 | CONFIG_IDEPCI_SHARE_IRQ=y | 323 | CONFIG_IDEPCI_SHARE_IRQ=y |
217 | # CONFIG_BLK_DEV_OFFBOARD is not set | 324 | # CONFIG_BLK_DEV_OFFBOARD is not set |
@@ -233,6 +340,7 @@ CONFIG_IDEDMA_PCI_AUTO=y | |||
233 | # CONFIG_BLK_DEV_HPT366 is not set | 340 | # CONFIG_BLK_DEV_HPT366 is not set |
234 | # CONFIG_BLK_DEV_SC1200 is not set | 341 | # CONFIG_BLK_DEV_SC1200 is not set |
235 | CONFIG_BLK_DEV_PIIX=m | 342 | CONFIG_BLK_DEV_PIIX=m |
343 | # CONFIG_BLK_DEV_IT821X is not set | ||
236 | # CONFIG_BLK_DEV_NS87415 is not set | 344 | # CONFIG_BLK_DEV_NS87415 is not set |
237 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | 345 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set |
238 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | 346 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set |
@@ -250,6 +358,7 @@ CONFIG_IDEDMA_AUTO=y | |||
250 | # | 358 | # |
251 | # SCSI device support | 359 | # SCSI device support |
252 | # | 360 | # |
361 | # CONFIG_RAID_ATTRS is not set | ||
253 | CONFIG_SCSI=y | 362 | CONFIG_SCSI=y |
254 | CONFIG_SCSI_PROC_FS=y | 363 | CONFIG_SCSI_PROC_FS=y |
255 | 364 | ||
@@ -261,6 +370,7 @@ CONFIG_BLK_DEV_SD=y | |||
261 | # CONFIG_CHR_DEV_OSST is not set | 370 | # CONFIG_CHR_DEV_OSST is not set |
262 | # CONFIG_BLK_DEV_SR is not set | 371 | # CONFIG_BLK_DEV_SR is not set |
263 | # CONFIG_CHR_DEV_SG is not set | 372 | # CONFIG_CHR_DEV_SG is not set |
373 | # CONFIG_CHR_DEV_SCH is not set | ||
264 | 374 | ||
265 | # | 375 | # |
266 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | 376 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
@@ -274,6 +384,8 @@ CONFIG_SCSI_LOGGING=y | |||
274 | # | 384 | # |
275 | CONFIG_SCSI_SPI_ATTRS=m | 385 | CONFIG_SCSI_SPI_ATTRS=m |
276 | # CONFIG_SCSI_FC_ATTRS is not set | 386 | # CONFIG_SCSI_FC_ATTRS is not set |
387 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
388 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
277 | 389 | ||
278 | # | 390 | # |
279 | # SCSI low-level drivers | 391 | # SCSI low-level drivers |
@@ -288,18 +400,13 @@ CONFIG_SCSI_SPI_ATTRS=m | |||
288 | # CONFIG_MEGARAID_NEWGEN is not set | 400 | # CONFIG_MEGARAID_NEWGEN is not set |
289 | # CONFIG_MEGARAID_LEGACY is not set | 401 | # CONFIG_MEGARAID_LEGACY is not set |
290 | # CONFIG_SCSI_SATA is not set | 402 | # CONFIG_SCSI_SATA is not set |
291 | # CONFIG_SCSI_BUSLOGIC is not set | ||
292 | # CONFIG_SCSI_DMX3191D is not set | 403 | # CONFIG_SCSI_DMX3191D is not set |
293 | # CONFIG_SCSI_EATA is not set | ||
294 | # CONFIG_SCSI_EATA_PIO is not set | ||
295 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 404 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
296 | # CONFIG_SCSI_GDTH is not set | ||
297 | # CONFIG_SCSI_IPS is not set | 405 | # CONFIG_SCSI_IPS is not set |
298 | # CONFIG_SCSI_INITIO is not set | 406 | # CONFIG_SCSI_INITIO is not set |
299 | # CONFIG_SCSI_INIA100 is not set | 407 | # CONFIG_SCSI_INIA100 is not set |
300 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 408 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
301 | # CONFIG_SCSI_IPR is not set | 409 | # CONFIG_SCSI_IPR is not set |
302 | # CONFIG_SCSI_QLOGIC_ISP is not set | ||
303 | # CONFIG_SCSI_QLOGIC_FC is not set | 410 | # CONFIG_SCSI_QLOGIC_FC is not set |
304 | CONFIG_SCSI_QLOGIC_1280=y | 411 | CONFIG_SCSI_QLOGIC_1280=y |
305 | # CONFIG_SCSI_QLOGIC_1280_1040 is not set | 412 | # CONFIG_SCSI_QLOGIC_1280_1040 is not set |
@@ -309,7 +416,8 @@ CONFIG_SCSI_QLA2XXX=y | |||
309 | # CONFIG_SCSI_QLA2300 is not set | 416 | # CONFIG_SCSI_QLA2300 is not set |
310 | # CONFIG_SCSI_QLA2322 is not set | 417 | # CONFIG_SCSI_QLA2322 is not set |
311 | # CONFIG_SCSI_QLA6312 is not set | 418 | # CONFIG_SCSI_QLA6312 is not set |
312 | # CONFIG_SCSI_QLA6322 is not set | 419 | # CONFIG_SCSI_QLA24XX is not set |
420 | # CONFIG_SCSI_LPFC is not set | ||
313 | # CONFIG_SCSI_DC395x is not set | 421 | # CONFIG_SCSI_DC395x is not set |
314 | # CONFIG_SCSI_DC390T is not set | 422 | # CONFIG_SCSI_DC390T is not set |
315 | # CONFIG_SCSI_DEBUG is not set | 423 | # CONFIG_SCSI_DEBUG is not set |
@@ -332,11 +440,14 @@ CONFIG_DM_CRYPT=m | |||
332 | CONFIG_DM_SNAPSHOT=m | 440 | CONFIG_DM_SNAPSHOT=m |
333 | CONFIG_DM_MIRROR=m | 441 | CONFIG_DM_MIRROR=m |
334 | CONFIG_DM_ZERO=m | 442 | CONFIG_DM_ZERO=m |
443 | # CONFIG_DM_MULTIPATH is not set | ||
335 | 444 | ||
336 | # | 445 | # |
337 | # Fusion MPT device support | 446 | # Fusion MPT device support |
338 | # | 447 | # |
339 | # CONFIG_FUSION is not set | 448 | # CONFIG_FUSION is not set |
449 | # CONFIG_FUSION_SPI is not set | ||
450 | # CONFIG_FUSION_FC is not set | ||
340 | 451 | ||
341 | # | 452 | # |
342 | # IEEE 1394 (FireWire) support | 453 | # IEEE 1394 (FireWire) support |
@@ -349,72 +460,14 @@ CONFIG_DM_ZERO=m | |||
349 | # CONFIG_I2O is not set | 460 | # CONFIG_I2O is not set |
350 | 461 | ||
351 | # | 462 | # |
352 | # Networking support | 463 | # Network device support |
353 | # | 464 | # |
354 | CONFIG_NET=y | ||
355 | |||
356 | # | ||
357 | # Networking options | ||
358 | # | ||
359 | CONFIG_PACKET=y | ||
360 | CONFIG_PACKET_MMAP=y | ||
361 | # CONFIG_NETLINK_DEV is not set | ||
362 | CONFIG_UNIX=y | ||
363 | # CONFIG_NET_KEY is not set | ||
364 | CONFIG_INET=y | ||
365 | # CONFIG_IP_MULTICAST is not set | ||
366 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
367 | # CONFIG_IP_PNP is not set | ||
368 | # CONFIG_NET_IPIP is not set | ||
369 | # CONFIG_NET_IPGRE is not set | ||
370 | # CONFIG_ARPD is not set | ||
371 | # CONFIG_SYN_COOKIES is not set | ||
372 | # CONFIG_INET_AH is not set | ||
373 | # CONFIG_INET_ESP is not set | ||
374 | # CONFIG_INET_IPCOMP is not set | ||
375 | # CONFIG_INET_TUNNEL is not set | ||
376 | CONFIG_IP_TCPDIAG=y | ||
377 | # CONFIG_IP_TCPDIAG_IPV6 is not set | ||
378 | # CONFIG_IPV6 is not set | ||
379 | # CONFIG_NETFILTER is not set | ||
380 | |||
381 | # | ||
382 | # SCTP Configuration (EXPERIMENTAL) | ||
383 | # | ||
384 | # CONFIG_IP_SCTP is not set | ||
385 | # CONFIG_ATM is not set | ||
386 | # CONFIG_BRIDGE is not set | ||
387 | # CONFIG_VLAN_8021Q is not set | ||
388 | # CONFIG_DECNET is not set | ||
389 | # CONFIG_LLC2 is not set | ||
390 | # CONFIG_IPX is not set | ||
391 | # CONFIG_ATALK is not set | ||
392 | # CONFIG_X25 is not set | ||
393 | # CONFIG_LAPB is not set | ||
394 | # CONFIG_NET_DIVERT is not set | ||
395 | # CONFIG_ECONET is not set | ||
396 | # CONFIG_WAN_ROUTER is not set | ||
397 | |||
398 | # | ||
399 | # QoS and/or fair queueing | ||
400 | # | ||
401 | # CONFIG_NET_SCHED is not set | ||
402 | # CONFIG_NET_CLS_ROUTE is not set | ||
403 | |||
404 | # | ||
405 | # Network testing | ||
406 | # | ||
407 | # CONFIG_NET_PKTGEN is not set | ||
408 | # CONFIG_NETPOLL is not set | ||
409 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
410 | # CONFIG_HAMRADIO is not set | ||
411 | # CONFIG_IRDA is not set | ||
412 | # CONFIG_BT is not set | ||
413 | CONFIG_NETDEVICES=y | 465 | CONFIG_NETDEVICES=y |
414 | CONFIG_DUMMY=y | 466 | CONFIG_DUMMY=y |
415 | # CONFIG_BONDING is not set | 467 | # CONFIG_BONDING is not set |
416 | # CONFIG_EQUALIZER is not set | 468 | # CONFIG_EQUALIZER is not set |
417 | # CONFIG_TUN is not set | 469 | # CONFIG_TUN is not set |
470 | # CONFIG_NET_SB1000 is not set | ||
418 | 471 | ||
419 | # | 472 | # |
420 | # ARCnet devices | 473 | # ARCnet devices |
@@ -422,6 +475,11 @@ CONFIG_DUMMY=y | |||
422 | # CONFIG_ARCNET is not set | 475 | # CONFIG_ARCNET is not set |
423 | 476 | ||
424 | # | 477 | # |
478 | # PHY device support | ||
479 | # | ||
480 | # CONFIG_PHYLIB is not set | ||
481 | |||
482 | # | ||
425 | # Ethernet (10 or 100Mbit) | 483 | # Ethernet (10 or 100Mbit) |
426 | # | 484 | # |
427 | CONFIG_NET_ETHERNET=y | 485 | CONFIG_NET_ETHERNET=y |
@@ -443,7 +501,6 @@ CONFIG_NET_PCI=y | |||
443 | # CONFIG_FORCEDETH is not set | 501 | # CONFIG_FORCEDETH is not set |
444 | # CONFIG_DGRS is not set | 502 | # CONFIG_DGRS is not set |
445 | CONFIG_EEPRO100=y | 503 | CONFIG_EEPRO100=y |
446 | # CONFIG_EEPRO100_PIO is not set | ||
447 | # CONFIG_E100 is not set | 504 | # CONFIG_E100 is not set |
448 | # CONFIG_FEALNX is not set | 505 | # CONFIG_FEALNX is not set |
449 | # CONFIG_NATSEMI is not set | 506 | # CONFIG_NATSEMI is not set |
@@ -465,13 +522,17 @@ CONFIG_EEPRO100=y | |||
465 | # CONFIG_HAMACHI is not set | 522 | # CONFIG_HAMACHI is not set |
466 | # CONFIG_YELLOWFIN is not set | 523 | # CONFIG_YELLOWFIN is not set |
467 | # CONFIG_R8169 is not set | 524 | # CONFIG_R8169 is not set |
525 | # CONFIG_SIS190 is not set | ||
526 | # CONFIG_SKGE is not set | ||
468 | # CONFIG_SK98LIN is not set | 527 | # CONFIG_SK98LIN is not set |
469 | # CONFIG_VIA_VELOCITY is not set | 528 | # CONFIG_VIA_VELOCITY is not set |
470 | # CONFIG_TIGON3 is not set | 529 | # CONFIG_TIGON3 is not set |
530 | # CONFIG_BNX2 is not set | ||
471 | 531 | ||
472 | # | 532 | # |
473 | # Ethernet (10000 Mbit) | 533 | # Ethernet (10000 Mbit) |
474 | # | 534 | # |
535 | # CONFIG_CHELSIO_T1 is not set | ||
475 | # CONFIG_IXGB is not set | 536 | # CONFIG_IXGB is not set |
476 | # CONFIG_S2IO is not set | 537 | # CONFIG_S2IO is not set |
477 | 538 | ||
@@ -496,6 +557,8 @@ CONFIG_EEPRO100=y | |||
496 | # CONFIG_NET_FC is not set | 557 | # CONFIG_NET_FC is not set |
497 | # CONFIG_SHAPER is not set | 558 | # CONFIG_SHAPER is not set |
498 | # CONFIG_NETCONSOLE is not set | 559 | # CONFIG_NETCONSOLE is not set |
560 | # CONFIG_NETPOLL is not set | ||
561 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
499 | 562 | ||
500 | # | 563 | # |
501 | # ISDN subsystem | 564 | # ISDN subsystem |
@@ -525,18 +588,6 @@ CONFIG_INPUT_EVDEV=y | |||
525 | # CONFIG_INPUT_EVBUG is not set | 588 | # CONFIG_INPUT_EVBUG is not set |
526 | 589 | ||
527 | # | 590 | # |
528 | # Input I/O drivers | ||
529 | # | ||
530 | # CONFIG_GAMEPORT is not set | ||
531 | CONFIG_SOUND_GAMEPORT=y | ||
532 | CONFIG_SERIO=y | ||
533 | CONFIG_SERIO_I8042=y | ||
534 | CONFIG_SERIO_SERPORT=y | ||
535 | # CONFIG_SERIO_CT82C710 is not set | ||
536 | # CONFIG_SERIO_PCIPS2 is not set | ||
537 | # CONFIG_SERIO_RAW is not set | ||
538 | |||
539 | # | ||
540 | # Input Device Drivers | 591 | # Input Device Drivers |
541 | # | 592 | # |
542 | CONFIG_INPUT_KEYBOARD=y | 593 | CONFIG_INPUT_KEYBOARD=y |
@@ -554,6 +605,17 @@ CONFIG_MOUSE_PS2=y | |||
554 | # CONFIG_INPUT_MISC is not set | 605 | # CONFIG_INPUT_MISC is not set |
555 | 606 | ||
556 | # | 607 | # |
608 | # Hardware I/O ports | ||
609 | # | ||
610 | CONFIG_SERIO=y | ||
611 | CONFIG_SERIO_I8042=y | ||
612 | CONFIG_SERIO_SERPORT=y | ||
613 | # CONFIG_SERIO_PCIPS2 is not set | ||
614 | CONFIG_SERIO_LIBPS2=y | ||
615 | # CONFIG_SERIO_RAW is not set | ||
616 | # CONFIG_GAMEPORT is not set | ||
617 | |||
618 | # | ||
557 | # Character devices | 619 | # Character devices |
558 | # | 620 | # |
559 | CONFIG_VT=y | 621 | CONFIG_VT=y |
@@ -571,7 +633,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4 | |||
571 | CONFIG_SERIAL_8250_EXTENDED=y | 633 | CONFIG_SERIAL_8250_EXTENDED=y |
572 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 634 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
573 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | 635 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set |
574 | # CONFIG_SERIAL_8250_MULTIPORT is not set | ||
575 | # CONFIG_SERIAL_8250_RSA is not set | 636 | # CONFIG_SERIAL_8250_RSA is not set |
576 | 637 | ||
577 | # | 638 | # |
@@ -579,6 +640,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
579 | # | 640 | # |
580 | CONFIG_SERIAL_CORE=y | 641 | CONFIG_SERIAL_CORE=y |
581 | CONFIG_SERIAL_CORE_CONSOLE=y | 642 | CONFIG_SERIAL_CORE_CONSOLE=y |
643 | # CONFIG_SERIAL_JSM is not set | ||
582 | CONFIG_UNIX98_PTYS=y | 644 | CONFIG_UNIX98_PTYS=y |
583 | CONFIG_LEGACY_PTYS=y | 645 | CONFIG_LEGACY_PTYS=y |
584 | CONFIG_LEGACY_PTY_COUNT=256 | 646 | CONFIG_LEGACY_PTY_COUNT=256 |
@@ -603,14 +665,22 @@ CONFIG_EFI_RTC=y | |||
603 | # | 665 | # |
604 | CONFIG_AGP=m | 666 | CONFIG_AGP=m |
605 | CONFIG_AGP_I460=m | 667 | CONFIG_AGP_I460=m |
606 | CONFIG_DRM=y | 668 | CONFIG_DRM=m |
607 | # CONFIG_DRM_TDFX is not set | 669 | # CONFIG_DRM_TDFX is not set |
608 | CONFIG_DRM_R128=m | 670 | CONFIG_DRM_R128=m |
609 | # CONFIG_DRM_RADEON is not set | 671 | # CONFIG_DRM_RADEON is not set |
610 | # CONFIG_DRM_MGA is not set | 672 | # CONFIG_DRM_MGA is not set |
611 | # CONFIG_DRM_SIS is not set | 673 | # CONFIG_DRM_SIS is not set |
674 | # CONFIG_DRM_VIA is not set | ||
675 | # CONFIG_DRM_SAVAGE is not set | ||
612 | # CONFIG_RAW_DRIVER is not set | 676 | # CONFIG_RAW_DRIVER is not set |
613 | # CONFIG_HPET is not set | 677 | # CONFIG_HPET is not set |
678 | # CONFIG_HANGCHECK_TIMER is not set | ||
679 | |||
680 | # | ||
681 | # TPM devices | ||
682 | # | ||
683 | # CONFIG_TCG_TPM is not set | ||
614 | 684 | ||
615 | # | 685 | # |
616 | # I2C support | 686 | # I2C support |
@@ -635,7 +705,7 @@ CONFIG_I2C_ALGOBIT=y | |||
635 | # CONFIG_I2C_AMD8111 is not set | 705 | # CONFIG_I2C_AMD8111 is not set |
636 | # CONFIG_I2C_I801 is not set | 706 | # CONFIG_I2C_I801 is not set |
637 | # CONFIG_I2C_I810 is not set | 707 | # CONFIG_I2C_I810 is not set |
638 | # CONFIG_I2C_ISA is not set | 708 | # CONFIG_I2C_PIIX4 is not set |
639 | # CONFIG_I2C_NFORCE2 is not set | 709 | # CONFIG_I2C_NFORCE2 is not set |
640 | # CONFIG_I2C_PARPORT_LIGHT is not set | 710 | # CONFIG_I2C_PARPORT_LIGHT is not set |
641 | # CONFIG_I2C_PROSAVAGE is not set | 711 | # CONFIG_I2C_PROSAVAGE is not set |
@@ -651,16 +721,43 @@ CONFIG_I2C_ALGOBIT=y | |||
651 | # CONFIG_I2C_PCA_ISA is not set | 721 | # CONFIG_I2C_PCA_ISA is not set |
652 | 722 | ||
653 | # | 723 | # |
654 | # Hardware Sensors Chip support | 724 | # Miscellaneous I2C Chip support |
655 | # | 725 | # |
656 | # CONFIG_I2C_SENSOR is not set | 726 | # CONFIG_SENSORS_DS1337 is not set |
727 | # CONFIG_SENSORS_DS1374 is not set | ||
728 | # CONFIG_SENSORS_EEPROM is not set | ||
729 | # CONFIG_SENSORS_PCF8574 is not set | ||
730 | # CONFIG_SENSORS_PCA9539 is not set | ||
731 | # CONFIG_SENSORS_PCF8591 is not set | ||
732 | # CONFIG_SENSORS_RTC8564 is not set | ||
733 | # CONFIG_SENSORS_MAX6875 is not set | ||
734 | # CONFIG_I2C_DEBUG_CORE is not set | ||
735 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
736 | # CONFIG_I2C_DEBUG_BUS is not set | ||
737 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
738 | |||
739 | # | ||
740 | # Dallas's 1-wire bus | ||
741 | # | ||
742 | # CONFIG_W1 is not set | ||
743 | |||
744 | # | ||
745 | # Hardware Monitoring support | ||
746 | # | ||
747 | CONFIG_HWMON=y | ||
748 | # CONFIG_HWMON_VID is not set | ||
657 | # CONFIG_SENSORS_ADM1021 is not set | 749 | # CONFIG_SENSORS_ADM1021 is not set |
658 | # CONFIG_SENSORS_ADM1025 is not set | 750 | # CONFIG_SENSORS_ADM1025 is not set |
751 | # CONFIG_SENSORS_ADM1026 is not set | ||
659 | # CONFIG_SENSORS_ADM1031 is not set | 752 | # CONFIG_SENSORS_ADM1031 is not set |
753 | # CONFIG_SENSORS_ADM9240 is not set | ||
660 | # CONFIG_SENSORS_ASB100 is not set | 754 | # CONFIG_SENSORS_ASB100 is not set |
755 | # CONFIG_SENSORS_ATXP1 is not set | ||
661 | # CONFIG_SENSORS_DS1621 is not set | 756 | # CONFIG_SENSORS_DS1621 is not set |
662 | # CONFIG_SENSORS_FSCHER is not set | 757 | # CONFIG_SENSORS_FSCHER is not set |
758 | # CONFIG_SENSORS_FSCPOS is not set | ||
663 | # CONFIG_SENSORS_GL518SM is not set | 759 | # CONFIG_SENSORS_GL518SM is not set |
760 | # CONFIG_SENSORS_GL520SM is not set | ||
664 | # CONFIG_SENSORS_IT87 is not set | 761 | # CONFIG_SENSORS_IT87 is not set |
665 | # CONFIG_SENSORS_LM63 is not set | 762 | # CONFIG_SENSORS_LM63 is not set |
666 | # CONFIG_SENSORS_LM75 is not set | 763 | # CONFIG_SENSORS_LM75 is not set |
@@ -671,33 +768,26 @@ CONFIG_I2C_ALGOBIT=y | |||
671 | # CONFIG_SENSORS_LM85 is not set | 768 | # CONFIG_SENSORS_LM85 is not set |
672 | # CONFIG_SENSORS_LM87 is not set | 769 | # CONFIG_SENSORS_LM87 is not set |
673 | # CONFIG_SENSORS_LM90 is not set | 770 | # CONFIG_SENSORS_LM90 is not set |
771 | # CONFIG_SENSORS_LM92 is not set | ||
674 | # CONFIG_SENSORS_MAX1619 is not set | 772 | # CONFIG_SENSORS_MAX1619 is not set |
675 | # CONFIG_SENSORS_PC87360 is not set | 773 | # CONFIG_SENSORS_PC87360 is not set |
774 | # CONFIG_SENSORS_SIS5595 is not set | ||
676 | # CONFIG_SENSORS_SMSC47M1 is not set | 775 | # CONFIG_SENSORS_SMSC47M1 is not set |
776 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
677 | # CONFIG_SENSORS_VIA686A is not set | 777 | # CONFIG_SENSORS_VIA686A is not set |
678 | # CONFIG_SENSORS_W83781D is not set | 778 | # CONFIG_SENSORS_W83781D is not set |
779 | # CONFIG_SENSORS_W83792D is not set | ||
679 | # CONFIG_SENSORS_W83L785TS is not set | 780 | # CONFIG_SENSORS_W83L785TS is not set |
680 | # CONFIG_SENSORS_W83627HF is not set | 781 | # CONFIG_SENSORS_W83627HF is not set |
782 | # CONFIG_SENSORS_W83627EHF is not set | ||
783 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
681 | 784 | ||
682 | # | 785 | # |
683 | # Other I2C Chip support | 786 | # Misc devices |
684 | # | ||
685 | # CONFIG_SENSORS_EEPROM is not set | ||
686 | # CONFIG_SENSORS_PCF8574 is not set | ||
687 | # CONFIG_SENSORS_PCF8591 is not set | ||
688 | # CONFIG_SENSORS_RTC8564 is not set | ||
689 | # CONFIG_I2C_DEBUG_CORE is not set | ||
690 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
691 | # CONFIG_I2C_DEBUG_BUS is not set | ||
692 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
693 | |||
694 | # | ||
695 | # Dallas's 1-wire bus | ||
696 | # | 787 | # |
697 | # CONFIG_W1 is not set | ||
698 | 788 | ||
699 | # | 789 | # |
700 | # Misc devices | 790 | # Multimedia Capabilities Port drivers |
701 | # | 791 | # |
702 | 792 | ||
703 | # | 793 | # |
@@ -752,11 +842,12 @@ CONFIG_SND_OPL3_LIB=m | |||
752 | # CONFIG_SND_MTPAV is not set | 842 | # CONFIG_SND_MTPAV is not set |
753 | # CONFIG_SND_SERIAL_U16550 is not set | 843 | # CONFIG_SND_SERIAL_U16550 is not set |
754 | # CONFIG_SND_MPU401 is not set | 844 | # CONFIG_SND_MPU401 is not set |
845 | CONFIG_SND_AC97_CODEC=m | ||
846 | CONFIG_SND_AC97_BUS=m | ||
755 | 847 | ||
756 | # | 848 | # |
757 | # PCI devices | 849 | # PCI devices |
758 | # | 850 | # |
759 | CONFIG_SND_AC97_CODEC=m | ||
760 | # CONFIG_SND_ALI5451 is not set | 851 | # CONFIG_SND_ALI5451 is not set |
761 | # CONFIG_SND_ATIIXP is not set | 852 | # CONFIG_SND_ATIIXP is not set |
762 | # CONFIG_SND_ATIIXP_MODEM is not set | 853 | # CONFIG_SND_ATIIXP_MODEM is not set |
@@ -768,6 +859,8 @@ CONFIG_SND_AC97_CODEC=m | |||
768 | # CONFIG_SND_CS46XX is not set | 859 | # CONFIG_SND_CS46XX is not set |
769 | CONFIG_SND_CS4281=m | 860 | CONFIG_SND_CS4281=m |
770 | # CONFIG_SND_EMU10K1 is not set | 861 | # CONFIG_SND_EMU10K1 is not set |
862 | # CONFIG_SND_EMU10K1X is not set | ||
863 | # CONFIG_SND_CA0106 is not set | ||
771 | # CONFIG_SND_KORG1212 is not set | 864 | # CONFIG_SND_KORG1212 is not set |
772 | # CONFIG_SND_MIXART is not set | 865 | # CONFIG_SND_MIXART is not set |
773 | # CONFIG_SND_NM256 is not set | 866 | # CONFIG_SND_NM256 is not set |
@@ -775,9 +868,10 @@ CONFIG_SND_CS4281=m | |||
775 | # CONFIG_SND_RME96 is not set | 868 | # CONFIG_SND_RME96 is not set |
776 | # CONFIG_SND_RME9652 is not set | 869 | # CONFIG_SND_RME9652 is not set |
777 | # CONFIG_SND_HDSP is not set | 870 | # CONFIG_SND_HDSP is not set |
871 | # CONFIG_SND_HDSPM is not set | ||
778 | # CONFIG_SND_TRIDENT is not set | 872 | # CONFIG_SND_TRIDENT is not set |
779 | # CONFIG_SND_YMFPCI is not set | 873 | # CONFIG_SND_YMFPCI is not set |
780 | # CONFIG_SND_ALS4000 is not set | 874 | # CONFIG_SND_AD1889 is not set |
781 | # CONFIG_SND_CMIPCI is not set | 875 | # CONFIG_SND_CMIPCI is not set |
782 | # CONFIG_SND_ENS1370 is not set | 876 | # CONFIG_SND_ENS1370 is not set |
783 | # CONFIG_SND_ENS1371 is not set | 877 | # CONFIG_SND_ENS1371 is not set |
@@ -791,13 +885,14 @@ CONFIG_SND_CS4281=m | |||
791 | # CONFIG_SND_INTEL8X0M is not set | 885 | # CONFIG_SND_INTEL8X0M is not set |
792 | # CONFIG_SND_SONICVIBES is not set | 886 | # CONFIG_SND_SONICVIBES is not set |
793 | # CONFIG_SND_VIA82XX is not set | 887 | # CONFIG_SND_VIA82XX is not set |
888 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
794 | # CONFIG_SND_VX222 is not set | 889 | # CONFIG_SND_VX222 is not set |
890 | # CONFIG_SND_HDA_INTEL is not set | ||
795 | 891 | ||
796 | # | 892 | # |
797 | # USB devices | 893 | # USB devices |
798 | # | 894 | # |
799 | # CONFIG_SND_USB_AUDIO is not set | 895 | # CONFIG_SND_USB_AUDIO is not set |
800 | # CONFIG_SND_USB_USX2Y is not set | ||
801 | 896 | ||
802 | # | 897 | # |
803 | # Open Sound System | 898 | # Open Sound System |
@@ -807,6 +902,8 @@ CONFIG_SND_CS4281=m | |||
807 | # | 902 | # |
808 | # USB support | 903 | # USB support |
809 | # | 904 | # |
905 | CONFIG_USB_ARCH_HAS_HCD=y | ||
906 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
810 | CONFIG_USB=m | 907 | CONFIG_USB=m |
811 | # CONFIG_USB_DEBUG is not set | 908 | # CONFIG_USB_DEBUG is not set |
812 | 909 | ||
@@ -818,35 +915,38 @@ CONFIG_USB_DEVICEFS=y | |||
818 | # CONFIG_USB_DYNAMIC_MINORS is not set | 915 | # CONFIG_USB_DYNAMIC_MINORS is not set |
819 | # CONFIG_USB_SUSPEND is not set | 916 | # CONFIG_USB_SUSPEND is not set |
820 | # CONFIG_USB_OTG is not set | 917 | # CONFIG_USB_OTG is not set |
821 | CONFIG_USB_ARCH_HAS_HCD=y | ||
822 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
823 | 918 | ||
824 | # | 919 | # |
825 | # USB Host Controller Drivers | 920 | # USB Host Controller Drivers |
826 | # | 921 | # |
827 | # CONFIG_USB_EHCI_HCD is not set | 922 | # CONFIG_USB_EHCI_HCD is not set |
923 | # CONFIG_USB_ISP116X_HCD is not set | ||
828 | # CONFIG_USB_OHCI_HCD is not set | 924 | # CONFIG_USB_OHCI_HCD is not set |
829 | CONFIG_USB_UHCI_HCD=m | 925 | CONFIG_USB_UHCI_HCD=m |
926 | # CONFIG_USB_SL811_HCD is not set | ||
830 | 927 | ||
831 | # | 928 | # |
832 | # USB Device Class drivers | 929 | # USB Device Class drivers |
833 | # | 930 | # |
834 | CONFIG_USB_AUDIO=m | 931 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set |
835 | CONFIG_USB_BLUETOOTH_TTY=m | 932 | CONFIG_USB_BLUETOOTH_TTY=m |
836 | CONFIG_USB_MIDI=m | ||
837 | CONFIG_USB_ACM=m | 933 | CONFIG_USB_ACM=m |
838 | CONFIG_USB_PRINTER=m | 934 | CONFIG_USB_PRINTER=m |
935 | |||
936 | # | ||
937 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | ||
938 | # | ||
839 | CONFIG_USB_STORAGE=m | 939 | CONFIG_USB_STORAGE=m |
840 | # CONFIG_USB_STORAGE_DEBUG is not set | 940 | # CONFIG_USB_STORAGE_DEBUG is not set |
841 | # CONFIG_USB_STORAGE_RW_DETECT is not set | ||
842 | # CONFIG_USB_STORAGE_DATAFAB is not set | 941 | # CONFIG_USB_STORAGE_DATAFAB is not set |
843 | # CONFIG_USB_STORAGE_FREECOM is not set | 942 | # CONFIG_USB_STORAGE_FREECOM is not set |
844 | # CONFIG_USB_STORAGE_ISD200 is not set | 943 | # CONFIG_USB_STORAGE_ISD200 is not set |
845 | # CONFIG_USB_STORAGE_DPCM is not set | 944 | # CONFIG_USB_STORAGE_DPCM is not set |
846 | # CONFIG_USB_STORAGE_HP8200e is not set | 945 | # CONFIG_USB_STORAGE_USBAT is not set |
847 | # CONFIG_USB_STORAGE_SDDR09 is not set | 946 | # CONFIG_USB_STORAGE_SDDR09 is not set |
848 | # CONFIG_USB_STORAGE_SDDR55 is not set | 947 | # CONFIG_USB_STORAGE_SDDR55 is not set |
849 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 948 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
949 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
850 | 950 | ||
851 | # | 951 | # |
852 | # USB Input Devices | 952 | # USB Input Devices |
@@ -863,19 +963,23 @@ CONFIG_USB_HIDDEV=y | |||
863 | # CONFIG_USB_MOUSE is not set | 963 | # CONFIG_USB_MOUSE is not set |
864 | # CONFIG_USB_AIPTEK is not set | 964 | # CONFIG_USB_AIPTEK is not set |
865 | # CONFIG_USB_WACOM is not set | 965 | # CONFIG_USB_WACOM is not set |
966 | # CONFIG_USB_ACECAD is not set | ||
866 | # CONFIG_USB_KBTAB is not set | 967 | # CONFIG_USB_KBTAB is not set |
867 | # CONFIG_USB_POWERMATE is not set | 968 | # CONFIG_USB_POWERMATE is not set |
868 | # CONFIG_USB_MTOUCH is not set | 969 | # CONFIG_USB_MTOUCH is not set |
970 | # CONFIG_USB_ITMTOUCH is not set | ||
869 | # CONFIG_USB_EGALAX is not set | 971 | # CONFIG_USB_EGALAX is not set |
972 | # CONFIG_USB_YEALINK is not set | ||
870 | # CONFIG_USB_XPAD is not set | 973 | # CONFIG_USB_XPAD is not set |
871 | # CONFIG_USB_ATI_REMOTE is not set | 974 | # CONFIG_USB_ATI_REMOTE is not set |
975 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
976 | # CONFIG_USB_APPLETOUCH is not set | ||
872 | 977 | ||
873 | # | 978 | # |
874 | # USB Imaging devices | 979 | # USB Imaging devices |
875 | # | 980 | # |
876 | # CONFIG_USB_MDC800 is not set | 981 | # CONFIG_USB_MDC800 is not set |
877 | # CONFIG_USB_MICROTEK is not set | 982 | # CONFIG_USB_MICROTEK is not set |
878 | # CONFIG_USB_HPUSBSCSI is not set | ||
879 | 983 | ||
880 | # | 984 | # |
881 | # USB Multimedia devices | 985 | # USB Multimedia devices |
@@ -894,6 +998,7 @@ CONFIG_USB_HIDDEV=y | |||
894 | # CONFIG_USB_PEGASUS is not set | 998 | # CONFIG_USB_PEGASUS is not set |
895 | # CONFIG_USB_RTL8150 is not set | 999 | # CONFIG_USB_RTL8150 is not set |
896 | # CONFIG_USB_USBNET is not set | 1000 | # CONFIG_USB_USBNET is not set |
1001 | CONFIG_USB_MON=y | ||
897 | 1002 | ||
898 | # | 1003 | # |
899 | # USB port drivers | 1004 | # USB port drivers |
@@ -909,7 +1014,6 @@ CONFIG_USB_HIDDEV=y | |||
909 | # | 1014 | # |
910 | # CONFIG_USB_EMI62 is not set | 1015 | # CONFIG_USB_EMI62 is not set |
911 | # CONFIG_USB_EMI26 is not set | 1016 | # CONFIG_USB_EMI26 is not set |
912 | # CONFIG_USB_TIGL is not set | ||
913 | # CONFIG_USB_AUERSWALD is not set | 1017 | # CONFIG_USB_AUERSWALD is not set |
914 | # CONFIG_USB_RIO500 is not set | 1018 | # CONFIG_USB_RIO500 is not set |
915 | # CONFIG_USB_LEGOTOWER is not set | 1019 | # CONFIG_USB_LEGOTOWER is not set |
@@ -918,10 +1022,12 @@ CONFIG_USB_HIDDEV=y | |||
918 | # CONFIG_USB_CYTHERM is not set | 1022 | # CONFIG_USB_CYTHERM is not set |
919 | # CONFIG_USB_PHIDGETKIT is not set | 1023 | # CONFIG_USB_PHIDGETKIT is not set |
920 | # CONFIG_USB_PHIDGETSERVO is not set | 1024 | # CONFIG_USB_PHIDGETSERVO is not set |
1025 | # CONFIG_USB_IDMOUSE is not set | ||
1026 | # CONFIG_USB_LD is not set | ||
921 | # CONFIG_USB_TEST is not set | 1027 | # CONFIG_USB_TEST is not set |
922 | 1028 | ||
923 | # | 1029 | # |
924 | # USB ATM/DSL drivers | 1030 | # USB DSL modem support |
925 | # | 1031 | # |
926 | 1032 | ||
927 | # | 1033 | # |
@@ -930,10 +1036,25 @@ CONFIG_USB_HIDDEV=y | |||
930 | # CONFIG_USB_GADGET is not set | 1036 | # CONFIG_USB_GADGET is not set |
931 | 1037 | ||
932 | # | 1038 | # |
1039 | # MMC/SD Card support | ||
1040 | # | ||
1041 | # CONFIG_MMC is not set | ||
1042 | |||
1043 | # | ||
1044 | # InfiniBand support | ||
1045 | # | ||
1046 | # CONFIG_INFINIBAND is not set | ||
1047 | |||
1048 | # | ||
1049 | # SN Devices | ||
1050 | # | ||
1051 | |||
1052 | # | ||
933 | # File systems | 1053 | # File systems |
934 | # | 1054 | # |
935 | CONFIG_EXT2_FS=y | 1055 | CONFIG_EXT2_FS=y |
936 | # CONFIG_EXT2_FS_XATTR is not set | 1056 | # CONFIG_EXT2_FS_XATTR is not set |
1057 | # CONFIG_EXT2_FS_XIP is not set | ||
937 | CONFIG_EXT3_FS=y | 1058 | CONFIG_EXT3_FS=y |
938 | CONFIG_EXT3_FS_XATTR=y | 1059 | CONFIG_EXT3_FS_XATTR=y |
939 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1060 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
@@ -945,17 +1066,20 @@ CONFIG_FS_MBCACHE=y | |||
945 | # CONFIG_JFS_FS is not set | 1066 | # CONFIG_JFS_FS is not set |
946 | CONFIG_FS_POSIX_ACL=y | 1067 | CONFIG_FS_POSIX_ACL=y |
947 | CONFIG_XFS_FS=y | 1068 | CONFIG_XFS_FS=y |
948 | # CONFIG_XFS_RT is not set | 1069 | CONFIG_XFS_EXPORT=y |
949 | CONFIG_XFS_QUOTA=y | 1070 | CONFIG_XFS_QUOTA=y |
950 | CONFIG_XFS_SECURITY=y | 1071 | CONFIG_XFS_SECURITY=y |
951 | CONFIG_XFS_POSIX_ACL=y | 1072 | CONFIG_XFS_POSIX_ACL=y |
1073 | # CONFIG_XFS_RT is not set | ||
952 | # CONFIG_MINIX_FS is not set | 1074 | # CONFIG_MINIX_FS is not set |
953 | # CONFIG_ROMFS_FS is not set | 1075 | # CONFIG_ROMFS_FS is not set |
1076 | CONFIG_INOTIFY=y | ||
954 | # CONFIG_QUOTA is not set | 1077 | # CONFIG_QUOTA is not set |
955 | CONFIG_QUOTACTL=y | 1078 | CONFIG_QUOTACTL=y |
956 | CONFIG_DNOTIFY=y | 1079 | CONFIG_DNOTIFY=y |
957 | CONFIG_AUTOFS_FS=m | 1080 | CONFIG_AUTOFS_FS=m |
958 | CONFIG_AUTOFS4_FS=m | 1081 | CONFIG_AUTOFS4_FS=m |
1082 | # CONFIG_FUSE_FS is not set | ||
959 | 1083 | ||
960 | # | 1084 | # |
961 | # CD-ROM/DVD Filesystems | 1085 | # CD-ROM/DVD Filesystems |
@@ -982,14 +1106,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
982 | CONFIG_PROC_FS=y | 1106 | CONFIG_PROC_FS=y |
983 | CONFIG_PROC_KCORE=y | 1107 | CONFIG_PROC_KCORE=y |
984 | CONFIG_SYSFS=y | 1108 | CONFIG_SYSFS=y |
985 | # CONFIG_DEVFS_FS is not set | ||
986 | CONFIG_DEVPTS_FS_XATTR=y | ||
987 | CONFIG_DEVPTS_FS_SECURITY=y | ||
988 | CONFIG_TMPFS=y | 1109 | CONFIG_TMPFS=y |
989 | # CONFIG_TMPFS_XATTR is not set | ||
990 | CONFIG_HUGETLBFS=y | 1110 | CONFIG_HUGETLBFS=y |
991 | CONFIG_HUGETLB_PAGE=y | 1111 | CONFIG_HUGETLB_PAGE=y |
992 | CONFIG_RAMFS=y | 1112 | CONFIG_RAMFS=y |
1113 | # CONFIG_RELAYFS_FS is not set | ||
993 | 1114 | ||
994 | # | 1115 | # |
995 | # Miscellaneous filesystems | 1116 | # Miscellaneous filesystems |
@@ -1013,15 +1134,18 @@ CONFIG_RAMFS=y | |||
1013 | # | 1134 | # |
1014 | CONFIG_NFS_FS=m | 1135 | CONFIG_NFS_FS=m |
1015 | CONFIG_NFS_V3=y | 1136 | CONFIG_NFS_V3=y |
1137 | # CONFIG_NFS_V3_ACL is not set | ||
1016 | CONFIG_NFS_V4=y | 1138 | CONFIG_NFS_V4=y |
1017 | # CONFIG_NFS_DIRECTIO is not set | 1139 | # CONFIG_NFS_DIRECTIO is not set |
1018 | CONFIG_NFSD=m | 1140 | CONFIG_NFSD=m |
1019 | CONFIG_NFSD_V3=y | 1141 | CONFIG_NFSD_V3=y |
1142 | # CONFIG_NFSD_V3_ACL is not set | ||
1020 | CONFIG_NFSD_V4=y | 1143 | CONFIG_NFSD_V4=y |
1021 | CONFIG_NFSD_TCP=y | 1144 | CONFIG_NFSD_TCP=y |
1022 | CONFIG_LOCKD=m | 1145 | CONFIG_LOCKD=m |
1023 | CONFIG_LOCKD_V4=y | 1146 | CONFIG_LOCKD_V4=y |
1024 | CONFIG_EXPORTFS=m | 1147 | CONFIG_EXPORTFS=y |
1148 | CONFIG_NFS_COMMON=y | ||
1025 | CONFIG_SUNRPC=m | 1149 | CONFIG_SUNRPC=m |
1026 | CONFIG_SUNRPC_GSS=m | 1150 | CONFIG_SUNRPC_GSS=m |
1027 | CONFIG_RPCSEC_GSS_KRB5=m | 1151 | CONFIG_RPCSEC_GSS_KRB5=m |
@@ -1031,9 +1155,11 @@ CONFIG_CIFS=m | |||
1031 | CONFIG_CIFS_STATS=y | 1155 | CONFIG_CIFS_STATS=y |
1032 | CONFIG_CIFS_XATTR=y | 1156 | CONFIG_CIFS_XATTR=y |
1033 | CONFIG_CIFS_POSIX=y | 1157 | CONFIG_CIFS_POSIX=y |
1158 | # CONFIG_CIFS_EXPERIMENTAL is not set | ||
1034 | # CONFIG_NCP_FS is not set | 1159 | # CONFIG_NCP_FS is not set |
1035 | # CONFIG_CODA_FS is not set | 1160 | # CONFIG_CODA_FS is not set |
1036 | # CONFIG_AFS_FS is not set | 1161 | # CONFIG_AFS_FS is not set |
1162 | # CONFIG_9P_FS is not set | ||
1037 | 1163 | ||
1038 | # | 1164 | # |
1039 | # Partition Types | 1165 | # Partition Types |
@@ -1103,8 +1229,12 @@ CONFIG_NLS_UTF8=m | |||
1103 | # Library routines | 1229 | # Library routines |
1104 | # | 1230 | # |
1105 | # CONFIG_CRC_CCITT is not set | 1231 | # CONFIG_CRC_CCITT is not set |
1232 | # CONFIG_CRC16 is not set | ||
1106 | CONFIG_CRC32=y | 1233 | CONFIG_CRC32=y |
1107 | # CONFIG_LIBCRC32C is not set | 1234 | # CONFIG_LIBCRC32C is not set |
1235 | CONFIG_GENERIC_HARDIRQS=y | ||
1236 | CONFIG_GENERIC_IRQ_PROBE=y | ||
1237 | CONFIG_GENERIC_PENDING_IRQ=y | ||
1108 | 1238 | ||
1109 | # | 1239 | # |
1110 | # Profiling support | 1240 | # Profiling support |
@@ -1115,14 +1245,20 @@ CONFIG_OPROFILE=y | |||
1115 | # | 1245 | # |
1116 | # Kernel hacking | 1246 | # Kernel hacking |
1117 | # | 1247 | # |
1248 | # CONFIG_PRINTK_TIME is not set | ||
1118 | CONFIG_DEBUG_KERNEL=y | 1249 | CONFIG_DEBUG_KERNEL=y |
1119 | CONFIG_MAGIC_SYSRQ=y | 1250 | CONFIG_MAGIC_SYSRQ=y |
1251 | CONFIG_LOG_BUF_SHIFT=16 | ||
1252 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1120 | # CONFIG_SCHEDSTATS is not set | 1253 | # CONFIG_SCHEDSTATS is not set |
1121 | # CONFIG_DEBUG_SLAB is not set | 1254 | # CONFIG_DEBUG_SLAB is not set |
1255 | CONFIG_DEBUG_PREEMPT=y | ||
1122 | # CONFIG_DEBUG_SPINLOCK is not set | 1256 | # CONFIG_DEBUG_SPINLOCK is not set |
1123 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1257 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1124 | # CONFIG_DEBUG_KOBJECT is not set | 1258 | # CONFIG_DEBUG_KOBJECT is not set |
1125 | # CONFIG_DEBUG_INFO is not set | 1259 | # CONFIG_DEBUG_INFO is not set |
1260 | # CONFIG_DEBUG_FS is not set | ||
1261 | # CONFIG_KPROBES is not set | ||
1126 | # CONFIG_IA64_GRANULE_16MB is not set | 1262 | # CONFIG_IA64_GRANULE_16MB is not set |
1127 | CONFIG_IA64_GRANULE_64MB=y | 1263 | CONFIG_IA64_GRANULE_64MB=y |
1128 | # CONFIG_IA64_PRINT_HAZARDS is not set | 1264 | # CONFIG_IA64_PRINT_HAZARDS is not set |
@@ -1149,6 +1285,7 @@ CONFIG_CRYPTO_MD5=y | |||
1149 | # CONFIG_CRYPTO_SHA256 is not set | 1285 | # CONFIG_CRYPTO_SHA256 is not set |
1150 | # CONFIG_CRYPTO_SHA512 is not set | 1286 | # CONFIG_CRYPTO_SHA512 is not set |
1151 | # CONFIG_CRYPTO_WP512 is not set | 1287 | # CONFIG_CRYPTO_WP512 is not set |
1288 | # CONFIG_CRYPTO_TGR192 is not set | ||
1152 | CONFIG_CRYPTO_DES=y | 1289 | CONFIG_CRYPTO_DES=y |
1153 | # CONFIG_CRYPTO_BLOWFISH is not set | 1290 | # CONFIG_CRYPTO_BLOWFISH is not set |
1154 | # CONFIG_CRYPTO_TWOFISH is not set | 1291 | # CONFIG_CRYPTO_TWOFISH is not set |
@@ -1164,3 +1301,7 @@ CONFIG_CRYPTO_DES=y | |||
1164 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1301 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1165 | # CONFIG_CRYPTO_CRC32C is not set | 1302 | # CONFIG_CRYPTO_CRC32C is not set |
1166 | # CONFIG_CRYPTO_TEST is not set | 1303 | # CONFIG_CRYPTO_TEST is not set |
1304 | |||
1305 | # | ||
1306 | # Hardware crypto devices | ||
1307 | # | ||
diff --git a/arch/ia64/configs/gensparse_defconfig b/arch/ia64/configs/gensparse_defconfig new file mode 100644 index 000000000000..80f8663bc6d9 --- /dev/null +++ b/arch/ia64/configs/gensparse_defconfig | |||
@@ -0,0 +1,1319 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.14-rc2 | ||
4 | # Wed Sep 28 08:27:29 2005 | ||
5 | # | ||
6 | |||
7 | # | ||
8 | # Code maturity level options | ||
9 | # | ||
10 | CONFIG_EXPERIMENTAL=y | ||
11 | CONFIG_CLEAN_COMPILE=y | ||
12 | CONFIG_LOCK_KERNEL=y | ||
13 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
14 | |||
15 | # | ||
16 | # General setup | ||
17 | # | ||
18 | CONFIG_LOCALVERSION="" | ||
19 | CONFIG_LOCALVERSION_AUTO=y | ||
20 | CONFIG_SWAP=y | ||
21 | CONFIG_SYSVIPC=y | ||
22 | CONFIG_POSIX_MQUEUE=y | ||
23 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
24 | CONFIG_SYSCTL=y | ||
25 | # CONFIG_AUDIT is not set | ||
26 | CONFIG_HOTPLUG=y | ||
27 | CONFIG_KOBJECT_UEVENT=y | ||
28 | CONFIG_IKCONFIG=y | ||
29 | CONFIG_IKCONFIG_PROC=y | ||
30 | # CONFIG_CPUSETS is not set | ||
31 | CONFIG_INITRAMFS_SOURCE="" | ||
32 | # CONFIG_EMBEDDED is not set | ||
33 | CONFIG_KALLSYMS=y | ||
34 | CONFIG_KALLSYMS_ALL=y | ||
35 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
36 | CONFIG_PRINTK=y | ||
37 | CONFIG_BUG=y | ||
38 | CONFIG_BASE_FULL=y | ||
39 | CONFIG_FUTEX=y | ||
40 | CONFIG_EPOLL=y | ||
41 | CONFIG_SHMEM=y | ||
42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
43 | CONFIG_CC_ALIGN_LABELS=0 | ||
44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
46 | # CONFIG_TINY_SHMEM is not set | ||
47 | CONFIG_BASE_SMALL=0 | ||
48 | |||
49 | # | ||
50 | # Loadable module support | ||
51 | # | ||
52 | CONFIG_MODULES=y | ||
53 | CONFIG_MODULE_UNLOAD=y | ||
54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
55 | CONFIG_OBSOLETE_MODPARM=y | ||
56 | CONFIG_MODVERSIONS=y | ||
57 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
58 | CONFIG_KMOD=y | ||
59 | CONFIG_STOP_MACHINE=y | ||
60 | |||
61 | # | ||
62 | # Processor type and features | ||
63 | # | ||
64 | CONFIG_IA64=y | ||
65 | CONFIG_64BIT=y | ||
66 | CONFIG_MMU=y | ||
67 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
68 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
69 | CONFIG_TIME_INTERPOLATION=y | ||
70 | CONFIG_EFI=y | ||
71 | CONFIG_GENERIC_IOMAP=y | ||
72 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
73 | CONFIG_IA64_GENERIC=y | ||
74 | # CONFIG_IA64_DIG is not set | ||
75 | # CONFIG_IA64_HP_ZX1 is not set | ||
76 | # CONFIG_IA64_HP_ZX1_SWIOTLB is not set | ||
77 | # CONFIG_IA64_SGI_SN2 is not set | ||
78 | # CONFIG_IA64_HP_SIM is not set | ||
79 | # CONFIG_ITANIUM is not set | ||
80 | CONFIG_MCKINLEY=y | ||
81 | # CONFIG_IA64_PAGE_SIZE_4KB is not set | ||
82 | # CONFIG_IA64_PAGE_SIZE_8KB is not set | ||
83 | CONFIG_IA64_PAGE_SIZE_16KB=y | ||
84 | # CONFIG_IA64_PAGE_SIZE_64KB is not set | ||
85 | # CONFIG_HZ_100 is not set | ||
86 | CONFIG_HZ_250=y | ||
87 | # CONFIG_HZ_1000 is not set | ||
88 | CONFIG_HZ=250 | ||
89 | CONFIG_IA64_L1_CACHE_SHIFT=7 | ||
90 | CONFIG_IA64_CYCLONE=y | ||
91 | CONFIG_IOSAPIC=y | ||
92 | # CONFIG_IA64_SGI_SN_XP is not set | ||
93 | CONFIG_FORCE_MAX_ZONEORDER=17 | ||
94 | CONFIG_SMP=y | ||
95 | CONFIG_NR_CPUS=512 | ||
96 | CONFIG_HOTPLUG_CPU=y | ||
97 | # CONFIG_SCHED_SMT is not set | ||
98 | # CONFIG_PREEMPT is not set | ||
99 | CONFIG_SELECT_MEMORY_MODEL=y | ||
100 | # CONFIG_FLATMEM_MANUAL is not set | ||
101 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
102 | CONFIG_SPARSEMEM_MANUAL=y | ||
103 | CONFIG_SPARSEMEM=y | ||
104 | CONFIG_NEED_MULTIPLE_NODES=y | ||
105 | CONFIG_HAVE_MEMORY_PRESENT=y | ||
106 | # CONFIG_SPARSEMEM_STATIC is not set | ||
107 | CONFIG_SPARSEMEM_EXTREME=y | ||
108 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
109 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
110 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
111 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
112 | CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y | ||
113 | CONFIG_NUMA=y | ||
114 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | ||
115 | CONFIG_IA32_SUPPORT=y | ||
116 | CONFIG_COMPAT=y | ||
117 | CONFIG_IA64_MCA_RECOVERY=y | ||
118 | CONFIG_PERFMON=y | ||
119 | CONFIG_IA64_PALINFO=y | ||
120 | |||
121 | # | ||
122 | # Firmware Drivers | ||
123 | # | ||
124 | CONFIG_EFI_VARS=y | ||
125 | CONFIG_EFI_PCDP=y | ||
126 | # CONFIG_DELL_RBU is not set | ||
127 | CONFIG_BINFMT_ELF=y | ||
128 | CONFIG_BINFMT_MISC=m | ||
129 | |||
130 | # | ||
131 | # Power management and ACPI | ||
132 | # | ||
133 | CONFIG_PM=y | ||
134 | # CONFIG_PM_DEBUG is not set | ||
135 | |||
136 | # | ||
137 | # ACPI (Advanced Configuration and Power Interface) Support | ||
138 | # | ||
139 | CONFIG_ACPI=y | ||
140 | CONFIG_ACPI_BUTTON=m | ||
141 | CONFIG_ACPI_FAN=m | ||
142 | CONFIG_ACPI_PROCESSOR=m | ||
143 | CONFIG_ACPI_HOTPLUG_CPU=y | ||
144 | CONFIG_ACPI_THERMAL=m | ||
145 | CONFIG_ACPI_NUMA=y | ||
146 | CONFIG_ACPI_BLACKLIST_YEAR=0 | ||
147 | # CONFIG_ACPI_DEBUG is not set | ||
148 | CONFIG_ACPI_POWER=y | ||
149 | CONFIG_ACPI_SYSTEM=y | ||
150 | CONFIG_ACPI_CONTAINER=m | ||
151 | |||
152 | # | ||
153 | # CPU Frequency scaling | ||
154 | # | ||
155 | # CONFIG_CPU_FREQ is not set | ||
156 | |||
157 | # | ||
158 | # Bus options (PCI, PCMCIA) | ||
159 | # | ||
160 | CONFIG_PCI=y | ||
161 | CONFIG_PCI_DOMAINS=y | ||
162 | # CONFIG_PCI_MSI is not set | ||
163 | CONFIG_PCI_LEGACY_PROC=y | ||
164 | # CONFIG_PCI_DEBUG is not set | ||
165 | |||
166 | # | ||
167 | # PCI Hotplug Support | ||
168 | # | ||
169 | CONFIG_HOTPLUG_PCI=m | ||
170 | # CONFIG_HOTPLUG_PCI_FAKE is not set | ||
171 | CONFIG_HOTPLUG_PCI_ACPI=m | ||
172 | # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set | ||
173 | # CONFIG_HOTPLUG_PCI_CPCI is not set | ||
174 | # CONFIG_HOTPLUG_PCI_SHPC is not set | ||
175 | # CONFIG_HOTPLUG_PCI_SGI is not set | ||
176 | |||
177 | # | ||
178 | # PCCARD (PCMCIA/CardBus) support | ||
179 | # | ||
180 | # CONFIG_PCCARD is not set | ||
181 | |||
182 | # | ||
183 | # Networking | ||
184 | # | ||
185 | CONFIG_NET=y | ||
186 | |||
187 | # | ||
188 | # Networking options | ||
189 | # | ||
190 | CONFIG_PACKET=y | ||
191 | # CONFIG_PACKET_MMAP is not set | ||
192 | CONFIG_UNIX=y | ||
193 | # CONFIG_NET_KEY is not set | ||
194 | CONFIG_INET=y | ||
195 | CONFIG_IP_MULTICAST=y | ||
196 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
197 | CONFIG_IP_FIB_HASH=y | ||
198 | # CONFIG_IP_PNP is not set | ||
199 | # CONFIG_NET_IPIP is not set | ||
200 | # CONFIG_NET_IPGRE is not set | ||
201 | # CONFIG_IP_MROUTE is not set | ||
202 | CONFIG_ARPD=y | ||
203 | CONFIG_SYN_COOKIES=y | ||
204 | # CONFIG_INET_AH is not set | ||
205 | # CONFIG_INET_ESP is not set | ||
206 | # CONFIG_INET_IPCOMP is not set | ||
207 | # CONFIG_INET_TUNNEL is not set | ||
208 | CONFIG_INET_DIAG=y | ||
209 | CONFIG_INET_TCP_DIAG=y | ||
210 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
211 | CONFIG_TCP_CONG_BIC=y | ||
212 | # CONFIG_IPV6 is not set | ||
213 | # CONFIG_NETFILTER is not set | ||
214 | |||
215 | # | ||
216 | # DCCP Configuration (EXPERIMENTAL) | ||
217 | # | ||
218 | # CONFIG_IP_DCCP is not set | ||
219 | |||
220 | # | ||
221 | # SCTP Configuration (EXPERIMENTAL) | ||
222 | # | ||
223 | # CONFIG_IP_SCTP is not set | ||
224 | # CONFIG_ATM is not set | ||
225 | # CONFIG_BRIDGE is not set | ||
226 | # CONFIG_VLAN_8021Q is not set | ||
227 | # CONFIG_DECNET is not set | ||
228 | # CONFIG_LLC2 is not set | ||
229 | # CONFIG_IPX is not set | ||
230 | # CONFIG_ATALK is not set | ||
231 | # CONFIG_X25 is not set | ||
232 | # CONFIG_LAPB is not set | ||
233 | # CONFIG_NET_DIVERT is not set | ||
234 | # CONFIG_ECONET is not set | ||
235 | # CONFIG_WAN_ROUTER is not set | ||
236 | # CONFIG_NET_SCHED is not set | ||
237 | # CONFIG_NET_CLS_ROUTE is not set | ||
238 | |||
239 | # | ||
240 | # Network testing | ||
241 | # | ||
242 | # CONFIG_NET_PKTGEN is not set | ||
243 | # CONFIG_HAMRADIO is not set | ||
244 | # CONFIG_IRDA is not set | ||
245 | # CONFIG_BT is not set | ||
246 | # CONFIG_IEEE80211 is not set | ||
247 | |||
248 | # | ||
249 | # Device Drivers | ||
250 | # | ||
251 | |||
252 | # | ||
253 | # Generic Driver Options | ||
254 | # | ||
255 | CONFIG_STANDALONE=y | ||
256 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
257 | CONFIG_FW_LOADER=m | ||
258 | # CONFIG_DEBUG_DRIVER is not set | ||
259 | |||
260 | # | ||
261 | # Connector - unified userspace <-> kernelspace linker | ||
262 | # | ||
263 | # CONFIG_CONNECTOR is not set | ||
264 | |||
265 | # | ||
266 | # Memory Technology Devices (MTD) | ||
267 | # | ||
268 | # CONFIG_MTD is not set | ||
269 | |||
270 | # | ||
271 | # Parallel port support | ||
272 | # | ||
273 | # CONFIG_PARPORT is not set | ||
274 | |||
275 | # | ||
276 | # Plug and Play support | ||
277 | # | ||
278 | # CONFIG_PNP is not set | ||
279 | |||
280 | # | ||
281 | # Block devices | ||
282 | # | ||
283 | # CONFIG_BLK_CPQ_DA is not set | ||
284 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
285 | # CONFIG_BLK_DEV_DAC960 is not set | ||
286 | # CONFIG_BLK_DEV_UMEM is not set | ||
287 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
288 | CONFIG_BLK_DEV_LOOP=m | ||
289 | CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
290 | CONFIG_BLK_DEV_NBD=m | ||
291 | # CONFIG_BLK_DEV_SX8 is not set | ||
292 | # CONFIG_BLK_DEV_UB is not set | ||
293 | CONFIG_BLK_DEV_RAM=y | ||
294 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
295 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
296 | CONFIG_BLK_DEV_INITRD=y | ||
297 | # CONFIG_CDROM_PKTCDVD is not set | ||
298 | |||
299 | # | ||
300 | # IO Schedulers | ||
301 | # | ||
302 | CONFIG_IOSCHED_NOOP=y | ||
303 | CONFIG_IOSCHED_AS=y | ||
304 | CONFIG_IOSCHED_DEADLINE=y | ||
305 | CONFIG_IOSCHED_CFQ=y | ||
306 | # CONFIG_ATA_OVER_ETH is not set | ||
307 | |||
308 | # | ||
309 | # ATA/ATAPI/MFM/RLL support | ||
310 | # | ||
311 | CONFIG_IDE=y | ||
312 | CONFIG_BLK_DEV_IDE=y | ||
313 | |||
314 | # | ||
315 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
316 | # | ||
317 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
318 | CONFIG_BLK_DEV_IDEDISK=y | ||
319 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
320 | CONFIG_BLK_DEV_IDECD=y | ||
321 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
322 | CONFIG_BLK_DEV_IDEFLOPPY=y | ||
323 | CONFIG_BLK_DEV_IDESCSI=m | ||
324 | # CONFIG_IDE_TASK_IOCTL is not set | ||
325 | |||
326 | # | ||
327 | # IDE chipset support/bugfixes | ||
328 | # | ||
329 | CONFIG_IDE_GENERIC=y | ||
330 | CONFIG_BLK_DEV_IDEPCI=y | ||
331 | # CONFIG_IDEPCI_SHARE_IRQ is not set | ||
332 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
333 | CONFIG_BLK_DEV_GENERIC=y | ||
334 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
335 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
336 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
337 | CONFIG_IDEDMA_PCI_AUTO=y | ||
338 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
339 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
340 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
341 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
342 | CONFIG_BLK_DEV_CMD64X=y | ||
343 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
344 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
345 | # CONFIG_BLK_DEV_CS5520 is not set | ||
346 | # CONFIG_BLK_DEV_CS5530 is not set | ||
347 | # CONFIG_BLK_DEV_HPT34X is not set | ||
348 | # CONFIG_BLK_DEV_HPT366 is not set | ||
349 | # CONFIG_BLK_DEV_SC1200 is not set | ||
350 | CONFIG_BLK_DEV_PIIX=y | ||
351 | # CONFIG_BLK_DEV_IT821X is not set | ||
352 | # CONFIG_BLK_DEV_NS87415 is not set | ||
353 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
354 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
355 | # CONFIG_BLK_DEV_SVWKS is not set | ||
356 | CONFIG_BLK_DEV_SGIIOC4=y | ||
357 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
358 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
359 | # CONFIG_BLK_DEV_TRM290 is not set | ||
360 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
361 | # CONFIG_IDE_ARM is not set | ||
362 | CONFIG_BLK_DEV_IDEDMA=y | ||
363 | # CONFIG_IDEDMA_IVB is not set | ||
364 | CONFIG_IDEDMA_AUTO=y | ||
365 | # CONFIG_BLK_DEV_HD is not set | ||
366 | |||
367 | # | ||
368 | # SCSI device support | ||
369 | # | ||
370 | # CONFIG_RAID_ATTRS is not set | ||
371 | CONFIG_SCSI=y | ||
372 | CONFIG_SCSI_PROC_FS=y | ||
373 | |||
374 | # | ||
375 | # SCSI support type (disk, tape, CD-ROM) | ||
376 | # | ||
377 | CONFIG_BLK_DEV_SD=y | ||
378 | CONFIG_CHR_DEV_ST=m | ||
379 | # CONFIG_CHR_DEV_OSST is not set | ||
380 | CONFIG_BLK_DEV_SR=m | ||
381 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
382 | CONFIG_CHR_DEV_SG=m | ||
383 | # CONFIG_CHR_DEV_SCH is not set | ||
384 | |||
385 | # | ||
386 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
387 | # | ||
388 | # CONFIG_SCSI_MULTI_LUN is not set | ||
389 | # CONFIG_SCSI_CONSTANTS is not set | ||
390 | # CONFIG_SCSI_LOGGING is not set | ||
391 | |||
392 | # | ||
393 | # SCSI Transport Attributes | ||
394 | # | ||
395 | CONFIG_SCSI_SPI_ATTRS=y | ||
396 | CONFIG_SCSI_FC_ATTRS=y | ||
397 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
398 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
399 | |||
400 | # | ||
401 | # SCSI low-level drivers | ||
402 | # | ||
403 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
404 | # CONFIG_SCSI_3W_9XXX is not set | ||
405 | # CONFIG_SCSI_ACARD is not set | ||
406 | # CONFIG_SCSI_AACRAID is not set | ||
407 | # CONFIG_SCSI_AIC7XXX is not set | ||
408 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
409 | # CONFIG_SCSI_AIC79XX is not set | ||
410 | # CONFIG_MEGARAID_NEWGEN is not set | ||
411 | # CONFIG_MEGARAID_LEGACY is not set | ||
412 | CONFIG_SCSI_SATA=y | ||
413 | # CONFIG_SCSI_SATA_AHCI is not set | ||
414 | # CONFIG_SCSI_SATA_SVW is not set | ||
415 | # CONFIG_SCSI_ATA_PIIX is not set | ||
416 | # CONFIG_SCSI_SATA_MV is not set | ||
417 | # CONFIG_SCSI_SATA_NV is not set | ||
418 | # CONFIG_SCSI_SATA_PROMISE is not set | ||
419 | # CONFIG_SCSI_SATA_QSTOR is not set | ||
420 | # CONFIG_SCSI_SATA_SX4 is not set | ||
421 | # CONFIG_SCSI_SATA_SIL is not set | ||
422 | # CONFIG_SCSI_SATA_SIS is not set | ||
423 | # CONFIG_SCSI_SATA_ULI is not set | ||
424 | # CONFIG_SCSI_SATA_VIA is not set | ||
425 | CONFIG_SCSI_SATA_VITESSE=y | ||
426 | # CONFIG_SCSI_DMX3191D is not set | ||
427 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
428 | # CONFIG_SCSI_IPS is not set | ||
429 | # CONFIG_SCSI_INITIO is not set | ||
430 | # CONFIG_SCSI_INIA100 is not set | ||
431 | CONFIG_SCSI_SYM53C8XX_2=y | ||
432 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 | ||
433 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 | ||
434 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | ||
435 | # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set | ||
436 | # CONFIG_SCSI_IPR is not set | ||
437 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
438 | CONFIG_SCSI_QLOGIC_1280=y | ||
439 | # CONFIG_SCSI_QLOGIC_1280_1040 is not set | ||
440 | CONFIG_SCSI_QLA2XXX=y | ||
441 | CONFIG_SCSI_QLA21XX=m | ||
442 | CONFIG_SCSI_QLA22XX=m | ||
443 | CONFIG_SCSI_QLA2300=m | ||
444 | CONFIG_SCSI_QLA2322=m | ||
445 | # CONFIG_SCSI_QLA6312 is not set | ||
446 | # CONFIG_SCSI_QLA24XX is not set | ||
447 | # CONFIG_SCSI_LPFC is not set | ||
448 | # CONFIG_SCSI_DC395x is not set | ||
449 | # CONFIG_SCSI_DC390T is not set | ||
450 | # CONFIG_SCSI_DEBUG is not set | ||
451 | |||
452 | # | ||
453 | # Multi-device support (RAID and LVM) | ||
454 | # | ||
455 | CONFIG_MD=y | ||
456 | CONFIG_BLK_DEV_MD=m | ||
457 | CONFIG_MD_LINEAR=m | ||
458 | CONFIG_MD_RAID0=m | ||
459 | CONFIG_MD_RAID1=m | ||
460 | # CONFIG_MD_RAID10 is not set | ||
461 | CONFIG_MD_RAID5=m | ||
462 | CONFIG_MD_RAID6=m | ||
463 | CONFIG_MD_MULTIPATH=m | ||
464 | # CONFIG_MD_FAULTY is not set | ||
465 | CONFIG_BLK_DEV_DM=m | ||
466 | CONFIG_DM_CRYPT=m | ||
467 | CONFIG_DM_SNAPSHOT=m | ||
468 | CONFIG_DM_MIRROR=m | ||
469 | CONFIG_DM_ZERO=m | ||
470 | CONFIG_DM_MULTIPATH=m | ||
471 | # CONFIG_DM_MULTIPATH_EMC is not set | ||
472 | |||
473 | # | ||
474 | # Fusion MPT device support | ||
475 | # | ||
476 | CONFIG_FUSION=y | ||
477 | CONFIG_FUSION_SPI=y | ||
478 | CONFIG_FUSION_FC=m | ||
479 | CONFIG_FUSION_MAX_SGE=128 | ||
480 | # CONFIG_FUSION_CTL is not set | ||
481 | |||
482 | # | ||
483 | # IEEE 1394 (FireWire) support | ||
484 | # | ||
485 | # CONFIG_IEEE1394 is not set | ||
486 | |||
487 | # | ||
488 | # I2O device support | ||
489 | # | ||
490 | # CONFIG_I2O is not set | ||
491 | |||
492 | # | ||
493 | # Network device support | ||
494 | # | ||
495 | CONFIG_NETDEVICES=y | ||
496 | CONFIG_DUMMY=m | ||
497 | # CONFIG_BONDING is not set | ||
498 | # CONFIG_EQUALIZER is not set | ||
499 | # CONFIG_TUN is not set | ||
500 | |||
501 | # | ||
502 | # ARCnet devices | ||
503 | # | ||
504 | # CONFIG_ARCNET is not set | ||
505 | |||
506 | # | ||
507 | # PHY device support | ||
508 | # | ||
509 | # CONFIG_PHYLIB is not set | ||
510 | |||
511 | # | ||
512 | # Ethernet (10 or 100Mbit) | ||
513 | # | ||
514 | CONFIG_NET_ETHERNET=y | ||
515 | CONFIG_MII=m | ||
516 | # CONFIG_HAPPYMEAL is not set | ||
517 | # CONFIG_SUNGEM is not set | ||
518 | # CONFIG_NET_VENDOR_3COM is not set | ||
519 | |||
520 | # | ||
521 | # Tulip family network device support | ||
522 | # | ||
523 | CONFIG_NET_TULIP=y | ||
524 | # CONFIG_DE2104X is not set | ||
525 | CONFIG_TULIP=m | ||
526 | # CONFIG_TULIP_MWI is not set | ||
527 | # CONFIG_TULIP_MMIO is not set | ||
528 | # CONFIG_TULIP_NAPI is not set | ||
529 | # CONFIG_DE4X5 is not set | ||
530 | # CONFIG_WINBOND_840 is not set | ||
531 | # CONFIG_DM9102 is not set | ||
532 | # CONFIG_ULI526X is not set | ||
533 | # CONFIG_HP100 is not set | ||
534 | CONFIG_NET_PCI=y | ||
535 | # CONFIG_PCNET32 is not set | ||
536 | # CONFIG_AMD8111_ETH is not set | ||
537 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
538 | # CONFIG_B44 is not set | ||
539 | # CONFIG_FORCEDETH is not set | ||
540 | # CONFIG_DGRS is not set | ||
541 | CONFIG_EEPRO100=m | ||
542 | CONFIG_E100=m | ||
543 | # CONFIG_FEALNX is not set | ||
544 | # CONFIG_NATSEMI is not set | ||
545 | # CONFIG_NE2K_PCI is not set | ||
546 | # CONFIG_8139CP is not set | ||
547 | # CONFIG_8139TOO is not set | ||
548 | # CONFIG_SIS900 is not set | ||
549 | # CONFIG_EPIC100 is not set | ||
550 | # CONFIG_SUNDANCE is not set | ||
551 | # CONFIG_VIA_RHINE is not set | ||
552 | |||
553 | # | ||
554 | # Ethernet (1000 Mbit) | ||
555 | # | ||
556 | # CONFIG_ACENIC is not set | ||
557 | # CONFIG_DL2K is not set | ||
558 | CONFIG_E1000=y | ||
559 | # CONFIG_E1000_NAPI is not set | ||
560 | # CONFIG_NS83820 is not set | ||
561 | # CONFIG_HAMACHI is not set | ||
562 | # CONFIG_YELLOWFIN is not set | ||
563 | # CONFIG_R8169 is not set | ||
564 | # CONFIG_SIS190 is not set | ||
565 | # CONFIG_SKGE is not set | ||
566 | # CONFIG_SK98LIN is not set | ||
567 | # CONFIG_VIA_VELOCITY is not set | ||
568 | CONFIG_TIGON3=y | ||
569 | # CONFIG_BNX2 is not set | ||
570 | |||
571 | # | ||
572 | # Ethernet (10000 Mbit) | ||
573 | # | ||
574 | # CONFIG_CHELSIO_T1 is not set | ||
575 | # CONFIG_IXGB is not set | ||
576 | # CONFIG_S2IO is not set | ||
577 | |||
578 | # | ||
579 | # Token Ring devices | ||
580 | # | ||
581 | # CONFIG_TR is not set | ||
582 | |||
583 | # | ||
584 | # Wireless LAN (non-hamradio) | ||
585 | # | ||
586 | # CONFIG_NET_RADIO is not set | ||
587 | |||
588 | # | ||
589 | # Wan interfaces | ||
590 | # | ||
591 | # CONFIG_WAN is not set | ||
592 | # CONFIG_FDDI is not set | ||
593 | # CONFIG_HIPPI is not set | ||
594 | # CONFIG_PPP is not set | ||
595 | # CONFIG_SLIP is not set | ||
596 | # CONFIG_NET_FC is not set | ||
597 | # CONFIG_SHAPER is not set | ||
598 | CONFIG_NETCONSOLE=y | ||
599 | CONFIG_NETPOLL=y | ||
600 | # CONFIG_NETPOLL_RX is not set | ||
601 | # CONFIG_NETPOLL_TRAP is not set | ||
602 | CONFIG_NET_POLL_CONTROLLER=y | ||
603 | |||
604 | # | ||
605 | # ISDN subsystem | ||
606 | # | ||
607 | # CONFIG_ISDN is not set | ||
608 | |||
609 | # | ||
610 | # Telephony Support | ||
611 | # | ||
612 | # CONFIG_PHONE is not set | ||
613 | |||
614 | # | ||
615 | # Input device support | ||
616 | # | ||
617 | CONFIG_INPUT=y | ||
618 | |||
619 | # | ||
620 | # Userland interfaces | ||
621 | # | ||
622 | CONFIG_INPUT_MOUSEDEV=y | ||
623 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
624 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
625 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
626 | # CONFIG_INPUT_JOYDEV is not set | ||
627 | # CONFIG_INPUT_TSDEV is not set | ||
628 | # CONFIG_INPUT_EVDEV is not set | ||
629 | # CONFIG_INPUT_EVBUG is not set | ||
630 | |||
631 | # | ||
632 | # Input Device Drivers | ||
633 | # | ||
634 | CONFIG_INPUT_KEYBOARD=y | ||
635 | CONFIG_KEYBOARD_ATKBD=y | ||
636 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
637 | # CONFIG_KEYBOARD_LKKBD is not set | ||
638 | # CONFIG_KEYBOARD_XTKBD is not set | ||
639 | # CONFIG_KEYBOARD_NEWTON is not set | ||
640 | CONFIG_INPUT_MOUSE=y | ||
641 | CONFIG_MOUSE_PS2=y | ||
642 | # CONFIG_MOUSE_SERIAL is not set | ||
643 | # CONFIG_MOUSE_VSXXXAA is not set | ||
644 | # CONFIG_INPUT_JOYSTICK is not set | ||
645 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
646 | # CONFIG_INPUT_MISC is not set | ||
647 | |||
648 | # | ||
649 | # Hardware I/O ports | ||
650 | # | ||
651 | CONFIG_SERIO=y | ||
652 | CONFIG_SERIO_I8042=y | ||
653 | # CONFIG_SERIO_SERPORT is not set | ||
654 | # CONFIG_SERIO_PCIPS2 is not set | ||
655 | CONFIG_SERIO_LIBPS2=y | ||
656 | # CONFIG_SERIO_RAW is not set | ||
657 | CONFIG_GAMEPORT=m | ||
658 | # CONFIG_GAMEPORT_NS558 is not set | ||
659 | # CONFIG_GAMEPORT_L4 is not set | ||
660 | # CONFIG_GAMEPORT_EMU10K1 is not set | ||
661 | # CONFIG_GAMEPORT_FM801 is not set | ||
662 | |||
663 | # | ||
664 | # Character devices | ||
665 | # | ||
666 | CONFIG_VT=y | ||
667 | CONFIG_VT_CONSOLE=y | ||
668 | CONFIG_HW_CONSOLE=y | ||
669 | CONFIG_SERIAL_NONSTANDARD=y | ||
670 | # CONFIG_ROCKETPORT is not set | ||
671 | # CONFIG_CYCLADES is not set | ||
672 | # CONFIG_DIGIEPCA is not set | ||
673 | # CONFIG_MOXA_SMARTIO is not set | ||
674 | # CONFIG_ISI is not set | ||
675 | # CONFIG_SYNCLINKMP is not set | ||
676 | # CONFIG_N_HDLC is not set | ||
677 | # CONFIG_SPECIALIX is not set | ||
678 | # CONFIG_SX is not set | ||
679 | # CONFIG_STALDRV is not set | ||
680 | CONFIG_SGI_SNSC=y | ||
681 | CONFIG_SGI_TIOCX=y | ||
682 | CONFIG_SGI_MBCS=m | ||
683 | |||
684 | # | ||
685 | # Serial drivers | ||
686 | # | ||
687 | CONFIG_SERIAL_8250=y | ||
688 | CONFIG_SERIAL_8250_CONSOLE=y | ||
689 | CONFIG_SERIAL_8250_ACPI=y | ||
690 | CONFIG_SERIAL_8250_NR_UARTS=6 | ||
691 | CONFIG_SERIAL_8250_EXTENDED=y | ||
692 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
693 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | ||
694 | # CONFIG_SERIAL_8250_RSA is not set | ||
695 | |||
696 | # | ||
697 | # Non-8250 serial port support | ||
698 | # | ||
699 | CONFIG_SERIAL_CORE=y | ||
700 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
701 | CONFIG_SERIAL_SGI_L1_CONSOLE=y | ||
702 | # CONFIG_SERIAL_JSM is not set | ||
703 | CONFIG_SERIAL_SGI_IOC4=y | ||
704 | CONFIG_UNIX98_PTYS=y | ||
705 | CONFIG_LEGACY_PTYS=y | ||
706 | CONFIG_LEGACY_PTY_COUNT=256 | ||
707 | |||
708 | # | ||
709 | # IPMI | ||
710 | # | ||
711 | # CONFIG_IPMI_HANDLER is not set | ||
712 | |||
713 | # | ||
714 | # Watchdog Cards | ||
715 | # | ||
716 | # CONFIG_WATCHDOG is not set | ||
717 | # CONFIG_HW_RANDOM is not set | ||
718 | CONFIG_EFI_RTC=y | ||
719 | # CONFIG_DTLK is not set | ||
720 | # CONFIG_R3964 is not set | ||
721 | # CONFIG_APPLICOM is not set | ||
722 | |||
723 | # | ||
724 | # Ftape, the floppy tape device driver | ||
725 | # | ||
726 | CONFIG_AGP=m | ||
727 | CONFIG_AGP_I460=m | ||
728 | CONFIG_AGP_HP_ZX1=m | ||
729 | CONFIG_AGP_SGI_TIOCA=m | ||
730 | CONFIG_DRM=m | ||
731 | CONFIG_DRM_TDFX=m | ||
732 | CONFIG_DRM_R128=m | ||
733 | CONFIG_DRM_RADEON=m | ||
734 | CONFIG_DRM_MGA=m | ||
735 | CONFIG_DRM_SIS=m | ||
736 | # CONFIG_DRM_VIA is not set | ||
737 | # CONFIG_DRM_SAVAGE is not set | ||
738 | CONFIG_RAW_DRIVER=m | ||
739 | CONFIG_HPET=y | ||
740 | # CONFIG_HPET_RTC_IRQ is not set | ||
741 | CONFIG_HPET_MMAP=y | ||
742 | CONFIG_MAX_RAW_DEVS=256 | ||
743 | # CONFIG_HANGCHECK_TIMER is not set | ||
744 | CONFIG_MMTIMER=y | ||
745 | |||
746 | # | ||
747 | # TPM devices | ||
748 | # | ||
749 | # CONFIG_TCG_TPM is not set | ||
750 | |||
751 | # | ||
752 | # I2C support | ||
753 | # | ||
754 | # CONFIG_I2C is not set | ||
755 | |||
756 | # | ||
757 | # Dallas's 1-wire bus | ||
758 | # | ||
759 | # CONFIG_W1 is not set | ||
760 | |||
761 | # | ||
762 | # Hardware Monitoring support | ||
763 | # | ||
764 | CONFIG_HWMON=y | ||
765 | # CONFIG_HWMON_VID is not set | ||
766 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
767 | |||
768 | # | ||
769 | # Misc devices | ||
770 | # | ||
771 | |||
772 | # | ||
773 | # Multimedia Capabilities Port drivers | ||
774 | # | ||
775 | |||
776 | # | ||
777 | # Multimedia devices | ||
778 | # | ||
779 | # CONFIG_VIDEO_DEV is not set | ||
780 | |||
781 | # | ||
782 | # Digital Video Broadcasting Devices | ||
783 | # | ||
784 | # CONFIG_DVB is not set | ||
785 | |||
786 | # | ||
787 | # Graphics support | ||
788 | # | ||
789 | # CONFIG_FB is not set | ||
790 | |||
791 | # | ||
792 | # Console display driver support | ||
793 | # | ||
794 | CONFIG_VGA_CONSOLE=y | ||
795 | CONFIG_DUMMY_CONSOLE=y | ||
796 | |||
797 | # | ||
798 | # Sound | ||
799 | # | ||
800 | CONFIG_SOUND=m | ||
801 | |||
802 | # | ||
803 | # Advanced Linux Sound Architecture | ||
804 | # | ||
805 | CONFIG_SND=m | ||
806 | CONFIG_SND_TIMER=m | ||
807 | CONFIG_SND_PCM=m | ||
808 | CONFIG_SND_HWDEP=m | ||
809 | CONFIG_SND_RAWMIDI=m | ||
810 | CONFIG_SND_SEQUENCER=m | ||
811 | CONFIG_SND_SEQ_DUMMY=m | ||
812 | CONFIG_SND_OSSEMUL=y | ||
813 | CONFIG_SND_MIXER_OSS=m | ||
814 | CONFIG_SND_PCM_OSS=m | ||
815 | CONFIG_SND_SEQUENCER_OSS=y | ||
816 | CONFIG_SND_VERBOSE_PRINTK=y | ||
817 | # CONFIG_SND_DEBUG is not set | ||
818 | CONFIG_SND_GENERIC_DRIVER=y | ||
819 | |||
820 | # | ||
821 | # Generic devices | ||
822 | # | ||
823 | CONFIG_SND_MPU401_UART=m | ||
824 | CONFIG_SND_OPL3_LIB=m | ||
825 | CONFIG_SND_DUMMY=m | ||
826 | CONFIG_SND_VIRMIDI=m | ||
827 | CONFIG_SND_MTPAV=m | ||
828 | CONFIG_SND_SERIAL_U16550=m | ||
829 | CONFIG_SND_MPU401=m | ||
830 | CONFIG_SND_AC97_CODEC=m | ||
831 | CONFIG_SND_AC97_BUS=m | ||
832 | |||
833 | # | ||
834 | # PCI devices | ||
835 | # | ||
836 | # CONFIG_SND_ALI5451 is not set | ||
837 | # CONFIG_SND_ATIIXP is not set | ||
838 | # CONFIG_SND_ATIIXP_MODEM is not set | ||
839 | # CONFIG_SND_AU8810 is not set | ||
840 | # CONFIG_SND_AU8820 is not set | ||
841 | # CONFIG_SND_AU8830 is not set | ||
842 | # CONFIG_SND_AZT3328 is not set | ||
843 | # CONFIG_SND_BT87X is not set | ||
844 | CONFIG_SND_CS46XX=m | ||
845 | CONFIG_SND_CS46XX_NEW_DSP=y | ||
846 | CONFIG_SND_CS4281=m | ||
847 | CONFIG_SND_EMU10K1=m | ||
848 | # CONFIG_SND_EMU10K1X is not set | ||
849 | # CONFIG_SND_CA0106 is not set | ||
850 | # CONFIG_SND_KORG1212 is not set | ||
851 | # CONFIG_SND_MIXART is not set | ||
852 | # CONFIG_SND_NM256 is not set | ||
853 | # CONFIG_SND_RME32 is not set | ||
854 | # CONFIG_SND_RME96 is not set | ||
855 | # CONFIG_SND_RME9652 is not set | ||
856 | # CONFIG_SND_HDSP is not set | ||
857 | # CONFIG_SND_HDSPM is not set | ||
858 | # CONFIG_SND_TRIDENT is not set | ||
859 | # CONFIG_SND_YMFPCI is not set | ||
860 | # CONFIG_SND_AD1889 is not set | ||
861 | # CONFIG_SND_CMIPCI is not set | ||
862 | # CONFIG_SND_ENS1370 is not set | ||
863 | # CONFIG_SND_ENS1371 is not set | ||
864 | # CONFIG_SND_ES1938 is not set | ||
865 | # CONFIG_SND_ES1968 is not set | ||
866 | # CONFIG_SND_MAESTRO3 is not set | ||
867 | CONFIG_SND_FM801=m | ||
868 | # CONFIG_SND_FM801_TEA575X is not set | ||
869 | # CONFIG_SND_ICE1712 is not set | ||
870 | # CONFIG_SND_ICE1724 is not set | ||
871 | # CONFIG_SND_INTEL8X0 is not set | ||
872 | # CONFIG_SND_INTEL8X0M is not set | ||
873 | # CONFIG_SND_SONICVIBES is not set | ||
874 | # CONFIG_SND_VIA82XX is not set | ||
875 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
876 | # CONFIG_SND_VX222 is not set | ||
877 | # CONFIG_SND_HDA_INTEL is not set | ||
878 | |||
879 | # | ||
880 | # USB devices | ||
881 | # | ||
882 | # CONFIG_SND_USB_AUDIO is not set | ||
883 | |||
884 | # | ||
885 | # Open Sound System | ||
886 | # | ||
887 | # CONFIG_SOUND_PRIME is not set | ||
888 | |||
889 | # | ||
890 | # USB support | ||
891 | # | ||
892 | CONFIG_USB_ARCH_HAS_HCD=y | ||
893 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
894 | CONFIG_USB=m | ||
895 | # CONFIG_USB_DEBUG is not set | ||
896 | |||
897 | # | ||
898 | # Miscellaneous USB options | ||
899 | # | ||
900 | CONFIG_USB_DEVICEFS=y | ||
901 | # CONFIG_USB_BANDWIDTH is not set | ||
902 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
903 | # CONFIG_USB_SUSPEND is not set | ||
904 | # CONFIG_USB_OTG is not set | ||
905 | |||
906 | # | ||
907 | # USB Host Controller Drivers | ||
908 | # | ||
909 | CONFIG_USB_EHCI_HCD=m | ||
910 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
911 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | ||
912 | # CONFIG_USB_ISP116X_HCD is not set | ||
913 | CONFIG_USB_OHCI_HCD=m | ||
914 | # CONFIG_USB_OHCI_BIG_ENDIAN is not set | ||
915 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
916 | CONFIG_USB_UHCI_HCD=m | ||
917 | # CONFIG_USB_SL811_HCD is not set | ||
918 | |||
919 | # | ||
920 | # USB Device Class drivers | ||
921 | # | ||
922 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set | ||
923 | # CONFIG_USB_BLUETOOTH_TTY is not set | ||
924 | # CONFIG_USB_ACM is not set | ||
925 | # CONFIG_USB_PRINTER is not set | ||
926 | |||
927 | # | ||
928 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | ||
929 | # | ||
930 | CONFIG_USB_STORAGE=m | ||
931 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
932 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
933 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
934 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
935 | # CONFIG_USB_STORAGE_DPCM is not set | ||
936 | # CONFIG_USB_STORAGE_USBAT is not set | ||
937 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
938 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
939 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
940 | |||
941 | # | ||
942 | # USB Input Devices | ||
943 | # | ||
944 | CONFIG_USB_HID=m | ||
945 | CONFIG_USB_HIDINPUT=y | ||
946 | # CONFIG_HID_FF is not set | ||
947 | # CONFIG_USB_HIDDEV is not set | ||
948 | |||
949 | # | ||
950 | # USB HID Boot Protocol drivers | ||
951 | # | ||
952 | # CONFIG_USB_KBD is not set | ||
953 | # CONFIG_USB_MOUSE is not set | ||
954 | # CONFIG_USB_AIPTEK is not set | ||
955 | # CONFIG_USB_WACOM is not set | ||
956 | # CONFIG_USB_ACECAD is not set | ||
957 | # CONFIG_USB_KBTAB is not set | ||
958 | # CONFIG_USB_POWERMATE is not set | ||
959 | # CONFIG_USB_MTOUCH is not set | ||
960 | # CONFIG_USB_ITMTOUCH is not set | ||
961 | # CONFIG_USB_EGALAX is not set | ||
962 | # CONFIG_USB_YEALINK is not set | ||
963 | # CONFIG_USB_XPAD is not set | ||
964 | # CONFIG_USB_ATI_REMOTE is not set | ||
965 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
966 | # CONFIG_USB_APPLETOUCH is not set | ||
967 | |||
968 | # | ||
969 | # USB Imaging devices | ||
970 | # | ||
971 | # CONFIG_USB_MDC800 is not set | ||
972 | # CONFIG_USB_MICROTEK is not set | ||
973 | |||
974 | # | ||
975 | # USB Multimedia devices | ||
976 | # | ||
977 | # CONFIG_USB_DABUSB is not set | ||
978 | |||
979 | # | ||
980 | # Video4Linux support is needed for USB Multimedia device support | ||
981 | # | ||
982 | |||
983 | # | ||
984 | # USB Network Adapters | ||
985 | # | ||
986 | # CONFIG_USB_CATC is not set | ||
987 | # CONFIG_USB_KAWETH is not set | ||
988 | # CONFIG_USB_PEGASUS is not set | ||
989 | # CONFIG_USB_RTL8150 is not set | ||
990 | # CONFIG_USB_USBNET is not set | ||
991 | CONFIG_USB_MON=y | ||
992 | |||
993 | # | ||
994 | # USB port drivers | ||
995 | # | ||
996 | |||
997 | # | ||
998 | # USB Serial Converter support | ||
999 | # | ||
1000 | # CONFIG_USB_SERIAL is not set | ||
1001 | |||
1002 | # | ||
1003 | # USB Miscellaneous drivers | ||
1004 | # | ||
1005 | # CONFIG_USB_EMI62 is not set | ||
1006 | # CONFIG_USB_EMI26 is not set | ||
1007 | # CONFIG_USB_AUERSWALD is not set | ||
1008 | # CONFIG_USB_RIO500 is not set | ||
1009 | # CONFIG_USB_LEGOTOWER is not set | ||
1010 | # CONFIG_USB_LCD is not set | ||
1011 | # CONFIG_USB_LED is not set | ||
1012 | # CONFIG_USB_CYTHERM is not set | ||
1013 | # CONFIG_USB_PHIDGETKIT is not set | ||
1014 | # CONFIG_USB_PHIDGETSERVO is not set | ||
1015 | # CONFIG_USB_IDMOUSE is not set | ||
1016 | # CONFIG_USB_SISUSBVGA is not set | ||
1017 | # CONFIG_USB_LD is not set | ||
1018 | # CONFIG_USB_TEST is not set | ||
1019 | |||
1020 | # | ||
1021 | # USB DSL modem support | ||
1022 | # | ||
1023 | |||
1024 | # | ||
1025 | # USB Gadget Support | ||
1026 | # | ||
1027 | # CONFIG_USB_GADGET is not set | ||
1028 | |||
1029 | # | ||
1030 | # MMC/SD Card support | ||
1031 | # | ||
1032 | # CONFIG_MMC is not set | ||
1033 | |||
1034 | # | ||
1035 | # InfiniBand support | ||
1036 | # | ||
1037 | CONFIG_INFINIBAND=m | ||
1038 | # CONFIG_INFINIBAND_USER_MAD is not set | ||
1039 | # CONFIG_INFINIBAND_USER_ACCESS is not set | ||
1040 | CONFIG_INFINIBAND_MTHCA=m | ||
1041 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set | ||
1042 | CONFIG_INFINIBAND_IPOIB=m | ||
1043 | # CONFIG_INFINIBAND_IPOIB_DEBUG is not set | ||
1044 | |||
1045 | # | ||
1046 | # SN Devices | ||
1047 | # | ||
1048 | CONFIG_SGI_IOC4=y | ||
1049 | |||
1050 | # | ||
1051 | # File systems | ||
1052 | # | ||
1053 | CONFIG_EXT2_FS=y | ||
1054 | CONFIG_EXT2_FS_XATTR=y | ||
1055 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
1056 | CONFIG_EXT2_FS_SECURITY=y | ||
1057 | # CONFIG_EXT2_FS_XIP is not set | ||
1058 | CONFIG_EXT3_FS=y | ||
1059 | CONFIG_EXT3_FS_XATTR=y | ||
1060 | CONFIG_EXT3_FS_POSIX_ACL=y | ||
1061 | CONFIG_EXT3_FS_SECURITY=y | ||
1062 | CONFIG_JBD=y | ||
1063 | # CONFIG_JBD_DEBUG is not set | ||
1064 | CONFIG_FS_MBCACHE=y | ||
1065 | CONFIG_REISERFS_FS=y | ||
1066 | # CONFIG_REISERFS_CHECK is not set | ||
1067 | # CONFIG_REISERFS_PROC_INFO is not set | ||
1068 | CONFIG_REISERFS_FS_XATTR=y | ||
1069 | CONFIG_REISERFS_FS_POSIX_ACL=y | ||
1070 | CONFIG_REISERFS_FS_SECURITY=y | ||
1071 | # CONFIG_JFS_FS is not set | ||
1072 | CONFIG_FS_POSIX_ACL=y | ||
1073 | CONFIG_XFS_FS=y | ||
1074 | CONFIG_XFS_EXPORT=y | ||
1075 | # CONFIG_XFS_QUOTA is not set | ||
1076 | # CONFIG_XFS_SECURITY is not set | ||
1077 | # CONFIG_XFS_POSIX_ACL is not set | ||
1078 | # CONFIG_XFS_RT is not set | ||
1079 | # CONFIG_MINIX_FS is not set | ||
1080 | # CONFIG_ROMFS_FS is not set | ||
1081 | CONFIG_INOTIFY=y | ||
1082 | # CONFIG_QUOTA is not set | ||
1083 | CONFIG_DNOTIFY=y | ||
1084 | CONFIG_AUTOFS_FS=y | ||
1085 | CONFIG_AUTOFS4_FS=y | ||
1086 | # CONFIG_FUSE_FS is not set | ||
1087 | |||
1088 | # | ||
1089 | # CD-ROM/DVD Filesystems | ||
1090 | # | ||
1091 | CONFIG_ISO9660_FS=m | ||
1092 | CONFIG_JOLIET=y | ||
1093 | # CONFIG_ZISOFS is not set | ||
1094 | CONFIG_UDF_FS=m | ||
1095 | CONFIG_UDF_NLS=y | ||
1096 | |||
1097 | # | ||
1098 | # DOS/FAT/NT Filesystems | ||
1099 | # | ||
1100 | CONFIG_FAT_FS=y | ||
1101 | # CONFIG_MSDOS_FS is not set | ||
1102 | CONFIG_VFAT_FS=y | ||
1103 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
1104 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
1105 | CONFIG_NTFS_FS=m | ||
1106 | # CONFIG_NTFS_DEBUG is not set | ||
1107 | # CONFIG_NTFS_RW is not set | ||
1108 | |||
1109 | # | ||
1110 | # Pseudo filesystems | ||
1111 | # | ||
1112 | CONFIG_PROC_FS=y | ||
1113 | CONFIG_PROC_KCORE=y | ||
1114 | CONFIG_SYSFS=y | ||
1115 | CONFIG_TMPFS=y | ||
1116 | CONFIG_HUGETLBFS=y | ||
1117 | CONFIG_HUGETLB_PAGE=y | ||
1118 | CONFIG_RAMFS=y | ||
1119 | # CONFIG_RELAYFS_FS is not set | ||
1120 | |||
1121 | # | ||
1122 | # Miscellaneous filesystems | ||
1123 | # | ||
1124 | # CONFIG_ADFS_FS is not set | ||
1125 | # CONFIG_AFFS_FS is not set | ||
1126 | # CONFIG_HFS_FS is not set | ||
1127 | # CONFIG_HFSPLUS_FS is not set | ||
1128 | # CONFIG_BEFS_FS is not set | ||
1129 | # CONFIG_BFS_FS is not set | ||
1130 | # CONFIG_EFS_FS is not set | ||
1131 | # CONFIG_CRAMFS is not set | ||
1132 | # CONFIG_VXFS_FS is not set | ||
1133 | # CONFIG_HPFS_FS is not set | ||
1134 | # CONFIG_QNX4FS_FS is not set | ||
1135 | # CONFIG_SYSV_FS is not set | ||
1136 | # CONFIG_UFS_FS is not set | ||
1137 | |||
1138 | # | ||
1139 | # Network File Systems | ||
1140 | # | ||
1141 | CONFIG_NFS_FS=m | ||
1142 | CONFIG_NFS_V3=y | ||
1143 | # CONFIG_NFS_V3_ACL is not set | ||
1144 | CONFIG_NFS_V4=y | ||
1145 | CONFIG_NFS_DIRECTIO=y | ||
1146 | CONFIG_NFSD=m | ||
1147 | CONFIG_NFSD_V3=y | ||
1148 | # CONFIG_NFSD_V3_ACL is not set | ||
1149 | CONFIG_NFSD_V4=y | ||
1150 | CONFIG_NFSD_TCP=y | ||
1151 | CONFIG_LOCKD=m | ||
1152 | CONFIG_LOCKD_V4=y | ||
1153 | CONFIG_EXPORTFS=y | ||
1154 | CONFIG_NFS_COMMON=y | ||
1155 | CONFIG_SUNRPC=m | ||
1156 | CONFIG_SUNRPC_GSS=m | ||
1157 | CONFIG_RPCSEC_GSS_KRB5=m | ||
1158 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1159 | CONFIG_SMB_FS=m | ||
1160 | CONFIG_SMB_NLS_DEFAULT=y | ||
1161 | CONFIG_SMB_NLS_REMOTE="cp437" | ||
1162 | CONFIG_CIFS=m | ||
1163 | # CONFIG_CIFS_STATS is not set | ||
1164 | # CONFIG_CIFS_XATTR is not set | ||
1165 | # CONFIG_CIFS_EXPERIMENTAL is not set | ||
1166 | # CONFIG_NCP_FS is not set | ||
1167 | # CONFIG_CODA_FS is not set | ||
1168 | # CONFIG_AFS_FS is not set | ||
1169 | # CONFIG_9P_FS is not set | ||
1170 | |||
1171 | # | ||
1172 | # Partition Types | ||
1173 | # | ||
1174 | CONFIG_PARTITION_ADVANCED=y | ||
1175 | # CONFIG_ACORN_PARTITION is not set | ||
1176 | # CONFIG_OSF_PARTITION is not set | ||
1177 | # CONFIG_AMIGA_PARTITION is not set | ||
1178 | # CONFIG_ATARI_PARTITION is not set | ||
1179 | # CONFIG_MAC_PARTITION is not set | ||
1180 | CONFIG_MSDOS_PARTITION=y | ||
1181 | # CONFIG_BSD_DISKLABEL is not set | ||
1182 | # CONFIG_MINIX_SUBPARTITION is not set | ||
1183 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
1184 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
1185 | # CONFIG_LDM_PARTITION is not set | ||
1186 | CONFIG_SGI_PARTITION=y | ||
1187 | # CONFIG_ULTRIX_PARTITION is not set | ||
1188 | # CONFIG_SUN_PARTITION is not set | ||
1189 | CONFIG_EFI_PARTITION=y | ||
1190 | |||
1191 | # | ||
1192 | # Native Language Support | ||
1193 | # | ||
1194 | CONFIG_NLS=y | ||
1195 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1196 | CONFIG_NLS_CODEPAGE_437=y | ||
1197 | CONFIG_NLS_CODEPAGE_737=m | ||
1198 | CONFIG_NLS_CODEPAGE_775=m | ||
1199 | CONFIG_NLS_CODEPAGE_850=m | ||
1200 | CONFIG_NLS_CODEPAGE_852=m | ||
1201 | CONFIG_NLS_CODEPAGE_855=m | ||
1202 | CONFIG_NLS_CODEPAGE_857=m | ||
1203 | CONFIG_NLS_CODEPAGE_860=m | ||
1204 | CONFIG_NLS_CODEPAGE_861=m | ||
1205 | CONFIG_NLS_CODEPAGE_862=m | ||
1206 | CONFIG_NLS_CODEPAGE_863=m | ||
1207 | CONFIG_NLS_CODEPAGE_864=m | ||
1208 | CONFIG_NLS_CODEPAGE_865=m | ||
1209 | CONFIG_NLS_CODEPAGE_866=m | ||
1210 | CONFIG_NLS_CODEPAGE_869=m | ||
1211 | CONFIG_NLS_CODEPAGE_936=m | ||
1212 | CONFIG_NLS_CODEPAGE_950=m | ||
1213 | CONFIG_NLS_CODEPAGE_932=m | ||
1214 | CONFIG_NLS_CODEPAGE_949=m | ||
1215 | CONFIG_NLS_CODEPAGE_874=m | ||
1216 | CONFIG_NLS_ISO8859_8=m | ||
1217 | CONFIG_NLS_CODEPAGE_1250=m | ||
1218 | CONFIG_NLS_CODEPAGE_1251=m | ||
1219 | # CONFIG_NLS_ASCII is not set | ||
1220 | CONFIG_NLS_ISO8859_1=y | ||
1221 | CONFIG_NLS_ISO8859_2=m | ||
1222 | CONFIG_NLS_ISO8859_3=m | ||
1223 | CONFIG_NLS_ISO8859_4=m | ||
1224 | CONFIG_NLS_ISO8859_5=m | ||
1225 | CONFIG_NLS_ISO8859_6=m | ||
1226 | CONFIG_NLS_ISO8859_7=m | ||
1227 | CONFIG_NLS_ISO8859_9=m | ||
1228 | CONFIG_NLS_ISO8859_13=m | ||
1229 | CONFIG_NLS_ISO8859_14=m | ||
1230 | CONFIG_NLS_ISO8859_15=m | ||
1231 | CONFIG_NLS_KOI8_R=m | ||
1232 | CONFIG_NLS_KOI8_U=m | ||
1233 | CONFIG_NLS_UTF8=m | ||
1234 | |||
1235 | # | ||
1236 | # Library routines | ||
1237 | # | ||
1238 | # CONFIG_CRC_CCITT is not set | ||
1239 | # CONFIG_CRC16 is not set | ||
1240 | CONFIG_CRC32=y | ||
1241 | # CONFIG_LIBCRC32C is not set | ||
1242 | CONFIG_GENERIC_HARDIRQS=y | ||
1243 | CONFIG_GENERIC_IRQ_PROBE=y | ||
1244 | CONFIG_GENERIC_PENDING_IRQ=y | ||
1245 | |||
1246 | # | ||
1247 | # HP Simulator drivers | ||
1248 | # | ||
1249 | # CONFIG_HP_SIMETH is not set | ||
1250 | # CONFIG_HP_SIMSERIAL is not set | ||
1251 | # CONFIG_HP_SIMSCSI is not set | ||
1252 | |||
1253 | # | ||
1254 | # Profiling support | ||
1255 | # | ||
1256 | # CONFIG_PROFILING is not set | ||
1257 | |||
1258 | # | ||
1259 | # Kernel hacking | ||
1260 | # | ||
1261 | # CONFIG_PRINTK_TIME is not set | ||
1262 | CONFIG_DEBUG_KERNEL=y | ||
1263 | CONFIG_MAGIC_SYSRQ=y | ||
1264 | CONFIG_LOG_BUF_SHIFT=20 | ||
1265 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1266 | # CONFIG_SCHEDSTATS is not set | ||
1267 | # CONFIG_DEBUG_SLAB is not set | ||
1268 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1269 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1270 | # CONFIG_DEBUG_KOBJECT is not set | ||
1271 | # CONFIG_DEBUG_INFO is not set | ||
1272 | # CONFIG_DEBUG_FS is not set | ||
1273 | # CONFIG_KPROBES is not set | ||
1274 | CONFIG_IA64_GRANULE_16MB=y | ||
1275 | # CONFIG_IA64_GRANULE_64MB is not set | ||
1276 | # CONFIG_IA64_PRINT_HAZARDS is not set | ||
1277 | # CONFIG_DISABLE_VHPT is not set | ||
1278 | # CONFIG_IA64_DEBUG_CMPXCHG is not set | ||
1279 | # CONFIG_IA64_DEBUG_IRQ is not set | ||
1280 | CONFIG_SYSVIPC_COMPAT=y | ||
1281 | |||
1282 | # | ||
1283 | # Security options | ||
1284 | # | ||
1285 | # CONFIG_KEYS is not set | ||
1286 | # CONFIG_SECURITY is not set | ||
1287 | |||
1288 | # | ||
1289 | # Cryptographic options | ||
1290 | # | ||
1291 | CONFIG_CRYPTO=y | ||
1292 | # CONFIG_CRYPTO_HMAC is not set | ||
1293 | # CONFIG_CRYPTO_NULL is not set | ||
1294 | # CONFIG_CRYPTO_MD4 is not set | ||
1295 | CONFIG_CRYPTO_MD5=y | ||
1296 | # CONFIG_CRYPTO_SHA1 is not set | ||
1297 | # CONFIG_CRYPTO_SHA256 is not set | ||
1298 | # CONFIG_CRYPTO_SHA512 is not set | ||
1299 | # CONFIG_CRYPTO_WP512 is not set | ||
1300 | # CONFIG_CRYPTO_TGR192 is not set | ||
1301 | CONFIG_CRYPTO_DES=m | ||
1302 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1303 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1304 | # CONFIG_CRYPTO_SERPENT is not set | ||
1305 | # CONFIG_CRYPTO_AES is not set | ||
1306 | # CONFIG_CRYPTO_CAST5 is not set | ||
1307 | # CONFIG_CRYPTO_CAST6 is not set | ||
1308 | # CONFIG_CRYPTO_TEA is not set | ||
1309 | # CONFIG_CRYPTO_ARC4 is not set | ||
1310 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1311 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1312 | # CONFIG_CRYPTO_DEFLATE is not set | ||
1313 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1314 | # CONFIG_CRYPTO_CRC32C is not set | ||
1315 | # CONFIG_CRYPTO_TEST is not set | ||
1316 | |||
1317 | # | ||
1318 | # Hardware crypto devices | ||
1319 | # | ||
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig index d452e18ac494..9bc8bcafc905 100644 --- a/arch/ia64/configs/tiger_defconfig +++ b/arch/ia64/configs/tiger_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.13-rc6-tiger-smp | 3 | # Linux kernel version: 2.6.14-rc1 |
4 | # Wed Aug 17 10:19:51 2005 | 4 | # Wed Sep 14 15:17:57 2005 |
5 | # | 5 | # |
6 | 6 | ||
7 | # | 7 | # |
@@ -16,6 +16,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
16 | # General setup | 16 | # General setup |
17 | # | 17 | # |
18 | CONFIG_LOCALVERSION="" | 18 | CONFIG_LOCALVERSION="" |
19 | CONFIG_LOCALVERSION_AUTO=y | ||
19 | CONFIG_SWAP=y | 20 | CONFIG_SWAP=y |
20 | CONFIG_SYSVIPC=y | 21 | CONFIG_SYSVIPC=y |
21 | CONFIG_POSIX_MQUEUE=y | 22 | CONFIG_POSIX_MQUEUE=y |
@@ -27,6 +28,7 @@ CONFIG_KOBJECT_UEVENT=y | |||
27 | CONFIG_IKCONFIG=y | 28 | CONFIG_IKCONFIG=y |
28 | CONFIG_IKCONFIG_PROC=y | 29 | CONFIG_IKCONFIG_PROC=y |
29 | # CONFIG_CPUSETS is not set | 30 | # CONFIG_CPUSETS is not set |
31 | CONFIG_INITRAMFS_SOURCE="" | ||
30 | # CONFIG_EMBEDDED is not set | 32 | # CONFIG_EMBEDDED is not set |
31 | CONFIG_KALLSYMS=y | 33 | CONFIG_KALLSYMS=y |
32 | CONFIG_KALLSYMS_ALL=y | 34 | CONFIG_KALLSYMS_ALL=y |
@@ -103,6 +105,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
103 | # CONFIG_SPARSEMEM_MANUAL is not set | 105 | # CONFIG_SPARSEMEM_MANUAL is not set |
104 | CONFIG_FLATMEM=y | 106 | CONFIG_FLATMEM=y |
105 | CONFIG_FLAT_NODE_MEM_MAP=y | 107 | CONFIG_FLAT_NODE_MEM_MAP=y |
108 | # CONFIG_SPARSEMEM_STATIC is not set | ||
106 | CONFIG_HAVE_DEC_LOCK=y | 109 | CONFIG_HAVE_DEC_LOCK=y |
107 | CONFIG_IA32_SUPPORT=y | 110 | CONFIG_IA32_SUPPORT=y |
108 | CONFIG_COMPAT=y | 111 | CONFIG_COMPAT=y |
@@ -115,6 +118,7 @@ CONFIG_IA64_PALINFO=y | |||
115 | # | 118 | # |
116 | CONFIG_EFI_VARS=y | 119 | CONFIG_EFI_VARS=y |
117 | CONFIG_EFI_PCDP=y | 120 | CONFIG_EFI_PCDP=y |
121 | # CONFIG_DELL_RBU is not set | ||
118 | CONFIG_BINFMT_ELF=y | 122 | CONFIG_BINFMT_ELF=y |
119 | CONFIG_BINFMT_MISC=m | 123 | CONFIG_BINFMT_MISC=m |
120 | 124 | ||
@@ -122,20 +126,27 @@ CONFIG_BINFMT_MISC=m | |||
122 | # Power management and ACPI | 126 | # Power management and ACPI |
123 | # | 127 | # |
124 | CONFIG_PM=y | 128 | CONFIG_PM=y |
125 | CONFIG_ACPI=y | 129 | # CONFIG_PM_DEBUG is not set |
126 | 130 | ||
127 | # | 131 | # |
128 | # ACPI (Advanced Configuration and Power Interface) Support | 132 | # ACPI (Advanced Configuration and Power Interface) Support |
129 | # | 133 | # |
134 | CONFIG_ACPI=y | ||
130 | CONFIG_ACPI_BUTTON=m | 135 | CONFIG_ACPI_BUTTON=m |
131 | CONFIG_ACPI_FAN=m | 136 | CONFIG_ACPI_FAN=m |
132 | CONFIG_ACPI_PROCESSOR=m | 137 | CONFIG_ACPI_PROCESSOR=m |
133 | # CONFIG_ACPI_HOTPLUG_CPU is not set | 138 | CONFIG_ACPI_HOTPLUG_CPU=y |
134 | CONFIG_ACPI_THERMAL=m | 139 | CONFIG_ACPI_THERMAL=m |
140 | CONFIG_ACPI_BLACKLIST_YEAR=0 | ||
135 | # CONFIG_ACPI_DEBUG is not set | 141 | # CONFIG_ACPI_DEBUG is not set |
136 | CONFIG_ACPI_POWER=y | 142 | CONFIG_ACPI_POWER=y |
137 | CONFIG_ACPI_SYSTEM=y | 143 | CONFIG_ACPI_SYSTEM=y |
138 | # CONFIG_ACPI_CONTAINER is not set | 144 | CONFIG_ACPI_CONTAINER=m |
145 | |||
146 | # | ||
147 | # CPU Frequency scaling | ||
148 | # | ||
149 | # CONFIG_CPU_FREQ is not set | ||
139 | 150 | ||
140 | # | 151 | # |
141 | # Bus options (PCI, PCMCIA) | 152 | # Bus options (PCI, PCMCIA) |
@@ -144,7 +155,6 @@ CONFIG_PCI=y | |||
144 | CONFIG_PCI_DOMAINS=y | 155 | CONFIG_PCI_DOMAINS=y |
145 | # CONFIG_PCI_MSI is not set | 156 | # CONFIG_PCI_MSI is not set |
146 | CONFIG_PCI_LEGACY_PROC=y | 157 | CONFIG_PCI_LEGACY_PROC=y |
147 | CONFIG_PCI_NAMES=y | ||
148 | # CONFIG_PCI_DEBUG is not set | 158 | # CONFIG_PCI_DEBUG is not set |
149 | 159 | ||
150 | # | 160 | # |
@@ -188,14 +198,19 @@ CONFIG_SYN_COOKIES=y | |||
188 | # CONFIG_INET_ESP is not set | 198 | # CONFIG_INET_ESP is not set |
189 | # CONFIG_INET_IPCOMP is not set | 199 | # CONFIG_INET_IPCOMP is not set |
190 | # CONFIG_INET_TUNNEL is not set | 200 | # CONFIG_INET_TUNNEL is not set |
191 | CONFIG_IP_TCPDIAG=y | 201 | CONFIG_INET_DIAG=y |
192 | # CONFIG_IP_TCPDIAG_IPV6 is not set | 202 | CONFIG_INET_TCP_DIAG=y |
193 | # CONFIG_TCP_CONG_ADVANCED is not set | 203 | # CONFIG_TCP_CONG_ADVANCED is not set |
194 | CONFIG_TCP_CONG_BIC=y | 204 | CONFIG_TCP_CONG_BIC=y |
195 | # CONFIG_IPV6 is not set | 205 | # CONFIG_IPV6 is not set |
196 | # CONFIG_NETFILTER is not set | 206 | # CONFIG_NETFILTER is not set |
197 | 207 | ||
198 | # | 208 | # |
209 | # DCCP Configuration (EXPERIMENTAL) | ||
210 | # | ||
211 | # CONFIG_IP_DCCP is not set | ||
212 | |||
213 | # | ||
199 | # SCTP Configuration (EXPERIMENTAL) | 214 | # SCTP Configuration (EXPERIMENTAL) |
200 | # | 215 | # |
201 | # CONFIG_IP_SCTP is not set | 216 | # CONFIG_IP_SCTP is not set |
@@ -218,9 +233,11 @@ CONFIG_TCP_CONG_BIC=y | |||
218 | # Network testing | 233 | # Network testing |
219 | # | 234 | # |
220 | # CONFIG_NET_PKTGEN is not set | 235 | # CONFIG_NET_PKTGEN is not set |
236 | # CONFIG_NETFILTER_NETLINK is not set | ||
221 | # CONFIG_HAMRADIO is not set | 237 | # CONFIG_HAMRADIO is not set |
222 | # CONFIG_IRDA is not set | 238 | # CONFIG_IRDA is not set |
223 | # CONFIG_BT is not set | 239 | # CONFIG_BT is not set |
240 | # CONFIG_IEEE80211 is not set | ||
224 | 241 | ||
225 | # | 242 | # |
226 | # Device Drivers | 243 | # Device Drivers |
@@ -235,6 +252,11 @@ CONFIG_FW_LOADER=m | |||
235 | # CONFIG_DEBUG_DRIVER is not set | 252 | # CONFIG_DEBUG_DRIVER is not set |
236 | 253 | ||
237 | # | 254 | # |
255 | # Connector - unified userspace <-> kernelspace linker | ||
256 | # | ||
257 | # CONFIG_CONNECTOR is not set | ||
258 | |||
259 | # | ||
238 | # Memory Technology Devices (MTD) | 260 | # Memory Technology Devices (MTD) |
239 | # | 261 | # |
240 | # CONFIG_MTD is not set | 262 | # CONFIG_MTD is not set |
@@ -247,7 +269,13 @@ CONFIG_FW_LOADER=m | |||
247 | # | 269 | # |
248 | # Plug and Play support | 270 | # Plug and Play support |
249 | # | 271 | # |
250 | # CONFIG_PNP is not set | 272 | CONFIG_PNP=y |
273 | # CONFIG_PNP_DEBUG is not set | ||
274 | |||
275 | # | ||
276 | # Protocols | ||
277 | # | ||
278 | CONFIG_PNPACPI=y | ||
251 | 279 | ||
252 | # | 280 | # |
253 | # Block devices | 281 | # Block devices |
@@ -266,7 +294,6 @@ CONFIG_BLK_DEV_RAM=y | |||
266 | CONFIG_BLK_DEV_RAM_COUNT=16 | 294 | CONFIG_BLK_DEV_RAM_COUNT=16 |
267 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 295 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
268 | CONFIG_BLK_DEV_INITRD=y | 296 | CONFIG_BLK_DEV_INITRD=y |
269 | CONFIG_INITRAMFS_SOURCE="" | ||
270 | # CONFIG_CDROM_PKTCDVD is not set | 297 | # CONFIG_CDROM_PKTCDVD is not set |
271 | 298 | ||
272 | # | 299 | # |
@@ -299,7 +326,8 @@ CONFIG_BLK_DEV_IDESCSI=m | |||
299 | # | 326 | # |
300 | # IDE chipset support/bugfixes | 327 | # IDE chipset support/bugfixes |
301 | # | 328 | # |
302 | CONFIG_IDE_GENERIC=y | 329 | # CONFIG_IDE_GENERIC is not set |
330 | # CONFIG_BLK_DEV_IDEPNP is not set | ||
303 | CONFIG_BLK_DEV_IDEPCI=y | 331 | CONFIG_BLK_DEV_IDEPCI=y |
304 | # CONFIG_IDEPCI_SHARE_IRQ is not set | 332 | # CONFIG_IDEPCI_SHARE_IRQ is not set |
305 | # CONFIG_BLK_DEV_OFFBOARD is not set | 333 | # CONFIG_BLK_DEV_OFFBOARD is not set |
@@ -339,6 +367,7 @@ CONFIG_IDEDMA_AUTO=y | |||
339 | # | 367 | # |
340 | # SCSI device support | 368 | # SCSI device support |
341 | # | 369 | # |
370 | # CONFIG_RAID_ATTRS is not set | ||
342 | CONFIG_SCSI=y | 371 | CONFIG_SCSI=y |
343 | CONFIG_SCSI_PROC_FS=y | 372 | CONFIG_SCSI_PROC_FS=y |
344 | 373 | ||
@@ -366,6 +395,7 @@ CONFIG_CHR_DEV_SG=m | |||
366 | CONFIG_SCSI_SPI_ATTRS=y | 395 | CONFIG_SCSI_SPI_ATTRS=y |
367 | CONFIG_SCSI_FC_ATTRS=y | 396 | CONFIG_SCSI_FC_ATTRS=y |
368 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 397 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
398 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
369 | 399 | ||
370 | # | 400 | # |
371 | # SCSI low-level drivers | 401 | # SCSI low-level drivers |
@@ -454,6 +484,7 @@ CONFIG_DUMMY=m | |||
454 | # CONFIG_BONDING is not set | 484 | # CONFIG_BONDING is not set |
455 | # CONFIG_EQUALIZER is not set | 485 | # CONFIG_EQUALIZER is not set |
456 | # CONFIG_TUN is not set | 486 | # CONFIG_TUN is not set |
487 | # CONFIG_NET_SB1000 is not set | ||
457 | 488 | ||
458 | # | 489 | # |
459 | # ARCnet devices | 490 | # ARCnet devices |
@@ -461,6 +492,11 @@ CONFIG_DUMMY=m | |||
461 | # CONFIG_ARCNET is not set | 492 | # CONFIG_ARCNET is not set |
462 | 493 | ||
463 | # | 494 | # |
495 | # PHY device support | ||
496 | # | ||
497 | # CONFIG_PHYLIB is not set | ||
498 | |||
499 | # | ||
464 | # Ethernet (10 or 100Mbit) | 500 | # Ethernet (10 or 100Mbit) |
465 | # | 501 | # |
466 | CONFIG_NET_ETHERNET=y | 502 | CONFIG_NET_ETHERNET=y |
@@ -481,6 +517,7 @@ CONFIG_TULIP=m | |||
481 | # CONFIG_DE4X5 is not set | 517 | # CONFIG_DE4X5 is not set |
482 | # CONFIG_WINBOND_840 is not set | 518 | # CONFIG_WINBOND_840 is not set |
483 | # CONFIG_DM9102 is not set | 519 | # CONFIG_DM9102 is not set |
520 | # CONFIG_ULI526X is not set | ||
484 | # CONFIG_HP100 is not set | 521 | # CONFIG_HP100 is not set |
485 | CONFIG_NET_PCI=y | 522 | CONFIG_NET_PCI=y |
486 | # CONFIG_PCNET32 is not set | 523 | # CONFIG_PCNET32 is not set |
@@ -512,6 +549,7 @@ CONFIG_E1000=y | |||
512 | # CONFIG_HAMACHI is not set | 549 | # CONFIG_HAMACHI is not set |
513 | # CONFIG_YELLOWFIN is not set | 550 | # CONFIG_YELLOWFIN is not set |
514 | # CONFIG_R8169 is not set | 551 | # CONFIG_R8169 is not set |
552 | # CONFIG_SIS190 is not set | ||
515 | # CONFIG_SKGE is not set | 553 | # CONFIG_SKGE is not set |
516 | # CONFIG_SK98LIN is not set | 554 | # CONFIG_SK98LIN is not set |
517 | # CONFIG_VIA_VELOCITY is not set | 555 | # CONFIG_VIA_VELOCITY is not set |
@@ -521,6 +559,7 @@ CONFIG_TIGON3=y | |||
521 | # | 559 | # |
522 | # Ethernet (10000 Mbit) | 560 | # Ethernet (10000 Mbit) |
523 | # | 561 | # |
562 | # CONFIG_CHELSIO_T1 is not set | ||
524 | # CONFIG_IXGB is not set | 563 | # CONFIG_IXGB is not set |
525 | # CONFIG_S2IO is not set | 564 | # CONFIG_S2IO is not set |
526 | 565 | ||
@@ -618,6 +657,7 @@ CONFIG_HW_CONSOLE=y | |||
618 | CONFIG_SERIAL_NONSTANDARD=y | 657 | CONFIG_SERIAL_NONSTANDARD=y |
619 | # CONFIG_ROCKETPORT is not set | 658 | # CONFIG_ROCKETPORT is not set |
620 | # CONFIG_CYCLADES is not set | 659 | # CONFIG_CYCLADES is not set |
660 | # CONFIG_DIGIEPCA is not set | ||
621 | # CONFIG_MOXA_SMARTIO is not set | 661 | # CONFIG_MOXA_SMARTIO is not set |
622 | # CONFIG_ISI is not set | 662 | # CONFIG_ISI is not set |
623 | # CONFIG_SYNCLINKMP is not set | 663 | # CONFIG_SYNCLINKMP is not set |
@@ -675,6 +715,7 @@ CONFIG_DRM_RADEON=m | |||
675 | CONFIG_DRM_MGA=m | 715 | CONFIG_DRM_MGA=m |
676 | CONFIG_DRM_SIS=m | 716 | CONFIG_DRM_SIS=m |
677 | # CONFIG_DRM_VIA is not set | 717 | # CONFIG_DRM_VIA is not set |
718 | # CONFIG_DRM_SAVAGE is not set | ||
678 | CONFIG_RAW_DRIVER=m | 719 | CONFIG_RAW_DRIVER=m |
679 | CONFIG_HPET=y | 720 | CONFIG_HPET=y |
680 | # CONFIG_HPET_RTC_IRQ is not set | 721 | # CONFIG_HPET_RTC_IRQ is not set |
@@ -691,7 +732,6 @@ CONFIG_MAX_RAW_DEVS=256 | |||
691 | # I2C support | 732 | # I2C support |
692 | # | 733 | # |
693 | # CONFIG_I2C is not set | 734 | # CONFIG_I2C is not set |
694 | # CONFIG_I2C_SENSOR is not set | ||
695 | 735 | ||
696 | # | 736 | # |
697 | # Dallas's 1-wire bus | 737 | # Dallas's 1-wire bus |
@@ -702,6 +742,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
702 | # Hardware Monitoring support | 742 | # Hardware Monitoring support |
703 | # | 743 | # |
704 | CONFIG_HWMON=y | 744 | CONFIG_HWMON=y |
745 | # CONFIG_HWMON_VID is not set | ||
705 | # CONFIG_HWMON_DEBUG_CHIP is not set | 746 | # CONFIG_HWMON_DEBUG_CHIP is not set |
706 | 747 | ||
707 | # | 748 | # |
@@ -709,6 +750,10 @@ CONFIG_HWMON=y | |||
709 | # | 750 | # |
710 | 751 | ||
711 | # | 752 | # |
753 | # Multimedia Capabilities Port drivers | ||
754 | # | ||
755 | |||
756 | # | ||
712 | # Multimedia devices | 757 | # Multimedia devices |
713 | # | 758 | # |
714 | # CONFIG_VIDEO_DEV is not set | 759 | # CONFIG_VIDEO_DEV is not set |
@@ -800,9 +845,11 @@ CONFIG_USB_HIDINPUT=y | |||
800 | # CONFIG_USB_MTOUCH is not set | 845 | # CONFIG_USB_MTOUCH is not set |
801 | # CONFIG_USB_ITMTOUCH is not set | 846 | # CONFIG_USB_ITMTOUCH is not set |
802 | # CONFIG_USB_EGALAX is not set | 847 | # CONFIG_USB_EGALAX is not set |
848 | # CONFIG_USB_YEALINK is not set | ||
803 | # CONFIG_USB_XPAD is not set | 849 | # CONFIG_USB_XPAD is not set |
804 | # CONFIG_USB_ATI_REMOTE is not set | 850 | # CONFIG_USB_ATI_REMOTE is not set |
805 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 851 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
852 | # CONFIG_USB_APPLETOUCH is not set | ||
806 | 853 | ||
807 | # | 854 | # |
808 | # USB Imaging devices | 855 | # USB Imaging devices |
@@ -902,16 +949,12 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
902 | CONFIG_REISERFS_FS_SECURITY=y | 949 | CONFIG_REISERFS_FS_SECURITY=y |
903 | # CONFIG_JFS_FS is not set | 950 | # CONFIG_JFS_FS is not set |
904 | CONFIG_FS_POSIX_ACL=y | 951 | CONFIG_FS_POSIX_ACL=y |
905 | |||
906 | # | ||
907 | # XFS support | ||
908 | # | ||
909 | CONFIG_XFS_FS=y | 952 | CONFIG_XFS_FS=y |
910 | CONFIG_XFS_EXPORT=y | 953 | CONFIG_XFS_EXPORT=y |
911 | # CONFIG_XFS_RT is not set | ||
912 | # CONFIG_XFS_QUOTA is not set | 954 | # CONFIG_XFS_QUOTA is not set |
913 | # CONFIG_XFS_SECURITY is not set | 955 | # CONFIG_XFS_SECURITY is not set |
914 | # CONFIG_XFS_POSIX_ACL is not set | 956 | # CONFIG_XFS_POSIX_ACL is not set |
957 | # CONFIG_XFS_RT is not set | ||
915 | # CONFIG_MINIX_FS is not set | 958 | # CONFIG_MINIX_FS is not set |
916 | # CONFIG_ROMFS_FS is not set | 959 | # CONFIG_ROMFS_FS is not set |
917 | CONFIG_INOTIFY=y | 960 | CONFIG_INOTIFY=y |
@@ -919,6 +962,7 @@ CONFIG_INOTIFY=y | |||
919 | CONFIG_DNOTIFY=y | 962 | CONFIG_DNOTIFY=y |
920 | CONFIG_AUTOFS_FS=y | 963 | CONFIG_AUTOFS_FS=y |
921 | CONFIG_AUTOFS4_FS=y | 964 | CONFIG_AUTOFS4_FS=y |
965 | # CONFIG_FUSE_FS is not set | ||
922 | 966 | ||
923 | # | 967 | # |
924 | # CD-ROM/DVD Filesystems | 968 | # CD-ROM/DVD Filesystems |
@@ -947,13 +991,11 @@ CONFIG_NTFS_FS=m | |||
947 | CONFIG_PROC_FS=y | 991 | CONFIG_PROC_FS=y |
948 | CONFIG_PROC_KCORE=y | 992 | CONFIG_PROC_KCORE=y |
949 | CONFIG_SYSFS=y | 993 | CONFIG_SYSFS=y |
950 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
951 | CONFIG_TMPFS=y | 994 | CONFIG_TMPFS=y |
952 | CONFIG_TMPFS_XATTR=y | ||
953 | CONFIG_TMPFS_SECURITY=y | ||
954 | CONFIG_HUGETLBFS=y | 995 | CONFIG_HUGETLBFS=y |
955 | CONFIG_HUGETLB_PAGE=y | 996 | CONFIG_HUGETLB_PAGE=y |
956 | CONFIG_RAMFS=y | 997 | CONFIG_RAMFS=y |
998 | # CONFIG_RELAYFS_FS is not set | ||
957 | 999 | ||
958 | # | 1000 | # |
959 | # Miscellaneous filesystems | 1001 | # Miscellaneous filesystems |
@@ -1003,6 +1045,7 @@ CONFIG_CIFS=m | |||
1003 | # CONFIG_NCP_FS is not set | 1045 | # CONFIG_NCP_FS is not set |
1004 | # CONFIG_CODA_FS is not set | 1046 | # CONFIG_CODA_FS is not set |
1005 | # CONFIG_AFS_FS is not set | 1047 | # CONFIG_AFS_FS is not set |
1048 | # CONFIG_9P_FS is not set | ||
1006 | 1049 | ||
1007 | # | 1050 | # |
1008 | # Partition Types | 1051 | # Partition Types |
@@ -1072,10 +1115,12 @@ CONFIG_NLS_UTF8=m | |||
1072 | # Library routines | 1115 | # Library routines |
1073 | # | 1116 | # |
1074 | # CONFIG_CRC_CCITT is not set | 1117 | # CONFIG_CRC_CCITT is not set |
1118 | # CONFIG_CRC16 is not set | ||
1075 | CONFIG_CRC32=y | 1119 | CONFIG_CRC32=y |
1076 | # CONFIG_LIBCRC32C is not set | 1120 | # CONFIG_LIBCRC32C is not set |
1077 | CONFIG_GENERIC_HARDIRQS=y | 1121 | CONFIG_GENERIC_HARDIRQS=y |
1078 | CONFIG_GENERIC_IRQ_PROBE=y | 1122 | CONFIG_GENERIC_IRQ_PROBE=y |
1123 | CONFIG_GENERIC_PENDING_IRQ=y | ||
1079 | 1124 | ||
1080 | # | 1125 | # |
1081 | # Profiling support | 1126 | # Profiling support |
@@ -1089,6 +1134,7 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
1089 | CONFIG_DEBUG_KERNEL=y | 1134 | CONFIG_DEBUG_KERNEL=y |
1090 | CONFIG_MAGIC_SYSRQ=y | 1135 | CONFIG_MAGIC_SYSRQ=y |
1091 | CONFIG_LOG_BUF_SHIFT=20 | 1136 | CONFIG_LOG_BUF_SHIFT=20 |
1137 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1092 | # CONFIG_SCHEDSTATS is not set | 1138 | # CONFIG_SCHEDSTATS is not set |
1093 | # CONFIG_DEBUG_SLAB is not set | 1139 | # CONFIG_DEBUG_SLAB is not set |
1094 | # CONFIG_DEBUG_SPINLOCK is not set | 1140 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index 80b0e9eb7fb3..0856ca67dd50 100644 --- a/arch/ia64/configs/zx1_defconfig +++ b/arch/ia64/configs/zx1_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.13-rc6 | 3 | # Linux kernel version: 2.6.14-rc1 |
4 | # Wed Aug 17 10:02:43 2005 | 4 | # Wed Sep 14 15:15:01 2005 |
5 | # | 5 | # |
6 | 6 | ||
7 | # | 7 | # |
@@ -18,6 +18,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
18 | # General setup | 18 | # General setup |
19 | # | 19 | # |
20 | CONFIG_LOCALVERSION="" | 20 | CONFIG_LOCALVERSION="" |
21 | CONFIG_LOCALVERSION_AUTO=y | ||
21 | CONFIG_SWAP=y | 22 | CONFIG_SWAP=y |
22 | CONFIG_SYSVIPC=y | 23 | CONFIG_SYSVIPC=y |
23 | # CONFIG_POSIX_MQUEUE is not set | 24 | # CONFIG_POSIX_MQUEUE is not set |
@@ -29,6 +30,7 @@ CONFIG_HOTPLUG=y | |||
29 | CONFIG_KOBJECT_UEVENT=y | 30 | CONFIG_KOBJECT_UEVENT=y |
30 | # CONFIG_IKCONFIG is not set | 31 | # CONFIG_IKCONFIG is not set |
31 | # CONFIG_CPUSETS is not set | 32 | # CONFIG_CPUSETS is not set |
33 | CONFIG_INITRAMFS_SOURCE="" | ||
32 | # CONFIG_EMBEDDED is not set | 34 | # CONFIG_EMBEDDED is not set |
33 | CONFIG_KALLSYMS=y | 35 | CONFIG_KALLSYMS=y |
34 | # CONFIG_KALLSYMS_ALL is not set | 36 | # CONFIG_KALLSYMS_ALL is not set |
@@ -103,6 +105,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
103 | # CONFIG_SPARSEMEM_MANUAL is not set | 105 | # CONFIG_SPARSEMEM_MANUAL is not set |
104 | CONFIG_FLATMEM=y | 106 | CONFIG_FLATMEM=y |
105 | CONFIG_FLAT_NODE_MEM_MAP=y | 107 | CONFIG_FLAT_NODE_MEM_MAP=y |
108 | # CONFIG_SPARSEMEM_STATIC is not set | ||
106 | CONFIG_HAVE_DEC_LOCK=y | 109 | CONFIG_HAVE_DEC_LOCK=y |
107 | CONFIG_IA32_SUPPORT=y | 110 | CONFIG_IA32_SUPPORT=y |
108 | CONFIG_COMPAT=y | 111 | CONFIG_COMPAT=y |
@@ -115,6 +118,7 @@ CONFIG_IA64_PALINFO=y | |||
115 | # | 118 | # |
116 | CONFIG_EFI_VARS=y | 119 | CONFIG_EFI_VARS=y |
117 | CONFIG_EFI_PCDP=y | 120 | CONFIG_EFI_PCDP=y |
121 | # CONFIG_DELL_RBU is not set | ||
118 | CONFIG_BINFMT_ELF=y | 122 | CONFIG_BINFMT_ELF=y |
119 | CONFIG_BINFMT_MISC=y | 123 | CONFIG_BINFMT_MISC=y |
120 | 124 | ||
@@ -122,28 +126,34 @@ CONFIG_BINFMT_MISC=y | |||
122 | # Power management and ACPI | 126 | # Power management and ACPI |
123 | # | 127 | # |
124 | CONFIG_PM=y | 128 | CONFIG_PM=y |
125 | CONFIG_ACPI=y | 129 | # CONFIG_PM_DEBUG is not set |
126 | 130 | ||
127 | # | 131 | # |
128 | # ACPI (Advanced Configuration and Power Interface) Support | 132 | # ACPI (Advanced Configuration and Power Interface) Support |
129 | # | 133 | # |
134 | CONFIG_ACPI=y | ||
130 | CONFIG_ACPI_BUTTON=y | 135 | CONFIG_ACPI_BUTTON=y |
131 | CONFIG_ACPI_FAN=y | 136 | CONFIG_ACPI_FAN=y |
132 | CONFIG_ACPI_PROCESSOR=y | 137 | CONFIG_ACPI_PROCESSOR=y |
133 | CONFIG_ACPI_THERMAL=y | 138 | CONFIG_ACPI_THERMAL=y |
139 | CONFIG_ACPI_BLACKLIST_YEAR=0 | ||
134 | # CONFIG_ACPI_DEBUG is not set | 140 | # CONFIG_ACPI_DEBUG is not set |
135 | CONFIG_ACPI_POWER=y | 141 | CONFIG_ACPI_POWER=y |
136 | CONFIG_ACPI_SYSTEM=y | 142 | CONFIG_ACPI_SYSTEM=y |
137 | # CONFIG_ACPI_CONTAINER is not set | 143 | # CONFIG_ACPI_CONTAINER is not set |
138 | 144 | ||
139 | # | 145 | # |
146 | # CPU Frequency scaling | ||
147 | # | ||
148 | # CONFIG_CPU_FREQ is not set | ||
149 | |||
150 | # | ||
140 | # Bus options (PCI, PCMCIA) | 151 | # Bus options (PCI, PCMCIA) |
141 | # | 152 | # |
142 | CONFIG_PCI=y | 153 | CONFIG_PCI=y |
143 | CONFIG_PCI_DOMAINS=y | 154 | CONFIG_PCI_DOMAINS=y |
144 | # CONFIG_PCI_MSI is not set | 155 | # CONFIG_PCI_MSI is not set |
145 | CONFIG_PCI_LEGACY_PROC=y | 156 | CONFIG_PCI_LEGACY_PROC=y |
146 | CONFIG_PCI_NAMES=y | ||
147 | # CONFIG_PCI_DEBUG is not set | 157 | # CONFIG_PCI_DEBUG is not set |
148 | 158 | ||
149 | # | 159 | # |
@@ -187,8 +197,8 @@ CONFIG_IP_FIB_HASH=y | |||
187 | # CONFIG_INET_ESP is not set | 197 | # CONFIG_INET_ESP is not set |
188 | # CONFIG_INET_IPCOMP is not set | 198 | # CONFIG_INET_IPCOMP is not set |
189 | # CONFIG_INET_TUNNEL is not set | 199 | # CONFIG_INET_TUNNEL is not set |
190 | # CONFIG_IP_TCPDIAG is not set | 200 | CONFIG_INET_DIAG=y |
191 | # CONFIG_IP_TCPDIAG_IPV6 is not set | 201 | CONFIG_INET_TCP_DIAG=y |
192 | # CONFIG_TCP_CONG_ADVANCED is not set | 202 | # CONFIG_TCP_CONG_ADVANCED is not set |
193 | CONFIG_TCP_CONG_BIC=y | 203 | CONFIG_TCP_CONG_BIC=y |
194 | 204 | ||
@@ -204,7 +214,6 @@ CONFIG_NETFILTER=y | |||
204 | # IP: Netfilter Configuration | 214 | # IP: Netfilter Configuration |
205 | # | 215 | # |
206 | # CONFIG_IP_NF_CONNTRACK is not set | 216 | # CONFIG_IP_NF_CONNTRACK is not set |
207 | # CONFIG_IP_NF_CONNTRACK_MARK is not set | ||
208 | # CONFIG_IP_NF_QUEUE is not set | 217 | # CONFIG_IP_NF_QUEUE is not set |
209 | # CONFIG_IP_NF_IPTABLES is not set | 218 | # CONFIG_IP_NF_IPTABLES is not set |
210 | CONFIG_IP_NF_ARPTABLES=y | 219 | CONFIG_IP_NF_ARPTABLES=y |
@@ -212,6 +221,11 @@ CONFIG_IP_NF_ARPTABLES=y | |||
212 | # CONFIG_IP_NF_ARP_MANGLE is not set | 221 | # CONFIG_IP_NF_ARP_MANGLE is not set |
213 | 222 | ||
214 | # | 223 | # |
224 | # DCCP Configuration (EXPERIMENTAL) | ||
225 | # | ||
226 | # CONFIG_IP_DCCP is not set | ||
227 | |||
228 | # | ||
215 | # SCTP Configuration (EXPERIMENTAL) | 229 | # SCTP Configuration (EXPERIMENTAL) |
216 | # | 230 | # |
217 | # CONFIG_IP_SCTP is not set | 231 | # CONFIG_IP_SCTP is not set |
@@ -234,9 +248,11 @@ CONFIG_IP_NF_ARPTABLES=y | |||
234 | # Network testing | 248 | # Network testing |
235 | # | 249 | # |
236 | # CONFIG_NET_PKTGEN is not set | 250 | # CONFIG_NET_PKTGEN is not set |
251 | # CONFIG_NETFILTER_NETLINK is not set | ||
237 | # CONFIG_HAMRADIO is not set | 252 | # CONFIG_HAMRADIO is not set |
238 | # CONFIG_IRDA is not set | 253 | # CONFIG_IRDA is not set |
239 | # CONFIG_BT is not set | 254 | # CONFIG_BT is not set |
255 | # CONFIG_IEEE80211 is not set | ||
240 | 256 | ||
241 | # | 257 | # |
242 | # Device Drivers | 258 | # Device Drivers |
@@ -251,6 +267,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
251 | # CONFIG_DEBUG_DRIVER is not set | 267 | # CONFIG_DEBUG_DRIVER is not set |
252 | 268 | ||
253 | # | 269 | # |
270 | # Connector - unified userspace <-> kernelspace linker | ||
271 | # | ||
272 | # CONFIG_CONNECTOR is not set | ||
273 | |||
274 | # | ||
254 | # Memory Technology Devices (MTD) | 275 | # Memory Technology Devices (MTD) |
255 | # | 276 | # |
256 | # CONFIG_MTD is not set | 277 | # CONFIG_MTD is not set |
@@ -263,7 +284,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
263 | # | 284 | # |
264 | # Plug and Play support | 285 | # Plug and Play support |
265 | # | 286 | # |
266 | # CONFIG_PNP is not set | 287 | CONFIG_PNP=y |
288 | # CONFIG_PNP_DEBUG is not set | ||
289 | |||
290 | # | ||
291 | # Protocols | ||
292 | # | ||
293 | CONFIG_PNPACPI=y | ||
267 | 294 | ||
268 | # | 295 | # |
269 | # Block devices | 296 | # Block devices |
@@ -282,7 +309,6 @@ CONFIG_BLK_DEV_RAM=y | |||
282 | CONFIG_BLK_DEV_RAM_COUNT=16 | 309 | CONFIG_BLK_DEV_RAM_COUNT=16 |
283 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 310 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
284 | CONFIG_BLK_DEV_INITRD=y | 311 | CONFIG_BLK_DEV_INITRD=y |
285 | CONFIG_INITRAMFS_SOURCE="" | ||
286 | # CONFIG_CDROM_PKTCDVD is not set | 312 | # CONFIG_CDROM_PKTCDVD is not set |
287 | 313 | ||
288 | # | 314 | # |
@@ -315,7 +341,8 @@ CONFIG_BLK_DEV_IDECD=y | |||
315 | # | 341 | # |
316 | # IDE chipset support/bugfixes | 342 | # IDE chipset support/bugfixes |
317 | # | 343 | # |
318 | CONFIG_IDE_GENERIC=y | 344 | # CONFIG_IDE_GENERIC is not set |
345 | # CONFIG_BLK_DEV_IDEPNP is not set | ||
319 | CONFIG_BLK_DEV_IDEPCI=y | 346 | CONFIG_BLK_DEV_IDEPCI=y |
320 | CONFIG_IDEPCI_SHARE_IRQ=y | 347 | CONFIG_IDEPCI_SHARE_IRQ=y |
321 | # CONFIG_BLK_DEV_OFFBOARD is not set | 348 | # CONFIG_BLK_DEV_OFFBOARD is not set |
@@ -354,6 +381,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
354 | # | 381 | # |
355 | # SCSI device support | 382 | # SCSI device support |
356 | # | 383 | # |
384 | # CONFIG_RAID_ATTRS is not set | ||
357 | CONFIG_SCSI=y | 385 | CONFIG_SCSI=y |
358 | CONFIG_SCSI_PROC_FS=y | 386 | CONFIG_SCSI_PROC_FS=y |
359 | 387 | ||
@@ -381,6 +409,7 @@ CONFIG_SCSI_LOGGING=y | |||
381 | CONFIG_SCSI_SPI_ATTRS=y | 409 | CONFIG_SCSI_SPI_ATTRS=y |
382 | # CONFIG_SCSI_FC_ATTRS is not set | 410 | # CONFIG_SCSI_FC_ATTRS is not set |
383 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 411 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
412 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
384 | 413 | ||
385 | # | 414 | # |
386 | # SCSI low-level drivers | 415 | # SCSI low-level drivers |
@@ -457,6 +486,7 @@ CONFIG_DUMMY=y | |||
457 | # CONFIG_BONDING is not set | 486 | # CONFIG_BONDING is not set |
458 | # CONFIG_EQUALIZER is not set | 487 | # CONFIG_EQUALIZER is not set |
459 | # CONFIG_TUN is not set | 488 | # CONFIG_TUN is not set |
489 | # CONFIG_NET_SB1000 is not set | ||
460 | 490 | ||
461 | # | 491 | # |
462 | # ARCnet devices | 492 | # ARCnet devices |
@@ -464,6 +494,11 @@ CONFIG_DUMMY=y | |||
464 | # CONFIG_ARCNET is not set | 494 | # CONFIG_ARCNET is not set |
465 | 495 | ||
466 | # | 496 | # |
497 | # PHY device support | ||
498 | # | ||
499 | # CONFIG_PHYLIB is not set | ||
500 | |||
501 | # | ||
467 | # Ethernet (10 or 100Mbit) | 502 | # Ethernet (10 or 100Mbit) |
468 | # | 503 | # |
469 | CONFIG_NET_ETHERNET=y | 504 | CONFIG_NET_ETHERNET=y |
@@ -485,6 +520,7 @@ CONFIG_TULIP_NAPI_HW_MITIGATION=y | |||
485 | # CONFIG_DE4X5 is not set | 520 | # CONFIG_DE4X5 is not set |
486 | # CONFIG_WINBOND_840 is not set | 521 | # CONFIG_WINBOND_840 is not set |
487 | # CONFIG_DM9102 is not set | 522 | # CONFIG_DM9102 is not set |
523 | # CONFIG_ULI526X is not set | ||
488 | # CONFIG_HP100 is not set | 524 | # CONFIG_HP100 is not set |
489 | CONFIG_NET_PCI=y | 525 | CONFIG_NET_PCI=y |
490 | # CONFIG_PCNET32 is not set | 526 | # CONFIG_PCNET32 is not set |
@@ -516,6 +552,7 @@ CONFIG_E1000=y | |||
516 | # CONFIG_HAMACHI is not set | 552 | # CONFIG_HAMACHI is not set |
517 | # CONFIG_YELLOWFIN is not set | 553 | # CONFIG_YELLOWFIN is not set |
518 | # CONFIG_R8169 is not set | 554 | # CONFIG_R8169 is not set |
555 | # CONFIG_SIS190 is not set | ||
519 | # CONFIG_SKGE is not set | 556 | # CONFIG_SKGE is not set |
520 | # CONFIG_SK98LIN is not set | 557 | # CONFIG_SK98LIN is not set |
521 | # CONFIG_VIA_VELOCITY is not set | 558 | # CONFIG_VIA_VELOCITY is not set |
@@ -525,6 +562,7 @@ CONFIG_TIGON3=y | |||
525 | # | 562 | # |
526 | # Ethernet (10000 Mbit) | 563 | # Ethernet (10000 Mbit) |
527 | # | 564 | # |
565 | # CONFIG_CHELSIO_T1 is not set | ||
528 | # CONFIG_IXGB is not set | 566 | # CONFIG_IXGB is not set |
529 | # CONFIG_S2IO is not set | 567 | # CONFIG_S2IO is not set |
530 | 568 | ||
@@ -650,12 +688,12 @@ CONFIG_AGP=y | |||
650 | CONFIG_AGP_HP_ZX1=y | 688 | CONFIG_AGP_HP_ZX1=y |
651 | CONFIG_DRM=y | 689 | CONFIG_DRM=y |
652 | # CONFIG_DRM_TDFX is not set | 690 | # CONFIG_DRM_TDFX is not set |
653 | # CONFIG_DRM_GAMMA is not set | ||
654 | # CONFIG_DRM_R128 is not set | 691 | # CONFIG_DRM_R128 is not set |
655 | CONFIG_DRM_RADEON=y | 692 | CONFIG_DRM_RADEON=y |
656 | # CONFIG_DRM_MGA is not set | 693 | # CONFIG_DRM_MGA is not set |
657 | # CONFIG_DRM_SIS is not set | 694 | # CONFIG_DRM_SIS is not set |
658 | # CONFIG_DRM_VIA is not set | 695 | # CONFIG_DRM_VIA is not set |
696 | # CONFIG_DRM_SAVAGE is not set | ||
659 | # CONFIG_RAW_DRIVER is not set | 697 | # CONFIG_RAW_DRIVER is not set |
660 | # CONFIG_HPET is not set | 698 | # CONFIG_HPET is not set |
661 | # CONFIG_HANGCHECK_TIMER is not set | 699 | # CONFIG_HANGCHECK_TIMER is not set |
@@ -689,7 +727,6 @@ CONFIG_I2C_ALGOPCF=y | |||
689 | # CONFIG_I2C_I801 is not set | 727 | # CONFIG_I2C_I801 is not set |
690 | # CONFIG_I2C_I810 is not set | 728 | # CONFIG_I2C_I810 is not set |
691 | # CONFIG_I2C_PIIX4 is not set | 729 | # CONFIG_I2C_PIIX4 is not set |
692 | # CONFIG_I2C_ISA is not set | ||
693 | # CONFIG_I2C_NFORCE2 is not set | 730 | # CONFIG_I2C_NFORCE2 is not set |
694 | # CONFIG_I2C_PARPORT_LIGHT is not set | 731 | # CONFIG_I2C_PARPORT_LIGHT is not set |
695 | # CONFIG_I2C_PROSAVAGE is not set | 732 | # CONFIG_I2C_PROSAVAGE is not set |
@@ -703,7 +740,6 @@ CONFIG_I2C_ALGOPCF=y | |||
703 | # CONFIG_I2C_VIAPRO is not set | 740 | # CONFIG_I2C_VIAPRO is not set |
704 | # CONFIG_I2C_VOODOO3 is not set | 741 | # CONFIG_I2C_VOODOO3 is not set |
705 | # CONFIG_I2C_PCA_ISA is not set | 742 | # CONFIG_I2C_PCA_ISA is not set |
706 | # CONFIG_I2C_SENSOR is not set | ||
707 | 743 | ||
708 | # | 744 | # |
709 | # Miscellaneous I2C Chip support | 745 | # Miscellaneous I2C Chip support |
@@ -730,12 +766,17 @@ CONFIG_I2C_ALGOPCF=y | |||
730 | # Hardware Monitoring support | 766 | # Hardware Monitoring support |
731 | # | 767 | # |
732 | # CONFIG_HWMON is not set | 768 | # CONFIG_HWMON is not set |
769 | # CONFIG_HWMON_VID is not set | ||
733 | 770 | ||
734 | # | 771 | # |
735 | # Misc devices | 772 | # Misc devices |
736 | # | 773 | # |
737 | 774 | ||
738 | # | 775 | # |
776 | # Multimedia Capabilities Port drivers | ||
777 | # | ||
778 | |||
779 | # | ||
739 | # Multimedia devices | 780 | # Multimedia devices |
740 | # | 781 | # |
741 | CONFIG_VIDEO_DEV=y | 782 | CONFIG_VIDEO_DEV=y |
@@ -806,6 +847,7 @@ CONFIG_FB_RADEON_DEBUG=y | |||
806 | # CONFIG_FB_KYRO is not set | 847 | # CONFIG_FB_KYRO is not set |
807 | # CONFIG_FB_3DFX is not set | 848 | # CONFIG_FB_3DFX is not set |
808 | # CONFIG_FB_VOODOO1 is not set | 849 | # CONFIG_FB_VOODOO1 is not set |
850 | # CONFIG_FB_CYBLA is not set | ||
809 | # CONFIG_FB_TRIDENT is not set | 851 | # CONFIG_FB_TRIDENT is not set |
810 | # CONFIG_FB_PM3 is not set | 852 | # CONFIG_FB_PM3 is not set |
811 | # CONFIG_FB_S1D13XXX is not set | 853 | # CONFIG_FB_S1D13XXX is not set |
@@ -862,11 +904,12 @@ CONFIG_SND_OPL3_LIB=y | |||
862 | # CONFIG_SND_MTPAV is not set | 904 | # CONFIG_SND_MTPAV is not set |
863 | # CONFIG_SND_SERIAL_U16550 is not set | 905 | # CONFIG_SND_SERIAL_U16550 is not set |
864 | # CONFIG_SND_MPU401 is not set | 906 | # CONFIG_SND_MPU401 is not set |
907 | CONFIG_SND_AC97_CODEC=y | ||
908 | CONFIG_SND_AC97_BUS=y | ||
865 | 909 | ||
866 | # | 910 | # |
867 | # PCI devices | 911 | # PCI devices |
868 | # | 912 | # |
869 | CONFIG_SND_AC97_CODEC=y | ||
870 | # CONFIG_SND_ALI5451 is not set | 913 | # CONFIG_SND_ALI5451 is not set |
871 | # CONFIG_SND_ATIIXP is not set | 914 | # CONFIG_SND_ATIIXP is not set |
872 | # CONFIG_SND_ATIIXP_MODEM is not set | 915 | # CONFIG_SND_ATIIXP_MODEM is not set |
@@ -890,7 +933,7 @@ CONFIG_SND_AC97_CODEC=y | |||
890 | # CONFIG_SND_HDSPM is not set | 933 | # CONFIG_SND_HDSPM is not set |
891 | # CONFIG_SND_TRIDENT is not set | 934 | # CONFIG_SND_TRIDENT is not set |
892 | # CONFIG_SND_YMFPCI is not set | 935 | # CONFIG_SND_YMFPCI is not set |
893 | # CONFIG_SND_ALS4000 is not set | 936 | # CONFIG_SND_AD1889 is not set |
894 | # CONFIG_SND_CMIPCI is not set | 937 | # CONFIG_SND_CMIPCI is not set |
895 | # CONFIG_SND_ENS1370 is not set | 938 | # CONFIG_SND_ENS1370 is not set |
896 | # CONFIG_SND_ENS1371 is not set | 939 | # CONFIG_SND_ENS1371 is not set |
@@ -952,9 +995,8 @@ CONFIG_USB_UHCI_HCD=y | |||
952 | # | 995 | # |
953 | # USB Device Class drivers | 996 | # USB Device Class drivers |
954 | # | 997 | # |
955 | # CONFIG_USB_AUDIO is not set | 998 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set |
956 | # CONFIG_USB_BLUETOOTH_TTY is not set | 999 | # CONFIG_USB_BLUETOOTH_TTY is not set |
957 | # CONFIG_USB_MIDI is not set | ||
958 | # CONFIG_USB_ACM is not set | 1000 | # CONFIG_USB_ACM is not set |
959 | # CONFIG_USB_PRINTER is not set | 1001 | # CONFIG_USB_PRINTER is not set |
960 | 1002 | ||
@@ -971,6 +1013,7 @@ CONFIG_USB_STORAGE=y | |||
971 | # CONFIG_USB_STORAGE_SDDR09 is not set | 1013 | # CONFIG_USB_STORAGE_SDDR09 is not set |
972 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1014 | # CONFIG_USB_STORAGE_SDDR55 is not set |
973 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1015 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1016 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
974 | 1017 | ||
975 | # | 1018 | # |
976 | # USB Input Devices | 1019 | # USB Input Devices |
@@ -987,9 +1030,11 @@ CONFIG_USB_HIDDEV=y | |||
987 | # CONFIG_USB_MTOUCH is not set | 1030 | # CONFIG_USB_MTOUCH is not set |
988 | # CONFIG_USB_ITMTOUCH is not set | 1031 | # CONFIG_USB_ITMTOUCH is not set |
989 | # CONFIG_USB_EGALAX is not set | 1032 | # CONFIG_USB_EGALAX is not set |
1033 | # CONFIG_USB_YEALINK is not set | ||
990 | # CONFIG_USB_XPAD is not set | 1034 | # CONFIG_USB_XPAD is not set |
991 | # CONFIG_USB_ATI_REMOTE is not set | 1035 | # CONFIG_USB_ATI_REMOTE is not set |
992 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 1036 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
1037 | # CONFIG_USB_APPLETOUCH is not set | ||
993 | 1038 | ||
994 | # | 1039 | # |
995 | # USB Imaging devices | 1040 | # USB Imaging devices |
@@ -1088,10 +1133,6 @@ CONFIG_FS_MBCACHE=y | |||
1088 | # CONFIG_REISERFS_FS is not set | 1133 | # CONFIG_REISERFS_FS is not set |
1089 | # CONFIG_JFS_FS is not set | 1134 | # CONFIG_JFS_FS is not set |
1090 | # CONFIG_FS_POSIX_ACL is not set | 1135 | # CONFIG_FS_POSIX_ACL is not set |
1091 | |||
1092 | # | ||
1093 | # XFS support | ||
1094 | # | ||
1095 | # CONFIG_XFS_FS is not set | 1136 | # CONFIG_XFS_FS is not set |
1096 | # CONFIG_MINIX_FS is not set | 1137 | # CONFIG_MINIX_FS is not set |
1097 | # CONFIG_ROMFS_FS is not set | 1138 | # CONFIG_ROMFS_FS is not set |
@@ -1100,6 +1141,7 @@ CONFIG_FS_MBCACHE=y | |||
1100 | CONFIG_DNOTIFY=y | 1141 | CONFIG_DNOTIFY=y |
1101 | CONFIG_AUTOFS_FS=y | 1142 | CONFIG_AUTOFS_FS=y |
1102 | # CONFIG_AUTOFS4_FS is not set | 1143 | # CONFIG_AUTOFS4_FS is not set |
1144 | # CONFIG_FUSE_FS is not set | ||
1103 | 1145 | ||
1104 | # | 1146 | # |
1105 | # CD-ROM/DVD Filesystems | 1147 | # CD-ROM/DVD Filesystems |
@@ -1126,13 +1168,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1126 | CONFIG_PROC_FS=y | 1168 | CONFIG_PROC_FS=y |
1127 | CONFIG_PROC_KCORE=y | 1169 | CONFIG_PROC_KCORE=y |
1128 | CONFIG_SYSFS=y | 1170 | CONFIG_SYSFS=y |
1129 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
1130 | CONFIG_TMPFS=y | 1171 | CONFIG_TMPFS=y |
1131 | CONFIG_TMPFS_XATTR=y | ||
1132 | CONFIG_TMPFS_SECURITY=y | ||
1133 | CONFIG_HUGETLBFS=y | 1172 | CONFIG_HUGETLBFS=y |
1134 | CONFIG_HUGETLB_PAGE=y | 1173 | CONFIG_HUGETLB_PAGE=y |
1135 | CONFIG_RAMFS=y | 1174 | CONFIG_RAMFS=y |
1175 | # CONFIG_RELAYFS_FS is not set | ||
1136 | 1176 | ||
1137 | # | 1177 | # |
1138 | # Miscellaneous filesystems | 1178 | # Miscellaneous filesystems |
@@ -1177,6 +1217,7 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
1177 | # CONFIG_NCP_FS is not set | 1217 | # CONFIG_NCP_FS is not set |
1178 | # CONFIG_CODA_FS is not set | 1218 | # CONFIG_CODA_FS is not set |
1179 | # CONFIG_AFS_FS is not set | 1219 | # CONFIG_AFS_FS is not set |
1220 | # CONFIG_9P_FS is not set | ||
1180 | 1221 | ||
1181 | # | 1222 | # |
1182 | # Partition Types | 1223 | # Partition Types |
@@ -1246,10 +1287,12 @@ CONFIG_NLS_UTF8=y | |||
1246 | # Library routines | 1287 | # Library routines |
1247 | # | 1288 | # |
1248 | # CONFIG_CRC_CCITT is not set | 1289 | # CONFIG_CRC_CCITT is not set |
1290 | # CONFIG_CRC16 is not set | ||
1249 | CONFIG_CRC32=y | 1291 | CONFIG_CRC32=y |
1250 | # CONFIG_LIBCRC32C is not set | 1292 | # CONFIG_LIBCRC32C is not set |
1251 | CONFIG_GENERIC_HARDIRQS=y | 1293 | CONFIG_GENERIC_HARDIRQS=y |
1252 | CONFIG_GENERIC_IRQ_PROBE=y | 1294 | CONFIG_GENERIC_IRQ_PROBE=y |
1295 | CONFIG_GENERIC_PENDING_IRQ=y | ||
1253 | 1296 | ||
1254 | # | 1297 | # |
1255 | # Profiling support | 1298 | # Profiling support |
@@ -1263,6 +1306,7 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
1263 | CONFIG_DEBUG_KERNEL=y | 1306 | CONFIG_DEBUG_KERNEL=y |
1264 | CONFIG_MAGIC_SYSRQ=y | 1307 | CONFIG_MAGIC_SYSRQ=y |
1265 | CONFIG_LOG_BUF_SHIFT=17 | 1308 | CONFIG_LOG_BUF_SHIFT=17 |
1309 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1266 | # CONFIG_SCHEDSTATS is not set | 1310 | # CONFIG_SCHEDSTATS is not set |
1267 | # CONFIG_DEBUG_SLAB is not set | 1311 | # CONFIG_DEBUG_SLAB is not set |
1268 | # CONFIG_DEBUG_SPINLOCK is not set | 1312 | # CONFIG_DEBUG_SPINLOCK is not set |
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 5da208115ea1..6e3f147e03e5 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12 | 3 | # Linux kernel version: 2.6.14-rc1 |
4 | # Tue Jun 21 11:30:42 2005 | 4 | # Wed Sep 14 15:13:03 2005 |
5 | # | 5 | # |
6 | 6 | ||
7 | # | 7 | # |
@@ -16,6 +16,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
16 | # General setup | 16 | # General setup |
17 | # | 17 | # |
18 | CONFIG_LOCALVERSION="" | 18 | CONFIG_LOCALVERSION="" |
19 | CONFIG_LOCALVERSION_AUTO=y | ||
19 | CONFIG_SWAP=y | 20 | CONFIG_SWAP=y |
20 | CONFIG_SYSVIPC=y | 21 | CONFIG_SYSVIPC=y |
21 | CONFIG_POSIX_MQUEUE=y | 22 | CONFIG_POSIX_MQUEUE=y |
@@ -27,6 +28,7 @@ CONFIG_KOBJECT_UEVENT=y | |||
27 | CONFIG_IKCONFIG=y | 28 | CONFIG_IKCONFIG=y |
28 | CONFIG_IKCONFIG_PROC=y | 29 | CONFIG_IKCONFIG_PROC=y |
29 | # CONFIG_CPUSETS is not set | 30 | # CONFIG_CPUSETS is not set |
31 | CONFIG_INITRAMFS_SOURCE="" | ||
30 | # CONFIG_EMBEDDED is not set | 32 | # CONFIG_EMBEDDED is not set |
31 | CONFIG_KALLSYMS=y | 33 | CONFIG_KALLSYMS=y |
32 | CONFIG_KALLSYMS_ALL=y | 34 | CONFIG_KALLSYMS_ALL=y |
@@ -80,6 +82,10 @@ CONFIG_MCKINLEY=y | |||
80 | # CONFIG_IA64_PAGE_SIZE_8KB is not set | 82 | # CONFIG_IA64_PAGE_SIZE_8KB is not set |
81 | CONFIG_IA64_PAGE_SIZE_16KB=y | 83 | CONFIG_IA64_PAGE_SIZE_16KB=y |
82 | # CONFIG_IA64_PAGE_SIZE_64KB is not set | 84 | # CONFIG_IA64_PAGE_SIZE_64KB is not set |
85 | # CONFIG_HZ_100 is not set | ||
86 | CONFIG_HZ_250=y | ||
87 | # CONFIG_HZ_1000 is not set | ||
88 | CONFIG_HZ=250 | ||
83 | CONFIG_IA64_L1_CACHE_SHIFT=7 | 89 | CONFIG_IA64_L1_CACHE_SHIFT=7 |
84 | CONFIG_NUMA=y | 90 | CONFIG_NUMA=y |
85 | CONFIG_VIRTUAL_MEM_MAP=y | 91 | CONFIG_VIRTUAL_MEM_MAP=y |
@@ -87,12 +93,21 @@ CONFIG_HOLES_IN_ZONE=y | |||
87 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 93 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
88 | CONFIG_IA64_CYCLONE=y | 94 | CONFIG_IA64_CYCLONE=y |
89 | CONFIG_IOSAPIC=y | 95 | CONFIG_IOSAPIC=y |
96 | # CONFIG_IA64_SGI_SN_XP is not set | ||
90 | CONFIG_FORCE_MAX_ZONEORDER=18 | 97 | CONFIG_FORCE_MAX_ZONEORDER=18 |
91 | CONFIG_SMP=y | 98 | CONFIG_SMP=y |
92 | CONFIG_NR_CPUS=512 | 99 | CONFIG_NR_CPUS=512 |
93 | CONFIG_HOTPLUG_CPU=y | 100 | CONFIG_HOTPLUG_CPU=y |
94 | # CONFIG_SCHED_SMT is not set | 101 | # CONFIG_SCHED_SMT is not set |
95 | # CONFIG_PREEMPT is not set | 102 | # CONFIG_PREEMPT is not set |
103 | CONFIG_SELECT_MEMORY_MODEL=y | ||
104 | # CONFIG_FLATMEM_MANUAL is not set | ||
105 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
106 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
107 | CONFIG_DISCONTIGMEM=y | ||
108 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
109 | CONFIG_NEED_MULTIPLE_NODES=y | ||
110 | # CONFIG_SPARSEMEM_STATIC is not set | ||
96 | CONFIG_HAVE_DEC_LOCK=y | 111 | CONFIG_HAVE_DEC_LOCK=y |
97 | CONFIG_IA32_SUPPORT=y | 112 | CONFIG_IA32_SUPPORT=y |
98 | CONFIG_COMPAT=y | 113 | CONFIG_COMPAT=y |
@@ -105,6 +120,7 @@ CONFIG_IA64_PALINFO=y | |||
105 | # | 120 | # |
106 | CONFIG_EFI_VARS=y | 121 | CONFIG_EFI_VARS=y |
107 | CONFIG_EFI_PCDP=y | 122 | CONFIG_EFI_PCDP=y |
123 | # CONFIG_DELL_RBU is not set | ||
108 | CONFIG_BINFMT_ELF=y | 124 | CONFIG_BINFMT_ELF=y |
109 | CONFIG_BINFMT_MISC=m | 125 | CONFIG_BINFMT_MISC=m |
110 | 126 | ||
@@ -112,30 +128,36 @@ CONFIG_BINFMT_MISC=m | |||
112 | # Power management and ACPI | 128 | # Power management and ACPI |
113 | # | 129 | # |
114 | CONFIG_PM=y | 130 | CONFIG_PM=y |
115 | CONFIG_ACPI=y | 131 | # CONFIG_PM_DEBUG is not set |
116 | 132 | ||
117 | # | 133 | # |
118 | # ACPI (Advanced Configuration and Power Interface) Support | 134 | # ACPI (Advanced Configuration and Power Interface) Support |
119 | # | 135 | # |
136 | CONFIG_ACPI=y | ||
120 | CONFIG_ACPI_BUTTON=m | 137 | CONFIG_ACPI_BUTTON=m |
121 | CONFIG_ACPI_FAN=m | 138 | CONFIG_ACPI_FAN=m |
122 | CONFIG_ACPI_PROCESSOR=m | 139 | CONFIG_ACPI_PROCESSOR=m |
123 | CONFIG_ACPI_HOTPLUG_CPU=y | 140 | CONFIG_ACPI_HOTPLUG_CPU=y |
124 | CONFIG_ACPI_THERMAL=m | 141 | CONFIG_ACPI_THERMAL=m |
125 | CONFIG_ACPI_NUMA=y | 142 | CONFIG_ACPI_NUMA=y |
143 | CONFIG_ACPI_BLACKLIST_YEAR=0 | ||
126 | # CONFIG_ACPI_DEBUG is not set | 144 | # CONFIG_ACPI_DEBUG is not set |
127 | CONFIG_ACPI_POWER=y | 145 | CONFIG_ACPI_POWER=y |
128 | CONFIG_ACPI_SYSTEM=y | 146 | CONFIG_ACPI_SYSTEM=y |
129 | CONFIG_ACPI_CONTAINER=m | 147 | CONFIG_ACPI_CONTAINER=m |
130 | 148 | ||
131 | # | 149 | # |
150 | # CPU Frequency scaling | ||
151 | # | ||
152 | # CONFIG_CPU_FREQ is not set | ||
153 | |||
154 | # | ||
132 | # Bus options (PCI, PCMCIA) | 155 | # Bus options (PCI, PCMCIA) |
133 | # | 156 | # |
134 | CONFIG_PCI=y | 157 | CONFIG_PCI=y |
135 | CONFIG_PCI_DOMAINS=y | 158 | CONFIG_PCI_DOMAINS=y |
136 | # CONFIG_PCI_MSI is not set | 159 | # CONFIG_PCI_MSI is not set |
137 | CONFIG_PCI_LEGACY_PROC=y | 160 | CONFIG_PCI_LEGACY_PROC=y |
138 | CONFIG_PCI_NAMES=y | ||
139 | # CONFIG_PCI_DEBUG is not set | 161 | # CONFIG_PCI_DEBUG is not set |
140 | 162 | ||
141 | # | 163 | # |
@@ -147,6 +169,7 @@ CONFIG_HOTPLUG_PCI_ACPI=m | |||
147 | # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set | 169 | # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set |
148 | # CONFIG_HOTPLUG_PCI_CPCI is not set | 170 | # CONFIG_HOTPLUG_PCI_CPCI is not set |
149 | # CONFIG_HOTPLUG_PCI_SHPC is not set | 171 | # CONFIG_HOTPLUG_PCI_SHPC is not set |
172 | # CONFIG_HOTPLUG_PCI_SGI is not set | ||
150 | 173 | ||
151 | # | 174 | # |
152 | # PCCARD (PCMCIA/CardBus) support | 175 | # PCCARD (PCMCIA/CardBus) support |
@@ -154,6 +177,73 @@ CONFIG_HOTPLUG_PCI_ACPI=m | |||
154 | # CONFIG_PCCARD is not set | 177 | # CONFIG_PCCARD is not set |
155 | 178 | ||
156 | # | 179 | # |
180 | # Networking | ||
181 | # | ||
182 | CONFIG_NET=y | ||
183 | |||
184 | # | ||
185 | # Networking options | ||
186 | # | ||
187 | CONFIG_PACKET=y | ||
188 | # CONFIG_PACKET_MMAP is not set | ||
189 | CONFIG_UNIX=y | ||
190 | # CONFIG_NET_KEY is not set | ||
191 | CONFIG_INET=y | ||
192 | CONFIG_IP_MULTICAST=y | ||
193 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
194 | CONFIG_IP_FIB_HASH=y | ||
195 | # CONFIG_IP_PNP is not set | ||
196 | # CONFIG_NET_IPIP is not set | ||
197 | # CONFIG_NET_IPGRE is not set | ||
198 | # CONFIG_IP_MROUTE is not set | ||
199 | CONFIG_ARPD=y | ||
200 | CONFIG_SYN_COOKIES=y | ||
201 | # CONFIG_INET_AH is not set | ||
202 | # CONFIG_INET_ESP is not set | ||
203 | # CONFIG_INET_IPCOMP is not set | ||
204 | # CONFIG_INET_TUNNEL is not set | ||
205 | CONFIG_INET_DIAG=y | ||
206 | CONFIG_INET_TCP_DIAG=y | ||
207 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
208 | CONFIG_TCP_CONG_BIC=y | ||
209 | # CONFIG_IPV6 is not set | ||
210 | # CONFIG_NETFILTER is not set | ||
211 | |||
212 | # | ||
213 | # DCCP Configuration (EXPERIMENTAL) | ||
214 | # | ||
215 | # CONFIG_IP_DCCP is not set | ||
216 | |||
217 | # | ||
218 | # SCTP Configuration (EXPERIMENTAL) | ||
219 | # | ||
220 | # CONFIG_IP_SCTP is not set | ||
221 | # CONFIG_ATM is not set | ||
222 | # CONFIG_BRIDGE is not set | ||
223 | # CONFIG_VLAN_8021Q is not set | ||
224 | # CONFIG_DECNET is not set | ||
225 | # CONFIG_LLC2 is not set | ||
226 | # CONFIG_IPX is not set | ||
227 | # CONFIG_ATALK is not set | ||
228 | # CONFIG_X25 is not set | ||
229 | # CONFIG_LAPB is not set | ||
230 | # CONFIG_NET_DIVERT is not set | ||
231 | # CONFIG_ECONET is not set | ||
232 | # CONFIG_WAN_ROUTER is not set | ||
233 | # CONFIG_NET_SCHED is not set | ||
234 | # CONFIG_NET_CLS_ROUTE is not set | ||
235 | |||
236 | # | ||
237 | # Network testing | ||
238 | # | ||
239 | # CONFIG_NET_PKTGEN is not set | ||
240 | # CONFIG_NETFILTER_NETLINK is not set | ||
241 | # CONFIG_HAMRADIO is not set | ||
242 | # CONFIG_IRDA is not set | ||
243 | # CONFIG_BT is not set | ||
244 | # CONFIG_IEEE80211 is not set | ||
245 | |||
246 | # | ||
157 | # Device Drivers | 247 | # Device Drivers |
158 | # | 248 | # |
159 | 249 | ||
@@ -162,10 +252,15 @@ CONFIG_HOTPLUG_PCI_ACPI=m | |||
162 | # | 252 | # |
163 | CONFIG_STANDALONE=y | 253 | CONFIG_STANDALONE=y |
164 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 254 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
165 | # CONFIG_FW_LOADER is not set | 255 | CONFIG_FW_LOADER=m |
166 | # CONFIG_DEBUG_DRIVER is not set | 256 | # CONFIG_DEBUG_DRIVER is not set |
167 | 257 | ||
168 | # | 258 | # |
259 | # Connector - unified userspace <-> kernelspace linker | ||
260 | # | ||
261 | # CONFIG_CONNECTOR is not set | ||
262 | |||
263 | # | ||
169 | # Memory Technology Devices (MTD) | 264 | # Memory Technology Devices (MTD) |
170 | # | 265 | # |
171 | # CONFIG_MTD is not set | 266 | # CONFIG_MTD is not set |
@@ -178,7 +273,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
178 | # | 273 | # |
179 | # Plug and Play support | 274 | # Plug and Play support |
180 | # | 275 | # |
181 | # CONFIG_PNP is not set | 276 | CONFIG_PNP=y |
277 | # CONFIG_PNP_DEBUG is not set | ||
278 | |||
279 | # | ||
280 | # Protocols | ||
281 | # | ||
282 | CONFIG_PNPACPI=y | ||
182 | 283 | ||
183 | # | 284 | # |
184 | # Block devices | 285 | # Block devices |
@@ -197,7 +298,6 @@ CONFIG_BLK_DEV_RAM=y | |||
197 | CONFIG_BLK_DEV_RAM_COUNT=16 | 298 | CONFIG_BLK_DEV_RAM_COUNT=16 |
198 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 299 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
199 | CONFIG_BLK_DEV_INITRD=y | 300 | CONFIG_BLK_DEV_INITRD=y |
200 | CONFIG_INITRAMFS_SOURCE="" | ||
201 | # CONFIG_CDROM_PKTCDVD is not set | 301 | # CONFIG_CDROM_PKTCDVD is not set |
202 | 302 | ||
203 | # | 303 | # |
@@ -230,7 +330,8 @@ CONFIG_BLK_DEV_IDESCSI=m | |||
230 | # | 330 | # |
231 | # IDE chipset support/bugfixes | 331 | # IDE chipset support/bugfixes |
232 | # | 332 | # |
233 | CONFIG_IDE_GENERIC=y | 333 | # CONFIG_IDE_GENERIC is not set |
334 | # CONFIG_BLK_DEV_IDEPNP is not set | ||
234 | CONFIG_BLK_DEV_IDEPCI=y | 335 | CONFIG_BLK_DEV_IDEPCI=y |
235 | # CONFIG_IDEPCI_SHARE_IRQ is not set | 336 | # CONFIG_IDEPCI_SHARE_IRQ is not set |
236 | # CONFIG_BLK_DEV_OFFBOARD is not set | 337 | # CONFIG_BLK_DEV_OFFBOARD is not set |
@@ -252,6 +353,7 @@ CONFIG_BLK_DEV_CMD64X=y | |||
252 | # CONFIG_BLK_DEV_HPT366 is not set | 353 | # CONFIG_BLK_DEV_HPT366 is not set |
253 | # CONFIG_BLK_DEV_SC1200 is not set | 354 | # CONFIG_BLK_DEV_SC1200 is not set |
254 | CONFIG_BLK_DEV_PIIX=y | 355 | CONFIG_BLK_DEV_PIIX=y |
356 | # CONFIG_BLK_DEV_IT821X is not set | ||
255 | # CONFIG_BLK_DEV_NS87415 is not set | 357 | # CONFIG_BLK_DEV_NS87415 is not set |
256 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | 358 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set |
257 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | 359 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set |
@@ -270,6 +372,7 @@ CONFIG_IDEDMA_AUTO=y | |||
270 | # | 372 | # |
271 | # SCSI device support | 373 | # SCSI device support |
272 | # | 374 | # |
375 | # CONFIG_RAID_ATTRS is not set | ||
273 | CONFIG_SCSI=y | 376 | CONFIG_SCSI=y |
274 | CONFIG_SCSI_PROC_FS=y | 377 | CONFIG_SCSI_PROC_FS=y |
275 | 378 | ||
@@ -297,6 +400,7 @@ CONFIG_CHR_DEV_SG=m | |||
297 | CONFIG_SCSI_SPI_ATTRS=y | 400 | CONFIG_SCSI_SPI_ATTRS=y |
298 | CONFIG_SCSI_FC_ATTRS=y | 401 | CONFIG_SCSI_FC_ATTRS=y |
299 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 402 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
403 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
300 | 404 | ||
301 | # | 405 | # |
302 | # SCSI low-level drivers | 406 | # SCSI low-level drivers |
@@ -314,6 +418,7 @@ CONFIG_SCSI_SATA=y | |||
314 | # CONFIG_SCSI_SATA_AHCI is not set | 418 | # CONFIG_SCSI_SATA_AHCI is not set |
315 | # CONFIG_SCSI_SATA_SVW is not set | 419 | # CONFIG_SCSI_SATA_SVW is not set |
316 | # CONFIG_SCSI_ATA_PIIX is not set | 420 | # CONFIG_SCSI_ATA_PIIX is not set |
421 | # CONFIG_SCSI_SATA_MV is not set | ||
317 | # CONFIG_SCSI_SATA_NV is not set | 422 | # CONFIG_SCSI_SATA_NV is not set |
318 | # CONFIG_SCSI_SATA_PROMISE is not set | 423 | # CONFIG_SCSI_SATA_PROMISE is not set |
319 | # CONFIG_SCSI_SATA_QSTOR is not set | 424 | # CONFIG_SCSI_SATA_QSTOR is not set |
@@ -335,7 +440,6 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | |||
335 | # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set | 440 | # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set |
336 | # CONFIG_SCSI_IPR is not set | 441 | # CONFIG_SCSI_IPR is not set |
337 | # CONFIG_SCSI_QLOGIC_FC is not set | 442 | # CONFIG_SCSI_QLOGIC_FC is not set |
338 | # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set | ||
339 | CONFIG_SCSI_QLOGIC_1280=y | 443 | CONFIG_SCSI_QLOGIC_1280=y |
340 | # CONFIG_SCSI_QLOGIC_1280_1040 is not set | 444 | # CONFIG_SCSI_QLOGIC_1280_1040 is not set |
341 | CONFIG_SCSI_QLA2XXX=y | 445 | CONFIG_SCSI_QLA2XXX=y |
@@ -344,6 +448,7 @@ CONFIG_SCSI_QLA22XX=m | |||
344 | CONFIG_SCSI_QLA2300=m | 448 | CONFIG_SCSI_QLA2300=m |
345 | CONFIG_SCSI_QLA2322=m | 449 | CONFIG_SCSI_QLA2322=m |
346 | # CONFIG_SCSI_QLA6312 is not set | 450 | # CONFIG_SCSI_QLA6312 is not set |
451 | # CONFIG_SCSI_QLA24XX is not set | ||
347 | # CONFIG_SCSI_LPFC is not set | 452 | # CONFIG_SCSI_LPFC is not set |
348 | # CONFIG_SCSI_DC395x is not set | 453 | # CONFIG_SCSI_DC395x is not set |
349 | # CONFIG_SCSI_DC390T is not set | 454 | # CONFIG_SCSI_DC390T is not set |
@@ -390,74 +495,14 @@ CONFIG_FUSION_MAX_SGE=128 | |||
390 | # CONFIG_I2O is not set | 495 | # CONFIG_I2O is not set |
391 | 496 | ||
392 | # | 497 | # |
393 | # Networking support | 498 | # Network device support |
394 | # | ||
395 | CONFIG_NET=y | ||
396 | |||
397 | # | ||
398 | # Networking options | ||
399 | # | ||
400 | CONFIG_PACKET=y | ||
401 | # CONFIG_PACKET_MMAP is not set | ||
402 | CONFIG_UNIX=y | ||
403 | # CONFIG_NET_KEY is not set | ||
404 | CONFIG_INET=y | ||
405 | CONFIG_IP_MULTICAST=y | ||
406 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
407 | # CONFIG_IP_PNP is not set | ||
408 | # CONFIG_NET_IPIP is not set | ||
409 | # CONFIG_NET_IPGRE is not set | ||
410 | # CONFIG_IP_MROUTE is not set | ||
411 | CONFIG_ARPD=y | ||
412 | CONFIG_SYN_COOKIES=y | ||
413 | # CONFIG_INET_AH is not set | ||
414 | # CONFIG_INET_ESP is not set | ||
415 | # CONFIG_INET_IPCOMP is not set | ||
416 | # CONFIG_INET_TUNNEL is not set | ||
417 | CONFIG_IP_TCPDIAG=y | ||
418 | # CONFIG_IP_TCPDIAG_IPV6 is not set | ||
419 | # CONFIG_IPV6 is not set | ||
420 | # CONFIG_NETFILTER is not set | ||
421 | |||
422 | # | ||
423 | # SCTP Configuration (EXPERIMENTAL) | ||
424 | # | ||
425 | # CONFIG_IP_SCTP is not set | ||
426 | # CONFIG_ATM is not set | ||
427 | # CONFIG_BRIDGE is not set | ||
428 | # CONFIG_VLAN_8021Q is not set | ||
429 | # CONFIG_DECNET is not set | ||
430 | # CONFIG_LLC2 is not set | ||
431 | # CONFIG_IPX is not set | ||
432 | # CONFIG_ATALK is not set | ||
433 | # CONFIG_X25 is not set | ||
434 | # CONFIG_LAPB is not set | ||
435 | # CONFIG_NET_DIVERT is not set | ||
436 | # CONFIG_ECONET is not set | ||
437 | # CONFIG_WAN_ROUTER is not set | ||
438 | |||
439 | # | 499 | # |
440 | # QoS and/or fair queueing | ||
441 | # | ||
442 | # CONFIG_NET_SCHED is not set | ||
443 | # CONFIG_NET_CLS_ROUTE is not set | ||
444 | |||
445 | # | ||
446 | # Network testing | ||
447 | # | ||
448 | # CONFIG_NET_PKTGEN is not set | ||
449 | CONFIG_NETPOLL=y | ||
450 | # CONFIG_NETPOLL_RX is not set | ||
451 | # CONFIG_NETPOLL_TRAP is not set | ||
452 | CONFIG_NET_POLL_CONTROLLER=y | ||
453 | # CONFIG_HAMRADIO is not set | ||
454 | # CONFIG_IRDA is not set | ||
455 | # CONFIG_BT is not set | ||
456 | CONFIG_NETDEVICES=y | 500 | CONFIG_NETDEVICES=y |
457 | CONFIG_DUMMY=m | 501 | CONFIG_DUMMY=m |
458 | # CONFIG_BONDING is not set | 502 | # CONFIG_BONDING is not set |
459 | # CONFIG_EQUALIZER is not set | 503 | # CONFIG_EQUALIZER is not set |
460 | # CONFIG_TUN is not set | 504 | # CONFIG_TUN is not set |
505 | # CONFIG_NET_SB1000 is not set | ||
461 | 506 | ||
462 | # | 507 | # |
463 | # ARCnet devices | 508 | # ARCnet devices |
@@ -465,6 +510,11 @@ CONFIG_DUMMY=m | |||
465 | # CONFIG_ARCNET is not set | 510 | # CONFIG_ARCNET is not set |
466 | 511 | ||
467 | # | 512 | # |
513 | # PHY device support | ||
514 | # | ||
515 | # CONFIG_PHYLIB is not set | ||
516 | |||
517 | # | ||
468 | # Ethernet (10 or 100Mbit) | 518 | # Ethernet (10 or 100Mbit) |
469 | # | 519 | # |
470 | CONFIG_NET_ETHERNET=y | 520 | CONFIG_NET_ETHERNET=y |
@@ -485,6 +535,7 @@ CONFIG_TULIP=m | |||
485 | # CONFIG_DE4X5 is not set | 535 | # CONFIG_DE4X5 is not set |
486 | # CONFIG_WINBOND_840 is not set | 536 | # CONFIG_WINBOND_840 is not set |
487 | # CONFIG_DM9102 is not set | 537 | # CONFIG_DM9102 is not set |
538 | # CONFIG_ULI526X is not set | ||
488 | # CONFIG_HP100 is not set | 539 | # CONFIG_HP100 is not set |
489 | CONFIG_NET_PCI=y | 540 | CONFIG_NET_PCI=y |
490 | # CONFIG_PCNET32 is not set | 541 | # CONFIG_PCNET32 is not set |
@@ -516,6 +567,7 @@ CONFIG_E1000=y | |||
516 | # CONFIG_HAMACHI is not set | 567 | # CONFIG_HAMACHI is not set |
517 | # CONFIG_YELLOWFIN is not set | 568 | # CONFIG_YELLOWFIN is not set |
518 | # CONFIG_R8169 is not set | 569 | # CONFIG_R8169 is not set |
570 | # CONFIG_SIS190 is not set | ||
519 | # CONFIG_SKGE is not set | 571 | # CONFIG_SKGE is not set |
520 | # CONFIG_SK98LIN is not set | 572 | # CONFIG_SK98LIN is not set |
521 | # CONFIG_VIA_VELOCITY is not set | 573 | # CONFIG_VIA_VELOCITY is not set |
@@ -525,6 +577,7 @@ CONFIG_TIGON3=y | |||
525 | # | 577 | # |
526 | # Ethernet (10000 Mbit) | 578 | # Ethernet (10000 Mbit) |
527 | # | 579 | # |
580 | # CONFIG_CHELSIO_T1 is not set | ||
528 | # CONFIG_IXGB is not set | 581 | # CONFIG_IXGB is not set |
529 | # CONFIG_S2IO is not set | 582 | # CONFIG_S2IO is not set |
530 | 583 | ||
@@ -549,6 +602,10 @@ CONFIG_TIGON3=y | |||
549 | # CONFIG_NET_FC is not set | 602 | # CONFIG_NET_FC is not set |
550 | # CONFIG_SHAPER is not set | 603 | # CONFIG_SHAPER is not set |
551 | CONFIG_NETCONSOLE=y | 604 | CONFIG_NETCONSOLE=y |
605 | CONFIG_NETPOLL=y | ||
606 | # CONFIG_NETPOLL_RX is not set | ||
607 | # CONFIG_NETPOLL_TRAP is not set | ||
608 | CONFIG_NET_POLL_CONTROLLER=y | ||
552 | 609 | ||
553 | # | 610 | # |
554 | # ISDN subsystem | 611 | # ISDN subsystem |
@@ -607,9 +664,7 @@ CONFIG_GAMEPORT=m | |||
607 | # CONFIG_GAMEPORT_NS558 is not set | 664 | # CONFIG_GAMEPORT_NS558 is not set |
608 | # CONFIG_GAMEPORT_L4 is not set | 665 | # CONFIG_GAMEPORT_L4 is not set |
609 | # CONFIG_GAMEPORT_EMU10K1 is not set | 666 | # CONFIG_GAMEPORT_EMU10K1 is not set |
610 | # CONFIG_GAMEPORT_VORTEX is not set | ||
611 | # CONFIG_GAMEPORT_FM801 is not set | 667 | # CONFIG_GAMEPORT_FM801 is not set |
612 | # CONFIG_GAMEPORT_CS461X is not set | ||
613 | 668 | ||
614 | # | 669 | # |
615 | # Character devices | 670 | # Character devices |
@@ -620,6 +675,7 @@ CONFIG_HW_CONSOLE=y | |||
620 | CONFIG_SERIAL_NONSTANDARD=y | 675 | CONFIG_SERIAL_NONSTANDARD=y |
621 | # CONFIG_ROCKETPORT is not set | 676 | # CONFIG_ROCKETPORT is not set |
622 | # CONFIG_CYCLADES is not set | 677 | # CONFIG_CYCLADES is not set |
678 | # CONFIG_DIGIEPCA is not set | ||
623 | # CONFIG_MOXA_SMARTIO is not set | 679 | # CONFIG_MOXA_SMARTIO is not set |
624 | # CONFIG_ISI is not set | 680 | # CONFIG_ISI is not set |
625 | # CONFIG_SYNCLINKMP is not set | 681 | # CONFIG_SYNCLINKMP is not set |
@@ -641,7 +697,6 @@ CONFIG_SERIAL_8250_NR_UARTS=6 | |||
641 | CONFIG_SERIAL_8250_EXTENDED=y | 697 | CONFIG_SERIAL_8250_EXTENDED=y |
642 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 698 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
643 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | 699 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set |
644 | # CONFIG_SERIAL_8250_MULTIPORT is not set | ||
645 | # CONFIG_SERIAL_8250_RSA is not set | 700 | # CONFIG_SERIAL_8250_RSA is not set |
646 | 701 | ||
647 | # | 702 | # |
@@ -650,8 +705,8 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
650 | CONFIG_SERIAL_CORE=y | 705 | CONFIG_SERIAL_CORE=y |
651 | CONFIG_SERIAL_CORE_CONSOLE=y | 706 | CONFIG_SERIAL_CORE_CONSOLE=y |
652 | CONFIG_SERIAL_SGI_L1_CONSOLE=y | 707 | CONFIG_SERIAL_SGI_L1_CONSOLE=y |
653 | CONFIG_SERIAL_SGI_IOC4=y | ||
654 | # CONFIG_SERIAL_JSM is not set | 708 | # CONFIG_SERIAL_JSM is not set |
709 | CONFIG_SERIAL_SGI_IOC4=y | ||
655 | CONFIG_UNIX98_PTYS=y | 710 | CONFIG_UNIX98_PTYS=y |
656 | CONFIG_LEGACY_PTYS=y | 711 | CONFIG_LEGACY_PTYS=y |
657 | CONFIG_LEGACY_PTY_COUNT=256 | 712 | CONFIG_LEGACY_PTY_COUNT=256 |
@@ -684,6 +739,8 @@ CONFIG_DRM_R128=m | |||
684 | CONFIG_DRM_RADEON=m | 739 | CONFIG_DRM_RADEON=m |
685 | CONFIG_DRM_MGA=m | 740 | CONFIG_DRM_MGA=m |
686 | CONFIG_DRM_SIS=m | 741 | CONFIG_DRM_SIS=m |
742 | # CONFIG_DRM_VIA is not set | ||
743 | # CONFIG_DRM_SAVAGE is not set | ||
687 | CONFIG_RAW_DRIVER=m | 744 | CONFIG_RAW_DRIVER=m |
688 | CONFIG_HPET=y | 745 | CONFIG_HPET=y |
689 | # CONFIG_HPET_RTC_IRQ is not set | 746 | # CONFIG_HPET_RTC_IRQ is not set |
@@ -708,10 +765,21 @@ CONFIG_MMTIMER=y | |||
708 | # CONFIG_W1 is not set | 765 | # CONFIG_W1 is not set |
709 | 766 | ||
710 | # | 767 | # |
768 | # Hardware Monitoring support | ||
769 | # | ||
770 | CONFIG_HWMON=y | ||
771 | # CONFIG_HWMON_VID is not set | ||
772 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
773 | |||
774 | # | ||
711 | # Misc devices | 775 | # Misc devices |
712 | # | 776 | # |
713 | 777 | ||
714 | # | 778 | # |
779 | # Multimedia Capabilities Port drivers | ||
780 | # | ||
781 | |||
782 | # | ||
715 | # Multimedia devices | 783 | # Multimedia devices |
716 | # | 784 | # |
717 | # CONFIG_VIDEO_DEV is not set | 785 | # CONFIG_VIDEO_DEV is not set |
@@ -753,6 +821,7 @@ CONFIG_SND_PCM_OSS=m | |||
753 | CONFIG_SND_SEQUENCER_OSS=y | 821 | CONFIG_SND_SEQUENCER_OSS=y |
754 | CONFIG_SND_VERBOSE_PRINTK=y | 822 | CONFIG_SND_VERBOSE_PRINTK=y |
755 | # CONFIG_SND_DEBUG is not set | 823 | # CONFIG_SND_DEBUG is not set |
824 | CONFIG_SND_GENERIC_DRIVER=y | ||
756 | 825 | ||
757 | # | 826 | # |
758 | # Generic devices | 827 | # Generic devices |
@@ -764,11 +833,12 @@ CONFIG_SND_VIRMIDI=m | |||
764 | CONFIG_SND_MTPAV=m | 833 | CONFIG_SND_MTPAV=m |
765 | CONFIG_SND_SERIAL_U16550=m | 834 | CONFIG_SND_SERIAL_U16550=m |
766 | CONFIG_SND_MPU401=m | 835 | CONFIG_SND_MPU401=m |
836 | CONFIG_SND_AC97_CODEC=m | ||
837 | CONFIG_SND_AC97_BUS=m | ||
767 | 838 | ||
768 | # | 839 | # |
769 | # PCI devices | 840 | # PCI devices |
770 | # | 841 | # |
771 | CONFIG_SND_AC97_CODEC=m | ||
772 | # CONFIG_SND_ALI5451 is not set | 842 | # CONFIG_SND_ALI5451 is not set |
773 | # CONFIG_SND_ATIIXP is not set | 843 | # CONFIG_SND_ATIIXP is not set |
774 | # CONFIG_SND_ATIIXP_MODEM is not set | 844 | # CONFIG_SND_ATIIXP_MODEM is not set |
@@ -790,9 +860,10 @@ CONFIG_SND_EMU10K1=m | |||
790 | # CONFIG_SND_RME96 is not set | 860 | # CONFIG_SND_RME96 is not set |
791 | # CONFIG_SND_RME9652 is not set | 861 | # CONFIG_SND_RME9652 is not set |
792 | # CONFIG_SND_HDSP is not set | 862 | # CONFIG_SND_HDSP is not set |
863 | # CONFIG_SND_HDSPM is not set | ||
793 | # CONFIG_SND_TRIDENT is not set | 864 | # CONFIG_SND_TRIDENT is not set |
794 | # CONFIG_SND_YMFPCI is not set | 865 | # CONFIG_SND_YMFPCI is not set |
795 | # CONFIG_SND_ALS4000 is not set | 866 | # CONFIG_SND_AD1889 is not set |
796 | # CONFIG_SND_CMIPCI is not set | 867 | # CONFIG_SND_CMIPCI is not set |
797 | # CONFIG_SND_ENS1370 is not set | 868 | # CONFIG_SND_ENS1370 is not set |
798 | # CONFIG_SND_ENS1371 is not set | 869 | # CONFIG_SND_ENS1371 is not set |
@@ -844,6 +915,7 @@ CONFIG_USB_DEVICEFS=y | |||
844 | CONFIG_USB_EHCI_HCD=m | 915 | CONFIG_USB_EHCI_HCD=m |
845 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 916 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
846 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 917 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
918 | # CONFIG_USB_ISP116X_HCD is not set | ||
847 | CONFIG_USB_OHCI_HCD=m | 919 | CONFIG_USB_OHCI_HCD=m |
848 | # CONFIG_USB_OHCI_BIG_ENDIAN is not set | 920 | # CONFIG_USB_OHCI_BIG_ENDIAN is not set |
849 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 921 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
@@ -853,9 +925,8 @@ CONFIG_USB_UHCI_HCD=m | |||
853 | # | 925 | # |
854 | # USB Device Class drivers | 926 | # USB Device Class drivers |
855 | # | 927 | # |
856 | # CONFIG_USB_AUDIO is not set | 928 | # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set |
857 | # CONFIG_USB_BLUETOOTH_TTY is not set | 929 | # CONFIG_USB_BLUETOOTH_TTY is not set |
858 | # CONFIG_USB_MIDI is not set | ||
859 | # CONFIG_USB_ACM is not set | 930 | # CONFIG_USB_ACM is not set |
860 | # CONFIG_USB_PRINTER is not set | 931 | # CONFIG_USB_PRINTER is not set |
861 | 932 | ||
@@ -888,12 +959,17 @@ CONFIG_USB_HIDINPUT=y | |||
888 | # CONFIG_USB_MOUSE is not set | 959 | # CONFIG_USB_MOUSE is not set |
889 | # CONFIG_USB_AIPTEK is not set | 960 | # CONFIG_USB_AIPTEK is not set |
890 | # CONFIG_USB_WACOM is not set | 961 | # CONFIG_USB_WACOM is not set |
962 | # CONFIG_USB_ACECAD is not set | ||
891 | # CONFIG_USB_KBTAB is not set | 963 | # CONFIG_USB_KBTAB is not set |
892 | # CONFIG_USB_POWERMATE is not set | 964 | # CONFIG_USB_POWERMATE is not set |
893 | # CONFIG_USB_MTOUCH is not set | 965 | # CONFIG_USB_MTOUCH is not set |
966 | # CONFIG_USB_ITMTOUCH is not set | ||
894 | # CONFIG_USB_EGALAX is not set | 967 | # CONFIG_USB_EGALAX is not set |
968 | # CONFIG_USB_YEALINK is not set | ||
895 | # CONFIG_USB_XPAD is not set | 969 | # CONFIG_USB_XPAD is not set |
896 | # CONFIG_USB_ATI_REMOTE is not set | 970 | # CONFIG_USB_ATI_REMOTE is not set |
971 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
972 | # CONFIG_USB_APPLETOUCH is not set | ||
897 | 973 | ||
898 | # | 974 | # |
899 | # USB Imaging devices | 975 | # USB Imaging devices |
@@ -918,7 +994,7 @@ CONFIG_USB_HIDINPUT=y | |||
918 | # CONFIG_USB_PEGASUS is not set | 994 | # CONFIG_USB_PEGASUS is not set |
919 | # CONFIG_USB_RTL8150 is not set | 995 | # CONFIG_USB_RTL8150 is not set |
920 | # CONFIG_USB_USBNET is not set | 996 | # CONFIG_USB_USBNET is not set |
921 | CONFIG_USB_MON=m | 997 | CONFIG_USB_MON=y |
922 | 998 | ||
923 | # | 999 | # |
924 | # USB port drivers | 1000 | # USB port drivers |
@@ -944,10 +1020,11 @@ CONFIG_USB_MON=m | |||
944 | # CONFIG_USB_PHIDGETSERVO is not set | 1020 | # CONFIG_USB_PHIDGETSERVO is not set |
945 | # CONFIG_USB_IDMOUSE is not set | 1021 | # CONFIG_USB_IDMOUSE is not set |
946 | # CONFIG_USB_SISUSBVGA is not set | 1022 | # CONFIG_USB_SISUSBVGA is not set |
1023 | # CONFIG_USB_LD is not set | ||
947 | # CONFIG_USB_TEST is not set | 1024 | # CONFIG_USB_TEST is not set |
948 | 1025 | ||
949 | # | 1026 | # |
950 | # USB ATM/DSL drivers | 1027 | # USB DSL modem support |
951 | # | 1028 | # |
952 | 1029 | ||
953 | # | 1030 | # |
@@ -964,6 +1041,8 @@ CONFIG_USB_MON=m | |||
964 | # InfiniBand support | 1041 | # InfiniBand support |
965 | # | 1042 | # |
966 | CONFIG_INFINIBAND=m | 1043 | CONFIG_INFINIBAND=m |
1044 | # CONFIG_INFINIBAND_USER_MAD is not set | ||
1045 | # CONFIG_INFINIBAND_USER_ACCESS is not set | ||
967 | CONFIG_INFINIBAND_MTHCA=m | 1046 | CONFIG_INFINIBAND_MTHCA=m |
968 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set | 1047 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set |
969 | CONFIG_INFINIBAND_IPOIB=m | 1048 | CONFIG_INFINIBAND_IPOIB=m |
@@ -981,6 +1060,7 @@ CONFIG_EXT2_FS=y | |||
981 | CONFIG_EXT2_FS_XATTR=y | 1060 | CONFIG_EXT2_FS_XATTR=y |
982 | CONFIG_EXT2_FS_POSIX_ACL=y | 1061 | CONFIG_EXT2_FS_POSIX_ACL=y |
983 | CONFIG_EXT2_FS_SECURITY=y | 1062 | CONFIG_EXT2_FS_SECURITY=y |
1063 | # CONFIG_EXT2_FS_XIP is not set | ||
984 | CONFIG_EXT3_FS=y | 1064 | CONFIG_EXT3_FS=y |
985 | CONFIG_EXT3_FS_XATTR=y | 1065 | CONFIG_EXT3_FS_XATTR=y |
986 | CONFIG_EXT3_FS_POSIX_ACL=y | 1066 | CONFIG_EXT3_FS_POSIX_ACL=y |
@@ -996,22 +1076,20 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
996 | CONFIG_REISERFS_FS_SECURITY=y | 1076 | CONFIG_REISERFS_FS_SECURITY=y |
997 | # CONFIG_JFS_FS is not set | 1077 | # CONFIG_JFS_FS is not set |
998 | CONFIG_FS_POSIX_ACL=y | 1078 | CONFIG_FS_POSIX_ACL=y |
999 | |||
1000 | # | ||
1001 | # XFS support | ||
1002 | # | ||
1003 | CONFIG_XFS_FS=y | 1079 | CONFIG_XFS_FS=y |
1004 | CONFIG_XFS_EXPORT=y | 1080 | CONFIG_XFS_EXPORT=y |
1005 | # CONFIG_XFS_RT is not set | ||
1006 | # CONFIG_XFS_QUOTA is not set | 1081 | # CONFIG_XFS_QUOTA is not set |
1007 | # CONFIG_XFS_SECURITY is not set | 1082 | # CONFIG_XFS_SECURITY is not set |
1008 | # CONFIG_XFS_POSIX_ACL is not set | 1083 | # CONFIG_XFS_POSIX_ACL is not set |
1084 | # CONFIG_XFS_RT is not set | ||
1009 | # CONFIG_MINIX_FS is not set | 1085 | # CONFIG_MINIX_FS is not set |
1010 | # CONFIG_ROMFS_FS is not set | 1086 | # CONFIG_ROMFS_FS is not set |
1087 | CONFIG_INOTIFY=y | ||
1011 | # CONFIG_QUOTA is not set | 1088 | # CONFIG_QUOTA is not set |
1012 | CONFIG_DNOTIFY=y | 1089 | CONFIG_DNOTIFY=y |
1013 | CONFIG_AUTOFS_FS=y | 1090 | CONFIG_AUTOFS_FS=y |
1014 | CONFIG_AUTOFS4_FS=y | 1091 | CONFIG_AUTOFS4_FS=y |
1092 | # CONFIG_FUSE_FS is not set | ||
1015 | 1093 | ||
1016 | # | 1094 | # |
1017 | # CD-ROM/DVD Filesystems | 1095 | # CD-ROM/DVD Filesystems |
@@ -1040,14 +1118,11 @@ CONFIG_NTFS_FS=m | |||
1040 | CONFIG_PROC_FS=y | 1118 | CONFIG_PROC_FS=y |
1041 | CONFIG_PROC_KCORE=y | 1119 | CONFIG_PROC_KCORE=y |
1042 | CONFIG_SYSFS=y | 1120 | CONFIG_SYSFS=y |
1043 | # CONFIG_DEVFS_FS is not set | ||
1044 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
1045 | CONFIG_TMPFS=y | 1121 | CONFIG_TMPFS=y |
1046 | CONFIG_TMPFS_XATTR=y | ||
1047 | CONFIG_TMPFS_SECURITY=y | ||
1048 | CONFIG_HUGETLBFS=y | 1122 | CONFIG_HUGETLBFS=y |
1049 | CONFIG_HUGETLB_PAGE=y | 1123 | CONFIG_HUGETLB_PAGE=y |
1050 | CONFIG_RAMFS=y | 1124 | CONFIG_RAMFS=y |
1125 | # CONFIG_RELAYFS_FS is not set | ||
1051 | 1126 | ||
1052 | # | 1127 | # |
1053 | # Miscellaneous filesystems | 1128 | # Miscellaneous filesystems |
@@ -1071,15 +1146,18 @@ CONFIG_RAMFS=y | |||
1071 | # | 1146 | # |
1072 | CONFIG_NFS_FS=m | 1147 | CONFIG_NFS_FS=m |
1073 | CONFIG_NFS_V3=y | 1148 | CONFIG_NFS_V3=y |
1149 | # CONFIG_NFS_V3_ACL is not set | ||
1074 | CONFIG_NFS_V4=y | 1150 | CONFIG_NFS_V4=y |
1075 | CONFIG_NFS_DIRECTIO=y | 1151 | CONFIG_NFS_DIRECTIO=y |
1076 | CONFIG_NFSD=m | 1152 | CONFIG_NFSD=m |
1077 | CONFIG_NFSD_V3=y | 1153 | CONFIG_NFSD_V3=y |
1154 | # CONFIG_NFSD_V3_ACL is not set | ||
1078 | CONFIG_NFSD_V4=y | 1155 | CONFIG_NFSD_V4=y |
1079 | CONFIG_NFSD_TCP=y | 1156 | CONFIG_NFSD_TCP=y |
1080 | CONFIG_LOCKD=m | 1157 | CONFIG_LOCKD=m |
1081 | CONFIG_LOCKD_V4=y | 1158 | CONFIG_LOCKD_V4=y |
1082 | CONFIG_EXPORTFS=y | 1159 | CONFIG_EXPORTFS=y |
1160 | CONFIG_NFS_COMMON=y | ||
1083 | CONFIG_SUNRPC=m | 1161 | CONFIG_SUNRPC=m |
1084 | CONFIG_SUNRPC_GSS=m | 1162 | CONFIG_SUNRPC_GSS=m |
1085 | CONFIG_RPCSEC_GSS_KRB5=m | 1163 | CONFIG_RPCSEC_GSS_KRB5=m |
@@ -1094,6 +1172,7 @@ CONFIG_CIFS=m | |||
1094 | # CONFIG_NCP_FS is not set | 1172 | # CONFIG_NCP_FS is not set |
1095 | # CONFIG_CODA_FS is not set | 1173 | # CONFIG_CODA_FS is not set |
1096 | # CONFIG_AFS_FS is not set | 1174 | # CONFIG_AFS_FS is not set |
1175 | # CONFIG_9P_FS is not set | ||
1097 | 1176 | ||
1098 | # | 1177 | # |
1099 | # Partition Types | 1178 | # Partition Types |
@@ -1163,10 +1242,12 @@ CONFIG_NLS_UTF8=m | |||
1163 | # Library routines | 1242 | # Library routines |
1164 | # | 1243 | # |
1165 | # CONFIG_CRC_CCITT is not set | 1244 | # CONFIG_CRC_CCITT is not set |
1245 | # CONFIG_CRC16 is not set | ||
1166 | CONFIG_CRC32=y | 1246 | CONFIG_CRC32=y |
1167 | # CONFIG_LIBCRC32C is not set | 1247 | # CONFIG_LIBCRC32C is not set |
1168 | CONFIG_GENERIC_HARDIRQS=y | 1248 | CONFIG_GENERIC_HARDIRQS=y |
1169 | CONFIG_GENERIC_IRQ_PROBE=y | 1249 | CONFIG_GENERIC_IRQ_PROBE=y |
1250 | CONFIG_GENERIC_PENDING_IRQ=y | ||
1170 | 1251 | ||
1171 | # | 1252 | # |
1172 | # HP Simulator drivers | 1253 | # HP Simulator drivers |
@@ -1187,6 +1268,7 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
1187 | CONFIG_DEBUG_KERNEL=y | 1268 | CONFIG_DEBUG_KERNEL=y |
1188 | CONFIG_MAGIC_SYSRQ=y | 1269 | CONFIG_MAGIC_SYSRQ=y |
1189 | CONFIG_LOG_BUF_SHIFT=20 | 1270 | CONFIG_LOG_BUF_SHIFT=20 |
1271 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1190 | # CONFIG_SCHEDSTATS is not set | 1272 | # CONFIG_SCHEDSTATS is not set |
1191 | # CONFIG_DEBUG_SLAB is not set | 1273 | # CONFIG_DEBUG_SLAB is not set |
1192 | # CONFIG_DEBUG_SPINLOCK is not set | 1274 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1194,6 +1276,7 @@ CONFIG_LOG_BUF_SHIFT=20 | |||
1194 | # CONFIG_DEBUG_KOBJECT is not set | 1276 | # CONFIG_DEBUG_KOBJECT is not set |
1195 | # CONFIG_DEBUG_INFO is not set | 1277 | # CONFIG_DEBUG_INFO is not set |
1196 | # CONFIG_DEBUG_FS is not set | 1278 | # CONFIG_DEBUG_FS is not set |
1279 | # CONFIG_KPROBES is not set | ||
1197 | CONFIG_IA64_GRANULE_16MB=y | 1280 | CONFIG_IA64_GRANULE_16MB=y |
1198 | # CONFIG_IA64_GRANULE_64MB is not set | 1281 | # CONFIG_IA64_GRANULE_64MB is not set |
1199 | # CONFIG_IA64_PRINT_HAZARDS is not set | 1282 | # CONFIG_IA64_PRINT_HAZARDS is not set |
@@ -1215,7 +1298,7 @@ CONFIG_CRYPTO=y | |||
1215 | # CONFIG_CRYPTO_HMAC is not set | 1298 | # CONFIG_CRYPTO_HMAC is not set |
1216 | # CONFIG_CRYPTO_NULL is not set | 1299 | # CONFIG_CRYPTO_NULL is not set |
1217 | # CONFIG_CRYPTO_MD4 is not set | 1300 | # CONFIG_CRYPTO_MD4 is not set |
1218 | CONFIG_CRYPTO_MD5=m | 1301 | CONFIG_CRYPTO_MD5=y |
1219 | # CONFIG_CRYPTO_SHA1 is not set | 1302 | # CONFIG_CRYPTO_SHA1 is not set |
1220 | # CONFIG_CRYPTO_SHA256 is not set | 1303 | # CONFIG_CRYPTO_SHA256 is not set |
1221 | # CONFIG_CRYPTO_SHA512 is not set | 1304 | # CONFIG_CRYPTO_SHA512 is not set |
diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c index 80f8ef013939..317c334c5a18 100644 --- a/arch/ia64/hp/common/hwsw_iommu.c +++ b/arch/ia64/hp/common/hwsw_iommu.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <asm/machvec.h> | 17 | #include <asm/machvec.h> |
18 | 18 | ||
19 | /* swiotlb declarations & definitions: */ | 19 | /* swiotlb declarations & definitions: */ |
20 | extern void swiotlb_init_with_default_size (size_t size); | 20 | extern int swiotlb_late_init_with_default_size (size_t size); |
21 | extern ia64_mv_dma_alloc_coherent swiotlb_alloc_coherent; | 21 | extern ia64_mv_dma_alloc_coherent swiotlb_alloc_coherent; |
22 | extern ia64_mv_dma_free_coherent swiotlb_free_coherent; | 22 | extern ia64_mv_dma_free_coherent swiotlb_free_coherent; |
23 | extern ia64_mv_dma_map_single swiotlb_map_single; | 23 | extern ia64_mv_dma_map_single swiotlb_map_single; |
@@ -67,7 +67,16 @@ void | |||
67 | hwsw_init (void) | 67 | hwsw_init (void) |
68 | { | 68 | { |
69 | /* default to a smallish 2MB sw I/O TLB */ | 69 | /* default to a smallish 2MB sw I/O TLB */ |
70 | swiotlb_init_with_default_size (2 * (1<<20)); | 70 | if (swiotlb_late_init_with_default_size (2 * (1<<20)) != 0) { |
71 | #ifdef CONFIG_IA64_GENERIC | ||
72 | /* Better to have normal DMA than panic */ | ||
73 | printk(KERN_WARNING "%s: Failed to initialize software I/O TLB," | ||
74 | " reverting to hpzx1 platform vector\n", __FUNCTION__); | ||
75 | machvec_init("hpzx1"); | ||
76 | #else | ||
77 | panic("Unable to initialize software I/O TLB services"); | ||
78 | #endif | ||
79 | } | ||
71 | } | 80 | } |
72 | 81 | ||
73 | void * | 82 | void * |
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 11957598a8b9..e64ca04ace89 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c | |||
@@ -2028,9 +2028,40 @@ static struct acpi_driver acpi_sba_ioc_driver = { | |||
2028 | static int __init | 2028 | static int __init |
2029 | sba_init(void) | 2029 | sba_init(void) |
2030 | { | 2030 | { |
2031 | if (!ia64_platform_is("hpzx1") && !ia64_platform_is("hpzx1_swiotlb")) | ||
2032 | return 0; | ||
2033 | |||
2031 | acpi_bus_register_driver(&acpi_sba_ioc_driver); | 2034 | acpi_bus_register_driver(&acpi_sba_ioc_driver); |
2032 | if (!ioc_list) | 2035 | if (!ioc_list) { |
2036 | #ifdef CONFIG_IA64_GENERIC | ||
2037 | extern int swiotlb_late_init_with_default_size (size_t size); | ||
2038 | |||
2039 | /* | ||
2040 | * If we didn't find something sba_iommu can claim, we | ||
2041 | * need to setup the swiotlb and switch to the dig machvec. | ||
2042 | */ | ||
2043 | if (swiotlb_late_init_with_default_size(64 * (1<<20)) != 0) | ||
2044 | panic("Unable to find SBA IOMMU or initialize " | ||
2045 | "software I/O TLB: Try machvec=dig boot option"); | ||
2046 | machvec_init("dig"); | ||
2047 | #else | ||
2048 | panic("Unable to find SBA IOMMU: Try a generic or DIG kernel"); | ||
2049 | #endif | ||
2033 | return 0; | 2050 | return 0; |
2051 | } | ||
2052 | |||
2053 | #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_HP_ZX1_SWIOTLB) | ||
2054 | /* | ||
2055 | * hpzx1_swiotlb needs to have a fairly small swiotlb bounce | ||
2056 | * buffer setup to support devices with smaller DMA masks than | ||
2057 | * sba_iommu can handle. | ||
2058 | */ | ||
2059 | if (ia64_platform_is("hpzx1_swiotlb")) { | ||
2060 | extern void hwsw_init(void); | ||
2061 | |||
2062 | hwsw_init(); | ||
2063 | } | ||
2064 | #endif | ||
2034 | 2065 | ||
2035 | #ifdef CONFIG_PCI | 2066 | #ifdef CONFIG_PCI |
2036 | { | 2067 | { |
@@ -2048,18 +2079,6 @@ sba_init(void) | |||
2048 | 2079 | ||
2049 | subsys_initcall(sba_init); /* must be initialized after ACPI etc., but before any drivers... */ | 2080 | subsys_initcall(sba_init); /* must be initialized after ACPI etc., but before any drivers... */ |
2050 | 2081 | ||
2051 | extern void dig_setup(char**); | ||
2052 | /* | ||
2053 | * MAX_DMA_ADDRESS needs to be setup prior to paging_init to do any good, | ||
2054 | * so we use the platform_setup hook to fix it up. | ||
2055 | */ | ||
2056 | void __init | ||
2057 | sba_setup(char **cmdline_p) | ||
2058 | { | ||
2059 | MAX_DMA_ADDRESS = ~0UL; | ||
2060 | dig_setup(cmdline_p); | ||
2061 | } | ||
2062 | |||
2063 | static int __init | 2082 | static int __init |
2064 | nosbagart(char *str) | 2083 | nosbagart(char *str) |
2065 | { | 2084 | { |
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c index a18983a3c934..a3fe97531134 100644 --- a/arch/ia64/hp/sim/simscsi.c +++ b/arch/ia64/hp/sim/simscsi.c | |||
@@ -205,10 +205,11 @@ simscsi_get_disk_size (int fd) | |||
205 | char buf[512]; | 205 | char buf[512]; |
206 | 206 | ||
207 | /* | 207 | /* |
208 | * This is a bit kludgey: the simulator doesn't provide a direct way of determining | 208 | * This is a bit kludgey: the simulator doesn't provide a |
209 | * the disk size, so we do a binary search, assuming a maximum disk size of 4GB. | 209 | * direct way of determining the disk size, so we do a binary |
210 | * search, assuming a maximum disk size of 128GB. | ||
210 | */ | 211 | */ |
211 | for (bit = (4UL << 30)/512; bit != 0; bit >>= 1) { | 212 | for (bit = (128UL << 30)/512; bit != 0; bit >>= 1) { |
212 | req.addr = __pa(&buf); | 213 | req.addr = __pa(&buf); |
213 | req.len = sizeof(buf); | 214 | req.len = sizeof(buf); |
214 | ia64_ssc(fd, 1, __pa(&req), ((sectors | bit) - 1)*512, SSC_READ); | 215 | ia64_ssc(fd, 1, __pa(&req), ((sectors | bit) - 1)*512, SSC_READ); |
@@ -225,8 +226,10 @@ simscsi_readwrite10 (struct scsi_cmnd *sc, int mode) | |||
225 | { | 226 | { |
226 | unsigned long offset; | 227 | unsigned long offset; |
227 | 228 | ||
228 | offset = ( (sc->cmnd[2] << 24) | (sc->cmnd[3] << 16) | 229 | offset = (((unsigned long)sc->cmnd[2] << 24) |
229 | | (sc->cmnd[4] << 8) | (sc->cmnd[5] << 0))*512; | 230 | | ((unsigned long)sc->cmnd[3] << 16) |
231 | | ((unsigned long)sc->cmnd[4] << 8) | ||
232 | | ((unsigned long)sc->cmnd[5] << 0))*512UL; | ||
230 | if (sc->use_sg > 0) | 233 | if (sc->use_sg > 0) |
231 | simscsi_sg_readwrite(sc, mode, offset); | 234 | simscsi_sg_readwrite(sc, mode, offset); |
232 | else | 235 | else |
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 7e926471e4ec..9ad94ddf6687 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -838,7 +838,7 @@ EXPORT_SYMBOL(acpi_unmap_lsapic); | |||
838 | #endif /* CONFIG_ACPI_HOTPLUG_CPU */ | 838 | #endif /* CONFIG_ACPI_HOTPLUG_CPU */ |
839 | 839 | ||
840 | #ifdef CONFIG_ACPI_NUMA | 840 | #ifdef CONFIG_ACPI_NUMA |
841 | acpi_status __devinit | 841 | static acpi_status __devinit |
842 | acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret) | 842 | acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret) |
843 | { | 843 | { |
844 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | 844 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |
@@ -890,7 +890,16 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret) | |||
890 | map_iosapic_to_node(gsi_base, node); | 890 | map_iosapic_to_node(gsi_base, node); |
891 | return AE_OK; | 891 | return AE_OK; |
892 | } | 892 | } |
893 | #endif /* CONFIG_NUMA */ | 893 | |
894 | static int __init | ||
895 | acpi_map_iosapics (void) | ||
896 | { | ||
897 | acpi_get_devices(NULL, acpi_map_iosapic, NULL, NULL); | ||
898 | return 0; | ||
899 | } | ||
900 | |||
901 | fs_initcall(acpi_map_iosapics); | ||
902 | #endif /* CONFIG_ACPI_NUMA */ | ||
894 | 903 | ||
895 | int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base) | 904 | int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base) |
896 | { | 905 | { |
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index 179f230816ed..f72ea6aebcb1 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
@@ -239,57 +239,30 @@ is_available_memory (efi_memory_desc_t *md) | |||
239 | return 0; | 239 | return 0; |
240 | } | 240 | } |
241 | 241 | ||
242 | /* | 242 | typedef struct kern_memdesc { |
243 | * Trim descriptor MD so its starts at address START_ADDR. If the descriptor covers | 243 | u64 attribute; |
244 | * memory that is normally available to the kernel, issue a warning that some memory | 244 | u64 start; |
245 | * is being ignored. | 245 | u64 num_pages; |
246 | */ | 246 | } kern_memdesc_t; |
247 | static void | ||
248 | trim_bottom (efi_memory_desc_t *md, u64 start_addr) | ||
249 | { | ||
250 | u64 num_skipped_pages; | ||
251 | 247 | ||
252 | if (md->phys_addr >= start_addr || !md->num_pages) | 248 | static kern_memdesc_t *kern_memmap; |
253 | return; | ||
254 | |||
255 | num_skipped_pages = (start_addr - md->phys_addr) >> EFI_PAGE_SHIFT; | ||
256 | if (num_skipped_pages > md->num_pages) | ||
257 | num_skipped_pages = md->num_pages; | ||
258 | |||
259 | if (is_available_memory(md)) | ||
260 | printk(KERN_NOTICE "efi.%s: ignoring %luKB of memory at 0x%lx due to granule hole " | ||
261 | "at 0x%lx\n", __FUNCTION__, | ||
262 | (num_skipped_pages << EFI_PAGE_SHIFT) >> 10, | ||
263 | md->phys_addr, start_addr - IA64_GRANULE_SIZE); | ||
264 | /* | ||
265 | * NOTE: Don't set md->phys_addr to START_ADDR because that could cause the memory | ||
266 | * descriptor list to become unsorted. In such a case, md->num_pages will be | ||
267 | * zero, so the Right Thing will happen. | ||
268 | */ | ||
269 | md->phys_addr += num_skipped_pages << EFI_PAGE_SHIFT; | ||
270 | md->num_pages -= num_skipped_pages; | ||
271 | } | ||
272 | 249 | ||
273 | static void | 250 | static void |
274 | trim_top (efi_memory_desc_t *md, u64 end_addr) | 251 | walk (efi_freemem_callback_t callback, void *arg, u64 attr) |
275 | { | 252 | { |
276 | u64 num_dropped_pages, md_end_addr; | 253 | kern_memdesc_t *k; |
277 | 254 | u64 start, end, voff; | |
278 | md_end_addr = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT); | ||
279 | |||
280 | if (md_end_addr <= end_addr || !md->num_pages) | ||
281 | return; | ||
282 | 255 | ||
283 | num_dropped_pages = (md_end_addr - end_addr) >> EFI_PAGE_SHIFT; | 256 | voff = (attr == EFI_MEMORY_WB) ? PAGE_OFFSET : __IA64_UNCACHED_OFFSET; |
284 | if (num_dropped_pages > md->num_pages) | 257 | for (k = kern_memmap; k->start != ~0UL; k++) { |
285 | num_dropped_pages = md->num_pages; | 258 | if (k->attribute != attr) |
286 | 259 | continue; | |
287 | if (is_available_memory(md)) | 260 | start = PAGE_ALIGN(k->start); |
288 | printk(KERN_NOTICE "efi.%s: ignoring %luKB of memory at 0x%lx due to granule hole " | 261 | end = (k->start + (k->num_pages << EFI_PAGE_SHIFT)) & PAGE_MASK; |
289 | "at 0x%lx\n", __FUNCTION__, | 262 | if (start < end) |
290 | (num_dropped_pages << EFI_PAGE_SHIFT) >> 10, | 263 | if ((*callback)(start + voff, end + voff, arg) < 0) |
291 | md->phys_addr, end_addr); | 264 | return; |
292 | md->num_pages -= num_dropped_pages; | 265 | } |
293 | } | 266 | } |
294 | 267 | ||
295 | /* | 268 | /* |
@@ -299,148 +272,19 @@ trim_top (efi_memory_desc_t *md, u64 end_addr) | |||
299 | void | 272 | void |
300 | efi_memmap_walk (efi_freemem_callback_t callback, void *arg) | 273 | efi_memmap_walk (efi_freemem_callback_t callback, void *arg) |
301 | { | 274 | { |
302 | int prev_valid = 0; | 275 | walk(callback, arg, EFI_MEMORY_WB); |
303 | struct range { | ||
304 | u64 start; | ||
305 | u64 end; | ||
306 | } prev, curr; | ||
307 | void *efi_map_start, *efi_map_end, *p, *q; | ||
308 | efi_memory_desc_t *md, *check_md; | ||
309 | u64 efi_desc_size, start, end, granule_addr, last_granule_addr, first_non_wb_addr = 0; | ||
310 | unsigned long total_mem = 0; | ||
311 | |||
312 | efi_map_start = __va(ia64_boot_param->efi_memmap); | ||
313 | efi_map_end = efi_map_start + ia64_boot_param->efi_memmap_size; | ||
314 | efi_desc_size = ia64_boot_param->efi_memdesc_size; | ||
315 | |||
316 | for (p = efi_map_start; p < efi_map_end; p += efi_desc_size) { | ||
317 | md = p; | ||
318 | |||
319 | /* skip over non-WB memory descriptors; that's all we're interested in... */ | ||
320 | if (!(md->attribute & EFI_MEMORY_WB)) | ||
321 | continue; | ||
322 | |||
323 | /* | ||
324 | * granule_addr is the base of md's first granule. | ||
325 | * [granule_addr - first_non_wb_addr) is guaranteed to | ||
326 | * be contiguous WB memory. | ||
327 | */ | ||
328 | granule_addr = GRANULEROUNDDOWN(md->phys_addr); | ||
329 | first_non_wb_addr = max(first_non_wb_addr, granule_addr); | ||
330 | |||
331 | if (first_non_wb_addr < md->phys_addr) { | ||
332 | trim_bottom(md, granule_addr + IA64_GRANULE_SIZE); | ||
333 | granule_addr = GRANULEROUNDDOWN(md->phys_addr); | ||
334 | first_non_wb_addr = max(first_non_wb_addr, granule_addr); | ||
335 | } | ||
336 | |||
337 | for (q = p; q < efi_map_end; q += efi_desc_size) { | ||
338 | check_md = q; | ||
339 | |||
340 | if ((check_md->attribute & EFI_MEMORY_WB) && | ||
341 | (check_md->phys_addr == first_non_wb_addr)) | ||
342 | first_non_wb_addr += check_md->num_pages << EFI_PAGE_SHIFT; | ||
343 | else | ||
344 | break; /* non-WB or hole */ | ||
345 | } | ||
346 | |||
347 | last_granule_addr = GRANULEROUNDDOWN(first_non_wb_addr); | ||
348 | if (last_granule_addr < md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT)) | ||
349 | trim_top(md, last_granule_addr); | ||
350 | |||
351 | if (is_available_memory(md)) { | ||
352 | if (md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) >= max_addr) { | ||
353 | if (md->phys_addr >= max_addr) | ||
354 | continue; | ||
355 | md->num_pages = (max_addr - md->phys_addr) >> EFI_PAGE_SHIFT; | ||
356 | first_non_wb_addr = max_addr; | ||
357 | } | ||
358 | |||
359 | if (total_mem >= mem_limit) | ||
360 | continue; | ||
361 | |||
362 | if (total_mem + (md->num_pages << EFI_PAGE_SHIFT) > mem_limit) { | ||
363 | unsigned long limit_addr = md->phys_addr; | ||
364 | |||
365 | limit_addr += mem_limit - total_mem; | ||
366 | limit_addr = GRANULEROUNDDOWN(limit_addr); | ||
367 | |||
368 | if (md->phys_addr > limit_addr) | ||
369 | continue; | ||
370 | |||
371 | md->num_pages = (limit_addr - md->phys_addr) >> | ||
372 | EFI_PAGE_SHIFT; | ||
373 | first_non_wb_addr = max_addr = md->phys_addr + | ||
374 | (md->num_pages << EFI_PAGE_SHIFT); | ||
375 | } | ||
376 | total_mem += (md->num_pages << EFI_PAGE_SHIFT); | ||
377 | |||
378 | if (md->num_pages == 0) | ||
379 | continue; | ||
380 | |||
381 | curr.start = PAGE_OFFSET + md->phys_addr; | ||
382 | curr.end = curr.start + (md->num_pages << EFI_PAGE_SHIFT); | ||
383 | |||
384 | if (!prev_valid) { | ||
385 | prev = curr; | ||
386 | prev_valid = 1; | ||
387 | } else { | ||
388 | if (curr.start < prev.start) | ||
389 | printk(KERN_ERR "Oops: EFI memory table not ordered!\n"); | ||
390 | |||
391 | if (prev.end == curr.start) { | ||
392 | /* merge two consecutive memory ranges */ | ||
393 | prev.end = curr.end; | ||
394 | } else { | ||
395 | start = PAGE_ALIGN(prev.start); | ||
396 | end = prev.end & PAGE_MASK; | ||
397 | if ((end > start) && (*callback)(start, end, arg) < 0) | ||
398 | return; | ||
399 | prev = curr; | ||
400 | } | ||
401 | } | ||
402 | } | ||
403 | } | ||
404 | if (prev_valid) { | ||
405 | start = PAGE_ALIGN(prev.start); | ||
406 | end = prev.end & PAGE_MASK; | ||
407 | if (end > start) | ||
408 | (*callback)(start, end, arg); | ||
409 | } | ||
410 | } | 276 | } |
411 | 277 | ||
412 | /* | 278 | /* |
413 | * Walk the EFI memory map to pull out leftover pages in the lower | 279 | * Walks the EFI memory map and calls CALLBACK once for each EFI memory descriptor that |
414 | * memory regions which do not end up in the regular memory map and | 280 | * has memory that is available for uncached allocator. |
415 | * stick them into the uncached allocator | ||
416 | * | ||
417 | * The regular walk function is significantly more complex than the | ||
418 | * uncached walk which means it really doesn't make sense to try and | ||
419 | * marge the two. | ||
420 | */ | 281 | */ |
421 | void __init | 282 | void |
422 | efi_memmap_walk_uc (efi_freemem_callback_t callback) | 283 | efi_memmap_walk_uc (efi_freemem_callback_t callback, void *arg) |
423 | { | 284 | { |
424 | void *efi_map_start, *efi_map_end, *p; | 285 | walk(callback, arg, EFI_MEMORY_UC); |
425 | efi_memory_desc_t *md; | ||
426 | u64 efi_desc_size, start, end; | ||
427 | |||
428 | efi_map_start = __va(ia64_boot_param->efi_memmap); | ||
429 | efi_map_end = efi_map_start + ia64_boot_param->efi_memmap_size; | ||
430 | efi_desc_size = ia64_boot_param->efi_memdesc_size; | ||
431 | |||
432 | for (p = efi_map_start; p < efi_map_end; p += efi_desc_size) { | ||
433 | md = p; | ||
434 | if (md->attribute == EFI_MEMORY_UC) { | ||
435 | start = PAGE_ALIGN(md->phys_addr); | ||
436 | end = PAGE_ALIGN((md->phys_addr+(md->num_pages << EFI_PAGE_SHIFT)) & PAGE_MASK); | ||
437 | if ((*callback)(start, end, NULL) < 0) | ||
438 | return; | ||
439 | } | ||
440 | } | ||
441 | } | 286 | } |
442 | 287 | ||
443 | |||
444 | /* | 288 | /* |
445 | * Look for the PAL_CODE region reported by EFI and maps it using an | 289 | * Look for the PAL_CODE region reported by EFI and maps it using an |
446 | * ITR to enable safe PAL calls in virtual mode. See IA-64 Processor | 290 | * ITR to enable safe PAL calls in virtual mode. See IA-64 Processor |
@@ -862,3 +706,307 @@ efi_uart_console_only(void) | |||
862 | printk(KERN_ERR "Malformed %s value\n", name); | 706 | printk(KERN_ERR "Malformed %s value\n", name); |
863 | return 0; | 707 | return 0; |
864 | } | 708 | } |
709 | |||
710 | #define efi_md_size(md) (md->num_pages << EFI_PAGE_SHIFT) | ||
711 | |||
712 | static inline u64 | ||
713 | kmd_end(kern_memdesc_t *kmd) | ||
714 | { | ||
715 | return (kmd->start + (kmd->num_pages << EFI_PAGE_SHIFT)); | ||
716 | } | ||
717 | |||
718 | static inline u64 | ||
719 | efi_md_end(efi_memory_desc_t *md) | ||
720 | { | ||
721 | return (md->phys_addr + efi_md_size(md)); | ||
722 | } | ||
723 | |||
724 | static inline int | ||
725 | efi_wb(efi_memory_desc_t *md) | ||
726 | { | ||
727 | return (md->attribute & EFI_MEMORY_WB); | ||
728 | } | ||
729 | |||
730 | static inline int | ||
731 | efi_uc(efi_memory_desc_t *md) | ||
732 | { | ||
733 | return (md->attribute & EFI_MEMORY_UC); | ||
734 | } | ||
735 | |||
736 | /* | ||
737 | * Look for the first granule aligned memory descriptor memory | ||
738 | * that is big enough to hold EFI memory map. Make sure this | ||
739 | * descriptor is atleast granule sized so it does not get trimmed | ||
740 | */ | ||
741 | struct kern_memdesc * | ||
742 | find_memmap_space (void) | ||
743 | { | ||
744 | u64 contig_low=0, contig_high=0; | ||
745 | u64 as = 0, ae; | ||
746 | void *efi_map_start, *efi_map_end, *p, *q; | ||
747 | efi_memory_desc_t *md, *pmd = NULL, *check_md; | ||
748 | u64 space_needed, efi_desc_size; | ||
749 | unsigned long total_mem = 0; | ||
750 | |||
751 | efi_map_start = __va(ia64_boot_param->efi_memmap); | ||
752 | efi_map_end = efi_map_start + ia64_boot_param->efi_memmap_size; | ||
753 | efi_desc_size = ia64_boot_param->efi_memdesc_size; | ||
754 | |||
755 | /* | ||
756 | * Worst case: we need 3 kernel descriptors for each efi descriptor | ||
757 | * (if every entry has a WB part in the middle, and UC head and tail), | ||
758 | * plus one for the end marker. | ||
759 | */ | ||
760 | space_needed = sizeof(kern_memdesc_t) * | ||
761 | (3 * (ia64_boot_param->efi_memmap_size/efi_desc_size) + 1); | ||
762 | |||
763 | for (p = efi_map_start; p < efi_map_end; pmd = md, p += efi_desc_size) { | ||
764 | md = p; | ||
765 | if (!efi_wb(md)) { | ||
766 | continue; | ||
767 | } | ||
768 | if (pmd == NULL || !efi_wb(pmd) || efi_md_end(pmd) != md->phys_addr) { | ||
769 | contig_low = GRANULEROUNDUP(md->phys_addr); | ||
770 | contig_high = efi_md_end(md); | ||
771 | for (q = p + efi_desc_size; q < efi_map_end; q += efi_desc_size) { | ||
772 | check_md = q; | ||
773 | if (!efi_wb(check_md)) | ||
774 | break; | ||
775 | if (contig_high != check_md->phys_addr) | ||
776 | break; | ||
777 | contig_high = efi_md_end(check_md); | ||
778 | } | ||
779 | contig_high = GRANULEROUNDDOWN(contig_high); | ||
780 | } | ||
781 | if (!is_available_memory(md) || md->type == EFI_LOADER_DATA) | ||
782 | continue; | ||
783 | |||
784 | /* Round ends inward to granule boundaries */ | ||
785 | as = max(contig_low, md->phys_addr); | ||
786 | ae = min(contig_high, efi_md_end(md)); | ||
787 | |||
788 | /* keep within max_addr= command line arg */ | ||
789 | ae = min(ae, max_addr); | ||
790 | if (ae <= as) | ||
791 | continue; | ||
792 | |||
793 | /* avoid going over mem= command line arg */ | ||
794 | if (total_mem + (ae - as) > mem_limit) | ||
795 | ae -= total_mem + (ae - as) - mem_limit; | ||
796 | |||
797 | if (ae <= as) | ||
798 | continue; | ||
799 | |||
800 | if (ae - as > space_needed) | ||
801 | break; | ||
802 | } | ||
803 | if (p >= efi_map_end) | ||
804 | panic("Can't allocate space for kernel memory descriptors"); | ||
805 | |||
806 | return __va(as); | ||
807 | } | ||
808 | |||
809 | /* | ||
810 | * Walk the EFI memory map and gather all memory available for kernel | ||
811 | * to use. We can allocate partial granules only if the unavailable | ||
812 | * parts exist, and are WB. | ||
813 | */ | ||
814 | void | ||
815 | efi_memmap_init(unsigned long *s, unsigned long *e) | ||
816 | { | ||
817 | struct kern_memdesc *k, *prev = 0; | ||
818 | u64 contig_low=0, contig_high=0; | ||
819 | u64 as, ae, lim; | ||
820 | void *efi_map_start, *efi_map_end, *p, *q; | ||
821 | efi_memory_desc_t *md, *pmd = NULL, *check_md; | ||
822 | u64 efi_desc_size; | ||
823 | unsigned long total_mem = 0; | ||
824 | |||
825 | k = kern_memmap = find_memmap_space(); | ||
826 | |||
827 | efi_map_start = __va(ia64_boot_param->efi_memmap); | ||
828 | efi_map_end = efi_map_start + ia64_boot_param->efi_memmap_size; | ||
829 | efi_desc_size = ia64_boot_param->efi_memdesc_size; | ||
830 | |||
831 | for (p = efi_map_start; p < efi_map_end; pmd = md, p += efi_desc_size) { | ||
832 | md = p; | ||
833 | if (!efi_wb(md)) { | ||
834 | if (efi_uc(md) && (md->type == EFI_CONVENTIONAL_MEMORY || | ||
835 | md->type == EFI_BOOT_SERVICES_DATA)) { | ||
836 | k->attribute = EFI_MEMORY_UC; | ||
837 | k->start = md->phys_addr; | ||
838 | k->num_pages = md->num_pages; | ||
839 | k++; | ||
840 | } | ||
841 | continue; | ||
842 | } | ||
843 | if (pmd == NULL || !efi_wb(pmd) || efi_md_end(pmd) != md->phys_addr) { | ||
844 | contig_low = GRANULEROUNDUP(md->phys_addr); | ||
845 | contig_high = efi_md_end(md); | ||
846 | for (q = p + efi_desc_size; q < efi_map_end; q += efi_desc_size) { | ||
847 | check_md = q; | ||
848 | if (!efi_wb(check_md)) | ||
849 | break; | ||
850 | if (contig_high != check_md->phys_addr) | ||
851 | break; | ||
852 | contig_high = efi_md_end(check_md); | ||
853 | } | ||
854 | contig_high = GRANULEROUNDDOWN(contig_high); | ||
855 | } | ||
856 | if (!is_available_memory(md)) | ||
857 | continue; | ||
858 | |||
859 | /* | ||
860 | * Round ends inward to granule boundaries | ||
861 | * Give trimmings to uncached allocator | ||
862 | */ | ||
863 | if (md->phys_addr < contig_low) { | ||
864 | lim = min(efi_md_end(md), contig_low); | ||
865 | if (efi_uc(md)) { | ||
866 | if (k > kern_memmap && (k-1)->attribute == EFI_MEMORY_UC && | ||
867 | kmd_end(k-1) == md->phys_addr) { | ||
868 | (k-1)->num_pages += (lim - md->phys_addr) >> EFI_PAGE_SHIFT; | ||
869 | } else { | ||
870 | k->attribute = EFI_MEMORY_UC; | ||
871 | k->start = md->phys_addr; | ||
872 | k->num_pages = (lim - md->phys_addr) >> EFI_PAGE_SHIFT; | ||
873 | k++; | ||
874 | } | ||
875 | } | ||
876 | as = contig_low; | ||
877 | } else | ||
878 | as = md->phys_addr; | ||
879 | |||
880 | if (efi_md_end(md) > contig_high) { | ||
881 | lim = max(md->phys_addr, contig_high); | ||
882 | if (efi_uc(md)) { | ||
883 | if (lim == md->phys_addr && k > kern_memmap && | ||
884 | (k-1)->attribute == EFI_MEMORY_UC && | ||
885 | kmd_end(k-1) == md->phys_addr) { | ||
886 | (k-1)->num_pages += md->num_pages; | ||
887 | } else { | ||
888 | k->attribute = EFI_MEMORY_UC; | ||
889 | k->start = lim; | ||
890 | k->num_pages = (efi_md_end(md) - lim) >> EFI_PAGE_SHIFT; | ||
891 | k++; | ||
892 | } | ||
893 | } | ||
894 | ae = contig_high; | ||
895 | } else | ||
896 | ae = efi_md_end(md); | ||
897 | |||
898 | /* keep within max_addr= command line arg */ | ||
899 | ae = min(ae, max_addr); | ||
900 | if (ae <= as) | ||
901 | continue; | ||
902 | |||
903 | /* avoid going over mem= command line arg */ | ||
904 | if (total_mem + (ae - as) > mem_limit) | ||
905 | ae -= total_mem + (ae - as) - mem_limit; | ||
906 | |||
907 | if (ae <= as) | ||
908 | continue; | ||
909 | if (prev && kmd_end(prev) == md->phys_addr) { | ||
910 | prev->num_pages += (ae - as) >> EFI_PAGE_SHIFT; | ||
911 | total_mem += ae - as; | ||
912 | continue; | ||
913 | } | ||
914 | k->attribute = EFI_MEMORY_WB; | ||
915 | k->start = as; | ||
916 | k->num_pages = (ae - as) >> EFI_PAGE_SHIFT; | ||
917 | total_mem += ae - as; | ||
918 | prev = k++; | ||
919 | } | ||
920 | k->start = ~0L; /* end-marker */ | ||
921 | |||
922 | /* reserve the memory we are using for kern_memmap */ | ||
923 | *s = (u64)kern_memmap; | ||
924 | *e = (u64)++k; | ||
925 | } | ||
926 | |||
927 | void | ||
928 | efi_initialize_iomem_resources(struct resource *code_resource, | ||
929 | struct resource *data_resource) | ||
930 | { | ||
931 | struct resource *res; | ||
932 | void *efi_map_start, *efi_map_end, *p; | ||
933 | efi_memory_desc_t *md; | ||
934 | u64 efi_desc_size; | ||
935 | char *name; | ||
936 | unsigned long flags; | ||
937 | |||
938 | efi_map_start = __va(ia64_boot_param->efi_memmap); | ||
939 | efi_map_end = efi_map_start + ia64_boot_param->efi_memmap_size; | ||
940 | efi_desc_size = ia64_boot_param->efi_memdesc_size; | ||
941 | |||
942 | res = NULL; | ||
943 | |||
944 | for (p = efi_map_start; p < efi_map_end; p += efi_desc_size) { | ||
945 | md = p; | ||
946 | |||
947 | if (md->num_pages == 0) /* should not happen */ | ||
948 | continue; | ||
949 | |||
950 | flags = IORESOURCE_MEM; | ||
951 | switch (md->type) { | ||
952 | |||
953 | case EFI_MEMORY_MAPPED_IO: | ||
954 | case EFI_MEMORY_MAPPED_IO_PORT_SPACE: | ||
955 | continue; | ||
956 | |||
957 | case EFI_LOADER_CODE: | ||
958 | case EFI_LOADER_DATA: | ||
959 | case EFI_BOOT_SERVICES_DATA: | ||
960 | case EFI_BOOT_SERVICES_CODE: | ||
961 | case EFI_CONVENTIONAL_MEMORY: | ||
962 | if (md->attribute & EFI_MEMORY_WP) { | ||
963 | name = "System ROM"; | ||
964 | flags |= IORESOURCE_READONLY; | ||
965 | } else { | ||
966 | name = "System RAM"; | ||
967 | } | ||
968 | break; | ||
969 | |||
970 | case EFI_ACPI_MEMORY_NVS: | ||
971 | name = "ACPI Non-volatile Storage"; | ||
972 | flags |= IORESOURCE_BUSY; | ||
973 | break; | ||
974 | |||
975 | case EFI_UNUSABLE_MEMORY: | ||
976 | name = "reserved"; | ||
977 | flags |= IORESOURCE_BUSY | IORESOURCE_DISABLED; | ||
978 | break; | ||
979 | |||
980 | case EFI_RESERVED_TYPE: | ||
981 | case EFI_RUNTIME_SERVICES_CODE: | ||
982 | case EFI_RUNTIME_SERVICES_DATA: | ||
983 | case EFI_ACPI_RECLAIM_MEMORY: | ||
984 | default: | ||
985 | name = "reserved"; | ||
986 | flags |= IORESOURCE_BUSY; | ||
987 | break; | ||
988 | } | ||
989 | |||
990 | if ((res = kcalloc(1, sizeof(struct resource), GFP_KERNEL)) == NULL) { | ||
991 | printk(KERN_ERR "failed to alocate resource for iomem\n"); | ||
992 | return; | ||
993 | } | ||
994 | |||
995 | res->name = name; | ||
996 | res->start = md->phys_addr; | ||
997 | res->end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1; | ||
998 | res->flags = flags; | ||
999 | |||
1000 | if (insert_resource(&iomem_resource, res) < 0) | ||
1001 | kfree(res); | ||
1002 | else { | ||
1003 | /* | ||
1004 | * We don't know which region contains | ||
1005 | * kernel data so we try it repeatedly and | ||
1006 | * let the resource manager test it. | ||
1007 | */ | ||
1008 | insert_resource(res, code_resource); | ||
1009 | insert_resource(res, data_resource); | ||
1010 | } | ||
1011 | } | ||
1012 | } | ||
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c index 205d98028261..d33244c32759 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c | |||
@@ -57,9 +57,9 @@ int show_interrupts(struct seq_file *p, void *v) | |||
57 | 57 | ||
58 | if (i == 0) { | 58 | if (i == 0) { |
59 | seq_printf(p, " "); | 59 | seq_printf(p, " "); |
60 | for (j=0; j<NR_CPUS; j++) | 60 | for_each_online_cpu(j) { |
61 | if (cpu_online(j)) | 61 | seq_printf(p, "CPU%d ",j); |
62 | seq_printf(p, "CPU%d ",j); | 62 | } |
63 | seq_putc(p, '\n'); | 63 | seq_putc(p, '\n'); |
64 | } | 64 | } |
65 | 65 | ||
@@ -72,9 +72,9 @@ int show_interrupts(struct seq_file *p, void *v) | |||
72 | #ifndef CONFIG_SMP | 72 | #ifndef CONFIG_SMP |
73 | seq_printf(p, "%10u ", kstat_irqs(i)); | 73 | seq_printf(p, "%10u ", kstat_irqs(i)); |
74 | #else | 74 | #else |
75 | for (j = 0; j < NR_CPUS; j++) | 75 | for_each_online_cpu(j) { |
76 | if (cpu_online(j)) | 76 | seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); |
77 | seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); | 77 | } |
78 | #endif | 78 | #endif |
79 | seq_printf(p, " %14s", irq_desc[i].handler->typename); | 79 | seq_printf(p, " %14s", irq_desc[i].handler->typename); |
80 | seq_printf(p, " %s", action->name); | 80 | seq_printf(p, " %s", action->name); |
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index d0a5106fba24..52c47da17246 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c | |||
@@ -508,9 +508,7 @@ ia64_mca_wakeup_all(void) | |||
508 | int cpu; | 508 | int cpu; |
509 | 509 | ||
510 | /* Clear the Rendez checkin flag for all cpus */ | 510 | /* Clear the Rendez checkin flag for all cpus */ |
511 | for(cpu = 0; cpu < NR_CPUS; cpu++) { | 511 | for_each_online_cpu(cpu) { |
512 | if (!cpu_online(cpu)) | ||
513 | continue; | ||
514 | if (ia64_mc_info.imi_rendez_checkin[cpu] == IA64_MCA_RENDEZ_CHECKIN_DONE) | 512 | if (ia64_mc_info.imi_rendez_checkin[cpu] == IA64_MCA_RENDEZ_CHECKIN_DONE) |
515 | ia64_mca_wakeup(cpu); | 513 | ia64_mca_wakeup(cpu); |
516 | } | 514 | } |
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c index f1aca7cffd12..7a2f0a798d12 100644 --- a/arch/ia64/kernel/module.c +++ b/arch/ia64/kernel/module.c | |||
@@ -947,8 +947,8 @@ void | |||
947 | percpu_modcopy (void *pcpudst, const void *src, unsigned long size) | 947 | percpu_modcopy (void *pcpudst, const void *src, unsigned long size) |
948 | { | 948 | { |
949 | unsigned int i; | 949 | unsigned int i; |
950 | for (i = 0; i < NR_CPUS; i++) | 950 | for_each_cpu(i) { |
951 | if (cpu_possible(i)) | 951 | memcpy(pcpudst + __per_cpu_offset[i], src, size); |
952 | memcpy(pcpudst + __per_cpu_offset[i], src, size); | 952 | } |
953 | } | 953 | } |
954 | #endif /* CONFIG_SMP */ | 954 | #endif /* CONFIG_SMP */ |
diff --git a/arch/ia64/kernel/patch.c b/arch/ia64/kernel/patch.c index 367804a605fa..6a4ac7d70b35 100644 --- a/arch/ia64/kernel/patch.c +++ b/arch/ia64/kernel/patch.c | |||
@@ -64,22 +64,30 @@ ia64_patch (u64 insn_addr, u64 mask, u64 val) | |||
64 | void | 64 | void |
65 | ia64_patch_imm64 (u64 insn_addr, u64 val) | 65 | ia64_patch_imm64 (u64 insn_addr, u64 val) |
66 | { | 66 | { |
67 | ia64_patch(insn_addr, | 67 | /* The assembler may generate offset pointing to either slot 1 |
68 | or slot 2 for a long (2-slot) instruction, occupying slots 1 | ||
69 | and 2. */ | ||
70 | insn_addr &= -16UL; | ||
71 | ia64_patch(insn_addr + 2, | ||
68 | 0x01fffefe000UL, ( ((val & 0x8000000000000000UL) >> 27) /* bit 63 -> 36 */ | 72 | 0x01fffefe000UL, ( ((val & 0x8000000000000000UL) >> 27) /* bit 63 -> 36 */ |
69 | | ((val & 0x0000000000200000UL) << 0) /* bit 21 -> 21 */ | 73 | | ((val & 0x0000000000200000UL) << 0) /* bit 21 -> 21 */ |
70 | | ((val & 0x00000000001f0000UL) << 6) /* bit 16 -> 22 */ | 74 | | ((val & 0x00000000001f0000UL) << 6) /* bit 16 -> 22 */ |
71 | | ((val & 0x000000000000ff80UL) << 20) /* bit 7 -> 27 */ | 75 | | ((val & 0x000000000000ff80UL) << 20) /* bit 7 -> 27 */ |
72 | | ((val & 0x000000000000007fUL) << 13) /* bit 0 -> 13 */)); | 76 | | ((val & 0x000000000000007fUL) << 13) /* bit 0 -> 13 */)); |
73 | ia64_patch(insn_addr - 1, 0x1ffffffffffUL, val >> 22); | 77 | ia64_patch(insn_addr + 1, 0x1ffffffffffUL, val >> 22); |
74 | } | 78 | } |
75 | 79 | ||
76 | void | 80 | void |
77 | ia64_patch_imm60 (u64 insn_addr, u64 val) | 81 | ia64_patch_imm60 (u64 insn_addr, u64 val) |
78 | { | 82 | { |
79 | ia64_patch(insn_addr, | 83 | /* The assembler may generate offset pointing to either slot 1 |
84 | or slot 2 for a long (2-slot) instruction, occupying slots 1 | ||
85 | and 2. */ | ||
86 | insn_addr &= -16UL; | ||
87 | ia64_patch(insn_addr + 2, | ||
80 | 0x011ffffe000UL, ( ((val & 0x0800000000000000UL) >> 23) /* bit 59 -> 36 */ | 88 | 0x011ffffe000UL, ( ((val & 0x0800000000000000UL) >> 23) /* bit 59 -> 36 */ |
81 | | ((val & 0x00000000000fffffUL) << 13) /* bit 0 -> 13 */)); | 89 | | ((val & 0x00000000000fffffUL) << 13) /* bit 0 -> 13 */)); |
82 | ia64_patch(insn_addr - 1, 0x1fffffffffcUL, val >> 18); | 90 | ia64_patch(insn_addr + 1, 0x1fffffffffcUL, val >> 18); |
83 | } | 91 | } |
84 | 92 | ||
85 | /* | 93 | /* |
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 1f5c26dbe705..fc56ca2da358 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -78,6 +78,19 @@ struct screen_info screen_info; | |||
78 | unsigned long vga_console_iobase; | 78 | unsigned long vga_console_iobase; |
79 | unsigned long vga_console_membase; | 79 | unsigned long vga_console_membase; |
80 | 80 | ||
81 | static struct resource data_resource = { | ||
82 | .name = "Kernel data", | ||
83 | .flags = IORESOURCE_BUSY | IORESOURCE_MEM | ||
84 | }; | ||
85 | |||
86 | static struct resource code_resource = { | ||
87 | .name = "Kernel code", | ||
88 | .flags = IORESOURCE_BUSY | IORESOURCE_MEM | ||
89 | }; | ||
90 | extern void efi_initialize_iomem_resources(struct resource *, | ||
91 | struct resource *); | ||
92 | extern char _text[], _end[], _etext[]; | ||
93 | |||
81 | unsigned long ia64_max_cacheline_size; | 94 | unsigned long ia64_max_cacheline_size; |
82 | unsigned long ia64_iobase; /* virtual address for I/O accesses */ | 95 | unsigned long ia64_iobase; /* virtual address for I/O accesses */ |
83 | EXPORT_SYMBOL(ia64_iobase); | 96 | EXPORT_SYMBOL(ia64_iobase); |
@@ -171,6 +184,22 @@ sort_regions (struct rsvd_region *rsvd_region, int max) | |||
171 | } | 184 | } |
172 | } | 185 | } |
173 | 186 | ||
187 | /* | ||
188 | * Request address space for all standard resources | ||
189 | */ | ||
190 | static int __init register_memory(void) | ||
191 | { | ||
192 | code_resource.start = ia64_tpa(_text); | ||
193 | code_resource.end = ia64_tpa(_etext) - 1; | ||
194 | data_resource.start = ia64_tpa(_etext); | ||
195 | data_resource.end = ia64_tpa(_end) - 1; | ||
196 | efi_initialize_iomem_resources(&code_resource, &data_resource); | ||
197 | |||
198 | return 0; | ||
199 | } | ||
200 | |||
201 | __initcall(register_memory); | ||
202 | |||
174 | /** | 203 | /** |
175 | * reserve_memory - setup reserved memory areas | 204 | * reserve_memory - setup reserved memory areas |
176 | * | 205 | * |
@@ -211,6 +240,9 @@ reserve_memory (void) | |||
211 | } | 240 | } |
212 | #endif | 241 | #endif |
213 | 242 | ||
243 | efi_memmap_init(&rsvd_region[n].start, &rsvd_region[n].end); | ||
244 | n++; | ||
245 | |||
214 | /* end of memory marker */ | 246 | /* end of memory marker */ |
215 | rsvd_region[n].start = ~0UL; | 247 | rsvd_region[n].start = ~0UL; |
216 | rsvd_region[n].end = ~0UL; | 248 | rsvd_region[n].end = ~0UL; |
@@ -244,28 +276,31 @@ find_initrd (void) | |||
244 | static void __init | 276 | static void __init |
245 | io_port_init (void) | 277 | io_port_init (void) |
246 | { | 278 | { |
247 | extern unsigned long ia64_iobase; | ||
248 | unsigned long phys_iobase; | 279 | unsigned long phys_iobase; |
249 | 280 | ||
250 | /* | 281 | /* |
251 | * Set `iobase' to the appropriate address in region 6 (uncached access range). | 282 | * Set `iobase' based on the EFI memory map or, failing that, the |
283 | * value firmware left in ar.k0. | ||
252 | * | 284 | * |
253 | * The EFI memory map is the "preferred" location to get the I/O port space base, | 285 | * Note that in ia32 mode, IN/OUT instructions use ar.k0 to compute |
254 | * rather the relying on AR.KR0. This should become more clear in future SAL | 286 | * the port's virtual address, so ia32_load_state() loads it with a |
255 | * specs. We'll fall back to getting it out of AR.KR0 if no appropriate entry is | 287 | * user virtual address. But in ia64 mode, glibc uses the |
256 | * found in the memory map. | 288 | * *physical* address in ar.k0 to mmap the appropriate area from |
289 | * /dev/mem, and the inX()/outX() interfaces use MMIO. In both | ||
290 | * cases, user-mode can only use the legacy 0-64K I/O port space. | ||
291 | * | ||
292 | * ar.k0 is not involved in kernel I/O port accesses, which can use | ||
293 | * any of the I/O port spaces and are done via MMIO using the | ||
294 | * virtual mmio_base from the appropriate io_space[]. | ||
257 | */ | 295 | */ |
258 | phys_iobase = efi_get_iobase(); | 296 | phys_iobase = efi_get_iobase(); |
259 | if (phys_iobase) | 297 | if (!phys_iobase) { |
260 | /* set AR.KR0 since this is all we use it for anyway */ | ||
261 | ia64_set_kr(IA64_KR_IO_BASE, phys_iobase); | ||
262 | else { | ||
263 | phys_iobase = ia64_get_kr(IA64_KR_IO_BASE); | 298 | phys_iobase = ia64_get_kr(IA64_KR_IO_BASE); |
264 | printk(KERN_INFO "No I/O port range found in EFI memory map, falling back " | 299 | printk(KERN_INFO "No I/O port range found in EFI memory map, " |
265 | "to AR.KR0\n"); | 300 | "falling back to AR.KR0 (0x%lx)\n", phys_iobase); |
266 | printk(KERN_INFO "I/O port base = 0x%lx\n", phys_iobase); | ||
267 | } | 301 | } |
268 | ia64_iobase = (unsigned long) ioremap(phys_iobase, 0); | 302 | ia64_iobase = (unsigned long) ioremap(phys_iobase, 0); |
303 | ia64_set_kr(IA64_KR_IO_BASE, __pa(ia64_iobase)); | ||
269 | 304 | ||
270 | /* setup legacy IO port space */ | 305 | /* setup legacy IO port space */ |
271 | io_space[0].mmio_base = ia64_iobase; | 306 | io_space[0].mmio_base = ia64_iobase; |
@@ -526,7 +561,7 @@ show_cpuinfo (struct seq_file *m, void *v) | |||
526 | c->itc_freq / 1000000, c->itc_freq % 1000000, | 561 | c->itc_freq / 1000000, c->itc_freq % 1000000, |
527 | lpj*HZ/500000, (lpj*HZ/5000) % 100); | 562 | lpj*HZ/500000, (lpj*HZ/5000) % 100); |
528 | #ifdef CONFIG_SMP | 563 | #ifdef CONFIG_SMP |
529 | seq_printf(m, "siblings : %u\n", c->num_log); | 564 | seq_printf(m, "siblings : %u\n", cpus_weight(cpu_core_map[cpunum])); |
530 | if (c->threads_per_core > 1 || c->cores_per_socket > 1) | 565 | if (c->threads_per_core > 1 || c->cores_per_socket > 1) |
531 | seq_printf(m, | 566 | seq_printf(m, |
532 | "physical id: %u\n" | 567 | "physical id: %u\n" |
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c index 0166a9847095..657ac99a451c 100644 --- a/arch/ia64/kernel/smp.c +++ b/arch/ia64/kernel/smp.c | |||
@@ -185,8 +185,8 @@ send_IPI_allbutself (int op) | |||
185 | { | 185 | { |
186 | unsigned int i; | 186 | unsigned int i; |
187 | 187 | ||
188 | for (i = 0; i < NR_CPUS; i++) { | 188 | for_each_online_cpu(i) { |
189 | if (cpu_online(i) && i != smp_processor_id()) | 189 | if (i != smp_processor_id()) |
190 | send_IPI_single(i, op); | 190 | send_IPI_single(i, op); |
191 | } | 191 | } |
192 | } | 192 | } |
@@ -199,9 +199,9 @@ send_IPI_all (int op) | |||
199 | { | 199 | { |
200 | int i; | 200 | int i; |
201 | 201 | ||
202 | for (i = 0; i < NR_CPUS; i++) | 202 | for_each_online_cpu(i) { |
203 | if (cpu_online(i)) | 203 | send_IPI_single(i, op); |
204 | send_IPI_single(i, op); | 204 | } |
205 | } | 205 | } |
206 | 206 | ||
207 | /* | 207 | /* |
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 7d72c0d872b3..400a48987124 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -694,9 +694,9 @@ smp_cpus_done (unsigned int dummy) | |||
694 | * Allow the user to impress friends. | 694 | * Allow the user to impress friends. |
695 | */ | 695 | */ |
696 | 696 | ||
697 | for (cpu = 0; cpu < NR_CPUS; cpu++) | 697 | for_each_online_cpu(cpu) { |
698 | if (cpu_online(cpu)) | 698 | bogosum += cpu_data(cpu)->loops_per_jiffy; |
699 | bogosum += cpu_data(cpu)->loops_per_jiffy; | 699 | } |
700 | 700 | ||
701 | printk(KERN_INFO "Total of %d processors activated (%lu.%02lu BogoMIPS).\n", | 701 | printk(KERN_INFO "Total of %d processors activated (%lu.%02lu BogoMIPS).\n", |
702 | (int)num_online_cpus(), bogosum/(500000/HZ), (bogosum/(5000/HZ))%100); | 702 | (int)num_online_cpus(), bogosum/(500000/HZ), (bogosum/(5000/HZ))%100); |
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c index 4e9d06c48a8b..c6d40446c2c4 100644 --- a/arch/ia64/kernel/uncached.c +++ b/arch/ia64/kernel/uncached.c | |||
@@ -205,23 +205,18 @@ EXPORT_SYMBOL(uncached_free_page); | |||
205 | static int __init | 205 | static int __init |
206 | uncached_build_memmap(unsigned long start, unsigned long end, void *arg) | 206 | uncached_build_memmap(unsigned long start, unsigned long end, void *arg) |
207 | { | 207 | { |
208 | long length; | 208 | long length = end - start; |
209 | unsigned long vstart, vend; | ||
210 | int node; | 209 | int node; |
211 | 210 | ||
212 | length = end - start; | ||
213 | vstart = start + __IA64_UNCACHED_OFFSET; | ||
214 | vend = end + __IA64_UNCACHED_OFFSET; | ||
215 | |||
216 | dprintk(KERN_ERR "uncached_build_memmap(%lx %lx)\n", start, end); | 211 | dprintk(KERN_ERR "uncached_build_memmap(%lx %lx)\n", start, end); |
217 | 212 | ||
218 | memset((char *)vstart, 0, length); | 213 | memset((char *)start, 0, length); |
219 | 214 | ||
220 | node = paddr_to_nid(start); | 215 | node = paddr_to_nid(start - __IA64_UNCACHED_OFFSET); |
221 | 216 | ||
222 | for (; vstart < vend ; vstart += PAGE_SIZE) { | 217 | for (; start < end ; start += PAGE_SIZE) { |
223 | dprintk(KERN_INFO "sticking %lx into the pool!\n", vstart); | 218 | dprintk(KERN_INFO "sticking %lx into the pool!\n", start); |
224 | gen_pool_free(uncached_pool[node], vstart, PAGE_SIZE); | 219 | gen_pool_free(uncached_pool[node], start, PAGE_SIZE); |
225 | } | 220 | } |
226 | 221 | ||
227 | return 0; | 222 | return 0; |
diff --git a/arch/ia64/lib/swiotlb.c b/arch/ia64/lib/swiotlb.c index a604efc7f6c9..48e5ff26eb1d 100644 --- a/arch/ia64/lib/swiotlb.c +++ b/arch/ia64/lib/swiotlb.c | |||
@@ -49,6 +49,15 @@ | |||
49 | */ | 49 | */ |
50 | #define IO_TLB_SHIFT 11 | 50 | #define IO_TLB_SHIFT 11 |
51 | 51 | ||
52 | #define SLABS_PER_PAGE (1 << (PAGE_SHIFT - IO_TLB_SHIFT)) | ||
53 | |||
54 | /* | ||
55 | * Minimum IO TLB size to bother booting with. Systems with mainly | ||
56 | * 64bit capable cards will only lightly use the swiotlb. If we can't | ||
57 | * allocate a contiguous 1MB, we're probably in trouble anyway. | ||
58 | */ | ||
59 | #define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT) | ||
60 | |||
52 | int swiotlb_force; | 61 | int swiotlb_force; |
53 | 62 | ||
54 | /* | 63 | /* |
@@ -154,6 +163,99 @@ swiotlb_init (void) | |||
154 | swiotlb_init_with_default_size(64 * (1<<20)); /* default to 64MB */ | 163 | swiotlb_init_with_default_size(64 * (1<<20)); /* default to 64MB */ |
155 | } | 164 | } |
156 | 165 | ||
166 | /* | ||
167 | * Systems with larger DMA zones (those that don't support ISA) can | ||
168 | * initialize the swiotlb later using the slab allocator if needed. | ||
169 | * This should be just like above, but with some error catching. | ||
170 | */ | ||
171 | int | ||
172 | swiotlb_late_init_with_default_size (size_t default_size) | ||
173 | { | ||
174 | unsigned long i, req_nslabs = io_tlb_nslabs; | ||
175 | unsigned int order; | ||
176 | |||
177 | if (!io_tlb_nslabs) { | ||
178 | io_tlb_nslabs = (default_size >> IO_TLB_SHIFT); | ||
179 | io_tlb_nslabs = ALIGN(io_tlb_nslabs, IO_TLB_SEGSIZE); | ||
180 | } | ||
181 | |||
182 | /* | ||
183 | * Get IO TLB memory from the low pages | ||
184 | */ | ||
185 | order = get_order(io_tlb_nslabs * (1 << IO_TLB_SHIFT)); | ||
186 | io_tlb_nslabs = SLABS_PER_PAGE << order; | ||
187 | |||
188 | while ((SLABS_PER_PAGE << order) > IO_TLB_MIN_SLABS) { | ||
189 | io_tlb_start = (char *)__get_free_pages(GFP_DMA | __GFP_NOWARN, | ||
190 | order); | ||
191 | if (io_tlb_start) | ||
192 | break; | ||
193 | order--; | ||
194 | } | ||
195 | |||
196 | if (!io_tlb_start) | ||
197 | goto cleanup1; | ||
198 | |||
199 | if (order != get_order(io_tlb_nslabs * (1 << IO_TLB_SHIFT))) { | ||
200 | printk(KERN_WARNING "Warning: only able to allocate %ld MB " | ||
201 | "for software IO TLB\n", (PAGE_SIZE << order) >> 20); | ||
202 | io_tlb_nslabs = SLABS_PER_PAGE << order; | ||
203 | } | ||
204 | io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT); | ||
205 | memset(io_tlb_start, 0, io_tlb_nslabs * (1 << IO_TLB_SHIFT)); | ||
206 | |||
207 | /* | ||
208 | * Allocate and initialize the free list array. This array is used | ||
209 | * to find contiguous free memory regions of size up to IO_TLB_SEGSIZE | ||
210 | * between io_tlb_start and io_tlb_end. | ||
211 | */ | ||
212 | io_tlb_list = (unsigned int *)__get_free_pages(GFP_KERNEL, | ||
213 | get_order(io_tlb_nslabs * sizeof(int))); | ||
214 | if (!io_tlb_list) | ||
215 | goto cleanup2; | ||
216 | |||
217 | for (i = 0; i < io_tlb_nslabs; i++) | ||
218 | io_tlb_list[i] = IO_TLB_SEGSIZE - OFFSET(i, IO_TLB_SEGSIZE); | ||
219 | io_tlb_index = 0; | ||
220 | |||
221 | io_tlb_orig_addr = (unsigned char **)__get_free_pages(GFP_KERNEL, | ||
222 | get_order(io_tlb_nslabs * sizeof(char *))); | ||
223 | if (!io_tlb_orig_addr) | ||
224 | goto cleanup3; | ||
225 | |||
226 | memset(io_tlb_orig_addr, 0, io_tlb_nslabs * sizeof(char *)); | ||
227 | |||
228 | /* | ||
229 | * Get the overflow emergency buffer | ||
230 | */ | ||
231 | io_tlb_overflow_buffer = (void *)__get_free_pages(GFP_DMA, | ||
232 | get_order(io_tlb_overflow)); | ||
233 | if (!io_tlb_overflow_buffer) | ||
234 | goto cleanup4; | ||
235 | |||
236 | printk(KERN_INFO "Placing %ldMB software IO TLB between 0x%lx - " | ||
237 | "0x%lx\n", (io_tlb_nslabs * (1 << IO_TLB_SHIFT)) >> 20, | ||
238 | virt_to_phys(io_tlb_start), virt_to_phys(io_tlb_end)); | ||
239 | |||
240 | return 0; | ||
241 | |||
242 | cleanup4: | ||
243 | free_pages((unsigned long)io_tlb_orig_addr, get_order(io_tlb_nslabs * | ||
244 | sizeof(char *))); | ||
245 | io_tlb_orig_addr = NULL; | ||
246 | cleanup3: | ||
247 | free_pages((unsigned long)io_tlb_list, get_order(io_tlb_nslabs * | ||
248 | sizeof(int))); | ||
249 | io_tlb_list = NULL; | ||
250 | io_tlb_end = NULL; | ||
251 | cleanup2: | ||
252 | free_pages((unsigned long)io_tlb_start, order); | ||
253 | io_tlb_start = NULL; | ||
254 | cleanup1: | ||
255 | io_tlb_nslabs = req_nslabs; | ||
256 | return -ENOMEM; | ||
257 | } | ||
258 | |||
157 | static inline int | 259 | static inline int |
158 | address_needs_mapping(struct device *hwdev, dma_addr_t addr) | 260 | address_needs_mapping(struct device *hwdev, dma_addr_t addr) |
159 | { | 261 | { |
diff --git a/arch/ia64/mm/Makefile b/arch/ia64/mm/Makefile index 7078f67887ec..d78d20f0a0f0 100644 --- a/arch/ia64/mm/Makefile +++ b/arch/ia64/mm/Makefile | |||
@@ -7,6 +7,5 @@ obj-y := init.o fault.o tlb.o extable.o | |||
7 | obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o | 7 | obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o |
8 | obj-$(CONFIG_NUMA) += numa.o | 8 | obj-$(CONFIG_NUMA) += numa.o |
9 | obj-$(CONFIG_DISCONTIGMEM) += discontig.o | 9 | obj-$(CONFIG_DISCONTIGMEM) += discontig.o |
10 | ifndef CONFIG_DISCONTIGMEM | 10 | obj-$(CONFIG_SPARSEMEM) += discontig.o |
11 | obj-y += contig.o | 11 | obj-$(CONFIG_FLATMEM) += contig.o |
12 | endif | ||
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c index 91a055f5731f..acaaec4e4681 100644 --- a/arch/ia64/mm/contig.c +++ b/arch/ia64/mm/contig.c | |||
@@ -269,7 +269,7 @@ paging_init (void) | |||
269 | efi_memmap_walk(find_largest_hole, (u64 *)&max_gap); | 269 | efi_memmap_walk(find_largest_hole, (u64 *)&max_gap); |
270 | if (max_gap < LARGE_GAP) { | 270 | if (max_gap < LARGE_GAP) { |
271 | vmem_map = (struct page *) 0; | 271 | vmem_map = (struct page *) 0; |
272 | free_area_init_node(0, &contig_page_data, zones_size, 0, | 272 | free_area_init_node(0, NODE_DATA(0), zones_size, 0, |
273 | zholes_size); | 273 | zholes_size); |
274 | } else { | 274 | } else { |
275 | unsigned long map_size; | 275 | unsigned long map_size; |
@@ -282,7 +282,7 @@ paging_init (void) | |||
282 | efi_memmap_walk(create_mem_map_page_table, NULL); | 282 | efi_memmap_walk(create_mem_map_page_table, NULL); |
283 | 283 | ||
284 | NODE_DATA(0)->node_mem_map = vmem_map; | 284 | NODE_DATA(0)->node_mem_map = vmem_map; |
285 | free_area_init_node(0, &contig_page_data, zones_size, | 285 | free_area_init_node(0, NODE_DATA(0), zones_size, |
286 | 0, zholes_size); | 286 | 0, zholes_size); |
287 | 287 | ||
288 | printk("Virtual mem_map starts at 0x%p\n", mem_map); | 288 | printk("Virtual mem_map starts at 0x%p\n", mem_map); |
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index b5c90e548195..a3788fb84809 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c | |||
@@ -421,6 +421,37 @@ static void __init memory_less_nodes(void) | |||
421 | return; | 421 | return; |
422 | } | 422 | } |
423 | 423 | ||
424 | #ifdef CONFIG_SPARSEMEM | ||
425 | /** | ||
426 | * register_sparse_mem - notify SPARSEMEM that this memory range exists. | ||
427 | * @start: physical start of range | ||
428 | * @end: physical end of range | ||
429 | * @arg: unused | ||
430 | * | ||
431 | * Simply calls SPARSEMEM to register memory section(s). | ||
432 | */ | ||
433 | static int __init register_sparse_mem(unsigned long start, unsigned long end, | ||
434 | void *arg) | ||
435 | { | ||
436 | int nid; | ||
437 | |||
438 | start = __pa(start) >> PAGE_SHIFT; | ||
439 | end = __pa(end) >> PAGE_SHIFT; | ||
440 | nid = early_pfn_to_nid(start); | ||
441 | memory_present(nid, start, end); | ||
442 | |||
443 | return 0; | ||
444 | } | ||
445 | |||
446 | static void __init arch_sparse_init(void) | ||
447 | { | ||
448 | efi_memmap_walk(register_sparse_mem, NULL); | ||
449 | sparse_init(); | ||
450 | } | ||
451 | #else | ||
452 | #define arch_sparse_init() do {} while (0) | ||
453 | #endif | ||
454 | |||
424 | /** | 455 | /** |
425 | * find_memory - walk the EFI memory map and setup the bootmem allocator | 456 | * find_memory - walk the EFI memory map and setup the bootmem allocator |
426 | * | 457 | * |
@@ -528,8 +559,10 @@ void show_mem(void) | |||
528 | int shared = 0, cached = 0, reserved = 0; | 559 | int shared = 0, cached = 0, reserved = 0; |
529 | printk("Node ID: %d\n", pgdat->node_id); | 560 | printk("Node ID: %d\n", pgdat->node_id); |
530 | for(i = 0; i < pgdat->node_spanned_pages; i++) { | 561 | for(i = 0; i < pgdat->node_spanned_pages; i++) { |
531 | struct page *page = pgdat_page_nr(pgdat, i); | 562 | struct page *page; |
532 | if (!ia64_pfn_valid(pgdat->node_start_pfn+i)) | 563 | if (pfn_valid(pgdat->node_start_pfn + i)) |
564 | page = pfn_to_page(pgdat->node_start_pfn + i); | ||
565 | else | ||
533 | continue; | 566 | continue; |
534 | if (PageReserved(page)) | 567 | if (PageReserved(page)) |
535 | reserved++; | 568 | reserved++; |
@@ -648,12 +681,16 @@ void __init paging_init(void) | |||
648 | 681 | ||
649 | max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT; | 682 | max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT; |
650 | 683 | ||
684 | arch_sparse_init(); | ||
685 | |||
651 | efi_memmap_walk(filter_rsvd_memory, count_node_pages); | 686 | efi_memmap_walk(filter_rsvd_memory, count_node_pages); |
652 | 687 | ||
688 | #ifdef CONFIG_VIRTUAL_MEM_MAP | ||
653 | vmalloc_end -= PAGE_ALIGN(max_low_pfn * sizeof(struct page)); | 689 | vmalloc_end -= PAGE_ALIGN(max_low_pfn * sizeof(struct page)); |
654 | vmem_map = (struct page *) vmalloc_end; | 690 | vmem_map = (struct page *) vmalloc_end; |
655 | efi_memmap_walk(create_mem_map_page_table, NULL); | 691 | efi_memmap_walk(create_mem_map_page_table, NULL); |
656 | printk("Virtual mem_map starts at 0x%p\n", vmem_map); | 692 | printk("Virtual mem_map starts at 0x%p\n", vmem_map); |
693 | #endif | ||
657 | 694 | ||
658 | for_each_online_node(node) { | 695 | for_each_online_node(node) { |
659 | memset(zones_size, 0, sizeof(zones_size)); | 696 | memset(zones_size, 0, sizeof(zones_size)); |
@@ -690,7 +727,9 @@ void __init paging_init(void) | |||
690 | 727 | ||
691 | pfn_offset = mem_data[node].min_pfn; | 728 | pfn_offset = mem_data[node].min_pfn; |
692 | 729 | ||
730 | #ifdef CONFIG_VIRTUAL_MEM_MAP | ||
693 | NODE_DATA(node)->node_mem_map = vmem_map + pfn_offset; | 731 | NODE_DATA(node)->node_mem_map = vmem_map + pfn_offset; |
732 | #endif | ||
694 | free_area_init_node(node, NODE_DATA(node), zones_size, | 733 | free_area_init_node(node, NODE_DATA(node), zones_size, |
695 | pfn_offset, zholes_size); | 734 | pfn_offset, zholes_size); |
696 | } | 735 | } |
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 1281c609ee98..98246acd4991 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
@@ -593,7 +593,7 @@ mem_init (void) | |||
593 | platform_dma_init(); | 593 | platform_dma_init(); |
594 | #endif | 594 | #endif |
595 | 595 | ||
596 | #ifndef CONFIG_DISCONTIGMEM | 596 | #ifdef CONFIG_FLATMEM |
597 | if (!mem_map) | 597 | if (!mem_map) |
598 | BUG(); | 598 | BUG(); |
599 | max_mapnr = max_low_pfn; | 599 | max_mapnr = max_low_pfn; |
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c index 77118bbf3d8b..4e5c8b36ad93 100644 --- a/arch/ia64/mm/numa.c +++ b/arch/ia64/mm/numa.c | |||
@@ -47,3 +47,27 @@ paddr_to_nid(unsigned long paddr) | |||
47 | 47 | ||
48 | return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0); | 48 | return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0); |
49 | } | 49 | } |
50 | |||
51 | #if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA) | ||
52 | /* | ||
53 | * Because of holes evaluate on section limits. | ||
54 | * If the section of memory exists, then return the node where the section | ||
55 | * resides. Otherwise return node 0 as the default. This is used by | ||
56 | * SPARSEMEM to allocate the SPARSEMEM sectionmap on the NUMA node where | ||
57 | * the section resides. | ||
58 | */ | ||
59 | int early_pfn_to_nid(unsigned long pfn) | ||
60 | { | ||
61 | int i, section = pfn >> PFN_SECTION_SHIFT, ssec, esec; | ||
62 | |||
63 | for (i = 0; i < num_node_memblks; i++) { | ||
64 | ssec = node_memblk[i].start_paddr >> PA_SECTION_SHIFT; | ||
65 | esec = (node_memblk[i].start_paddr + node_memblk[i].size + | ||
66 | ((1L << PA_SECTION_SHIFT) - 1)) >> PA_SECTION_SHIFT; | ||
67 | if (section >= ssec && section < esec) | ||
68 | return node_memblk[i].nid; | ||
69 | } | ||
70 | |||
71 | return 0; | ||
72 | } | ||
73 | #endif | ||
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c index 464557e4ed82..987fb754d6ad 100644 --- a/arch/ia64/mm/tlb.c +++ b/arch/ia64/mm/tlb.c | |||
@@ -77,9 +77,10 @@ wrap_mmu_context (struct mm_struct *mm) | |||
77 | /* can't call flush_tlb_all() here because of race condition with O(1) scheduler [EF] */ | 77 | /* can't call flush_tlb_all() here because of race condition with O(1) scheduler [EF] */ |
78 | { | 78 | { |
79 | int cpu = get_cpu(); /* prevent preemption/migration */ | 79 | int cpu = get_cpu(); /* prevent preemption/migration */ |
80 | for (i = 0; i < NR_CPUS; ++i) | 80 | for_each_online_cpu(i) { |
81 | if (cpu_online(i) && (i != cpu)) | 81 | if (i != cpu) |
82 | per_cpu(ia64_need_tlb_flush, i) = 1; | 82 | per_cpu(ia64_need_tlb_flush, i) = 1; |
83 | } | ||
83 | put_cpu(); | 84 | put_cpu(); |
84 | } | 85 | } |
85 | local_flush_tlb_all(); | 86 | local_flush_tlb_all(); |
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 9b5de589b82f..017cfc3f4789 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
@@ -120,29 +120,6 @@ struct pci_ops pci_root_ops = { | |||
120 | .write = pci_write, | 120 | .write = pci_write, |
121 | }; | 121 | }; |
122 | 122 | ||
123 | #ifdef CONFIG_NUMA | ||
124 | extern acpi_status acpi_map_iosapic(acpi_handle, u32, void *, void **); | ||
125 | static void acpi_map_iosapics(void) | ||
126 | { | ||
127 | acpi_get_devices(NULL, acpi_map_iosapic, NULL, NULL); | ||
128 | } | ||
129 | #else | ||
130 | static void acpi_map_iosapics(void) | ||
131 | { | ||
132 | return; | ||
133 | } | ||
134 | #endif /* CONFIG_NUMA */ | ||
135 | |||
136 | static int __init | ||
137 | pci_acpi_init (void) | ||
138 | { | ||
139 | acpi_map_iosapics(); | ||
140 | |||
141 | return 0; | ||
142 | } | ||
143 | |||
144 | subsys_initcall(pci_acpi_init); | ||
145 | |||
146 | /* Called by ACPI when it finds a new root bus. */ | 123 | /* Called by ACPI when it finds a new root bus. */ |
147 | 124 | ||
148 | static struct pci_controller * __devinit | 125 | static struct pci_controller * __devinit |
@@ -191,6 +168,29 @@ add_io_space (struct acpi_resource_address64 *addr) | |||
191 | return IO_SPACE_BASE(i); | 168 | return IO_SPACE_BASE(i); |
192 | } | 169 | } |
193 | 170 | ||
171 | static acpi_status __devinit resource_to_window(struct acpi_resource *resource, | ||
172 | struct acpi_resource_address64 *addr) | ||
173 | { | ||
174 | acpi_status status; | ||
175 | |||
176 | /* | ||
177 | * We're only interested in _CRS descriptors that are | ||
178 | * - address space descriptors for memory or I/O space | ||
179 | * - non-zero size | ||
180 | * - producers, i.e., the address space is routed downstream, | ||
181 | * not consumed by the bridge itself | ||
182 | */ | ||
183 | status = acpi_resource_to_address64(resource, addr); | ||
184 | if (ACPI_SUCCESS(status) && | ||
185 | (addr->resource_type == ACPI_MEMORY_RANGE || | ||
186 | addr->resource_type == ACPI_IO_RANGE) && | ||
187 | addr->address_length && | ||
188 | addr->producer_consumer == ACPI_PRODUCER) | ||
189 | return AE_OK; | ||
190 | |||
191 | return AE_ERROR; | ||
192 | } | ||
193 | |||
194 | static acpi_status __devinit | 194 | static acpi_status __devinit |
195 | count_window (struct acpi_resource *resource, void *data) | 195 | count_window (struct acpi_resource *resource, void *data) |
196 | { | 196 | { |
@@ -198,11 +198,9 @@ count_window (struct acpi_resource *resource, void *data) | |||
198 | struct acpi_resource_address64 addr; | 198 | struct acpi_resource_address64 addr; |
199 | acpi_status status; | 199 | acpi_status status; |
200 | 200 | ||
201 | status = acpi_resource_to_address64(resource, &addr); | 201 | status = resource_to_window(resource, &addr); |
202 | if (ACPI_SUCCESS(status)) | 202 | if (ACPI_SUCCESS(status)) |
203 | if (addr.resource_type == ACPI_MEMORY_RANGE || | 203 | (*windows)++; |
204 | addr.resource_type == ACPI_IO_RANGE) | ||
205 | (*windows)++; | ||
206 | 204 | ||
207 | return AE_OK; | 205 | return AE_OK; |
208 | } | 206 | } |
@@ -221,13 +219,11 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data) | |||
221 | unsigned long flags, offset = 0; | 219 | unsigned long flags, offset = 0; |
222 | struct resource *root; | 220 | struct resource *root; |
223 | 221 | ||
224 | status = acpi_resource_to_address64(res, &addr); | 222 | /* Return AE_OK for non-window resources to keep scanning for more */ |
223 | status = resource_to_window(res, &addr); | ||
225 | if (!ACPI_SUCCESS(status)) | 224 | if (!ACPI_SUCCESS(status)) |
226 | return AE_OK; | 225 | return AE_OK; |
227 | 226 | ||
228 | if (!addr.address_length) | ||
229 | return AE_OK; | ||
230 | |||
231 | if (addr.resource_type == ACPI_MEMORY_RANGE) { | 227 | if (addr.resource_type == ACPI_MEMORY_RANGE) { |
232 | flags = IORESOURCE_MEM; | 228 | flags = IORESOURCE_MEM; |
233 | root = &iomem_resource; | 229 | root = &iomem_resource; |
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index 906622d9f933..b4f5053f5e1b 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c | |||
@@ -22,8 +22,6 @@ | |||
22 | #include "xtalk/hubdev.h" | 22 | #include "xtalk/hubdev.h" |
23 | #include "xtalk/xwidgetdev.h" | 23 | #include "xtalk/xwidgetdev.h" |
24 | 24 | ||
25 | nasid_t master_nasid = INVALID_NASID; /* Partition Master */ | ||
26 | |||
27 | static struct list_head sn_sysdata_list; | 25 | static struct list_head sn_sysdata_list; |
28 | 26 | ||
29 | /* sysdata list struct */ | 27 | /* sysdata list struct */ |
@@ -165,7 +163,7 @@ static void sn_fixup_ionodes(void) | |||
165 | * Get SGI Specific HUB chipset information. | 163 | * Get SGI Specific HUB chipset information. |
166 | * Inform Prom that this kernel can support domain bus numbering. | 164 | * Inform Prom that this kernel can support domain bus numbering. |
167 | */ | 165 | */ |
168 | for (i = 0; i < numionodes; i++) { | 166 | for (i = 0; i < num_cnodes; i++) { |
169 | hubdev = (struct hubdev_info *)(NODEPDA(i)->pdinfo); | 167 | hubdev = (struct hubdev_info *)(NODEPDA(i)->pdinfo); |
170 | nasid = cnodeid_to_nasid(i); | 168 | nasid = cnodeid_to_nasid(i); |
171 | hubdev->max_segment_number = 0xffffffff; | 169 | hubdev->max_segment_number = 0xffffffff; |
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index 6f8c5883716b..0fb579ef18c2 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
@@ -59,8 +59,6 @@ DEFINE_PER_CPU(struct pda_s, pda_percpu); | |||
59 | 59 | ||
60 | #define MAX_PHYS_MEMORY (1UL << IA64_MAX_PHYS_BITS) /* Max physical address supported */ | 60 | #define MAX_PHYS_MEMORY (1UL << IA64_MAX_PHYS_BITS) /* Max physical address supported */ |
61 | 61 | ||
62 | lboard_t *root_lboard[MAX_COMPACT_NODES]; | ||
63 | |||
64 | extern void bte_init_node(nodepda_t *, cnodeid_t); | 62 | extern void bte_init_node(nodepda_t *, cnodeid_t); |
65 | 63 | ||
66 | extern void sn_timer_init(void); | 64 | extern void sn_timer_init(void); |
@@ -97,15 +95,15 @@ u8 sn_region_size; | |||
97 | EXPORT_SYMBOL(sn_region_size); | 95 | EXPORT_SYMBOL(sn_region_size); |
98 | int sn_prom_type; /* 0=hardware, 1=medusa/realprom, 2=medusa/fakeprom */ | 96 | int sn_prom_type; /* 0=hardware, 1=medusa/realprom, 2=medusa/fakeprom */ |
99 | 97 | ||
100 | short physical_node_map[MAX_PHYSNODE_ID]; | 98 | short physical_node_map[MAX_NUMALINK_NODES]; |
101 | static unsigned long sn_prom_features[MAX_PROM_FEATURE_SETS]; | 99 | static unsigned long sn_prom_features[MAX_PROM_FEATURE_SETS]; |
102 | 100 | ||
103 | EXPORT_SYMBOL(physical_node_map); | 101 | EXPORT_SYMBOL(physical_node_map); |
104 | 102 | ||
105 | int numionodes; | 103 | int num_cnodes; |
106 | 104 | ||
107 | static void sn_init_pdas(char **); | 105 | static void sn_init_pdas(char **); |
108 | static void scan_for_ionodes(void); | 106 | static void build_cnode_tables(void); |
109 | 107 | ||
110 | static nodepda_t *nodepdaindr[MAX_COMPACT_NODES]; | 108 | static nodepda_t *nodepdaindr[MAX_COMPACT_NODES]; |
111 | 109 | ||
@@ -140,19 +138,6 @@ char drive_info[4 * 16]; | |||
140 | #endif | 138 | #endif |
141 | 139 | ||
142 | /* | 140 | /* |
143 | * Get nasid of current cpu early in boot before nodepda is initialized | ||
144 | */ | ||
145 | static int | ||
146 | boot_get_nasid(void) | ||
147 | { | ||
148 | int nasid; | ||
149 | |||
150 | if (ia64_sn_get_sapic_info(get_sapicid(), &nasid, NULL, NULL)) | ||
151 | BUG(); | ||
152 | return nasid; | ||
153 | } | ||
154 | |||
155 | /* | ||
156 | * This routine can only be used during init, since | 141 | * This routine can only be used during init, since |
157 | * smp_boot_data is an init data structure. | 142 | * smp_boot_data is an init data structure. |
158 | * We have to use smp_boot_data.cpu_phys_id to find | 143 | * We have to use smp_boot_data.cpu_phys_id to find |
@@ -223,7 +208,6 @@ void __init early_sn_setup(void) | |||
223 | } | 208 | } |
224 | 209 | ||
225 | extern int platform_intr_list[]; | 210 | extern int platform_intr_list[]; |
226 | extern nasid_t master_nasid; | ||
227 | static int __initdata shub_1_1_found = 0; | 211 | static int __initdata shub_1_1_found = 0; |
228 | 212 | ||
229 | /* | 213 | /* |
@@ -269,7 +253,6 @@ static void __init sn_check_for_wars(void) | |||
269 | void __init sn_setup(char **cmdline_p) | 253 | void __init sn_setup(char **cmdline_p) |
270 | { | 254 | { |
271 | long status, ticks_per_sec, drift; | 255 | long status, ticks_per_sec, drift; |
272 | int pxm; | ||
273 | u32 version = sn_sal_rev(); | 256 | u32 version = sn_sal_rev(); |
274 | extern void sn_cpu_init(void); | 257 | extern void sn_cpu_init(void); |
275 | 258 | ||
@@ -300,11 +283,10 @@ void __init sn_setup(char **cmdline_p) | |||
300 | 283 | ||
301 | MAX_DMA_ADDRESS = PAGE_OFFSET + MAX_PHYS_MEMORY; | 284 | MAX_DMA_ADDRESS = PAGE_OFFSET + MAX_PHYS_MEMORY; |
302 | 285 | ||
303 | memset(physical_node_map, -1, sizeof(physical_node_map)); | 286 | /* |
304 | for (pxm = 0; pxm < MAX_PXM_DOMAINS; pxm++) | 287 | * Build the tables for managing cnodes. |
305 | if (pxm_to_nid_map[pxm] != -1) | 288 | */ |
306 | physical_node_map[pxm_to_nasid(pxm)] = | 289 | build_cnode_tables(); |
307 | pxm_to_nid_map[pxm]; | ||
308 | 290 | ||
309 | /* | 291 | /* |
310 | * Old PROMs do not provide an ACPI FADT. Disable legacy keyboard | 292 | * Old PROMs do not provide an ACPI FADT. Disable legacy keyboard |
@@ -319,8 +301,6 @@ void __init sn_setup(char **cmdline_p) | |||
319 | 301 | ||
320 | printk("SGI SAL version %x.%02x\n", version >> 8, version & 0x00FF); | 302 | printk("SGI SAL version %x.%02x\n", version >> 8, version & 0x00FF); |
321 | 303 | ||
322 | master_nasid = boot_get_nasid(); | ||
323 | |||
324 | status = | 304 | status = |
325 | ia64_sal_freq_base(SAL_FREQ_BASE_REALTIME_CLOCK, &ticks_per_sec, | 305 | ia64_sal_freq_base(SAL_FREQ_BASE_REALTIME_CLOCK, &ticks_per_sec, |
326 | &drift); | 306 | &drift); |
@@ -378,15 +358,6 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
378 | { | 358 | { |
379 | cnodeid_t cnode; | 359 | cnodeid_t cnode; |
380 | 360 | ||
381 | memset(sn_cnodeid_to_nasid, -1, | ||
382 | sizeof(__ia64_per_cpu_var(__sn_cnodeid_to_nasid))); | ||
383 | for_each_online_node(cnode) | ||
384 | sn_cnodeid_to_nasid[cnode] = | ||
385 | pxm_to_nasid(nid_to_pxm_map[cnode]); | ||
386 | |||
387 | numionodes = num_online_nodes(); | ||
388 | scan_for_ionodes(); | ||
389 | |||
390 | /* | 361 | /* |
391 | * Allocate & initalize the nodepda for each node. | 362 | * Allocate & initalize the nodepda for each node. |
392 | */ | 363 | */ |
@@ -402,7 +373,7 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
402 | /* | 373 | /* |
403 | * Allocate & initialize nodepda for TIOs. For now, put them on node 0. | 374 | * Allocate & initialize nodepda for TIOs. For now, put them on node 0. |
404 | */ | 375 | */ |
405 | for (cnode = num_online_nodes(); cnode < numionodes; cnode++) { | 376 | for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) { |
406 | nodepdaindr[cnode] = | 377 | nodepdaindr[cnode] = |
407 | alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t)); | 378 | alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t)); |
408 | memset(nodepdaindr[cnode], 0, sizeof(nodepda_t)); | 379 | memset(nodepdaindr[cnode], 0, sizeof(nodepda_t)); |
@@ -411,7 +382,7 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
411 | /* | 382 | /* |
412 | * Now copy the array of nodepda pointers to each nodepda. | 383 | * Now copy the array of nodepda pointers to each nodepda. |
413 | */ | 384 | */ |
414 | for (cnode = 0; cnode < numionodes; cnode++) | 385 | for (cnode = 0; cnode < num_cnodes; cnode++) |
415 | memcpy(nodepdaindr[cnode]->pernode_pdaindr, nodepdaindr, | 386 | memcpy(nodepdaindr[cnode]->pernode_pdaindr, nodepdaindr, |
416 | sizeof(nodepdaindr)); | 387 | sizeof(nodepdaindr)); |
417 | 388 | ||
@@ -428,7 +399,7 @@ static void __init sn_init_pdas(char **cmdline_p) | |||
428 | * Initialize the per node hubdev. This includes IO Nodes and | 399 | * Initialize the per node hubdev. This includes IO Nodes and |
429 | * headless/memless nodes. | 400 | * headless/memless nodes. |
430 | */ | 401 | */ |
431 | for (cnode = 0; cnode < numionodes; cnode++) { | 402 | for (cnode = 0; cnode < num_cnodes; cnode++) { |
432 | hubdev_init_node(nodepdaindr[cnode], cnode); | 403 | hubdev_init_node(nodepdaindr[cnode], cnode); |
433 | } | 404 | } |
434 | } | 405 | } |
@@ -553,87 +524,58 @@ void __init sn_cpu_init(void) | |||
553 | } | 524 | } |
554 | 525 | ||
555 | /* | 526 | /* |
556 | * Scan klconfig for ionodes. Add the nasids to the | 527 | * Build tables for converting between NASIDs and cnodes. |
557 | * physical_node_map and the pda and increment numionodes. | ||
558 | */ | 528 | */ |
529 | static inline int __init board_needs_cnode(int type) | ||
530 | { | ||
531 | return (type == KLTYPE_SNIA || type == KLTYPE_TIO); | ||
532 | } | ||
559 | 533 | ||
560 | static void __init scan_for_ionodes(void) | 534 | void __init build_cnode_tables(void) |
561 | { | 535 | { |
562 | int nasid = 0; | 536 | int nasid; |
537 | int node; | ||
563 | lboard_t *brd; | 538 | lboard_t *brd; |
564 | 539 | ||
565 | /* fakeprom does not support klgraph */ | 540 | memset(physical_node_map, -1, sizeof(physical_node_map)); |
566 | if (IS_RUNNING_ON_FAKE_PROM()) | 541 | memset(sn_cnodeid_to_nasid, -1, |
567 | return; | 542 | sizeof(__ia64_per_cpu_var(__sn_cnodeid_to_nasid))); |
568 | |||
569 | /* Setup ionodes with memory */ | ||
570 | for (nasid = 0; nasid < MAX_PHYSNODE_ID; nasid += 2) { | ||
571 | char *klgraph_header; | ||
572 | cnodeid_t cnodeid; | ||
573 | |||
574 | if (physical_node_map[nasid] == -1) | ||
575 | continue; | ||
576 | 543 | ||
577 | cnodeid = -1; | 544 | /* |
578 | klgraph_header = __va(ia64_sn_get_klconfig_addr(nasid)); | 545 | * First populate the tables with C/M bricks. This ensures that |
579 | if (!klgraph_header) { | 546 | * cnode == node for all C & M bricks. |
580 | BUG(); /* All nodes must have klconfig tables! */ | 547 | */ |
581 | } | 548 | for_each_online_node(node) { |
582 | cnodeid = nasid_to_cnodeid(nasid); | 549 | nasid = pxm_to_nasid(nid_to_pxm_map[node]); |
583 | root_lboard[cnodeid] = (lboard_t *) | 550 | sn_cnodeid_to_nasid[node] = nasid; |
584 | NODE_OFFSET_TO_LBOARD((nasid), | 551 | physical_node_map[nasid] = node; |
585 | ((kl_config_hdr_t | ||
586 | *) (klgraph_header))-> | ||
587 | ch_board_info); | ||
588 | } | 552 | } |
589 | 553 | ||
590 | /* Scan headless/memless IO Nodes. */ | 554 | /* |
591 | for (nasid = 0; nasid < MAX_PHYSNODE_ID; nasid += 2) { | 555 | * num_cnodes is total number of C/M/TIO bricks. Because of the 256 node |
592 | /* if there's no nasid, don't try to read the klconfig on the node */ | 556 | * limit on the number of nodes, we can't use the generic node numbers |
593 | if (physical_node_map[nasid] == -1) | 557 | * for this. Note that num_cnodes is incremented below as TIOs or |
594 | continue; | 558 | * headless/memoryless nodes are discovered. |
595 | brd = find_lboard_any((lboard_t *) | 559 | */ |
596 | root_lboard[nasid_to_cnodeid(nasid)], | 560 | num_cnodes = num_online_nodes(); |
597 | KLTYPE_SNIA); | ||
598 | if (brd) { | ||
599 | brd = KLCF_NEXT_ANY(brd); /* Skip this node's lboard */ | ||
600 | if (!brd) | ||
601 | continue; | ||
602 | } | ||
603 | |||
604 | brd = find_lboard_any(brd, KLTYPE_SNIA); | ||
605 | 561 | ||
606 | while (brd) { | 562 | /* fakeprom does not support klgraph */ |
607 | sn_cnodeid_to_nasid[numionodes] = brd->brd_nasid; | 563 | if (IS_RUNNING_ON_FAKE_PROM()) |
608 | physical_node_map[brd->brd_nasid] = numionodes; | 564 | return; |
609 | root_lboard[numionodes] = brd; | ||
610 | numionodes++; | ||
611 | brd = KLCF_NEXT_ANY(brd); | ||
612 | if (!brd) | ||
613 | break; | ||
614 | |||
615 | brd = find_lboard_any(brd, KLTYPE_SNIA); | ||
616 | } | ||
617 | } | ||
618 | 565 | ||
619 | /* Scan for TIO nodes. */ | 566 | /* Find TIOs & headless/memoryless nodes and add them to the tables */ |
620 | for (nasid = 0; nasid < MAX_PHYSNODE_ID; nasid += 2) { | 567 | for_each_online_node(node) { |
621 | /* if there's no nasid, don't try to read the klconfig on the node */ | 568 | kl_config_hdr_t *klgraph_header; |
622 | if (physical_node_map[nasid] == -1) | 569 | nasid = cnodeid_to_nasid(node); |
623 | continue; | 570 | if ((klgraph_header = ia64_sn_get_klconfig_addr(nasid)) == NULL) |
624 | brd = find_lboard_any((lboard_t *) | 571 | BUG(); |
625 | root_lboard[nasid_to_cnodeid(nasid)], | 572 | brd = NODE_OFFSET_TO_LBOARD(nasid, klgraph_header->ch_board_info); |
626 | KLTYPE_TIO); | ||
627 | while (brd) { | 573 | while (brd) { |
628 | sn_cnodeid_to_nasid[numionodes] = brd->brd_nasid; | 574 | if (board_needs_cnode(brd->brd_type) && physical_node_map[brd->brd_nasid] < 0) { |
629 | physical_node_map[brd->brd_nasid] = numionodes; | 575 | sn_cnodeid_to_nasid[num_cnodes] = brd->brd_nasid; |
630 | root_lboard[numionodes] = brd; | 576 | physical_node_map[brd->brd_nasid] = num_cnodes++; |
631 | numionodes++; | 577 | } |
632 | brd = KLCF_NEXT_ANY(brd); | 578 | brd = find_lboard_next(brd); |
633 | if (!brd) | ||
634 | break; | ||
635 | |||
636 | brd = find_lboard_any(brd, KLTYPE_TIO); | ||
637 | } | 579 | } |
638 | } | 580 | } |
639 | } | 581 | } |
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c index 0513aacac8c1..6c6fbca3229c 100644 --- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c | |||
@@ -476,8 +476,8 @@ static int sn_topology_show(struct seq_file *s, void *d) | |||
476 | for_each_online_cpu(j) { | 476 | for_each_online_cpu(j) { |
477 | seq_printf(s, j ? ":%d" : ", dist %d", | 477 | seq_printf(s, j ? ":%d" : ", dist %d", |
478 | node_distance( | 478 | node_distance( |
479 | cpuid_to_cnodeid(i), | 479 | cpu_to_node(i), |
480 | cpuid_to_cnodeid(j))); | 480 | cpu_to_node(j))); |
481 | } | 481 | } |
482 | seq_putc(s, '\n'); | 482 | seq_putc(s, '\n'); |
483 | } | 483 | } |
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c index b45db5133f55..0d8592a745a7 100644 --- a/arch/ia64/sn/kernel/tiocx.c +++ b/arch/ia64/sn/kernel/tiocx.c | |||
@@ -183,11 +183,12 @@ int cx_driver_unregister(struct cx_drv *cx_driver) | |||
183 | * @part_num: device's part number | 183 | * @part_num: device's part number |
184 | * @mfg_num: device's manufacturer number | 184 | * @mfg_num: device's manufacturer number |
185 | * @hubdev: hub info associated with this device | 185 | * @hubdev: hub info associated with this device |
186 | * @bt: board type of the device | ||
186 | * | 187 | * |
187 | */ | 188 | */ |
188 | int | 189 | int |
189 | cx_device_register(nasid_t nasid, int part_num, int mfg_num, | 190 | cx_device_register(nasid_t nasid, int part_num, int mfg_num, |
190 | struct hubdev_info *hubdev) | 191 | struct hubdev_info *hubdev, int bt) |
191 | { | 192 | { |
192 | struct cx_dev *cx_dev; | 193 | struct cx_dev *cx_dev; |
193 | 194 | ||
@@ -200,6 +201,7 @@ cx_device_register(nasid_t nasid, int part_num, int mfg_num, | |||
200 | cx_dev->cx_id.mfg_num = mfg_num; | 201 | cx_dev->cx_id.mfg_num = mfg_num; |
201 | cx_dev->cx_id.nasid = nasid; | 202 | cx_dev->cx_id.nasid = nasid; |
202 | cx_dev->hubdev = hubdev; | 203 | cx_dev->hubdev = hubdev; |
204 | cx_dev->bt = bt; | ||
203 | 205 | ||
204 | cx_dev->dev.parent = NULL; | 206 | cx_dev->dev.parent = NULL; |
205 | cx_dev->dev.bus = &tiocx_bus_type; | 207 | cx_dev->dev.bus = &tiocx_bus_type; |
@@ -238,7 +240,8 @@ static int cx_device_reload(struct cx_dev *cx_dev) | |||
238 | { | 240 | { |
239 | cx_device_unregister(cx_dev); | 241 | cx_device_unregister(cx_dev); |
240 | return cx_device_register(cx_dev->cx_id.nasid, cx_dev->cx_id.part_num, | 242 | return cx_device_register(cx_dev->cx_id.nasid, cx_dev->cx_id.part_num, |
241 | cx_dev->cx_id.mfg_num, cx_dev->hubdev); | 243 | cx_dev->cx_id.mfg_num, cx_dev->hubdev, |
244 | cx_dev->bt); | ||
242 | } | 245 | } |
243 | 246 | ||
244 | static inline uint64_t tiocx_intr_alloc(nasid_t nasid, int widget, | 247 | static inline uint64_t tiocx_intr_alloc(nasid_t nasid, int widget, |
@@ -365,26 +368,20 @@ static void tio_corelet_reset(nasid_t nasid, int corelet) | |||
365 | udelay(2000); | 368 | udelay(2000); |
366 | } | 369 | } |
367 | 370 | ||
368 | static int tiocx_btchar_get(int nasid) | 371 | static int is_fpga_tio(int nasid, int *bt) |
369 | { | 372 | { |
370 | moduleid_t module_id; | 373 | int ioboard_type; |
371 | geoid_t geoid; | ||
372 | int cnodeid; | ||
373 | |||
374 | cnodeid = nasid_to_cnodeid(nasid); | ||
375 | geoid = cnodeid_get_geoid(cnodeid); | ||
376 | module_id = geo_module(geoid); | ||
377 | return MODULE_GET_BTCHAR(module_id); | ||
378 | } | ||
379 | 374 | ||
380 | static int is_fpga_brick(int nasid) | 375 | ioboard_type = ia64_sn_sysctl_ioboard_get(nasid); |
381 | { | 376 | |
382 | switch (tiocx_btchar_get(nasid)) { | 377 | switch (ioboard_type) { |
383 | case L1_BRICKTYPE_SA: | 378 | case L1_BRICKTYPE_SA: |
384 | case L1_BRICKTYPE_ATHENA: | 379 | case L1_BRICKTYPE_ATHENA: |
385 | case L1_BRICKTYPE_DAYTONA: | 380 | case L1_BOARDTYPE_DAYTONA: |
381 | *bt = ioboard_type; | ||
386 | return 1; | 382 | return 1; |
387 | } | 383 | } |
384 | |||
388 | return 0; | 385 | return 0; |
389 | } | 386 | } |
390 | 387 | ||
@@ -407,16 +404,22 @@ static int tiocx_reload(struct cx_dev *cx_dev) | |||
407 | 404 | ||
408 | if (bitstream_loaded(nasid)) { | 405 | if (bitstream_loaded(nasid)) { |
409 | uint64_t cx_id; | 406 | uint64_t cx_id; |
410 | 407 | int rv; | |
411 | cx_id = | 408 | |
412 | *(volatile uint64_t *)(TIO_SWIN_BASE(nasid, TIOCX_CORELET) + | 409 | rv = ia64_sn_sysctl_tio_clock_reset(nasid); |
410 | if (rv) { | ||
411 | printk(KERN_ALERT "CX port JTAG reset failed.\n"); | ||
412 | } else { | ||
413 | cx_id = *(volatile uint64_t *) | ||
414 | (TIO_SWIN_BASE(nasid, TIOCX_CORELET) + | ||
413 | WIDGET_ID); | 415 | WIDGET_ID); |
414 | part_num = XWIDGET_PART_NUM(cx_id); | 416 | part_num = XWIDGET_PART_NUM(cx_id); |
415 | mfg_num = XWIDGET_MFG_NUM(cx_id); | 417 | mfg_num = XWIDGET_MFG_NUM(cx_id); |
416 | DBG("part= 0x%x, mfg= 0x%x\n", part_num, mfg_num); | 418 | DBG("part= 0x%x, mfg= 0x%x\n", part_num, mfg_num); |
417 | /* just ignore it if it's a CE */ | 419 | /* just ignore it if it's a CE */ |
418 | if (part_num == TIO_CE_ASIC_PARTNUM) | 420 | if (part_num == TIO_CE_ASIC_PARTNUM) |
419 | return 0; | 421 | return 0; |
422 | } | ||
420 | } | 423 | } |
421 | 424 | ||
422 | cx_dev->cx_id.part_num = part_num; | 425 | cx_dev->cx_id.part_num = part_num; |
@@ -436,10 +439,10 @@ static ssize_t show_cxdev_control(struct device *dev, struct device_attribute *a | |||
436 | { | 439 | { |
437 | struct cx_dev *cx_dev = to_cx_dev(dev); | 440 | struct cx_dev *cx_dev = to_cx_dev(dev); |
438 | 441 | ||
439 | return sprintf(buf, "0x%x 0x%x 0x%x %d\n", | 442 | return sprintf(buf, "0x%x 0x%x 0x%x 0x%x\n", |
440 | cx_dev->cx_id.nasid, | 443 | cx_dev->cx_id.nasid, |
441 | cx_dev->cx_id.part_num, cx_dev->cx_id.mfg_num, | 444 | cx_dev->cx_id.part_num, cx_dev->cx_id.mfg_num, |
442 | tiocx_btchar_get(cx_dev->cx_id.nasid)); | 445 | cx_dev->bt); |
443 | } | 446 | } |
444 | 447 | ||
445 | static ssize_t store_cxdev_control(struct device *dev, struct device_attribute *attr, const char *buf, | 448 | static ssize_t store_cxdev_control(struct device *dev, struct device_attribute *attr, const char *buf, |
@@ -486,13 +489,13 @@ static int __init tiocx_init(void) | |||
486 | 489 | ||
487 | bus_register(&tiocx_bus_type); | 490 | bus_register(&tiocx_bus_type); |
488 | 491 | ||
489 | for (cnodeid = 0; cnodeid < MAX_COMPACT_NODES; cnodeid++) { | 492 | for (cnodeid = 0; cnodeid < num_cnodes; cnodeid++) { |
490 | nasid_t nasid; | 493 | nasid_t nasid; |
494 | int bt; | ||
491 | 495 | ||
492 | if ((nasid = cnodeid_to_nasid(cnodeid)) < 0) | 496 | nasid = cnodeid_to_nasid(cnodeid); |
493 | break; /* No more nasids .. bail out of loop */ | ||
494 | 497 | ||
495 | if ((nasid & 0x1) && is_fpga_brick(nasid)) { | 498 | if ((nasid & 0x1) && is_fpga_tio(nasid, &bt)) { |
496 | struct hubdev_info *hubdev; | 499 | struct hubdev_info *hubdev; |
497 | struct xwidget_info *widgetp; | 500 | struct xwidget_info *widgetp; |
498 | 501 | ||
@@ -512,7 +515,7 @@ static int __init tiocx_init(void) | |||
512 | 515 | ||
513 | if (cx_device_register | 516 | if (cx_device_register |
514 | (nasid, widgetp->xwi_hwid.part_num, | 517 | (nasid, widgetp->xwi_hwid.part_num, |
515 | widgetp->xwi_hwid.mfg_num, hubdev) < 0) | 518 | widgetp->xwi_hwid.mfg_num, hubdev, bt) < 0) |
516 | return -ENXIO; | 519 | return -ENXIO; |
517 | else | 520 | else |
518 | found_tiocx_device++; | 521 | found_tiocx_device++; |
diff --git a/arch/ia64/sn/kernel/xpc.h b/arch/ia64/sn/kernel/xpc.h index d0ee635daf2e..33df1b3758b6 100644 --- a/arch/ia64/sn/kernel/xpc.h +++ b/arch/ia64/sn/kernel/xpc.h | |||
@@ -57,7 +57,7 @@ | |||
57 | #define XPC_NASID_FROM_W_B(_w, _b) (((_w) * 64 + (_b)) * 2) | 57 | #define XPC_NASID_FROM_W_B(_w, _b) (((_w) * 64 + (_b)) * 2) |
58 | 58 | ||
59 | #define XPC_HB_DEFAULT_INTERVAL 5 /* incr HB every x secs */ | 59 | #define XPC_HB_DEFAULT_INTERVAL 5 /* incr HB every x secs */ |
60 | #define XPC_HB_CHECK_DEFAULT_TIMEOUT 20 /* check HB every x secs */ | 60 | #define XPC_HB_CHECK_DEFAULT_INTERVAL 20 /* check HB every x secs */ |
61 | 61 | ||
62 | /* define the process name of HB checker and the CPU it is pinned to */ | 62 | /* define the process name of HB checker and the CPU it is pinned to */ |
63 | #define XPC_HB_CHECK_THREAD_NAME "xpc_hb" | 63 | #define XPC_HB_CHECK_THREAD_NAME "xpc_hb" |
@@ -67,34 +67,82 @@ | |||
67 | #define XPC_DISCOVERY_THREAD_NAME "xpc_discovery" | 67 | #define XPC_DISCOVERY_THREAD_NAME "xpc_discovery" |
68 | 68 | ||
69 | 69 | ||
70 | #define XPC_HB_ALLOWED(_p, _v) ((_v)->heartbeating_to_mask & (1UL << (_p))) | ||
71 | #define XPC_ALLOW_HB(_p, _v) (_v)->heartbeating_to_mask |= (1UL << (_p)) | ||
72 | #define XPC_DISALLOW_HB(_p, _v) (_v)->heartbeating_to_mask &= (~(1UL << (_p))) | ||
73 | |||
74 | |||
75 | /* | 70 | /* |
76 | * Reserved Page provided by SAL. | 71 | * the reserved page |
72 | * | ||
73 | * SAL reserves one page of memory per partition for XPC. Though a full page | ||
74 | * in length (16384 bytes), its starting address is not page aligned, but it | ||
75 | * is cacheline aligned. The reserved page consists of the following: | ||
76 | * | ||
77 | * reserved page header | ||
78 | * | ||
79 | * The first cacheline of the reserved page contains the header | ||
80 | * (struct xpc_rsvd_page). Before SAL initialization has completed, | ||
81 | * SAL has set up the following fields of the reserved page header: | ||
82 | * SAL_signature, SAL_version, partid, and nasids_size. The other | ||
83 | * fields are set up by XPC. (xpc_rsvd_page points to the local | ||
84 | * partition's reserved page.) | ||
77 | * | 85 | * |
78 | * SAL provides one page per partition of reserved memory. When SAL | 86 | * part_nasids mask |
79 | * initialization is complete, SAL_signature, SAL_version, partid, | 87 | * mach_nasids mask |
80 | * part_nasids, and mach_nasids are set. | 88 | * |
89 | * SAL also sets up two bitmaps (or masks), one that reflects the actual | ||
90 | * nasids in this partition (part_nasids), and the other that reflects | ||
91 | * the actual nasids in the entire machine (mach_nasids). We're only | ||
92 | * interested in the even numbered nasids (which contain the processors | ||
93 | * and/or memory), so we only need half as many bits to represent the | ||
94 | * nasids. The part_nasids mask is located starting at the first cacheline | ||
95 | * following the reserved page header. The mach_nasids mask follows right | ||
96 | * after the part_nasids mask. The size in bytes of each mask is reflected | ||
97 | * by the reserved page header field 'nasids_size'. (Local partition's | ||
98 | * mask pointers are xpc_part_nasids and xpc_mach_nasids.) | ||
99 | * | ||
100 | * vars | ||
101 | * vars part | ||
102 | * | ||
103 | * Immediately following the mach_nasids mask are the XPC variables | ||
104 | * required by other partitions. First are those that are generic to all | ||
105 | * partitions (vars), followed on the next available cacheline by those | ||
106 | * which are partition specific (vars part). These are setup by XPC. | ||
107 | * (Local partition's vars pointers are xpc_vars and xpc_vars_part.) | ||
81 | * | 108 | * |
82 | * Note: Until vars_pa is set, the partition XPC code has not been initialized. | 109 | * Note: Until vars_pa is set, the partition XPC code has not been initialized. |
83 | */ | 110 | */ |
84 | struct xpc_rsvd_page { | 111 | struct xpc_rsvd_page { |
85 | u64 SAL_signature; /* SAL unique signature */ | 112 | u64 SAL_signature; /* SAL: unique signature */ |
86 | u64 SAL_version; /* SAL specified version */ | 113 | u64 SAL_version; /* SAL: version */ |
87 | u8 partid; /* partition ID from SAL */ | 114 | u8 partid; /* SAL: partition ID */ |
88 | u8 version; | 115 | u8 version; |
89 | u8 pad[6]; /* pad to u64 align */ | 116 | u8 pad1[6]; /* align to next u64 in cacheline */ |
90 | volatile u64 vars_pa; | 117 | volatile u64 vars_pa; |
91 | u64 part_nasids[XP_NASID_MASK_WORDS] ____cacheline_aligned; | 118 | struct timespec stamp; /* time when reserved page was setup by XPC */ |
92 | u64 mach_nasids[XP_NASID_MASK_WORDS] ____cacheline_aligned; | 119 | u64 pad2[9]; /* align to last u64 in cacheline */ |
120 | u64 nasids_size; /* SAL: size of each nasid mask in bytes */ | ||
93 | }; | 121 | }; |
94 | #define XPC_RP_VERSION _XPC_VERSION(1,0) /* version 1.0 of the reserved page */ | ||
95 | 122 | ||
96 | #define XPC_RSVD_PAGE_ALIGNED_SIZE \ | 123 | #define XPC_RP_VERSION _XPC_VERSION(1,1) /* version 1.1 of the reserved page */ |
97 | (L1_CACHE_ALIGN(sizeof(struct xpc_rsvd_page))) | 124 | |
125 | #define XPC_SUPPORTS_RP_STAMP(_version) \ | ||
126 | (_version >= _XPC_VERSION(1,1)) | ||
127 | |||
128 | /* | ||
129 | * compare stamps - the return value is: | ||
130 | * | ||
131 | * < 0, if stamp1 < stamp2 | ||
132 | * = 0, if stamp1 == stamp2 | ||
133 | * > 0, if stamp1 > stamp2 | ||
134 | */ | ||
135 | static inline int | ||
136 | xpc_compare_stamps(struct timespec *stamp1, struct timespec *stamp2) | ||
137 | { | ||
138 | int ret; | ||
139 | |||
140 | |||
141 | if ((ret = stamp1->tv_sec - stamp2->tv_sec) == 0) { | ||
142 | ret = stamp1->tv_nsec - stamp2->tv_nsec; | ||
143 | } | ||
144 | return ret; | ||
145 | } | ||
98 | 146 | ||
99 | 147 | ||
100 | /* | 148 | /* |
@@ -121,11 +169,58 @@ struct xpc_vars { | |||
121 | u64 vars_part_pa; | 169 | u64 vars_part_pa; |
122 | u64 amos_page_pa; /* paddr of page of AMOs from MSPEC driver */ | 170 | u64 amos_page_pa; /* paddr of page of AMOs from MSPEC driver */ |
123 | AMO_t *amos_page; /* vaddr of page of AMOs from MSPEC driver */ | 171 | AMO_t *amos_page; /* vaddr of page of AMOs from MSPEC driver */ |
124 | AMO_t *act_amos; /* pointer to the first activation AMO */ | ||
125 | }; | 172 | }; |
126 | #define XPC_V_VERSION _XPC_VERSION(3,0) /* version 3.0 of the cross vars */ | ||
127 | 173 | ||
128 | #define XPC_VARS_ALIGNED_SIZE (L1_CACHE_ALIGN(sizeof(struct xpc_vars))) | 174 | #define XPC_V_VERSION _XPC_VERSION(3,1) /* version 3.1 of the cross vars */ |
175 | |||
176 | #define XPC_SUPPORTS_DISENGAGE_REQUEST(_version) \ | ||
177 | (_version >= _XPC_VERSION(3,1)) | ||
178 | |||
179 | |||
180 | static inline int | ||
181 | xpc_hb_allowed(partid_t partid, struct xpc_vars *vars) | ||
182 | { | ||
183 | return ((vars->heartbeating_to_mask & (1UL << partid)) != 0); | ||
184 | } | ||
185 | |||
186 | static inline void | ||
187 | xpc_allow_hb(partid_t partid, struct xpc_vars *vars) | ||
188 | { | ||
189 | u64 old_mask, new_mask; | ||
190 | |||
191 | do { | ||
192 | old_mask = vars->heartbeating_to_mask; | ||
193 | new_mask = (old_mask | (1UL << partid)); | ||
194 | } while (cmpxchg(&vars->heartbeating_to_mask, old_mask, new_mask) != | ||
195 | old_mask); | ||
196 | } | ||
197 | |||
198 | static inline void | ||
199 | xpc_disallow_hb(partid_t partid, struct xpc_vars *vars) | ||
200 | { | ||
201 | u64 old_mask, new_mask; | ||
202 | |||
203 | do { | ||
204 | old_mask = vars->heartbeating_to_mask; | ||
205 | new_mask = (old_mask & ~(1UL << partid)); | ||
206 | } while (cmpxchg(&vars->heartbeating_to_mask, old_mask, new_mask) != | ||
207 | old_mask); | ||
208 | } | ||
209 | |||
210 | |||
211 | /* | ||
212 | * The AMOs page consists of a number of AMO variables which are divided into | ||
213 | * four groups, The first two groups are used to identify an IRQ's sender. | ||
214 | * These two groups consist of 64 and 128 AMO variables respectively. The last | ||
215 | * two groups, consisting of just one AMO variable each, are used to identify | ||
216 | * the remote partitions that are currently engaged (from the viewpoint of | ||
217 | * the XPC running on the remote partition). | ||
218 | */ | ||
219 | #define XPC_NOTIFY_IRQ_AMOS 0 | ||
220 | #define XPC_ACTIVATE_IRQ_AMOS (XPC_NOTIFY_IRQ_AMOS + XP_MAX_PARTITIONS) | ||
221 | #define XPC_ENGAGED_PARTITIONS_AMO (XPC_ACTIVATE_IRQ_AMOS + XP_NASID_MASK_WORDS) | ||
222 | #define XPC_DISENGAGE_REQUEST_AMO (XPC_ENGAGED_PARTITIONS_AMO + 1) | ||
223 | |||
129 | 224 | ||
130 | /* | 225 | /* |
131 | * The following structure describes the per partition specific variables. | 226 | * The following structure describes the per partition specific variables. |
@@ -165,6 +260,16 @@ struct xpc_vars_part { | |||
165 | #define XPC_VP_MAGIC2 0x0073726176435058L /* 'XPCvars\0'L (little endian) */ | 260 | #define XPC_VP_MAGIC2 0x0073726176435058L /* 'XPCvars\0'L (little endian) */ |
166 | 261 | ||
167 | 262 | ||
263 | /* the reserved page sizes and offsets */ | ||
264 | |||
265 | #define XPC_RP_HEADER_SIZE L1_CACHE_ALIGN(sizeof(struct xpc_rsvd_page)) | ||
266 | #define XPC_RP_VARS_SIZE L1_CACHE_ALIGN(sizeof(struct xpc_vars)) | ||
267 | |||
268 | #define XPC_RP_PART_NASIDS(_rp) (u64 *) ((u8 *) _rp + XPC_RP_HEADER_SIZE) | ||
269 | #define XPC_RP_MACH_NASIDS(_rp) (XPC_RP_PART_NASIDS(_rp) + xp_nasid_mask_words) | ||
270 | #define XPC_RP_VARS(_rp) ((struct xpc_vars *) XPC_RP_MACH_NASIDS(_rp) + xp_nasid_mask_words) | ||
271 | #define XPC_RP_VARS_PART(_rp) (struct xpc_vars_part *) ((u8 *) XPC_RP_VARS(rp) + XPC_RP_VARS_SIZE) | ||
272 | |||
168 | 273 | ||
169 | /* | 274 | /* |
170 | * Functions registered by add_timer() or called by kernel_thread() only | 275 | * Functions registered by add_timer() or called by kernel_thread() only |
@@ -349,6 +454,9 @@ struct xpc_channel { | |||
349 | atomic_t n_on_msg_allocate_wq; /* #on msg allocation wait queue */ | 454 | atomic_t n_on_msg_allocate_wq; /* #on msg allocation wait queue */ |
350 | wait_queue_head_t msg_allocate_wq; /* msg allocation wait queue */ | 455 | wait_queue_head_t msg_allocate_wq; /* msg allocation wait queue */ |
351 | 456 | ||
457 | u8 delayed_IPI_flags; /* IPI flags received, but delayed */ | ||
458 | /* action until channel disconnected */ | ||
459 | |||
352 | /* queue of msg senders who want to be notified when msg received */ | 460 | /* queue of msg senders who want to be notified when msg received */ |
353 | 461 | ||
354 | atomic_t n_to_notify; /* #of msg senders to notify */ | 462 | atomic_t n_to_notify; /* #of msg senders to notify */ |
@@ -358,7 +466,7 @@ struct xpc_channel { | |||
358 | void *key; /* pointer to user's key */ | 466 | void *key; /* pointer to user's key */ |
359 | 467 | ||
360 | struct semaphore msg_to_pull_sema; /* next msg to pull serialization */ | 468 | struct semaphore msg_to_pull_sema; /* next msg to pull serialization */ |
361 | struct semaphore teardown_sema; /* wait for teardown completion */ | 469 | struct semaphore wdisconnect_sema; /* wait for channel disconnect */ |
362 | 470 | ||
363 | struct xpc_openclose_args *local_openclose_args; /* args passed on */ | 471 | struct xpc_openclose_args *local_openclose_args; /* args passed on */ |
364 | /* opening or closing of channel */ | 472 | /* opening or closing of channel */ |
@@ -410,6 +518,8 @@ struct xpc_channel { | |||
410 | 518 | ||
411 | #define XPC_C_DISCONNECTED 0x00002000 /* channel is disconnected */ | 519 | #define XPC_C_DISCONNECTED 0x00002000 /* channel is disconnected */ |
412 | #define XPC_C_DISCONNECTING 0x00004000 /* channel is being disconnected */ | 520 | #define XPC_C_DISCONNECTING 0x00004000 /* channel is being disconnected */ |
521 | #define XPC_C_DISCONNECTCALLOUT 0x00008000 /* chan disconnected callout made */ | ||
522 | #define XPC_C_WDISCONNECT 0x00010000 /* waiting for channel disconnect */ | ||
413 | 523 | ||
414 | 524 | ||
415 | 525 | ||
@@ -422,6 +532,8 @@ struct xpc_partition { | |||
422 | 532 | ||
423 | /* XPC HB infrastructure */ | 533 | /* XPC HB infrastructure */ |
424 | 534 | ||
535 | u8 remote_rp_version; /* version# of partition's rsvd pg */ | ||
536 | struct timespec remote_rp_stamp;/* time when rsvd pg was initialized */ | ||
425 | u64 remote_rp_pa; /* phys addr of partition's rsvd pg */ | 537 | u64 remote_rp_pa; /* phys addr of partition's rsvd pg */ |
426 | u64 remote_vars_pa; /* phys addr of partition's vars */ | 538 | u64 remote_vars_pa; /* phys addr of partition's vars */ |
427 | u64 remote_vars_part_pa; /* phys addr of partition's vars part */ | 539 | u64 remote_vars_part_pa; /* phys addr of partition's vars part */ |
@@ -432,14 +544,18 @@ struct xpc_partition { | |||
432 | u32 act_IRQ_rcvd; /* IRQs since activation */ | 544 | u32 act_IRQ_rcvd; /* IRQs since activation */ |
433 | spinlock_t act_lock; /* protect updating of act_state */ | 545 | spinlock_t act_lock; /* protect updating of act_state */ |
434 | u8 act_state; /* from XPC HB viewpoint */ | 546 | u8 act_state; /* from XPC HB viewpoint */ |
547 | u8 remote_vars_version; /* version# of partition's vars */ | ||
435 | enum xpc_retval reason; /* reason partition is deactivating */ | 548 | enum xpc_retval reason; /* reason partition is deactivating */ |
436 | int reason_line; /* line# deactivation initiated from */ | 549 | int reason_line; /* line# deactivation initiated from */ |
437 | int reactivate_nasid; /* nasid in partition to reactivate */ | 550 | int reactivate_nasid; /* nasid in partition to reactivate */ |
438 | 551 | ||
552 | unsigned long disengage_request_timeout; /* timeout in jiffies */ | ||
553 | struct timer_list disengage_request_timer; | ||
554 | |||
439 | 555 | ||
440 | /* XPC infrastructure referencing and teardown control */ | 556 | /* XPC infrastructure referencing and teardown control */ |
441 | 557 | ||
442 | volatile u8 setup_state; /* infrastructure setup state */ | 558 | volatile u8 setup_state; /* infrastructure setup state */ |
443 | wait_queue_head_t teardown_wq; /* kthread waiting to teardown infra */ | 559 | wait_queue_head_t teardown_wq; /* kthread waiting to teardown infra */ |
444 | atomic_t references; /* #of references to infrastructure */ | 560 | atomic_t references; /* #of references to infrastructure */ |
445 | 561 | ||
@@ -454,6 +570,7 @@ struct xpc_partition { | |||
454 | 570 | ||
455 | u8 nchannels; /* #of defined channels supported */ | 571 | u8 nchannels; /* #of defined channels supported */ |
456 | atomic_t nchannels_active; /* #of channels that are not DISCONNECTED */ | 572 | atomic_t nchannels_active; /* #of channels that are not DISCONNECTED */ |
573 | atomic_t nchannels_engaged;/* #of channels engaged with remote part */ | ||
457 | struct xpc_channel *channels;/* array of channel structures */ | 574 | struct xpc_channel *channels;/* array of channel structures */ |
458 | 575 | ||
459 | void *local_GPs_base; /* base address of kmalloc'd space */ | 576 | void *local_GPs_base; /* base address of kmalloc'd space */ |
@@ -518,6 +635,7 @@ struct xpc_partition { | |||
518 | #define XPC_P_TORNDOWN 0x03 /* infrastructure is torndown */ | 635 | #define XPC_P_TORNDOWN 0x03 /* infrastructure is torndown */ |
519 | 636 | ||
520 | 637 | ||
638 | |||
521 | /* | 639 | /* |
522 | * struct xpc_partition IPI_timer #of seconds to wait before checking for | 640 | * struct xpc_partition IPI_timer #of seconds to wait before checking for |
523 | * dropped IPIs. These occur whenever an IPI amo write doesn't complete until | 641 | * dropped IPIs. These occur whenever an IPI amo write doesn't complete until |
@@ -526,6 +644,13 @@ struct xpc_partition { | |||
526 | #define XPC_P_DROPPED_IPI_WAIT (0.25 * HZ) | 644 | #define XPC_P_DROPPED_IPI_WAIT (0.25 * HZ) |
527 | 645 | ||
528 | 646 | ||
647 | /* number of seconds to wait for other partitions to disengage */ | ||
648 | #define XPC_DISENGAGE_REQUEST_DEFAULT_TIMELIMIT 90 | ||
649 | |||
650 | /* interval in seconds to print 'waiting disengagement' messages */ | ||
651 | #define XPC_DISENGAGE_PRINTMSG_INTERVAL 10 | ||
652 | |||
653 | |||
529 | #define XPC_PARTID(_p) ((partid_t) ((_p) - &xpc_partitions[0])) | 654 | #define XPC_PARTID(_p) ((partid_t) ((_p) - &xpc_partitions[0])) |
530 | 655 | ||
531 | 656 | ||
@@ -534,24 +659,20 @@ struct xpc_partition { | |||
534 | extern struct xpc_registration xpc_registrations[]; | 659 | extern struct xpc_registration xpc_registrations[]; |
535 | 660 | ||
536 | 661 | ||
537 | /* >>> found in xpc_main.c only */ | 662 | /* found in xpc_main.c */ |
538 | extern struct device *xpc_part; | 663 | extern struct device *xpc_part; |
539 | extern struct device *xpc_chan; | 664 | extern struct device *xpc_chan; |
665 | extern int xpc_disengage_request_timelimit; | ||
540 | extern irqreturn_t xpc_notify_IRQ_handler(int, void *, struct pt_regs *); | 666 | extern irqreturn_t xpc_notify_IRQ_handler(int, void *, struct pt_regs *); |
541 | extern void xpc_dropped_IPI_check(struct xpc_partition *); | 667 | extern void xpc_dropped_IPI_check(struct xpc_partition *); |
668 | extern void xpc_activate_partition(struct xpc_partition *); | ||
542 | extern void xpc_activate_kthreads(struct xpc_channel *, int); | 669 | extern void xpc_activate_kthreads(struct xpc_channel *, int); |
543 | extern void xpc_create_kthreads(struct xpc_channel *, int); | 670 | extern void xpc_create_kthreads(struct xpc_channel *, int); |
544 | extern void xpc_disconnect_wait(int); | 671 | extern void xpc_disconnect_wait(int); |
545 | 672 | ||
546 | 673 | ||
547 | /* found in xpc_main.c and efi-xpc.c */ | ||
548 | extern void xpc_activate_partition(struct xpc_partition *); | ||
549 | |||
550 | |||
551 | /* found in xpc_partition.c */ | 674 | /* found in xpc_partition.c */ |
552 | extern int xpc_exiting; | 675 | extern int xpc_exiting; |
553 | extern int xpc_hb_interval; | ||
554 | extern int xpc_hb_check_interval; | ||
555 | extern struct xpc_vars *xpc_vars; | 676 | extern struct xpc_vars *xpc_vars; |
556 | extern struct xpc_rsvd_page *xpc_rsvd_page; | 677 | extern struct xpc_rsvd_page *xpc_rsvd_page; |
557 | extern struct xpc_vars_part *xpc_vars_part; | 678 | extern struct xpc_vars_part *xpc_vars_part; |
@@ -561,6 +682,7 @@ extern struct xpc_rsvd_page *xpc_rsvd_page_init(void); | |||
561 | extern void xpc_allow_IPI_ops(void); | 682 | extern void xpc_allow_IPI_ops(void); |
562 | extern void xpc_restrict_IPI_ops(void); | 683 | extern void xpc_restrict_IPI_ops(void); |
563 | extern int xpc_identify_act_IRQ_sender(void); | 684 | extern int xpc_identify_act_IRQ_sender(void); |
685 | extern int xpc_partition_disengaged(struct xpc_partition *); | ||
564 | extern enum xpc_retval xpc_mark_partition_active(struct xpc_partition *); | 686 | extern enum xpc_retval xpc_mark_partition_active(struct xpc_partition *); |
565 | extern void xpc_mark_partition_inactive(struct xpc_partition *); | 687 | extern void xpc_mark_partition_inactive(struct xpc_partition *); |
566 | extern void xpc_discovery(void); | 688 | extern void xpc_discovery(void); |
@@ -585,8 +707,8 @@ extern void xpc_connected_callout(struct xpc_channel *); | |||
585 | extern void xpc_deliver_msg(struct xpc_channel *); | 707 | extern void xpc_deliver_msg(struct xpc_channel *); |
586 | extern void xpc_disconnect_channel(const int, struct xpc_channel *, | 708 | extern void xpc_disconnect_channel(const int, struct xpc_channel *, |
587 | enum xpc_retval, unsigned long *); | 709 | enum xpc_retval, unsigned long *); |
588 | extern void xpc_disconnected_callout(struct xpc_channel *); | 710 | extern void xpc_disconnecting_callout(struct xpc_channel *); |
589 | extern void xpc_partition_down(struct xpc_partition *, enum xpc_retval); | 711 | extern void xpc_partition_going_down(struct xpc_partition *, enum xpc_retval); |
590 | extern void xpc_teardown_infrastructure(struct xpc_partition *); | 712 | extern void xpc_teardown_infrastructure(struct xpc_partition *); |
591 | 713 | ||
592 | 714 | ||
@@ -674,6 +796,157 @@ xpc_part_ref(struct xpc_partition *part) | |||
674 | 796 | ||
675 | 797 | ||
676 | /* | 798 | /* |
799 | * This next set of inlines are used to keep track of when a partition is | ||
800 | * potentially engaged in accessing memory belonging to another partition. | ||
801 | */ | ||
802 | |||
803 | static inline void | ||
804 | xpc_mark_partition_engaged(struct xpc_partition *part) | ||
805 | { | ||
806 | unsigned long irq_flags; | ||
807 | AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa + | ||
808 | (XPC_ENGAGED_PARTITIONS_AMO * sizeof(AMO_t))); | ||
809 | |||
810 | |||
811 | local_irq_save(irq_flags); | ||
812 | |||
813 | /* set bit corresponding to our partid in remote partition's AMO */ | ||
814 | FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_OR, | ||
815 | (1UL << sn_partition_id)); | ||
816 | /* | ||
817 | * We must always use the nofault function regardless of whether we | ||
818 | * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we | ||
819 | * didn't, we'd never know that the other partition is down and would | ||
820 | * keep sending IPIs and AMOs to it until the heartbeat times out. | ||
821 | */ | ||
822 | (void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo-> | ||
823 | variable), xp_nofault_PIOR_target)); | ||
824 | |||
825 | local_irq_restore(irq_flags); | ||
826 | } | ||
827 | |||
828 | static inline void | ||
829 | xpc_mark_partition_disengaged(struct xpc_partition *part) | ||
830 | { | ||
831 | unsigned long irq_flags; | ||
832 | AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa + | ||
833 | (XPC_ENGAGED_PARTITIONS_AMO * sizeof(AMO_t))); | ||
834 | |||
835 | |||
836 | local_irq_save(irq_flags); | ||
837 | |||
838 | /* clear bit corresponding to our partid in remote partition's AMO */ | ||
839 | FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND, | ||
840 | ~(1UL << sn_partition_id)); | ||
841 | /* | ||
842 | * We must always use the nofault function regardless of whether we | ||
843 | * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we | ||
844 | * didn't, we'd never know that the other partition is down and would | ||
845 | * keep sending IPIs and AMOs to it until the heartbeat times out. | ||
846 | */ | ||
847 | (void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo-> | ||
848 | variable), xp_nofault_PIOR_target)); | ||
849 | |||
850 | local_irq_restore(irq_flags); | ||
851 | } | ||
852 | |||
853 | static inline void | ||
854 | xpc_request_partition_disengage(struct xpc_partition *part) | ||
855 | { | ||
856 | unsigned long irq_flags; | ||
857 | AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa + | ||
858 | (XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t))); | ||
859 | |||
860 | |||
861 | local_irq_save(irq_flags); | ||
862 | |||
863 | /* set bit corresponding to our partid in remote partition's AMO */ | ||
864 | FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_OR, | ||
865 | (1UL << sn_partition_id)); | ||
866 | /* | ||
867 | * We must always use the nofault function regardless of whether we | ||
868 | * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we | ||
869 | * didn't, we'd never know that the other partition is down and would | ||
870 | * keep sending IPIs and AMOs to it until the heartbeat times out. | ||
871 | */ | ||
872 | (void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo-> | ||
873 | variable), xp_nofault_PIOR_target)); | ||
874 | |||
875 | local_irq_restore(irq_flags); | ||
876 | } | ||
877 | |||
878 | static inline void | ||
879 | xpc_cancel_partition_disengage_request(struct xpc_partition *part) | ||
880 | { | ||
881 | unsigned long irq_flags; | ||
882 | AMO_t *amo = (AMO_t *) __va(part->remote_amos_page_pa + | ||
883 | (XPC_DISENGAGE_REQUEST_AMO * sizeof(AMO_t))); | ||
884 | |||
885 | |||
886 | local_irq_save(irq_flags); | ||
887 | |||
888 | /* clear bit corresponding to our partid in remote partition's AMO */ | ||
889 | FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND, | ||
890 | ~(1UL << sn_partition_id)); | ||
891 | /* | ||
892 | * We must always use the nofault function regardless of whether we | ||
893 | * are on a Shub 1.1 system or a Shub 1.2 slice 0xc processor. If we | ||
894 | * didn't, we'd never know that the other partition is down and would | ||
895 | * keep sending IPIs and AMOs to it until the heartbeat times out. | ||
896 | */ | ||
897 | (void) xp_nofault_PIOR((u64 *) GLOBAL_MMR_ADDR(NASID_GET(&amo-> | ||
898 | variable), xp_nofault_PIOR_target)); | ||
899 | |||
900 | local_irq_restore(irq_flags); | ||
901 | } | ||
902 | |||
903 | static inline u64 | ||
904 | xpc_partition_engaged(u64 partid_mask) | ||
905 | { | ||
906 | AMO_t *amo = xpc_vars->amos_page + XPC_ENGAGED_PARTITIONS_AMO; | ||
907 | |||
908 | |||
909 | /* return our partition's AMO variable ANDed with partid_mask */ | ||
910 | return (FETCHOP_LOAD_OP(TO_AMO((u64) &amo->variable), FETCHOP_LOAD) & | ||
911 | partid_mask); | ||
912 | } | ||
913 | |||
914 | static inline u64 | ||
915 | xpc_partition_disengage_requested(u64 partid_mask) | ||
916 | { | ||
917 | AMO_t *amo = xpc_vars->amos_page + XPC_DISENGAGE_REQUEST_AMO; | ||
918 | |||
919 | |||
920 | /* return our partition's AMO variable ANDed with partid_mask */ | ||
921 | return (FETCHOP_LOAD_OP(TO_AMO((u64) &amo->variable), FETCHOP_LOAD) & | ||
922 | partid_mask); | ||
923 | } | ||
924 | |||
925 | static inline void | ||
926 | xpc_clear_partition_engaged(u64 partid_mask) | ||
927 | { | ||
928 | AMO_t *amo = xpc_vars->amos_page + XPC_ENGAGED_PARTITIONS_AMO; | ||
929 | |||
930 | |||
931 | /* clear bit(s) based on partid_mask in our partition's AMO */ | ||
932 | FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND, | ||
933 | ~partid_mask); | ||
934 | } | ||
935 | |||
936 | static inline void | ||
937 | xpc_clear_partition_disengage_request(u64 partid_mask) | ||
938 | { | ||
939 | AMO_t *amo = xpc_vars->amos_page + XPC_DISENGAGE_REQUEST_AMO; | ||
940 | |||
941 | |||
942 | /* clear bit(s) based on partid_mask in our partition's AMO */ | ||
943 | FETCHOP_STORE_OP(TO_AMO((u64) &amo->variable), FETCHOP_AND, | ||
944 | ~partid_mask); | ||
945 | } | ||
946 | |||
947 | |||
948 | |||
949 | /* | ||
677 | * The following set of macros and inlines are used for the sending and | 950 | * The following set of macros and inlines are used for the sending and |
678 | * receiving of IPIs (also known as IRQs). There are two flavors of IPIs, | 951 | * receiving of IPIs (also known as IRQs). There are two flavors of IPIs, |
679 | * one that is associated with partition activity (SGI_XPC_ACTIVATE) and | 952 | * one that is associated with partition activity (SGI_XPC_ACTIVATE) and |
@@ -722,13 +995,13 @@ xpc_IPI_send(AMO_t *amo, u64 flag, int nasid, int phys_cpuid, int vector) | |||
722 | * Flag the appropriate AMO variable and send an IPI to the specified node. | 995 | * Flag the appropriate AMO variable and send an IPI to the specified node. |
723 | */ | 996 | */ |
724 | static inline void | 997 | static inline void |
725 | xpc_activate_IRQ_send(u64 amos_page, int from_nasid, int to_nasid, | 998 | xpc_activate_IRQ_send(u64 amos_page_pa, int from_nasid, int to_nasid, |
726 | int to_phys_cpuid) | 999 | int to_phys_cpuid) |
727 | { | 1000 | { |
728 | int w_index = XPC_NASID_W_INDEX(from_nasid); | 1001 | int w_index = XPC_NASID_W_INDEX(from_nasid); |
729 | int b_index = XPC_NASID_B_INDEX(from_nasid); | 1002 | int b_index = XPC_NASID_B_INDEX(from_nasid); |
730 | AMO_t *amos = (AMO_t *) __va(amos_page + | 1003 | AMO_t *amos = (AMO_t *) __va(amos_page_pa + |
731 | (XP_MAX_PARTITIONS * sizeof(AMO_t))); | 1004 | (XPC_ACTIVATE_IRQ_AMOS * sizeof(AMO_t))); |
732 | 1005 | ||
733 | 1006 | ||
734 | (void) xpc_IPI_send(&amos[w_index], (1UL << b_index), to_nasid, | 1007 | (void) xpc_IPI_send(&amos[w_index], (1UL << b_index), to_nasid, |
@@ -756,6 +1029,13 @@ xpc_IPI_send_reactivate(struct xpc_partition *part) | |||
756 | xpc_vars->act_nasid, xpc_vars->act_phys_cpuid); | 1029 | xpc_vars->act_nasid, xpc_vars->act_phys_cpuid); |
757 | } | 1030 | } |
758 | 1031 | ||
1032 | static inline void | ||
1033 | xpc_IPI_send_disengage(struct xpc_partition *part) | ||
1034 | { | ||
1035 | xpc_activate_IRQ_send(part->remote_amos_page_pa, cnodeid_to_nasid(0), | ||
1036 | part->remote_act_nasid, part->remote_act_phys_cpuid); | ||
1037 | } | ||
1038 | |||
759 | 1039 | ||
760 | /* | 1040 | /* |
761 | * IPIs associated with SGI_XPC_NOTIFY IRQ. | 1041 | * IPIs associated with SGI_XPC_NOTIFY IRQ. |
@@ -836,6 +1116,7 @@ xpc_notify_IRQ_send_local(struct xpc_channel *ch, u8 ipi_flag, | |||
836 | 1116 | ||
837 | /* given an AMO variable and a channel#, get its associated IPI flags */ | 1117 | /* given an AMO variable and a channel#, get its associated IPI flags */ |
838 | #define XPC_GET_IPI_FLAGS(_amo, _c) ((u8) (((_amo) >> ((_c) * 8)) & 0xff)) | 1118 | #define XPC_GET_IPI_FLAGS(_amo, _c) ((u8) (((_amo) >> ((_c) * 8)) & 0xff)) |
1119 | #define XPC_SET_IPI_FLAGS(_amo, _c, _f) (_amo) |= ((u64) (_f) << ((_c) * 8)) | ||
839 | 1120 | ||
840 | #define XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(_amo) ((_amo) & 0x0f0f0f0f0f0f0f0f) | 1121 | #define XPC_ANY_OPENCLOSE_IPI_FLAGS_SET(_amo) ((_amo) & 0x0f0f0f0f0f0f0f0f) |
841 | #define XPC_ANY_MSG_IPI_FLAGS_SET(_amo) ((_amo) & 0x1010101010101010) | 1122 | #define XPC_ANY_MSG_IPI_FLAGS_SET(_amo) ((_amo) & 0x1010101010101010) |
@@ -903,17 +1184,18 @@ xpc_IPI_send_local_msgrequest(struct xpc_channel *ch) | |||
903 | * cacheable mapping for the entire region. This will prevent speculative | 1184 | * cacheable mapping for the entire region. This will prevent speculative |
904 | * reading of cached copies of our lines from being issued which will cause | 1185 | * reading of cached copies of our lines from being issued which will cause |
905 | * a PI FSB Protocol error to be generated by the SHUB. For XPC, we need 64 | 1186 | * a PI FSB Protocol error to be generated by the SHUB. For XPC, we need 64 |
906 | * (XP_MAX_PARTITIONS) AMO variables for message notification (xpc_main.c) | 1187 | * AMO variables (based on XP_MAX_PARTITIONS) for message notification and an |
907 | * and an additional 16 AMO variables for partition activation (xpc_hb.c). | 1188 | * additional 128 AMO variables (based on XP_NASID_MASK_WORDS) for partition |
1189 | * activation and 2 AMO variables for partition deactivation. | ||
908 | */ | 1190 | */ |
909 | static inline AMO_t * | 1191 | static inline AMO_t * |
910 | xpc_IPI_init(partid_t partid) | 1192 | xpc_IPI_init(int index) |
911 | { | 1193 | { |
912 | AMO_t *part_amo = xpc_vars->amos_page + partid; | 1194 | AMO_t *amo = xpc_vars->amos_page + index; |
913 | 1195 | ||
914 | 1196 | ||
915 | xpc_IPI_receive(part_amo); | 1197 | (void) xpc_IPI_receive(amo); /* clear AMO variable */ |
916 | return part_amo; | 1198 | return amo; |
917 | } | 1199 | } |
918 | 1200 | ||
919 | 1201 | ||
diff --git a/arch/ia64/sn/kernel/xpc_channel.c b/arch/ia64/sn/kernel/xpc_channel.c index 94698bea7be0..abf4fc2a87bb 100644 --- a/arch/ia64/sn/kernel/xpc_channel.c +++ b/arch/ia64/sn/kernel/xpc_channel.c | |||
@@ -57,6 +57,7 @@ xpc_initialize_channels(struct xpc_partition *part, partid_t partid) | |||
57 | 57 | ||
58 | spin_lock_init(&ch->lock); | 58 | spin_lock_init(&ch->lock); |
59 | sema_init(&ch->msg_to_pull_sema, 1); /* mutex */ | 59 | sema_init(&ch->msg_to_pull_sema, 1); /* mutex */ |
60 | sema_init(&ch->wdisconnect_sema, 0); /* event wait */ | ||
60 | 61 | ||
61 | atomic_set(&ch->n_on_msg_allocate_wq, 0); | 62 | atomic_set(&ch->n_on_msg_allocate_wq, 0); |
62 | init_waitqueue_head(&ch->msg_allocate_wq); | 63 | init_waitqueue_head(&ch->msg_allocate_wq); |
@@ -166,6 +167,7 @@ xpc_setup_infrastructure(struct xpc_partition *part) | |||
166 | xpc_initialize_channels(part, partid); | 167 | xpc_initialize_channels(part, partid); |
167 | 168 | ||
168 | atomic_set(&part->nchannels_active, 0); | 169 | atomic_set(&part->nchannels_active, 0); |
170 | atomic_set(&part->nchannels_engaged, 0); | ||
169 | 171 | ||
170 | 172 | ||
171 | /* local_IPI_amo were set to 0 by an earlier memset() */ | 173 | /* local_IPI_amo were set to 0 by an earlier memset() */ |
@@ -555,8 +557,6 @@ xpc_allocate_msgqueues(struct xpc_channel *ch) | |||
555 | sema_init(&ch->notify_queue[i].sema, 0); | 557 | sema_init(&ch->notify_queue[i].sema, 0); |
556 | } | 558 | } |
557 | 559 | ||
558 | sema_init(&ch->teardown_sema, 0); /* event wait */ | ||
559 | |||
560 | spin_lock_irqsave(&ch->lock, irq_flags); | 560 | spin_lock_irqsave(&ch->lock, irq_flags); |
561 | ch->flags |= XPC_C_SETUP; | 561 | ch->flags |= XPC_C_SETUP; |
562 | spin_unlock_irqrestore(&ch->lock, irq_flags); | 562 | spin_unlock_irqrestore(&ch->lock, irq_flags); |
@@ -626,6 +626,55 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags) | |||
626 | 626 | ||
627 | 627 | ||
628 | /* | 628 | /* |
629 | * Notify those who wanted to be notified upon delivery of their message. | ||
630 | */ | ||
631 | static void | ||
632 | xpc_notify_senders(struct xpc_channel *ch, enum xpc_retval reason, s64 put) | ||
633 | { | ||
634 | struct xpc_notify *notify; | ||
635 | u8 notify_type; | ||
636 | s64 get = ch->w_remote_GP.get - 1; | ||
637 | |||
638 | |||
639 | while (++get < put && atomic_read(&ch->n_to_notify) > 0) { | ||
640 | |||
641 | notify = &ch->notify_queue[get % ch->local_nentries]; | ||
642 | |||
643 | /* | ||
644 | * See if the notify entry indicates it was associated with | ||
645 | * a message who's sender wants to be notified. It is possible | ||
646 | * that it is, but someone else is doing or has done the | ||
647 | * notification. | ||
648 | */ | ||
649 | notify_type = notify->type; | ||
650 | if (notify_type == 0 || | ||
651 | cmpxchg(¬ify->type, notify_type, 0) != | ||
652 | notify_type) { | ||
653 | continue; | ||
654 | } | ||
655 | |||
656 | DBUG_ON(notify_type != XPC_N_CALL); | ||
657 | |||
658 | atomic_dec(&ch->n_to_notify); | ||
659 | |||
660 | if (notify->func != NULL) { | ||
661 | dev_dbg(xpc_chan, "notify->func() called, notify=0x%p, " | ||
662 | "msg_number=%ld, partid=%d, channel=%d\n", | ||
663 | (void *) notify, get, ch->partid, ch->number); | ||
664 | |||
665 | notify->func(reason, ch->partid, ch->number, | ||
666 | notify->key); | ||
667 | |||
668 | dev_dbg(xpc_chan, "notify->func() returned, " | ||
669 | "notify=0x%p, msg_number=%ld, partid=%d, " | ||
670 | "channel=%d\n", (void *) notify, get, | ||
671 | ch->partid, ch->number); | ||
672 | } | ||
673 | } | ||
674 | } | ||
675 | |||
676 | |||
677 | /* | ||
629 | * Free up message queues and other stuff that were allocated for the specified | 678 | * Free up message queues and other stuff that were allocated for the specified |
630 | * channel. | 679 | * channel. |
631 | * | 680 | * |
@@ -669,9 +718,6 @@ xpc_free_msgqueues(struct xpc_channel *ch) | |||
669 | ch->remote_msgqueue = NULL; | 718 | ch->remote_msgqueue = NULL; |
670 | kfree(ch->notify_queue); | 719 | kfree(ch->notify_queue); |
671 | ch->notify_queue = NULL; | 720 | ch->notify_queue = NULL; |
672 | |||
673 | /* in case someone is waiting for the teardown to complete */ | ||
674 | up(&ch->teardown_sema); | ||
675 | } | 721 | } |
676 | } | 722 | } |
677 | 723 | ||
@@ -683,7 +729,7 @@ static void | |||
683 | xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags) | 729 | xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags) |
684 | { | 730 | { |
685 | struct xpc_partition *part = &xpc_partitions[ch->partid]; | 731 | struct xpc_partition *part = &xpc_partitions[ch->partid]; |
686 | u32 ch_flags = ch->flags; | 732 | u32 channel_was_connected = (ch->flags & XPC_C_WASCONNECTED); |
687 | 733 | ||
688 | 734 | ||
689 | DBUG_ON(!spin_is_locked(&ch->lock)); | 735 | DBUG_ON(!spin_is_locked(&ch->lock)); |
@@ -701,12 +747,13 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags) | |||
701 | } | 747 | } |
702 | DBUG_ON(atomic_read(&ch->kthreads_assigned) != 0); | 748 | DBUG_ON(atomic_read(&ch->kthreads_assigned) != 0); |
703 | 749 | ||
704 | /* it's now safe to free the channel's message queues */ | 750 | if (part->act_state == XPC_P_DEACTIVATING) { |
705 | 751 | /* can't proceed until the other side disengages from us */ | |
706 | xpc_free_msgqueues(ch); | 752 | if (xpc_partition_engaged(1UL << ch->partid)) { |
707 | DBUG_ON(ch->flags & XPC_C_SETUP); | 753 | return; |
754 | } | ||
708 | 755 | ||
709 | if (part->act_state != XPC_P_DEACTIVATING) { | 756 | } else { |
710 | 757 | ||
711 | /* as long as the other side is up do the full protocol */ | 758 | /* as long as the other side is up do the full protocol */ |
712 | 759 | ||
@@ -724,16 +771,42 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags) | |||
724 | } | 771 | } |
725 | } | 772 | } |
726 | 773 | ||
774 | /* wake those waiting for notify completion */ | ||
775 | if (atomic_read(&ch->n_to_notify) > 0) { | ||
776 | /* >>> we do callout while holding ch->lock */ | ||
777 | xpc_notify_senders(ch, ch->reason, ch->w_local_GP.put); | ||
778 | } | ||
779 | |||
727 | /* both sides are disconnected now */ | 780 | /* both sides are disconnected now */ |
728 | 781 | ||
729 | ch->flags = XPC_C_DISCONNECTED; /* clear all flags, but this one */ | 782 | /* it's now safe to free the channel's message queues */ |
783 | xpc_free_msgqueues(ch); | ||
784 | |||
785 | /* mark disconnected, clear all other flags except XPC_C_WDISCONNECT */ | ||
786 | ch->flags = (XPC_C_DISCONNECTED | (ch->flags & XPC_C_WDISCONNECT)); | ||
730 | 787 | ||
731 | atomic_dec(&part->nchannels_active); | 788 | atomic_dec(&part->nchannels_active); |
732 | 789 | ||
733 | if (ch_flags & XPC_C_WASCONNECTED) { | 790 | if (channel_was_connected) { |
734 | dev_info(xpc_chan, "channel %d to partition %d disconnected, " | 791 | dev_info(xpc_chan, "channel %d to partition %d disconnected, " |
735 | "reason=%d\n", ch->number, ch->partid, ch->reason); | 792 | "reason=%d\n", ch->number, ch->partid, ch->reason); |
736 | } | 793 | } |
794 | |||
795 | if (ch->flags & XPC_C_WDISCONNECT) { | ||
796 | spin_unlock_irqrestore(&ch->lock, *irq_flags); | ||
797 | up(&ch->wdisconnect_sema); | ||
798 | spin_lock_irqsave(&ch->lock, *irq_flags); | ||
799 | |||
800 | } else if (ch->delayed_IPI_flags) { | ||
801 | if (part->act_state != XPC_P_DEACTIVATING) { | ||
802 | /* time to take action on any delayed IPI flags */ | ||
803 | spin_lock(&part->IPI_lock); | ||
804 | XPC_SET_IPI_FLAGS(part->local_IPI_amo, ch->number, | ||
805 | ch->delayed_IPI_flags); | ||
806 | spin_unlock(&part->IPI_lock); | ||
807 | } | ||
808 | ch->delayed_IPI_flags = 0; | ||
809 | } | ||
737 | } | 810 | } |
738 | 811 | ||
739 | 812 | ||
@@ -754,6 +827,19 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, | |||
754 | 827 | ||
755 | spin_lock_irqsave(&ch->lock, irq_flags); | 828 | spin_lock_irqsave(&ch->lock, irq_flags); |
756 | 829 | ||
830 | again: | ||
831 | |||
832 | if ((ch->flags & XPC_C_DISCONNECTED) && | ||
833 | (ch->flags & XPC_C_WDISCONNECT)) { | ||
834 | /* | ||
835 | * Delay processing IPI flags until thread waiting disconnect | ||
836 | * has had a chance to see that the channel is disconnected. | ||
837 | */ | ||
838 | ch->delayed_IPI_flags |= IPI_flags; | ||
839 | spin_unlock_irqrestore(&ch->lock, irq_flags); | ||
840 | return; | ||
841 | } | ||
842 | |||
757 | 843 | ||
758 | if (IPI_flags & XPC_IPI_CLOSEREQUEST) { | 844 | if (IPI_flags & XPC_IPI_CLOSEREQUEST) { |
759 | 845 | ||
@@ -764,7 +850,7 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, | |||
764 | /* | 850 | /* |
765 | * If RCLOSEREQUEST is set, we're probably waiting for | 851 | * If RCLOSEREQUEST is set, we're probably waiting for |
766 | * RCLOSEREPLY. We should find it and a ROPENREQUEST packed | 852 | * RCLOSEREPLY. We should find it and a ROPENREQUEST packed |
767 | * with this RCLOSEQREUQEST in the IPI_flags. | 853 | * with this RCLOSEREQUEST in the IPI_flags. |
768 | */ | 854 | */ |
769 | 855 | ||
770 | if (ch->flags & XPC_C_RCLOSEREQUEST) { | 856 | if (ch->flags & XPC_C_RCLOSEREQUEST) { |
@@ -779,14 +865,22 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, | |||
779 | 865 | ||
780 | /* both sides have finished disconnecting */ | 866 | /* both sides have finished disconnecting */ |
781 | xpc_process_disconnect(ch, &irq_flags); | 867 | xpc_process_disconnect(ch, &irq_flags); |
868 | DBUG_ON(!(ch->flags & XPC_C_DISCONNECTED)); | ||
869 | goto again; | ||
782 | } | 870 | } |
783 | 871 | ||
784 | if (ch->flags & XPC_C_DISCONNECTED) { | 872 | if (ch->flags & XPC_C_DISCONNECTED) { |
785 | // >>> explain this section | ||
786 | |||
787 | if (!(IPI_flags & XPC_IPI_OPENREQUEST)) { | 873 | if (!(IPI_flags & XPC_IPI_OPENREQUEST)) { |
788 | DBUG_ON(part->act_state != | 874 | if ((XPC_GET_IPI_FLAGS(part->local_IPI_amo, |
789 | XPC_P_DEACTIVATING); | 875 | ch_number) & XPC_IPI_OPENREQUEST)) { |
876 | |||
877 | DBUG_ON(ch->delayed_IPI_flags != 0); | ||
878 | spin_lock(&part->IPI_lock); | ||
879 | XPC_SET_IPI_FLAGS(part->local_IPI_amo, | ||
880 | ch_number, | ||
881 | XPC_IPI_CLOSEREQUEST); | ||
882 | spin_unlock(&part->IPI_lock); | ||
883 | } | ||
790 | spin_unlock_irqrestore(&ch->lock, irq_flags); | 884 | spin_unlock_irqrestore(&ch->lock, irq_flags); |
791 | return; | 885 | return; |
792 | } | 886 | } |
@@ -816,9 +910,13 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, | |||
816 | } | 910 | } |
817 | 911 | ||
818 | XPC_DISCONNECT_CHANNEL(ch, reason, &irq_flags); | 912 | XPC_DISCONNECT_CHANNEL(ch, reason, &irq_flags); |
819 | } else { | 913 | |
820 | xpc_process_disconnect(ch, &irq_flags); | 914 | DBUG_ON(IPI_flags & XPC_IPI_CLOSEREPLY); |
915 | spin_unlock_irqrestore(&ch->lock, irq_flags); | ||
916 | return; | ||
821 | } | 917 | } |
918 | |||
919 | xpc_process_disconnect(ch, &irq_flags); | ||
822 | } | 920 | } |
823 | 921 | ||
824 | 922 | ||
@@ -834,7 +932,20 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, | |||
834 | } | 932 | } |
835 | 933 | ||
836 | DBUG_ON(!(ch->flags & XPC_C_CLOSEREQUEST)); | 934 | DBUG_ON(!(ch->flags & XPC_C_CLOSEREQUEST)); |
837 | DBUG_ON(!(ch->flags & XPC_C_RCLOSEREQUEST)); | 935 | |
936 | if (!(ch->flags & XPC_C_RCLOSEREQUEST)) { | ||
937 | if ((XPC_GET_IPI_FLAGS(part->local_IPI_amo, ch_number) | ||
938 | & XPC_IPI_CLOSEREQUEST)) { | ||
939 | |||
940 | DBUG_ON(ch->delayed_IPI_flags != 0); | ||
941 | spin_lock(&part->IPI_lock); | ||
942 | XPC_SET_IPI_FLAGS(part->local_IPI_amo, | ||
943 | ch_number, XPC_IPI_CLOSEREPLY); | ||
944 | spin_unlock(&part->IPI_lock); | ||
945 | } | ||
946 | spin_unlock_irqrestore(&ch->lock, irq_flags); | ||
947 | return; | ||
948 | } | ||
838 | 949 | ||
839 | ch->flags |= XPC_C_RCLOSEREPLY; | 950 | ch->flags |= XPC_C_RCLOSEREPLY; |
840 | 951 | ||
@@ -852,8 +963,14 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, | |||
852 | "channel=%d\n", args->msg_size, args->local_nentries, | 963 | "channel=%d\n", args->msg_size, args->local_nentries, |
853 | ch->partid, ch->number); | 964 | ch->partid, ch->number); |
854 | 965 | ||
855 | if ((ch->flags & XPC_C_DISCONNECTING) || | 966 | if (part->act_state == XPC_P_DEACTIVATING || |
856 | part->act_state == XPC_P_DEACTIVATING) { | 967 | (ch->flags & XPC_C_ROPENREQUEST)) { |
968 | spin_unlock_irqrestore(&ch->lock, irq_flags); | ||
969 | return; | ||
970 | } | ||
971 | |||
972 | if (ch->flags & (XPC_C_DISCONNECTING | XPC_C_WDISCONNECT)) { | ||
973 | ch->delayed_IPI_flags |= XPC_IPI_OPENREQUEST; | ||
857 | spin_unlock_irqrestore(&ch->lock, irq_flags); | 974 | spin_unlock_irqrestore(&ch->lock, irq_flags); |
858 | return; | 975 | return; |
859 | } | 976 | } |
@@ -867,8 +984,11 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, | |||
867 | * msg_size = size of channel's messages in bytes | 984 | * msg_size = size of channel's messages in bytes |
868 | * local_nentries = remote partition's local_nentries | 985 | * local_nentries = remote partition's local_nentries |
869 | */ | 986 | */ |
870 | DBUG_ON(args->msg_size == 0); | 987 | if (args->msg_size == 0 || args->local_nentries == 0) { |
871 | DBUG_ON(args->local_nentries == 0); | 988 | /* assume OPENREQUEST was delayed by mistake */ |
989 | spin_unlock_irqrestore(&ch->lock, irq_flags); | ||
990 | return; | ||
991 | } | ||
872 | 992 | ||
873 | ch->flags |= (XPC_C_ROPENREQUEST | XPC_C_CONNECTING); | 993 | ch->flags |= (XPC_C_ROPENREQUEST | XPC_C_CONNECTING); |
874 | ch->remote_nentries = args->local_nentries; | 994 | ch->remote_nentries = args->local_nentries; |
@@ -906,7 +1026,13 @@ xpc_process_openclose_IPI(struct xpc_partition *part, int ch_number, | |||
906 | spin_unlock_irqrestore(&ch->lock, irq_flags); | 1026 | spin_unlock_irqrestore(&ch->lock, irq_flags); |
907 | return; | 1027 | return; |
908 | } | 1028 | } |
909 | DBUG_ON(!(ch->flags & XPC_C_OPENREQUEST)); | 1029 | if (!(ch->flags & XPC_C_OPENREQUEST)) { |
1030 | XPC_DISCONNECT_CHANNEL(ch, xpcOpenCloseError, | ||
1031 | &irq_flags); | ||
1032 | spin_unlock_irqrestore(&ch->lock, irq_flags); | ||
1033 | return; | ||
1034 | } | ||
1035 | |||
910 | DBUG_ON(!(ch->flags & XPC_C_ROPENREQUEST)); | 1036 | DBUG_ON(!(ch->flags & XPC_C_ROPENREQUEST)); |
911 | DBUG_ON(ch->flags & XPC_C_CONNECTED); | 1037 | DBUG_ON(ch->flags & XPC_C_CONNECTED); |
912 | 1038 | ||
@@ -960,8 +1086,8 @@ xpc_connect_channel(struct xpc_channel *ch) | |||
960 | struct xpc_registration *registration = &xpc_registrations[ch->number]; | 1086 | struct xpc_registration *registration = &xpc_registrations[ch->number]; |
961 | 1087 | ||
962 | 1088 | ||
963 | if (down_interruptible(®istration->sema) != 0) { | 1089 | if (down_trylock(®istration->sema) != 0) { |
964 | return xpcInterrupted; | 1090 | return xpcRetry; |
965 | } | 1091 | } |
966 | 1092 | ||
967 | if (!XPC_CHANNEL_REGISTERED(ch->number)) { | 1093 | if (!XPC_CHANNEL_REGISTERED(ch->number)) { |
@@ -1040,55 +1166,6 @@ xpc_connect_channel(struct xpc_channel *ch) | |||
1040 | 1166 | ||
1041 | 1167 | ||
1042 | /* | 1168 | /* |
1043 | * Notify those who wanted to be notified upon delivery of their message. | ||
1044 | */ | ||
1045 | static void | ||
1046 | xpc_notify_senders(struct xpc_channel *ch, enum xpc_retval reason, s64 put) | ||
1047 | { | ||
1048 | struct xpc_notify *notify; | ||
1049 | u8 notify_type; | ||
1050 | s64 get = ch->w_remote_GP.get - 1; | ||
1051 | |||
1052 | |||
1053 | while (++get < put && atomic_read(&ch->n_to_notify) > 0) { | ||
1054 | |||
1055 | notify = &ch->notify_queue[get % ch->local_nentries]; | ||
1056 | |||
1057 | /* | ||
1058 | * See if the notify entry indicates it was associated with | ||
1059 | * a message who's sender wants to be notified. It is possible | ||
1060 | * that it is, but someone else is doing or has done the | ||
1061 | * notification. | ||
1062 | */ | ||
1063 | notify_type = notify->type; | ||
1064 | if (notify_type == 0 || | ||
1065 | cmpxchg(¬ify->type, notify_type, 0) != | ||
1066 | notify_type) { | ||
1067 | continue; | ||
1068 | } | ||
1069 | |||
1070 | DBUG_ON(notify_type != XPC_N_CALL); | ||
1071 | |||
1072 | atomic_dec(&ch->n_to_notify); | ||
1073 | |||
1074 | if (notify->func != NULL) { | ||
1075 | dev_dbg(xpc_chan, "notify->func() called, notify=0x%p, " | ||
1076 | "msg_number=%ld, partid=%d, channel=%d\n", | ||
1077 | (void *) notify, get, ch->partid, ch->number); | ||
1078 | |||
1079 | notify->func(reason, ch->partid, ch->number, | ||
1080 | notify->key); | ||
1081 | |||
1082 | dev_dbg(xpc_chan, "notify->func() returned, " | ||
1083 | "notify=0x%p, msg_number=%ld, partid=%d, " | ||
1084 | "channel=%d\n", (void *) notify, get, | ||
1085 | ch->partid, ch->number); | ||
1086 | } | ||
1087 | } | ||
1088 | } | ||
1089 | |||
1090 | |||
1091 | /* | ||
1092 | * Clear some of the msg flags in the local message queue. | 1169 | * Clear some of the msg flags in the local message queue. |
1093 | */ | 1170 | */ |
1094 | static inline void | 1171 | static inline void |
@@ -1240,6 +1317,7 @@ xpc_process_channel_activity(struct xpc_partition *part) | |||
1240 | u64 IPI_amo, IPI_flags; | 1317 | u64 IPI_amo, IPI_flags; |
1241 | struct xpc_channel *ch; | 1318 | struct xpc_channel *ch; |
1242 | int ch_number; | 1319 | int ch_number; |
1320 | u32 ch_flags; | ||
1243 | 1321 | ||
1244 | 1322 | ||
1245 | IPI_amo = xpc_get_IPI_flags(part); | 1323 | IPI_amo = xpc_get_IPI_flags(part); |
@@ -1266,8 +1344,9 @@ xpc_process_channel_activity(struct xpc_partition *part) | |||
1266 | xpc_process_openclose_IPI(part, ch_number, IPI_flags); | 1344 | xpc_process_openclose_IPI(part, ch_number, IPI_flags); |
1267 | } | 1345 | } |
1268 | 1346 | ||
1347 | ch_flags = ch->flags; /* need an atomic snapshot of flags */ | ||
1269 | 1348 | ||
1270 | if (ch->flags & XPC_C_DISCONNECTING) { | 1349 | if (ch_flags & XPC_C_DISCONNECTING) { |
1271 | spin_lock_irqsave(&ch->lock, irq_flags); | 1350 | spin_lock_irqsave(&ch->lock, irq_flags); |
1272 | xpc_process_disconnect(ch, &irq_flags); | 1351 | xpc_process_disconnect(ch, &irq_flags); |
1273 | spin_unlock_irqrestore(&ch->lock, irq_flags); | 1352 | spin_unlock_irqrestore(&ch->lock, irq_flags); |
@@ -1278,9 +1357,9 @@ xpc_process_channel_activity(struct xpc_partition *part) | |||
1278 | continue; | 1357 | continue; |
1279 | } | 1358 | } |
1280 | 1359 | ||
1281 | if (!(ch->flags & XPC_C_CONNECTED)) { | 1360 | if (!(ch_flags & XPC_C_CONNECTED)) { |
1282 | if (!(ch->flags & XPC_C_OPENREQUEST)) { | 1361 | if (!(ch_flags & XPC_C_OPENREQUEST)) { |
1283 | DBUG_ON(ch->flags & XPC_C_SETUP); | 1362 | DBUG_ON(ch_flags & XPC_C_SETUP); |
1284 | (void) xpc_connect_channel(ch); | 1363 | (void) xpc_connect_channel(ch); |
1285 | } else { | 1364 | } else { |
1286 | spin_lock_irqsave(&ch->lock, irq_flags); | 1365 | spin_lock_irqsave(&ch->lock, irq_flags); |
@@ -1305,8 +1384,8 @@ xpc_process_channel_activity(struct xpc_partition *part) | |||
1305 | 1384 | ||
1306 | 1385 | ||
1307 | /* | 1386 | /* |
1308 | * XPC's heartbeat code calls this function to inform XPC that a partition has | 1387 | * XPC's heartbeat code calls this function to inform XPC that a partition is |
1309 | * gone down. XPC responds by tearing down the XPartition Communication | 1388 | * going down. XPC responds by tearing down the XPartition Communication |
1310 | * infrastructure used for the just downed partition. | 1389 | * infrastructure used for the just downed partition. |
1311 | * | 1390 | * |
1312 | * XPC's heartbeat code will never call this function and xpc_partition_up() | 1391 | * XPC's heartbeat code will never call this function and xpc_partition_up() |
@@ -1314,7 +1393,7 @@ xpc_process_channel_activity(struct xpc_partition *part) | |||
1314 | * at the same time. | 1393 | * at the same time. |
1315 | */ | 1394 | */ |
1316 | void | 1395 | void |
1317 | xpc_partition_down(struct xpc_partition *part, enum xpc_retval reason) | 1396 | xpc_partition_going_down(struct xpc_partition *part, enum xpc_retval reason) |
1318 | { | 1397 | { |
1319 | unsigned long irq_flags; | 1398 | unsigned long irq_flags; |
1320 | int ch_number; | 1399 | int ch_number; |
@@ -1330,12 +1409,11 @@ xpc_partition_down(struct xpc_partition *part, enum xpc_retval reason) | |||
1330 | } | 1409 | } |
1331 | 1410 | ||
1332 | 1411 | ||
1333 | /* disconnect all channels associated with the downed partition */ | 1412 | /* disconnect channels associated with the partition going down */ |
1334 | 1413 | ||
1335 | for (ch_number = 0; ch_number < part->nchannels; ch_number++) { | 1414 | for (ch_number = 0; ch_number < part->nchannels; ch_number++) { |
1336 | ch = &part->channels[ch_number]; | 1415 | ch = &part->channels[ch_number]; |
1337 | 1416 | ||
1338 | |||
1339 | xpc_msgqueue_ref(ch); | 1417 | xpc_msgqueue_ref(ch); |
1340 | spin_lock_irqsave(&ch->lock, irq_flags); | 1418 | spin_lock_irqsave(&ch->lock, irq_flags); |
1341 | 1419 | ||
@@ -1370,6 +1448,7 @@ xpc_teardown_infrastructure(struct xpc_partition *part) | |||
1370 | * this partition. | 1448 | * this partition. |
1371 | */ | 1449 | */ |
1372 | 1450 | ||
1451 | DBUG_ON(atomic_read(&part->nchannels_engaged) != 0); | ||
1373 | DBUG_ON(atomic_read(&part->nchannels_active) != 0); | 1452 | DBUG_ON(atomic_read(&part->nchannels_active) != 0); |
1374 | DBUG_ON(part->setup_state != XPC_P_SETUP); | 1453 | DBUG_ON(part->setup_state != XPC_P_SETUP); |
1375 | part->setup_state = XPC_P_WTEARDOWN; | 1454 | part->setup_state = XPC_P_WTEARDOWN; |
@@ -1428,19 +1507,11 @@ xpc_initiate_connect(int ch_number) | |||
1428 | if (xpc_part_ref(part)) { | 1507 | if (xpc_part_ref(part)) { |
1429 | ch = &part->channels[ch_number]; | 1508 | ch = &part->channels[ch_number]; |
1430 | 1509 | ||
1431 | if (!(ch->flags & XPC_C_DISCONNECTING)) { | 1510 | /* |
1432 | DBUG_ON(ch->flags & XPC_C_OPENREQUEST); | 1511 | * Initiate the establishment of a connection on the |
1433 | DBUG_ON(ch->flags & XPC_C_CONNECTED); | 1512 | * newly registered channel to the remote partition. |
1434 | DBUG_ON(ch->flags & XPC_C_SETUP); | 1513 | */ |
1435 | 1514 | xpc_wakeup_channel_mgr(part); | |
1436 | /* | ||
1437 | * Initiate the establishment of a connection | ||
1438 | * on the newly registered channel to the | ||
1439 | * remote partition. | ||
1440 | */ | ||
1441 | xpc_wakeup_channel_mgr(part); | ||
1442 | } | ||
1443 | |||
1444 | xpc_part_deref(part); | 1515 | xpc_part_deref(part); |
1445 | } | 1516 | } |
1446 | } | 1517 | } |
@@ -1450,9 +1521,6 @@ xpc_initiate_connect(int ch_number) | |||
1450 | void | 1521 | void |
1451 | xpc_connected_callout(struct xpc_channel *ch) | 1522 | xpc_connected_callout(struct xpc_channel *ch) |
1452 | { | 1523 | { |
1453 | unsigned long irq_flags; | ||
1454 | |||
1455 | |||
1456 | /* let the registerer know that a connection has been established */ | 1524 | /* let the registerer know that a connection has been established */ |
1457 | 1525 | ||
1458 | if (ch->func != NULL) { | 1526 | if (ch->func != NULL) { |
@@ -1465,10 +1533,6 @@ xpc_connected_callout(struct xpc_channel *ch) | |||
1465 | dev_dbg(xpc_chan, "ch->func() returned, reason=xpcConnected, " | 1533 | dev_dbg(xpc_chan, "ch->func() returned, reason=xpcConnected, " |
1466 | "partid=%d, channel=%d\n", ch->partid, ch->number); | 1534 | "partid=%d, channel=%d\n", ch->partid, ch->number); |
1467 | } | 1535 | } |
1468 | |||
1469 | spin_lock_irqsave(&ch->lock, irq_flags); | ||
1470 | ch->flags |= XPC_C_CONNECTCALLOUT; | ||
1471 | spin_unlock_irqrestore(&ch->lock, irq_flags); | ||
1472 | } | 1536 | } |
1473 | 1537 | ||
1474 | 1538 | ||
@@ -1506,8 +1570,12 @@ xpc_initiate_disconnect(int ch_number) | |||
1506 | 1570 | ||
1507 | spin_lock_irqsave(&ch->lock, irq_flags); | 1571 | spin_lock_irqsave(&ch->lock, irq_flags); |
1508 | 1572 | ||
1509 | XPC_DISCONNECT_CHANNEL(ch, xpcUnregistering, | 1573 | if (!(ch->flags & XPC_C_DISCONNECTED)) { |
1574 | ch->flags |= XPC_C_WDISCONNECT; | ||
1575 | |||
1576 | XPC_DISCONNECT_CHANNEL(ch, xpcUnregistering, | ||
1510 | &irq_flags); | 1577 | &irq_flags); |
1578 | } | ||
1511 | 1579 | ||
1512 | spin_unlock_irqrestore(&ch->lock, irq_flags); | 1580 | spin_unlock_irqrestore(&ch->lock, irq_flags); |
1513 | 1581 | ||
@@ -1523,8 +1591,9 @@ xpc_initiate_disconnect(int ch_number) | |||
1523 | /* | 1591 | /* |
1524 | * To disconnect a channel, and reflect it back to all who may be waiting. | 1592 | * To disconnect a channel, and reflect it back to all who may be waiting. |
1525 | * | 1593 | * |
1526 | * >>> An OPEN is not allowed until XPC_C_DISCONNECTING is cleared by | 1594 | * An OPEN is not allowed until XPC_C_DISCONNECTING is cleared by |
1527 | * >>> xpc_free_msgqueues(). | 1595 | * xpc_process_disconnect(), and if set, XPC_C_WDISCONNECT is cleared by |
1596 | * xpc_disconnect_wait(). | ||
1528 | * | 1597 | * |
1529 | * THE CHANNEL IS TO BE LOCKED BY THE CALLER AND WILL REMAIN LOCKED UPON RETURN. | 1598 | * THE CHANNEL IS TO BE LOCKED BY THE CALLER AND WILL REMAIN LOCKED UPON RETURN. |
1530 | */ | 1599 | */ |
@@ -1532,7 +1601,7 @@ void | |||
1532 | xpc_disconnect_channel(const int line, struct xpc_channel *ch, | 1601 | xpc_disconnect_channel(const int line, struct xpc_channel *ch, |
1533 | enum xpc_retval reason, unsigned long *irq_flags) | 1602 | enum xpc_retval reason, unsigned long *irq_flags) |
1534 | { | 1603 | { |
1535 | u32 flags; | 1604 | u32 channel_was_connected = (ch->flags & XPC_C_CONNECTED); |
1536 | 1605 | ||
1537 | 1606 | ||
1538 | DBUG_ON(!spin_is_locked(&ch->lock)); | 1607 | DBUG_ON(!spin_is_locked(&ch->lock)); |
@@ -1547,61 +1616,53 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch, | |||
1547 | 1616 | ||
1548 | XPC_SET_REASON(ch, reason, line); | 1617 | XPC_SET_REASON(ch, reason, line); |
1549 | 1618 | ||
1550 | flags = ch->flags; | 1619 | ch->flags |= (XPC_C_CLOSEREQUEST | XPC_C_DISCONNECTING); |
1551 | /* some of these may not have been set */ | 1620 | /* some of these may not have been set */ |
1552 | ch->flags &= ~(XPC_C_OPENREQUEST | XPC_C_OPENREPLY | | 1621 | ch->flags &= ~(XPC_C_OPENREQUEST | XPC_C_OPENREPLY | |
1553 | XPC_C_ROPENREQUEST | XPC_C_ROPENREPLY | | 1622 | XPC_C_ROPENREQUEST | XPC_C_ROPENREPLY | |
1554 | XPC_C_CONNECTING | XPC_C_CONNECTED); | 1623 | XPC_C_CONNECTING | XPC_C_CONNECTED); |
1555 | 1624 | ||
1556 | ch->flags |= (XPC_C_CLOSEREQUEST | XPC_C_DISCONNECTING); | ||
1557 | xpc_IPI_send_closerequest(ch, irq_flags); | 1625 | xpc_IPI_send_closerequest(ch, irq_flags); |
1558 | 1626 | ||
1559 | if (flags & XPC_C_CONNECTED) { | 1627 | if (channel_was_connected) { |
1560 | ch->flags |= XPC_C_WASCONNECTED; | 1628 | ch->flags |= XPC_C_WASCONNECTED; |
1561 | } | 1629 | } |
1562 | 1630 | ||
1631 | spin_unlock_irqrestore(&ch->lock, *irq_flags); | ||
1632 | |||
1633 | /* wake all idle kthreads so they can exit */ | ||
1563 | if (atomic_read(&ch->kthreads_idle) > 0) { | 1634 | if (atomic_read(&ch->kthreads_idle) > 0) { |
1564 | /* wake all idle kthreads so they can exit */ | ||
1565 | wake_up_all(&ch->idle_wq); | 1635 | wake_up_all(&ch->idle_wq); |
1566 | } | 1636 | } |
1567 | 1637 | ||
1568 | spin_unlock_irqrestore(&ch->lock, *irq_flags); | ||
1569 | |||
1570 | |||
1571 | /* wake those waiting to allocate an entry from the local msg queue */ | 1638 | /* wake those waiting to allocate an entry from the local msg queue */ |
1572 | |||
1573 | if (atomic_read(&ch->n_on_msg_allocate_wq) > 0) { | 1639 | if (atomic_read(&ch->n_on_msg_allocate_wq) > 0) { |
1574 | wake_up(&ch->msg_allocate_wq); | 1640 | wake_up(&ch->msg_allocate_wq); |
1575 | } | 1641 | } |
1576 | 1642 | ||
1577 | /* wake those waiting for notify completion */ | ||
1578 | |||
1579 | if (atomic_read(&ch->n_to_notify) > 0) { | ||
1580 | xpc_notify_senders(ch, reason, ch->w_local_GP.put); | ||
1581 | } | ||
1582 | |||
1583 | spin_lock_irqsave(&ch->lock, *irq_flags); | 1643 | spin_lock_irqsave(&ch->lock, *irq_flags); |
1584 | } | 1644 | } |
1585 | 1645 | ||
1586 | 1646 | ||
1587 | void | 1647 | void |
1588 | xpc_disconnected_callout(struct xpc_channel *ch) | 1648 | xpc_disconnecting_callout(struct xpc_channel *ch) |
1589 | { | 1649 | { |
1590 | /* | 1650 | /* |
1591 | * Let the channel's registerer know that the channel is now | 1651 | * Let the channel's registerer know that the channel is being |
1592 | * disconnected. We don't want to do this if the registerer was never | 1652 | * disconnected. We don't want to do this if the registerer was never |
1593 | * informed of a connection being made, unless the disconnect was for | 1653 | * informed of a connection being made. |
1594 | * abnormal reasons. | ||
1595 | */ | 1654 | */ |
1596 | 1655 | ||
1597 | if (ch->func != NULL) { | 1656 | if (ch->func != NULL) { |
1598 | dev_dbg(xpc_chan, "ch->func() called, reason=%d, partid=%d, " | 1657 | dev_dbg(xpc_chan, "ch->func() called, reason=xpcDisconnecting," |
1599 | "channel=%d\n", ch->reason, ch->partid, ch->number); | 1658 | " partid=%d, channel=%d\n", ch->partid, ch->number); |
1600 | 1659 | ||
1601 | ch->func(ch->reason, ch->partid, ch->number, NULL, ch->key); | 1660 | ch->func(xpcDisconnecting, ch->partid, ch->number, NULL, |
1661 | ch->key); | ||
1602 | 1662 | ||
1603 | dev_dbg(xpc_chan, "ch->func() returned, reason=%d, partid=%d, " | 1663 | dev_dbg(xpc_chan, "ch->func() returned, reason=" |
1604 | "channel=%d\n", ch->reason, ch->partid, ch->number); | 1664 | "xpcDisconnecting, partid=%d, channel=%d\n", |
1665 | ch->partid, ch->number); | ||
1605 | } | 1666 | } |
1606 | } | 1667 | } |
1607 | 1668 | ||
@@ -1848,7 +1909,7 @@ xpc_send_msg(struct xpc_channel *ch, struct xpc_msg *msg, u8 notify_type, | |||
1848 | xpc_notify_func func, void *key) | 1909 | xpc_notify_func func, void *key) |
1849 | { | 1910 | { |
1850 | enum xpc_retval ret = xpcSuccess; | 1911 | enum xpc_retval ret = xpcSuccess; |
1851 | struct xpc_notify *notify = NULL; // >>> to keep the compiler happy!! | 1912 | struct xpc_notify *notify = notify; |
1852 | s64 put, msg_number = msg->number; | 1913 | s64 put, msg_number = msg->number; |
1853 | 1914 | ||
1854 | 1915 | ||
diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c index ed7c21586e98..cece3c7c69be 100644 --- a/arch/ia64/sn/kernel/xpc_main.c +++ b/arch/ia64/sn/kernel/xpc_main.c | |||
@@ -54,6 +54,7 @@ | |||
54 | #include <linux/interrupt.h> | 54 | #include <linux/interrupt.h> |
55 | #include <linux/slab.h> | 55 | #include <linux/slab.h> |
56 | #include <linux/delay.h> | 56 | #include <linux/delay.h> |
57 | #include <linux/reboot.h> | ||
57 | #include <asm/sn/intr.h> | 58 | #include <asm/sn/intr.h> |
58 | #include <asm/sn/sn_sal.h> | 59 | #include <asm/sn/sn_sal.h> |
59 | #include <asm/uaccess.h> | 60 | #include <asm/uaccess.h> |
@@ -82,11 +83,17 @@ struct device *xpc_chan = &xpc_chan_dbg_subname; | |||
82 | 83 | ||
83 | /* systune related variables for /proc/sys directories */ | 84 | /* systune related variables for /proc/sys directories */ |
84 | 85 | ||
85 | static int xpc_hb_min = 1; | 86 | static int xpc_hb_interval = XPC_HB_DEFAULT_INTERVAL; |
86 | static int xpc_hb_max = 10; | 87 | static int xpc_hb_min_interval = 1; |
88 | static int xpc_hb_max_interval = 10; | ||
87 | 89 | ||
88 | static int xpc_hb_check_min = 10; | 90 | static int xpc_hb_check_interval = XPC_HB_CHECK_DEFAULT_INTERVAL; |
89 | static int xpc_hb_check_max = 120; | 91 | static int xpc_hb_check_min_interval = 10; |
92 | static int xpc_hb_check_max_interval = 120; | ||
93 | |||
94 | int xpc_disengage_request_timelimit = XPC_DISENGAGE_REQUEST_DEFAULT_TIMELIMIT; | ||
95 | static int xpc_disengage_request_min_timelimit = 0; | ||
96 | static int xpc_disengage_request_max_timelimit = 120; | ||
90 | 97 | ||
91 | static ctl_table xpc_sys_xpc_hb_dir[] = { | 98 | static ctl_table xpc_sys_xpc_hb_dir[] = { |
92 | { | 99 | { |
@@ -99,7 +106,8 @@ static ctl_table xpc_sys_xpc_hb_dir[] = { | |||
99 | &proc_dointvec_minmax, | 106 | &proc_dointvec_minmax, |
100 | &sysctl_intvec, | 107 | &sysctl_intvec, |
101 | NULL, | 108 | NULL, |
102 | &xpc_hb_min, &xpc_hb_max | 109 | &xpc_hb_min_interval, |
110 | &xpc_hb_max_interval | ||
103 | }, | 111 | }, |
104 | { | 112 | { |
105 | 2, | 113 | 2, |
@@ -111,7 +119,8 @@ static ctl_table xpc_sys_xpc_hb_dir[] = { | |||
111 | &proc_dointvec_minmax, | 119 | &proc_dointvec_minmax, |
112 | &sysctl_intvec, | 120 | &sysctl_intvec, |
113 | NULL, | 121 | NULL, |
114 | &xpc_hb_check_min, &xpc_hb_check_max | 122 | &xpc_hb_check_min_interval, |
123 | &xpc_hb_check_max_interval | ||
115 | }, | 124 | }, |
116 | {0} | 125 | {0} |
117 | }; | 126 | }; |
@@ -124,6 +133,19 @@ static ctl_table xpc_sys_xpc_dir[] = { | |||
124 | 0555, | 133 | 0555, |
125 | xpc_sys_xpc_hb_dir | 134 | xpc_sys_xpc_hb_dir |
126 | }, | 135 | }, |
136 | { | ||
137 | 2, | ||
138 | "disengage_request_timelimit", | ||
139 | &xpc_disengage_request_timelimit, | ||
140 | sizeof(int), | ||
141 | 0644, | ||
142 | NULL, | ||
143 | &proc_dointvec_minmax, | ||
144 | &sysctl_intvec, | ||
145 | NULL, | ||
146 | &xpc_disengage_request_min_timelimit, | ||
147 | &xpc_disengage_request_max_timelimit | ||
148 | }, | ||
127 | {0} | 149 | {0} |
128 | }; | 150 | }; |
129 | static ctl_table xpc_sys_dir[] = { | 151 | static ctl_table xpc_sys_dir[] = { |
@@ -148,10 +170,10 @@ static DECLARE_WAIT_QUEUE_HEAD(xpc_act_IRQ_wq); | |||
148 | 170 | ||
149 | static unsigned long xpc_hb_check_timeout; | 171 | static unsigned long xpc_hb_check_timeout; |
150 | 172 | ||
151 | /* xpc_hb_checker thread exited notification */ | 173 | /* notification that the xpc_hb_checker thread has exited */ |
152 | static DECLARE_MUTEX_LOCKED(xpc_hb_checker_exited); | 174 | static DECLARE_MUTEX_LOCKED(xpc_hb_checker_exited); |
153 | 175 | ||
154 | /* xpc_discovery thread exited notification */ | 176 | /* notification that the xpc_discovery thread has exited */ |
155 | static DECLARE_MUTEX_LOCKED(xpc_discovery_exited); | 177 | static DECLARE_MUTEX_LOCKED(xpc_discovery_exited); |
156 | 178 | ||
157 | 179 | ||
@@ -161,6 +183,30 @@ static struct timer_list xpc_hb_timer; | |||
161 | static void xpc_kthread_waitmsgs(struct xpc_partition *, struct xpc_channel *); | 183 | static void xpc_kthread_waitmsgs(struct xpc_partition *, struct xpc_channel *); |
162 | 184 | ||
163 | 185 | ||
186 | static int xpc_system_reboot(struct notifier_block *, unsigned long, void *); | ||
187 | static struct notifier_block xpc_reboot_notifier = { | ||
188 | .notifier_call = xpc_system_reboot, | ||
189 | }; | ||
190 | |||
191 | |||
192 | /* | ||
193 | * Timer function to enforce the timelimit on the partition disengage request. | ||
194 | */ | ||
195 | static void | ||
196 | xpc_timeout_partition_disengage_request(unsigned long data) | ||
197 | { | ||
198 | struct xpc_partition *part = (struct xpc_partition *) data; | ||
199 | |||
200 | |||
201 | DBUG_ON(jiffies < part->disengage_request_timeout); | ||
202 | |||
203 | (void) xpc_partition_disengaged(part); | ||
204 | |||
205 | DBUG_ON(part->disengage_request_timeout != 0); | ||
206 | DBUG_ON(xpc_partition_engaged(1UL << XPC_PARTID(part)) != 0); | ||
207 | } | ||
208 | |||
209 | |||
164 | /* | 210 | /* |
165 | * Notify the heartbeat check thread that an IRQ has been received. | 211 | * Notify the heartbeat check thread that an IRQ has been received. |
166 | */ | 212 | */ |
@@ -214,12 +260,6 @@ xpc_hb_checker(void *ignore) | |||
214 | 260 | ||
215 | while (!(volatile int) xpc_exiting) { | 261 | while (!(volatile int) xpc_exiting) { |
216 | 262 | ||
217 | /* wait for IRQ or timeout */ | ||
218 | (void) wait_event_interruptible(xpc_act_IRQ_wq, | ||
219 | (last_IRQ_count < atomic_read(&xpc_act_IRQ_rcvd) || | ||
220 | jiffies >= xpc_hb_check_timeout || | ||
221 | (volatile int) xpc_exiting)); | ||
222 | |||
223 | dev_dbg(xpc_part, "woke up with %d ticks rem; %d IRQs have " | 263 | dev_dbg(xpc_part, "woke up with %d ticks rem; %d IRQs have " |
224 | "been received\n", | 264 | "been received\n", |
225 | (int) (xpc_hb_check_timeout - jiffies), | 265 | (int) (xpc_hb_check_timeout - jiffies), |
@@ -240,6 +280,7 @@ xpc_hb_checker(void *ignore) | |||
240 | } | 280 | } |
241 | 281 | ||
242 | 282 | ||
283 | /* check for outstanding IRQs */ | ||
243 | new_IRQ_count = atomic_read(&xpc_act_IRQ_rcvd); | 284 | new_IRQ_count = atomic_read(&xpc_act_IRQ_rcvd); |
244 | if (last_IRQ_count < new_IRQ_count || force_IRQ != 0) { | 285 | if (last_IRQ_count < new_IRQ_count || force_IRQ != 0) { |
245 | force_IRQ = 0; | 286 | force_IRQ = 0; |
@@ -257,12 +298,18 @@ xpc_hb_checker(void *ignore) | |||
257 | xpc_hb_check_timeout = jiffies + | 298 | xpc_hb_check_timeout = jiffies + |
258 | (xpc_hb_check_interval * HZ); | 299 | (xpc_hb_check_interval * HZ); |
259 | } | 300 | } |
301 | |||
302 | /* wait for IRQ or timeout */ | ||
303 | (void) wait_event_interruptible(xpc_act_IRQ_wq, | ||
304 | (last_IRQ_count < atomic_read(&xpc_act_IRQ_rcvd) || | ||
305 | jiffies >= xpc_hb_check_timeout || | ||
306 | (volatile int) xpc_exiting)); | ||
260 | } | 307 | } |
261 | 308 | ||
262 | dev_dbg(xpc_part, "heartbeat checker is exiting\n"); | 309 | dev_dbg(xpc_part, "heartbeat checker is exiting\n"); |
263 | 310 | ||
264 | 311 | ||
265 | /* mark this thread as inactive */ | 312 | /* mark this thread as having exited */ |
266 | up(&xpc_hb_checker_exited); | 313 | up(&xpc_hb_checker_exited); |
267 | return 0; | 314 | return 0; |
268 | } | 315 | } |
@@ -282,7 +329,7 @@ xpc_initiate_discovery(void *ignore) | |||
282 | 329 | ||
283 | dev_dbg(xpc_part, "discovery thread is exiting\n"); | 330 | dev_dbg(xpc_part, "discovery thread is exiting\n"); |
284 | 331 | ||
285 | /* mark this thread as inactive */ | 332 | /* mark this thread as having exited */ |
286 | up(&xpc_discovery_exited); | 333 | up(&xpc_discovery_exited); |
287 | return 0; | 334 | return 0; |
288 | } | 335 | } |
@@ -309,7 +356,7 @@ xpc_make_first_contact(struct xpc_partition *part) | |||
309 | "partition %d\n", XPC_PARTID(part)); | 356 | "partition %d\n", XPC_PARTID(part)); |
310 | 357 | ||
311 | /* wait a 1/4 of a second or so */ | 358 | /* wait a 1/4 of a second or so */ |
312 | msleep_interruptible(250); | 359 | (void) msleep_interruptible(250); |
313 | 360 | ||
314 | if (part->act_state == XPC_P_DEACTIVATING) { | 361 | if (part->act_state == XPC_P_DEACTIVATING) { |
315 | return part->reason; | 362 | return part->reason; |
@@ -336,7 +383,8 @@ static void | |||
336 | xpc_channel_mgr(struct xpc_partition *part) | 383 | xpc_channel_mgr(struct xpc_partition *part) |
337 | { | 384 | { |
338 | while (part->act_state != XPC_P_DEACTIVATING || | 385 | while (part->act_state != XPC_P_DEACTIVATING || |
339 | atomic_read(&part->nchannels_active) > 0) { | 386 | atomic_read(&part->nchannels_active) > 0 || |
387 | !xpc_partition_disengaged(part)) { | ||
340 | 388 | ||
341 | xpc_process_channel_activity(part); | 389 | xpc_process_channel_activity(part); |
342 | 390 | ||
@@ -360,7 +408,8 @@ xpc_channel_mgr(struct xpc_partition *part) | |||
360 | (volatile u64) part->local_IPI_amo != 0 || | 408 | (volatile u64) part->local_IPI_amo != 0 || |
361 | ((volatile u8) part->act_state == | 409 | ((volatile u8) part->act_state == |
362 | XPC_P_DEACTIVATING && | 410 | XPC_P_DEACTIVATING && |
363 | atomic_read(&part->nchannels_active) == 0))); | 411 | atomic_read(&part->nchannels_active) == 0 && |
412 | xpc_partition_disengaged(part)))); | ||
364 | atomic_set(&part->channel_mgr_requests, 1); | 413 | atomic_set(&part->channel_mgr_requests, 1); |
365 | 414 | ||
366 | // >>> Does it need to wakeup periodically as well? In case we | 415 | // >>> Does it need to wakeup periodically as well? In case we |
@@ -482,7 +531,7 @@ xpc_activating(void *__partid) | |||
482 | return 0; | 531 | return 0; |
483 | } | 532 | } |
484 | 533 | ||
485 | XPC_ALLOW_HB(partid, xpc_vars); | 534 | xpc_allow_hb(partid, xpc_vars); |
486 | xpc_IPI_send_activated(part); | 535 | xpc_IPI_send_activated(part); |
487 | 536 | ||
488 | 537 | ||
@@ -492,6 +541,7 @@ xpc_activating(void *__partid) | |||
492 | */ | 541 | */ |
493 | (void) xpc_partition_up(part); | 542 | (void) xpc_partition_up(part); |
494 | 543 | ||
544 | xpc_disallow_hb(partid, xpc_vars); | ||
495 | xpc_mark_partition_inactive(part); | 545 | xpc_mark_partition_inactive(part); |
496 | 546 | ||
497 | if (part->reason == xpcReactivating) { | 547 | if (part->reason == xpcReactivating) { |
@@ -670,6 +720,7 @@ xpc_daemonize_kthread(void *args) | |||
670 | struct xpc_partition *part = &xpc_partitions[partid]; | 720 | struct xpc_partition *part = &xpc_partitions[partid]; |
671 | struct xpc_channel *ch; | 721 | struct xpc_channel *ch; |
672 | int n_needed; | 722 | int n_needed; |
723 | unsigned long irq_flags; | ||
673 | 724 | ||
674 | 725 | ||
675 | daemonize("xpc%02dc%d", partid, ch_number); | 726 | daemonize("xpc%02dc%d", partid, ch_number); |
@@ -680,11 +731,14 @@ xpc_daemonize_kthread(void *args) | |||
680 | ch = &part->channels[ch_number]; | 731 | ch = &part->channels[ch_number]; |
681 | 732 | ||
682 | if (!(ch->flags & XPC_C_DISCONNECTING)) { | 733 | if (!(ch->flags & XPC_C_DISCONNECTING)) { |
683 | DBUG_ON(!(ch->flags & XPC_C_CONNECTED)); | ||
684 | 734 | ||
685 | /* let registerer know that connection has been established */ | 735 | /* let registerer know that connection has been established */ |
686 | 736 | ||
687 | if (atomic_read(&ch->kthreads_assigned) == 1) { | 737 | spin_lock_irqsave(&ch->lock, irq_flags); |
738 | if (!(ch->flags & XPC_C_CONNECTCALLOUT)) { | ||
739 | ch->flags |= XPC_C_CONNECTCALLOUT; | ||
740 | spin_unlock_irqrestore(&ch->lock, irq_flags); | ||
741 | |||
688 | xpc_connected_callout(ch); | 742 | xpc_connected_callout(ch); |
689 | 743 | ||
690 | /* | 744 | /* |
@@ -699,16 +753,28 @@ xpc_daemonize_kthread(void *args) | |||
699 | !(ch->flags & XPC_C_DISCONNECTING)) { | 753 | !(ch->flags & XPC_C_DISCONNECTING)) { |
700 | xpc_activate_kthreads(ch, n_needed); | 754 | xpc_activate_kthreads(ch, n_needed); |
701 | } | 755 | } |
756 | } else { | ||
757 | spin_unlock_irqrestore(&ch->lock, irq_flags); | ||
702 | } | 758 | } |
703 | 759 | ||
704 | xpc_kthread_waitmsgs(part, ch); | 760 | xpc_kthread_waitmsgs(part, ch); |
705 | } | 761 | } |
706 | 762 | ||
707 | if (atomic_dec_return(&ch->kthreads_assigned) == 0 && | 763 | if (atomic_dec_return(&ch->kthreads_assigned) == 0) { |
708 | ((ch->flags & XPC_C_CONNECTCALLOUT) || | 764 | spin_lock_irqsave(&ch->lock, irq_flags); |
709 | (ch->reason != xpcUnregistering && | 765 | if ((ch->flags & XPC_C_CONNECTCALLOUT) && |
710 | ch->reason != xpcOtherUnregistering))) { | 766 | !(ch->flags & XPC_C_DISCONNECTCALLOUT)) { |
711 | xpc_disconnected_callout(ch); | 767 | ch->flags |= XPC_C_DISCONNECTCALLOUT; |
768 | spin_unlock_irqrestore(&ch->lock, irq_flags); | ||
769 | |||
770 | xpc_disconnecting_callout(ch); | ||
771 | } else { | ||
772 | spin_unlock_irqrestore(&ch->lock, irq_flags); | ||
773 | } | ||
774 | if (atomic_dec_return(&part->nchannels_engaged) == 0) { | ||
775 | xpc_mark_partition_disengaged(part); | ||
776 | xpc_IPI_send_disengage(part); | ||
777 | } | ||
712 | } | 778 | } |
713 | 779 | ||
714 | 780 | ||
@@ -740,12 +806,33 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed) | |||
740 | unsigned long irq_flags; | 806 | unsigned long irq_flags; |
741 | pid_t pid; | 807 | pid_t pid; |
742 | u64 args = XPC_PACK_ARGS(ch->partid, ch->number); | 808 | u64 args = XPC_PACK_ARGS(ch->partid, ch->number); |
809 | struct xpc_partition *part = &xpc_partitions[ch->partid]; | ||
743 | 810 | ||
744 | 811 | ||
745 | while (needed-- > 0) { | 812 | while (needed-- > 0) { |
813 | |||
814 | /* | ||
815 | * The following is done on behalf of the newly created | ||
816 | * kthread. That kthread is responsible for doing the | ||
817 | * counterpart to the following before it exits. | ||
818 | */ | ||
819 | (void) xpc_part_ref(part); | ||
820 | xpc_msgqueue_ref(ch); | ||
821 | if (atomic_inc_return(&ch->kthreads_assigned) == 1 && | ||
822 | atomic_inc_return(&part->nchannels_engaged) == 1) { | ||
823 | xpc_mark_partition_engaged(part); | ||
824 | } | ||
825 | |||
746 | pid = kernel_thread(xpc_daemonize_kthread, (void *) args, 0); | 826 | pid = kernel_thread(xpc_daemonize_kthread, (void *) args, 0); |
747 | if (pid < 0) { | 827 | if (pid < 0) { |
748 | /* the fork failed */ | 828 | /* the fork failed */ |
829 | if (atomic_dec_return(&ch->kthreads_assigned) == 0 && | ||
830 | atomic_dec_return(&part->nchannels_engaged) == 0) { | ||
831 | xpc_mark_partition_disengaged(part); | ||
832 | xpc_IPI_send_disengage(part); | ||
833 | } | ||
834 | xpc_msgqueue_deref(ch); | ||
835 | xpc_part_deref(part); | ||
749 | 836 | ||
750 | if (atomic_read(&ch->kthreads_assigned) < | 837 | if (atomic_read(&ch->kthreads_assigned) < |
751 | ch->kthreads_idle_limit) { | 838 | ch->kthreads_idle_limit) { |
@@ -765,14 +852,6 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed) | |||
765 | break; | 852 | break; |
766 | } | 853 | } |
767 | 854 | ||
768 | /* | ||
769 | * The following is done on behalf of the newly created | ||
770 | * kthread. That kthread is responsible for doing the | ||
771 | * counterpart to the following before it exits. | ||
772 | */ | ||
773 | (void) xpc_part_ref(&xpc_partitions[ch->partid]); | ||
774 | xpc_msgqueue_ref(ch); | ||
775 | atomic_inc(&ch->kthreads_assigned); | ||
776 | ch->kthreads_created++; // >>> temporary debug only!!! | 855 | ch->kthreads_created++; // >>> temporary debug only!!! |
777 | } | 856 | } |
778 | } | 857 | } |
@@ -781,87 +860,142 @@ xpc_create_kthreads(struct xpc_channel *ch, int needed) | |||
781 | void | 860 | void |
782 | xpc_disconnect_wait(int ch_number) | 861 | xpc_disconnect_wait(int ch_number) |
783 | { | 862 | { |
863 | unsigned long irq_flags; | ||
784 | partid_t partid; | 864 | partid_t partid; |
785 | struct xpc_partition *part; | 865 | struct xpc_partition *part; |
786 | struct xpc_channel *ch; | 866 | struct xpc_channel *ch; |
867 | int wakeup_channel_mgr; | ||
787 | 868 | ||
788 | 869 | ||
789 | /* now wait for all callouts to the caller's function to cease */ | 870 | /* now wait for all callouts to the caller's function to cease */ |
790 | for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) { | 871 | for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) { |
791 | part = &xpc_partitions[partid]; | 872 | part = &xpc_partitions[partid]; |
792 | 873 | ||
793 | if (xpc_part_ref(part)) { | 874 | if (!xpc_part_ref(part)) { |
794 | ch = &part->channels[ch_number]; | 875 | continue; |
876 | } | ||
795 | 877 | ||
796 | // >>> how do we keep from falling into the window between our check and going | 878 | ch = &part->channels[ch_number]; |
797 | // >>> down and coming back up where sema is re-inited? | ||
798 | if (ch->flags & XPC_C_SETUP) { | ||
799 | (void) down(&ch->teardown_sema); | ||
800 | } | ||
801 | 879 | ||
880 | if (!(ch->flags & XPC_C_WDISCONNECT)) { | ||
802 | xpc_part_deref(part); | 881 | xpc_part_deref(part); |
882 | continue; | ||
883 | } | ||
884 | |||
885 | (void) down(&ch->wdisconnect_sema); | ||
886 | |||
887 | spin_lock_irqsave(&ch->lock, irq_flags); | ||
888 | DBUG_ON(!(ch->flags & XPC_C_DISCONNECTED)); | ||
889 | wakeup_channel_mgr = 0; | ||
890 | |||
891 | if (ch->delayed_IPI_flags) { | ||
892 | if (part->act_state != XPC_P_DEACTIVATING) { | ||
893 | spin_lock(&part->IPI_lock); | ||
894 | XPC_SET_IPI_FLAGS(part->local_IPI_amo, | ||
895 | ch->number, ch->delayed_IPI_flags); | ||
896 | spin_unlock(&part->IPI_lock); | ||
897 | wakeup_channel_mgr = 1; | ||
898 | } | ||
899 | ch->delayed_IPI_flags = 0; | ||
803 | } | 900 | } |
901 | |||
902 | ch->flags &= ~XPC_C_WDISCONNECT; | ||
903 | spin_unlock_irqrestore(&ch->lock, irq_flags); | ||
904 | |||
905 | if (wakeup_channel_mgr) { | ||
906 | xpc_wakeup_channel_mgr(part); | ||
907 | } | ||
908 | |||
909 | xpc_part_deref(part); | ||
804 | } | 910 | } |
805 | } | 911 | } |
806 | 912 | ||
807 | 913 | ||
808 | static void | 914 | static void |
809 | xpc_do_exit(void) | 915 | xpc_do_exit(enum xpc_retval reason) |
810 | { | 916 | { |
811 | partid_t partid; | 917 | partid_t partid; |
812 | int active_part_count; | 918 | int active_part_count; |
813 | struct xpc_partition *part; | 919 | struct xpc_partition *part; |
920 | unsigned long printmsg_time; | ||
814 | 921 | ||
815 | 922 | ||
816 | /* now it's time to eliminate our heartbeat */ | 923 | /* a 'rmmod XPC' and a 'reboot' cannot both end up here together */ |
817 | del_timer_sync(&xpc_hb_timer); | 924 | DBUG_ON(xpc_exiting == 1); |
818 | xpc_vars->heartbeating_to_mask = 0; | ||
819 | |||
820 | /* indicate to others that our reserved page is uninitialized */ | ||
821 | xpc_rsvd_page->vars_pa = 0; | ||
822 | |||
823 | /* | ||
824 | * Ignore all incoming interrupts. Without interupts the heartbeat | ||
825 | * checker won't activate any new partitions that may come up. | ||
826 | */ | ||
827 | free_irq(SGI_XPC_ACTIVATE, NULL); | ||
828 | 925 | ||
829 | /* | 926 | /* |
830 | * Cause the heartbeat checker and the discovery threads to exit. | 927 | * Let the heartbeat checker thread and the discovery thread |
831 | * We don't want them attempting to activate new partitions as we | 928 | * (if one is running) know that they should exit. Also wake up |
832 | * try to deactivate the existing ones. | 929 | * the heartbeat checker thread in case it's sleeping. |
833 | */ | 930 | */ |
834 | xpc_exiting = 1; | 931 | xpc_exiting = 1; |
835 | wake_up_interruptible(&xpc_act_IRQ_wq); | 932 | wake_up_interruptible(&xpc_act_IRQ_wq); |
836 | 933 | ||
837 | /* wait for the heartbeat checker thread to mark itself inactive */ | 934 | /* ignore all incoming interrupts */ |
838 | down(&xpc_hb_checker_exited); | 935 | free_irq(SGI_XPC_ACTIVATE, NULL); |
839 | 936 | ||
840 | /* wait for the discovery thread to mark itself inactive */ | 937 | /* wait for the discovery thread to exit */ |
841 | down(&xpc_discovery_exited); | 938 | down(&xpc_discovery_exited); |
842 | 939 | ||
940 | /* wait for the heartbeat checker thread to exit */ | ||
941 | down(&xpc_hb_checker_exited); | ||
843 | 942 | ||
844 | msleep_interruptible(300); | 943 | |
944 | /* sleep for a 1/3 of a second or so */ | ||
945 | (void) msleep_interruptible(300); | ||
845 | 946 | ||
846 | 947 | ||
847 | /* wait for all partitions to become inactive */ | 948 | /* wait for all partitions to become inactive */ |
848 | 949 | ||
950 | printmsg_time = jiffies; | ||
951 | |||
849 | do { | 952 | do { |
850 | active_part_count = 0; | 953 | active_part_count = 0; |
851 | 954 | ||
852 | for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) { | 955 | for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) { |
853 | part = &xpc_partitions[partid]; | 956 | part = &xpc_partitions[partid]; |
854 | if (part->act_state != XPC_P_INACTIVE) { | ||
855 | active_part_count++; | ||
856 | 957 | ||
857 | XPC_DEACTIVATE_PARTITION(part, xpcUnloading); | 958 | if (xpc_partition_disengaged(part) && |
959 | part->act_state == XPC_P_INACTIVE) { | ||
960 | continue; | ||
858 | } | 961 | } |
962 | |||
963 | active_part_count++; | ||
964 | |||
965 | XPC_DEACTIVATE_PARTITION(part, reason); | ||
859 | } | 966 | } |
860 | 967 | ||
861 | if (active_part_count) | 968 | if (active_part_count == 0) { |
862 | msleep_interruptible(300); | 969 | break; |
863 | } while (active_part_count > 0); | 970 | } |
864 | 971 | ||
972 | if (jiffies >= printmsg_time) { | ||
973 | dev_info(xpc_part, "waiting for partitions to " | ||
974 | "deactivate/disengage, active count=%d, remote " | ||
975 | "engaged=0x%lx\n", active_part_count, | ||
976 | xpc_partition_engaged(1UL << partid)); | ||
977 | |||
978 | printmsg_time = jiffies + | ||
979 | (XPC_DISENGAGE_PRINTMSG_INTERVAL * HZ); | ||
980 | } | ||
981 | |||
982 | /* sleep for a 1/3 of a second or so */ | ||
983 | (void) msleep_interruptible(300); | ||
984 | |||
985 | } while (1); | ||
986 | |||
987 | DBUG_ON(xpc_partition_engaged(-1UL)); | ||
988 | |||
989 | |||
990 | /* indicate to others that our reserved page is uninitialized */ | ||
991 | xpc_rsvd_page->vars_pa = 0; | ||
992 | |||
993 | /* now it's time to eliminate our heartbeat */ | ||
994 | del_timer_sync(&xpc_hb_timer); | ||
995 | DBUG_ON(xpc_vars->heartbeating_to_mask != 0); | ||
996 | |||
997 | /* take ourselves off of the reboot_notifier_list */ | ||
998 | (void) unregister_reboot_notifier(&xpc_reboot_notifier); | ||
865 | 999 | ||
866 | /* close down protections for IPI operations */ | 1000 | /* close down protections for IPI operations */ |
867 | xpc_restrict_IPI_ops(); | 1001 | xpc_restrict_IPI_ops(); |
@@ -876,6 +1010,34 @@ xpc_do_exit(void) | |||
876 | } | 1010 | } |
877 | 1011 | ||
878 | 1012 | ||
1013 | /* | ||
1014 | * This function is called when the system is being rebooted. | ||
1015 | */ | ||
1016 | static int | ||
1017 | xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused) | ||
1018 | { | ||
1019 | enum xpc_retval reason; | ||
1020 | |||
1021 | |||
1022 | switch (event) { | ||
1023 | case SYS_RESTART: | ||
1024 | reason = xpcSystemReboot; | ||
1025 | break; | ||
1026 | case SYS_HALT: | ||
1027 | reason = xpcSystemHalt; | ||
1028 | break; | ||
1029 | case SYS_POWER_OFF: | ||
1030 | reason = xpcSystemPoweroff; | ||
1031 | break; | ||
1032 | default: | ||
1033 | reason = xpcSystemGoingDown; | ||
1034 | } | ||
1035 | |||
1036 | xpc_do_exit(reason); | ||
1037 | return NOTIFY_DONE; | ||
1038 | } | ||
1039 | |||
1040 | |||
879 | int __init | 1041 | int __init |
880 | xpc_init(void) | 1042 | xpc_init(void) |
881 | { | 1043 | { |
@@ -891,11 +1053,11 @@ xpc_init(void) | |||
891 | 1053 | ||
892 | /* | 1054 | /* |
893 | * xpc_remote_copy_buffer is used as a temporary buffer for bte_copy'ng | 1055 | * xpc_remote_copy_buffer is used as a temporary buffer for bte_copy'ng |
894 | * both a partition's reserved page and its XPC variables. Its size was | 1056 | * various portions of a partition's reserved page. Its size is based |
895 | * based on the size of a reserved page. So we need to ensure that the | 1057 | * on the size of the reserved page header and part_nasids mask. So we |
896 | * XPC variables will fit as well. | 1058 | * need to ensure that the other items will fit as well. |
897 | */ | 1059 | */ |
898 | if (XPC_VARS_ALIGNED_SIZE > XPC_RSVD_PAGE_ALIGNED_SIZE) { | 1060 | if (XPC_RP_VARS_SIZE > XPC_RP_HEADER_SIZE + XP_NASID_MASK_BYTES) { |
899 | dev_err(xpc_part, "xpc_remote_copy_buffer is not big enough\n"); | 1061 | dev_err(xpc_part, "xpc_remote_copy_buffer is not big enough\n"); |
900 | return -EPERM; | 1062 | return -EPERM; |
901 | } | 1063 | } |
@@ -924,6 +1086,12 @@ xpc_init(void) | |||
924 | spin_lock_init(&part->act_lock); | 1086 | spin_lock_init(&part->act_lock); |
925 | part->act_state = XPC_P_INACTIVE; | 1087 | part->act_state = XPC_P_INACTIVE; |
926 | XPC_SET_REASON(part, 0, 0); | 1088 | XPC_SET_REASON(part, 0, 0); |
1089 | |||
1090 | init_timer(&part->disengage_request_timer); | ||
1091 | part->disengage_request_timer.function = | ||
1092 | xpc_timeout_partition_disengage_request; | ||
1093 | part->disengage_request_timer.data = (unsigned long) part; | ||
1094 | |||
927 | part->setup_state = XPC_P_UNSET; | 1095 | part->setup_state = XPC_P_UNSET; |
928 | init_waitqueue_head(&part->teardown_wq); | 1096 | init_waitqueue_head(&part->teardown_wq); |
929 | atomic_set(&part->references, 0); | 1097 | atomic_set(&part->references, 0); |
@@ -980,6 +1148,13 @@ xpc_init(void) | |||
980 | } | 1148 | } |
981 | 1149 | ||
982 | 1150 | ||
1151 | /* add ourselves to the reboot_notifier_list */ | ||
1152 | ret = register_reboot_notifier(&xpc_reboot_notifier); | ||
1153 | if (ret != 0) { | ||
1154 | dev_warn(xpc_part, "can't register reboot notifier\n"); | ||
1155 | } | ||
1156 | |||
1157 | |||
983 | /* | 1158 | /* |
984 | * Set the beating to other partitions into motion. This is | 1159 | * Set the beating to other partitions into motion. This is |
985 | * the last requirement for other partitions' discovery to | 1160 | * the last requirement for other partitions' discovery to |
@@ -1001,6 +1176,9 @@ xpc_init(void) | |||
1001 | /* indicate to others that our reserved page is uninitialized */ | 1176 | /* indicate to others that our reserved page is uninitialized */ |
1002 | xpc_rsvd_page->vars_pa = 0; | 1177 | xpc_rsvd_page->vars_pa = 0; |
1003 | 1178 | ||
1179 | /* take ourselves off of the reboot_notifier_list */ | ||
1180 | (void) unregister_reboot_notifier(&xpc_reboot_notifier); | ||
1181 | |||
1004 | del_timer_sync(&xpc_hb_timer); | 1182 | del_timer_sync(&xpc_hb_timer); |
1005 | free_irq(SGI_XPC_ACTIVATE, NULL); | 1183 | free_irq(SGI_XPC_ACTIVATE, NULL); |
1006 | xpc_restrict_IPI_ops(); | 1184 | xpc_restrict_IPI_ops(); |
@@ -1024,7 +1202,7 @@ xpc_init(void) | |||
1024 | /* mark this new thread as a non-starter */ | 1202 | /* mark this new thread as a non-starter */ |
1025 | up(&xpc_discovery_exited); | 1203 | up(&xpc_discovery_exited); |
1026 | 1204 | ||
1027 | xpc_do_exit(); | 1205 | xpc_do_exit(xpcUnloading); |
1028 | return -EBUSY; | 1206 | return -EBUSY; |
1029 | } | 1207 | } |
1030 | 1208 | ||
@@ -1043,7 +1221,7 @@ module_init(xpc_init); | |||
1043 | void __exit | 1221 | void __exit |
1044 | xpc_exit(void) | 1222 | xpc_exit(void) |
1045 | { | 1223 | { |
1046 | xpc_do_exit(); | 1224 | xpc_do_exit(xpcUnloading); |
1047 | } | 1225 | } |
1048 | module_exit(xpc_exit); | 1226 | module_exit(xpc_exit); |
1049 | 1227 | ||
@@ -1060,3 +1238,7 @@ module_param(xpc_hb_check_interval, int, 0); | |||
1060 | MODULE_PARM_DESC(xpc_hb_check_interval, "Number of seconds between " | 1238 | MODULE_PARM_DESC(xpc_hb_check_interval, "Number of seconds between " |
1061 | "heartbeat checks."); | 1239 | "heartbeat checks."); |
1062 | 1240 | ||
1241 | module_param(xpc_disengage_request_timelimit, int, 0); | ||
1242 | MODULE_PARM_DESC(xpc_disengage_request_timelimit, "Number of seconds to wait " | ||
1243 | "for disengage request to complete."); | ||
1244 | |||
diff --git a/arch/ia64/sn/kernel/xpc_partition.c b/arch/ia64/sn/kernel/xpc_partition.c index 578265ea9e67..581e113d2d37 100644 --- a/arch/ia64/sn/kernel/xpc_partition.c +++ b/arch/ia64/sn/kernel/xpc_partition.c | |||
@@ -44,16 +44,19 @@ static u64 xpc_sh2_IPI_access3; | |||
44 | 44 | ||
45 | 45 | ||
46 | /* original protection values for each node */ | 46 | /* original protection values for each node */ |
47 | u64 xpc_prot_vec[MAX_COMPACT_NODES]; | 47 | u64 xpc_prot_vec[MAX_NUMNODES]; |
48 | 48 | ||
49 | 49 | ||
50 | /* this partition's reserved page */ | 50 | /* this partition's reserved page pointers */ |
51 | struct xpc_rsvd_page *xpc_rsvd_page; | 51 | struct xpc_rsvd_page *xpc_rsvd_page; |
52 | 52 | static u64 *xpc_part_nasids; | |
53 | /* this partition's XPC variables (within the reserved page) */ | 53 | static u64 *xpc_mach_nasids; |
54 | struct xpc_vars *xpc_vars; | 54 | struct xpc_vars *xpc_vars; |
55 | struct xpc_vars_part *xpc_vars_part; | 55 | struct xpc_vars_part *xpc_vars_part; |
56 | 56 | ||
57 | static int xp_nasid_mask_bytes; /* actual size in bytes of nasid mask */ | ||
58 | static int xp_nasid_mask_words; /* actual size in words of nasid mask */ | ||
59 | |||
57 | 60 | ||
58 | /* | 61 | /* |
59 | * For performance reasons, each entry of xpc_partitions[] is cacheline | 62 | * For performance reasons, each entry of xpc_partitions[] is cacheline |
@@ -65,20 +68,16 @@ struct xpc_partition xpc_partitions[XP_MAX_PARTITIONS + 1]; | |||
65 | 68 | ||
66 | 69 | ||
67 | /* | 70 | /* |
68 | * Generic buffer used to store a local copy of the remote partitions | 71 | * Generic buffer used to store a local copy of portions of a remote |
69 | * reserved page or XPC variables. | 72 | * partition's reserved page (either its header and part_nasids mask, |
73 | * or its vars). | ||
70 | * | 74 | * |
71 | * xpc_discovery runs only once and is a seperate thread that is | 75 | * xpc_discovery runs only once and is a seperate thread that is |
72 | * very likely going to be processing in parallel with receiving | 76 | * very likely going to be processing in parallel with receiving |
73 | * interrupts. | 77 | * interrupts. |
74 | */ | 78 | */ |
75 | char ____cacheline_aligned | 79 | char ____cacheline_aligned xpc_remote_copy_buffer[XPC_RP_HEADER_SIZE + |
76 | xpc_remote_copy_buffer[XPC_RSVD_PAGE_ALIGNED_SIZE]; | 80 | XP_NASID_MASK_BYTES]; |
77 | |||
78 | |||
79 | /* systune related variables */ | ||
80 | int xpc_hb_interval = XPC_HB_DEFAULT_INTERVAL; | ||
81 | int xpc_hb_check_interval = XPC_HB_CHECK_DEFAULT_TIMEOUT; | ||
82 | 81 | ||
83 | 82 | ||
84 | /* | 83 | /* |
@@ -86,13 +85,16 @@ int xpc_hb_check_interval = XPC_HB_CHECK_DEFAULT_TIMEOUT; | |||
86 | * for that nasid. This function returns 0 on any error. | 85 | * for that nasid. This function returns 0 on any error. |
87 | */ | 86 | */ |
88 | static u64 | 87 | static u64 |
89 | xpc_get_rsvd_page_pa(int nasid, u64 buf, u64 buf_size) | 88 | xpc_get_rsvd_page_pa(int nasid) |
90 | { | 89 | { |
91 | bte_result_t bte_res; | 90 | bte_result_t bte_res; |
92 | s64 status; | 91 | s64 status; |
93 | u64 cookie = 0; | 92 | u64 cookie = 0; |
94 | u64 rp_pa = nasid; /* seed with nasid */ | 93 | u64 rp_pa = nasid; /* seed with nasid */ |
95 | u64 len = 0; | 94 | u64 len = 0; |
95 | u64 buf = buf; | ||
96 | u64 buf_len = 0; | ||
97 | void *buf_base = NULL; | ||
96 | 98 | ||
97 | 99 | ||
98 | while (1) { | 100 | while (1) { |
@@ -108,13 +110,22 @@ xpc_get_rsvd_page_pa(int nasid, u64 buf, u64 buf_size) | |||
108 | break; | 110 | break; |
109 | } | 111 | } |
110 | 112 | ||
111 | if (len > buf_size) { | 113 | if (L1_CACHE_ALIGN(len) > buf_len) { |
112 | dev_err(xpc_part, "len (=0x%016lx) > buf_size\n", len); | 114 | if (buf_base != NULL) { |
113 | status = SALRET_ERROR; | 115 | kfree(buf_base); |
114 | break; | 116 | } |
117 | buf_len = L1_CACHE_ALIGN(len); | ||
118 | buf = (u64) xpc_kmalloc_cacheline_aligned(buf_len, | ||
119 | GFP_KERNEL, &buf_base); | ||
120 | if (buf_base == NULL) { | ||
121 | dev_err(xpc_part, "unable to kmalloc " | ||
122 | "len=0x%016lx\n", buf_len); | ||
123 | status = SALRET_ERROR; | ||
124 | break; | ||
125 | } | ||
115 | } | 126 | } |
116 | 127 | ||
117 | bte_res = xp_bte_copy(rp_pa, ia64_tpa(buf), buf_size, | 128 | bte_res = xp_bte_copy(rp_pa, ia64_tpa(buf), buf_len, |
118 | (BTE_NOTIFY | BTE_WACQUIRE), NULL); | 129 | (BTE_NOTIFY | BTE_WACQUIRE), NULL); |
119 | if (bte_res != BTE_SUCCESS) { | 130 | if (bte_res != BTE_SUCCESS) { |
120 | dev_dbg(xpc_part, "xp_bte_copy failed %i\n", bte_res); | 131 | dev_dbg(xpc_part, "xp_bte_copy failed %i\n", bte_res); |
@@ -123,6 +134,10 @@ xpc_get_rsvd_page_pa(int nasid, u64 buf, u64 buf_size) | |||
123 | } | 134 | } |
124 | } | 135 | } |
125 | 136 | ||
137 | if (buf_base != NULL) { | ||
138 | kfree(buf_base); | ||
139 | } | ||
140 | |||
126 | if (status != SALRET_OK) { | 141 | if (status != SALRET_OK) { |
127 | rp_pa = 0; | 142 | rp_pa = 0; |
128 | } | 143 | } |
@@ -141,15 +156,15 @@ xpc_rsvd_page_init(void) | |||
141 | { | 156 | { |
142 | struct xpc_rsvd_page *rp; | 157 | struct xpc_rsvd_page *rp; |
143 | AMO_t *amos_page; | 158 | AMO_t *amos_page; |
144 | u64 rp_pa, next_cl, nasid_array = 0; | 159 | u64 rp_pa, nasid_array = 0; |
145 | int i, ret; | 160 | int i, ret; |
146 | 161 | ||
147 | 162 | ||
148 | /* get the local reserved page's address */ | 163 | /* get the local reserved page's address */ |
149 | 164 | ||
150 | rp_pa = xpc_get_rsvd_page_pa(cnodeid_to_nasid(0), | 165 | preempt_disable(); |
151 | (u64) xpc_remote_copy_buffer, | 166 | rp_pa = xpc_get_rsvd_page_pa(cpuid_to_nasid(smp_processor_id())); |
152 | XPC_RSVD_PAGE_ALIGNED_SIZE); | 167 | preempt_enable(); |
153 | if (rp_pa == 0) { | 168 | if (rp_pa == 0) { |
154 | dev_err(xpc_part, "SAL failed to locate the reserved page\n"); | 169 | dev_err(xpc_part, "SAL failed to locate the reserved page\n"); |
155 | return NULL; | 170 | return NULL; |
@@ -164,12 +179,19 @@ xpc_rsvd_page_init(void) | |||
164 | 179 | ||
165 | rp->version = XPC_RP_VERSION; | 180 | rp->version = XPC_RP_VERSION; |
166 | 181 | ||
167 | /* | 182 | /* establish the actual sizes of the nasid masks */ |
168 | * Place the XPC variables on the cache line following the | 183 | if (rp->SAL_version == 1) { |
169 | * reserved page structure. | 184 | /* SAL_version 1 didn't set the nasids_size field */ |
170 | */ | 185 | rp->nasids_size = 128; |
171 | next_cl = (u64) rp + XPC_RSVD_PAGE_ALIGNED_SIZE; | 186 | } |
172 | xpc_vars = (struct xpc_vars *) next_cl; | 187 | xp_nasid_mask_bytes = rp->nasids_size; |
188 | xp_nasid_mask_words = xp_nasid_mask_bytes / 8; | ||
189 | |||
190 | /* setup the pointers to the various items in the reserved page */ | ||
191 | xpc_part_nasids = XPC_RP_PART_NASIDS(rp); | ||
192 | xpc_mach_nasids = XPC_RP_MACH_NASIDS(rp); | ||
193 | xpc_vars = XPC_RP_VARS(rp); | ||
194 | xpc_vars_part = XPC_RP_VARS_PART(rp); | ||
173 | 195 | ||
174 | /* | 196 | /* |
175 | * Before clearing xpc_vars, see if a page of AMOs had been previously | 197 | * Before clearing xpc_vars, see if a page of AMOs had been previously |
@@ -221,33 +243,32 @@ xpc_rsvd_page_init(void) | |||
221 | amos_page = (AMO_t *) TO_AMO((u64) amos_page); | 243 | amos_page = (AMO_t *) TO_AMO((u64) amos_page); |
222 | } | 244 | } |
223 | 245 | ||
246 | /* clear xpc_vars */ | ||
224 | memset(xpc_vars, 0, sizeof(struct xpc_vars)); | 247 | memset(xpc_vars, 0, sizeof(struct xpc_vars)); |
225 | 248 | ||
226 | /* | ||
227 | * Place the XPC per partition specific variables on the cache line | ||
228 | * following the XPC variables structure. | ||
229 | */ | ||
230 | next_cl += XPC_VARS_ALIGNED_SIZE; | ||
231 | memset((u64 *) next_cl, 0, sizeof(struct xpc_vars_part) * | ||
232 | XP_MAX_PARTITIONS); | ||
233 | xpc_vars_part = (struct xpc_vars_part *) next_cl; | ||
234 | xpc_vars->vars_part_pa = __pa(next_cl); | ||
235 | |||
236 | xpc_vars->version = XPC_V_VERSION; | 249 | xpc_vars->version = XPC_V_VERSION; |
237 | xpc_vars->act_nasid = cpuid_to_nasid(0); | 250 | xpc_vars->act_nasid = cpuid_to_nasid(0); |
238 | xpc_vars->act_phys_cpuid = cpu_physical_id(0); | 251 | xpc_vars->act_phys_cpuid = cpu_physical_id(0); |
252 | xpc_vars->vars_part_pa = __pa(xpc_vars_part); | ||
253 | xpc_vars->amos_page_pa = ia64_tpa((u64) amos_page); | ||
239 | xpc_vars->amos_page = amos_page; /* save for next load of XPC */ | 254 | xpc_vars->amos_page = amos_page; /* save for next load of XPC */ |
240 | 255 | ||
241 | 256 | ||
242 | /* | 257 | /* clear xpc_vars_part */ |
243 | * Initialize the activation related AMO variables. | 258 | memset((u64 *) xpc_vars_part, 0, sizeof(struct xpc_vars_part) * |
244 | */ | 259 | XP_MAX_PARTITIONS); |
245 | xpc_vars->act_amos = xpc_IPI_init(XP_MAX_PARTITIONS); | 260 | |
246 | for (i = 1; i < XP_NASID_MASK_WORDS; i++) { | 261 | /* initialize the activate IRQ related AMO variables */ |
247 | xpc_IPI_init(i + XP_MAX_PARTITIONS); | 262 | for (i = 0; i < xp_nasid_mask_words; i++) { |
263 | (void) xpc_IPI_init(XPC_ACTIVATE_IRQ_AMOS + i); | ||
248 | } | 264 | } |
249 | /* export AMO page's physical address to other partitions */ | 265 | |
250 | xpc_vars->amos_page_pa = ia64_tpa((u64) xpc_vars->amos_page); | 266 | /* initialize the engaged remote partitions related AMO variables */ |
267 | (void) xpc_IPI_init(XPC_ENGAGED_PARTITIONS_AMO); | ||
268 | (void) xpc_IPI_init(XPC_DISENGAGE_REQUEST_AMO); | ||
269 | |||
270 | /* timestamp of when reserved page was setup by XPC */ | ||
271 | rp->stamp = CURRENT_TIME; | ||
251 | 272 | ||
252 | /* | 273 | /* |
253 | * This signifies to the remote partition that our reserved | 274 | * This signifies to the remote partition that our reserved |
@@ -387,6 +408,11 @@ xpc_check_remote_hb(void) | |||
387 | remote_vars = (struct xpc_vars *) xpc_remote_copy_buffer; | 408 | remote_vars = (struct xpc_vars *) xpc_remote_copy_buffer; |
388 | 409 | ||
389 | for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) { | 410 | for (partid = 1; partid < XP_MAX_PARTITIONS; partid++) { |
411 | |||
412 | if (xpc_exiting) { | ||
413 | break; | ||
414 | } | ||
415 | |||
390 | if (partid == sn_partition_id) { | 416 | if (partid == sn_partition_id) { |
391 | continue; | 417 | continue; |
392 | } | 418 | } |
@@ -401,7 +427,7 @@ xpc_check_remote_hb(void) | |||
401 | /* pull the remote_hb cache line */ | 427 | /* pull the remote_hb cache line */ |
402 | bres = xp_bte_copy(part->remote_vars_pa, | 428 | bres = xp_bte_copy(part->remote_vars_pa, |
403 | ia64_tpa((u64) remote_vars), | 429 | ia64_tpa((u64) remote_vars), |
404 | XPC_VARS_ALIGNED_SIZE, | 430 | XPC_RP_VARS_SIZE, |
405 | (BTE_NOTIFY | BTE_WACQUIRE), NULL); | 431 | (BTE_NOTIFY | BTE_WACQUIRE), NULL); |
406 | if (bres != BTE_SUCCESS) { | 432 | if (bres != BTE_SUCCESS) { |
407 | XPC_DEACTIVATE_PARTITION(part, | 433 | XPC_DEACTIVATE_PARTITION(part, |
@@ -417,7 +443,7 @@ xpc_check_remote_hb(void) | |||
417 | 443 | ||
418 | if (((remote_vars->heartbeat == part->last_heartbeat) && | 444 | if (((remote_vars->heartbeat == part->last_heartbeat) && |
419 | (remote_vars->kdb_status == 0)) || | 445 | (remote_vars->kdb_status == 0)) || |
420 | !XPC_HB_ALLOWED(sn_partition_id, remote_vars)) { | 446 | !xpc_hb_allowed(sn_partition_id, remote_vars)) { |
421 | 447 | ||
422 | XPC_DEACTIVATE_PARTITION(part, xpcNoHeartbeat); | 448 | XPC_DEACTIVATE_PARTITION(part, xpcNoHeartbeat); |
423 | continue; | 449 | continue; |
@@ -429,31 +455,31 @@ xpc_check_remote_hb(void) | |||
429 | 455 | ||
430 | 456 | ||
431 | /* | 457 | /* |
432 | * Get a copy of the remote partition's rsvd page. | 458 | * Get a copy of a portion of the remote partition's rsvd page. |
433 | * | 459 | * |
434 | * remote_rp points to a buffer that is cacheline aligned for BTE copies and | 460 | * remote_rp points to a buffer that is cacheline aligned for BTE copies and |
435 | * assumed to be of size XPC_RSVD_PAGE_ALIGNED_SIZE. | 461 | * is large enough to contain a copy of their reserved page header and |
462 | * part_nasids mask. | ||
436 | */ | 463 | */ |
437 | static enum xpc_retval | 464 | static enum xpc_retval |
438 | xpc_get_remote_rp(int nasid, u64 *discovered_nasids, | 465 | xpc_get_remote_rp(int nasid, u64 *discovered_nasids, |
439 | struct xpc_rsvd_page *remote_rp, u64 *remote_rsvd_page_pa) | 466 | struct xpc_rsvd_page *remote_rp, u64 *remote_rp_pa) |
440 | { | 467 | { |
441 | int bres, i; | 468 | int bres, i; |
442 | 469 | ||
443 | 470 | ||
444 | /* get the reserved page's physical address */ | 471 | /* get the reserved page's physical address */ |
445 | 472 | ||
446 | *remote_rsvd_page_pa = xpc_get_rsvd_page_pa(nasid, (u64) remote_rp, | 473 | *remote_rp_pa = xpc_get_rsvd_page_pa(nasid); |
447 | XPC_RSVD_PAGE_ALIGNED_SIZE); | 474 | if (*remote_rp_pa == 0) { |
448 | if (*remote_rsvd_page_pa == 0) { | ||
449 | return xpcNoRsvdPageAddr; | 475 | return xpcNoRsvdPageAddr; |
450 | } | 476 | } |
451 | 477 | ||
452 | 478 | ||
453 | /* pull over the reserved page structure */ | 479 | /* pull over the reserved page header and part_nasids mask */ |
454 | 480 | ||
455 | bres = xp_bte_copy(*remote_rsvd_page_pa, ia64_tpa((u64) remote_rp), | 481 | bres = xp_bte_copy(*remote_rp_pa, ia64_tpa((u64) remote_rp), |
456 | XPC_RSVD_PAGE_ALIGNED_SIZE, | 482 | XPC_RP_HEADER_SIZE + xp_nasid_mask_bytes, |
457 | (BTE_NOTIFY | BTE_WACQUIRE), NULL); | 483 | (BTE_NOTIFY | BTE_WACQUIRE), NULL); |
458 | if (bres != BTE_SUCCESS) { | 484 | if (bres != BTE_SUCCESS) { |
459 | return xpc_map_bte_errors(bres); | 485 | return xpc_map_bte_errors(bres); |
@@ -461,8 +487,11 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids, | |||
461 | 487 | ||
462 | 488 | ||
463 | if (discovered_nasids != NULL) { | 489 | if (discovered_nasids != NULL) { |
464 | for (i = 0; i < XP_NASID_MASK_WORDS; i++) { | 490 | u64 *remote_part_nasids = XPC_RP_PART_NASIDS(remote_rp); |
465 | discovered_nasids[i] |= remote_rp->part_nasids[i]; | 491 | |
492 | |||
493 | for (i = 0; i < xp_nasid_mask_words; i++) { | ||
494 | discovered_nasids[i] |= remote_part_nasids[i]; | ||
466 | } | 495 | } |
467 | } | 496 | } |
468 | 497 | ||
@@ -489,10 +518,10 @@ xpc_get_remote_rp(int nasid, u64 *discovered_nasids, | |||
489 | 518 | ||
490 | 519 | ||
491 | /* | 520 | /* |
492 | * Get a copy of the remote partition's XPC variables. | 521 | * Get a copy of the remote partition's XPC variables from the reserved page. |
493 | * | 522 | * |
494 | * remote_vars points to a buffer that is cacheline aligned for BTE copies and | 523 | * remote_vars points to a buffer that is cacheline aligned for BTE copies and |
495 | * assumed to be of size XPC_VARS_ALIGNED_SIZE. | 524 | * assumed to be of size XPC_RP_VARS_SIZE. |
496 | */ | 525 | */ |
497 | static enum xpc_retval | 526 | static enum xpc_retval |
498 | xpc_get_remote_vars(u64 remote_vars_pa, struct xpc_vars *remote_vars) | 527 | xpc_get_remote_vars(u64 remote_vars_pa, struct xpc_vars *remote_vars) |
@@ -508,7 +537,7 @@ xpc_get_remote_vars(u64 remote_vars_pa, struct xpc_vars *remote_vars) | |||
508 | /* pull over the cross partition variables */ | 537 | /* pull over the cross partition variables */ |
509 | 538 | ||
510 | bres = xp_bte_copy(remote_vars_pa, ia64_tpa((u64) remote_vars), | 539 | bres = xp_bte_copy(remote_vars_pa, ia64_tpa((u64) remote_vars), |
511 | XPC_VARS_ALIGNED_SIZE, | 540 | XPC_RP_VARS_SIZE, |
512 | (BTE_NOTIFY | BTE_WACQUIRE), NULL); | 541 | (BTE_NOTIFY | BTE_WACQUIRE), NULL); |
513 | if (bres != BTE_SUCCESS) { | 542 | if (bres != BTE_SUCCESS) { |
514 | return xpc_map_bte_errors(bres); | 543 | return xpc_map_bte_errors(bres); |
@@ -524,7 +553,56 @@ xpc_get_remote_vars(u64 remote_vars_pa, struct xpc_vars *remote_vars) | |||
524 | 553 | ||
525 | 554 | ||
526 | /* | 555 | /* |
527 | * Prior code has determine the nasid which generated an IPI. Inspect | 556 | * Update the remote partition's info. |
557 | */ | ||
558 | static void | ||
559 | xpc_update_partition_info(struct xpc_partition *part, u8 remote_rp_version, | ||
560 | struct timespec *remote_rp_stamp, u64 remote_rp_pa, | ||
561 | u64 remote_vars_pa, struct xpc_vars *remote_vars) | ||
562 | { | ||
563 | part->remote_rp_version = remote_rp_version; | ||
564 | dev_dbg(xpc_part, " remote_rp_version = 0x%016lx\n", | ||
565 | part->remote_rp_version); | ||
566 | |||
567 | part->remote_rp_stamp = *remote_rp_stamp; | ||
568 | dev_dbg(xpc_part, " remote_rp_stamp (tv_sec = 0x%lx tv_nsec = 0x%lx\n", | ||
569 | part->remote_rp_stamp.tv_sec, part->remote_rp_stamp.tv_nsec); | ||
570 | |||
571 | part->remote_rp_pa = remote_rp_pa; | ||
572 | dev_dbg(xpc_part, " remote_rp_pa = 0x%016lx\n", part->remote_rp_pa); | ||
573 | |||
574 | part->remote_vars_pa = remote_vars_pa; | ||
575 | dev_dbg(xpc_part, " remote_vars_pa = 0x%016lx\n", | ||
576 | part->remote_vars_pa); | ||
577 | |||
578 | part->last_heartbeat = remote_vars->heartbeat; | ||
579 | dev_dbg(xpc_part, " last_heartbeat = 0x%016lx\n", | ||
580 | part->last_heartbeat); | ||
581 | |||
582 | part->remote_vars_part_pa = remote_vars->vars_part_pa; | ||
583 | dev_dbg(xpc_part, " remote_vars_part_pa = 0x%016lx\n", | ||
584 | part->remote_vars_part_pa); | ||
585 | |||
586 | part->remote_act_nasid = remote_vars->act_nasid; | ||
587 | dev_dbg(xpc_part, " remote_act_nasid = 0x%x\n", | ||
588 | part->remote_act_nasid); | ||
589 | |||
590 | part->remote_act_phys_cpuid = remote_vars->act_phys_cpuid; | ||
591 | dev_dbg(xpc_part, " remote_act_phys_cpuid = 0x%x\n", | ||
592 | part->remote_act_phys_cpuid); | ||
593 | |||
594 | part->remote_amos_page_pa = remote_vars->amos_page_pa; | ||
595 | dev_dbg(xpc_part, " remote_amos_page_pa = 0x%lx\n", | ||
596 | part->remote_amos_page_pa); | ||
597 | |||
598 | part->remote_vars_version = remote_vars->version; | ||
599 | dev_dbg(xpc_part, " remote_vars_version = 0x%x\n", | ||
600 | part->remote_vars_version); | ||
601 | } | ||
602 | |||
603 | |||
604 | /* | ||
605 | * Prior code has determined the nasid which generated an IPI. Inspect | ||
528 | * that nasid to determine if its partition needs to be activated or | 606 | * that nasid to determine if its partition needs to be activated or |
529 | * deactivated. | 607 | * deactivated. |
530 | * | 608 | * |
@@ -542,8 +620,12 @@ xpc_identify_act_IRQ_req(int nasid) | |||
542 | { | 620 | { |
543 | struct xpc_rsvd_page *remote_rp; | 621 | struct xpc_rsvd_page *remote_rp; |
544 | struct xpc_vars *remote_vars; | 622 | struct xpc_vars *remote_vars; |
545 | u64 remote_rsvd_page_pa; | 623 | u64 remote_rp_pa; |
546 | u64 remote_vars_pa; | 624 | u64 remote_vars_pa; |
625 | int remote_rp_version; | ||
626 | int reactivate = 0; | ||
627 | int stamp_diff; | ||
628 | struct timespec remote_rp_stamp = { 0, 0 }; | ||
547 | partid_t partid; | 629 | partid_t partid; |
548 | struct xpc_partition *part; | 630 | struct xpc_partition *part; |
549 | enum xpc_retval ret; | 631 | enum xpc_retval ret; |
@@ -553,7 +635,7 @@ xpc_identify_act_IRQ_req(int nasid) | |||
553 | 635 | ||
554 | remote_rp = (struct xpc_rsvd_page *) xpc_remote_copy_buffer; | 636 | remote_rp = (struct xpc_rsvd_page *) xpc_remote_copy_buffer; |
555 | 637 | ||
556 | ret = xpc_get_remote_rp(nasid, NULL, remote_rp, &remote_rsvd_page_pa); | 638 | ret = xpc_get_remote_rp(nasid, NULL, remote_rp, &remote_rp_pa); |
557 | if (ret != xpcSuccess) { | 639 | if (ret != xpcSuccess) { |
558 | dev_warn(xpc_part, "unable to get reserved page from nasid %d, " | 640 | dev_warn(xpc_part, "unable to get reserved page from nasid %d, " |
559 | "which sent interrupt, reason=%d\n", nasid, ret); | 641 | "which sent interrupt, reason=%d\n", nasid, ret); |
@@ -561,6 +643,10 @@ xpc_identify_act_IRQ_req(int nasid) | |||
561 | } | 643 | } |
562 | 644 | ||
563 | remote_vars_pa = remote_rp->vars_pa; | 645 | remote_vars_pa = remote_rp->vars_pa; |
646 | remote_rp_version = remote_rp->version; | ||
647 | if (XPC_SUPPORTS_RP_STAMP(remote_rp_version)) { | ||
648 | remote_rp_stamp = remote_rp->stamp; | ||
649 | } | ||
564 | partid = remote_rp->partid; | 650 | partid = remote_rp->partid; |
565 | part = &xpc_partitions[partid]; | 651 | part = &xpc_partitions[partid]; |
566 | 652 | ||
@@ -586,44 +672,117 @@ xpc_identify_act_IRQ_req(int nasid) | |||
586 | "%ld:0x%lx\n", (int) nasid, (int) partid, part->act_IRQ_rcvd, | 672 | "%ld:0x%lx\n", (int) nasid, (int) partid, part->act_IRQ_rcvd, |
587 | remote_vars->heartbeat, remote_vars->heartbeating_to_mask); | 673 | remote_vars->heartbeat, remote_vars->heartbeating_to_mask); |
588 | 674 | ||
675 | if (xpc_partition_disengaged(part) && | ||
676 | part->act_state == XPC_P_INACTIVE) { | ||
589 | 677 | ||
590 | if (part->act_state == XPC_P_INACTIVE) { | 678 | xpc_update_partition_info(part, remote_rp_version, |
679 | &remote_rp_stamp, remote_rp_pa, | ||
680 | remote_vars_pa, remote_vars); | ||
591 | 681 | ||
592 | part->remote_rp_pa = remote_rsvd_page_pa; | 682 | if (XPC_SUPPORTS_DISENGAGE_REQUEST(part->remote_vars_version)) { |
593 | dev_dbg(xpc_part, " remote_rp_pa = 0x%016lx\n", | 683 | if (xpc_partition_disengage_requested(1UL << partid)) { |
594 | part->remote_rp_pa); | 684 | /* |
685 | * Other side is waiting on us to disengage, | ||
686 | * even though we already have. | ||
687 | */ | ||
688 | return; | ||
689 | } | ||
690 | } else { | ||
691 | /* other side doesn't support disengage requests */ | ||
692 | xpc_clear_partition_disengage_request(1UL << partid); | ||
693 | } | ||
595 | 694 | ||
596 | part->remote_vars_pa = remote_vars_pa; | 695 | xpc_activate_partition(part); |
597 | dev_dbg(xpc_part, " remote_vars_pa = 0x%016lx\n", | 696 | return; |
598 | part->remote_vars_pa); | 697 | } |
599 | 698 | ||
600 | part->last_heartbeat = remote_vars->heartbeat; | 699 | DBUG_ON(part->remote_rp_version == 0); |
601 | dev_dbg(xpc_part, " last_heartbeat = 0x%016lx\n", | 700 | DBUG_ON(part->remote_vars_version == 0); |
602 | part->last_heartbeat); | 701 | |
702 | if (!XPC_SUPPORTS_RP_STAMP(part->remote_rp_version)) { | ||
703 | DBUG_ON(XPC_SUPPORTS_DISENGAGE_REQUEST(part-> | ||
704 | remote_vars_version)); | ||
705 | |||
706 | if (!XPC_SUPPORTS_RP_STAMP(remote_rp_version)) { | ||
707 | DBUG_ON(XPC_SUPPORTS_DISENGAGE_REQUEST(remote_vars-> | ||
708 | version)); | ||
709 | /* see if the other side rebooted */ | ||
710 | if (part->remote_amos_page_pa == | ||
711 | remote_vars->amos_page_pa && | ||
712 | xpc_hb_allowed(sn_partition_id, | ||
713 | remote_vars)) { | ||
714 | /* doesn't look that way, so ignore the IPI */ | ||
715 | return; | ||
716 | } | ||
717 | } | ||
603 | 718 | ||
604 | part->remote_vars_part_pa = remote_vars->vars_part_pa; | 719 | /* |
605 | dev_dbg(xpc_part, " remote_vars_part_pa = 0x%016lx\n", | 720 | * Other side rebooted and previous XPC didn't support the |
606 | part->remote_vars_part_pa); | 721 | * disengage request, so we don't need to do anything special. |
722 | */ | ||
607 | 723 | ||
608 | part->remote_act_nasid = remote_vars->act_nasid; | 724 | xpc_update_partition_info(part, remote_rp_version, |
609 | dev_dbg(xpc_part, " remote_act_nasid = 0x%x\n", | 725 | &remote_rp_stamp, remote_rp_pa, |
610 | part->remote_act_nasid); | 726 | remote_vars_pa, remote_vars); |
727 | part->reactivate_nasid = nasid; | ||
728 | XPC_DEACTIVATE_PARTITION(part, xpcReactivating); | ||
729 | return; | ||
730 | } | ||
611 | 731 | ||
612 | part->remote_act_phys_cpuid = remote_vars->act_phys_cpuid; | 732 | DBUG_ON(!XPC_SUPPORTS_DISENGAGE_REQUEST(part->remote_vars_version)); |
613 | dev_dbg(xpc_part, " remote_act_phys_cpuid = 0x%x\n", | ||
614 | part->remote_act_phys_cpuid); | ||
615 | 733 | ||
616 | part->remote_amos_page_pa = remote_vars->amos_page_pa; | 734 | if (!XPC_SUPPORTS_RP_STAMP(remote_rp_version)) { |
617 | dev_dbg(xpc_part, " remote_amos_page_pa = 0x%lx\n", | 735 | DBUG_ON(!XPC_SUPPORTS_DISENGAGE_REQUEST(remote_vars->version)); |
618 | part->remote_amos_page_pa); | ||
619 | 736 | ||
620 | xpc_activate_partition(part); | 737 | /* |
738 | * Other side rebooted and previous XPC did support the | ||
739 | * disengage request, but the new one doesn't. | ||
740 | */ | ||
741 | |||
742 | xpc_clear_partition_engaged(1UL << partid); | ||
743 | xpc_clear_partition_disengage_request(1UL << partid); | ||
621 | 744 | ||
622 | } else if (part->remote_amos_page_pa != remote_vars->amos_page_pa || | 745 | xpc_update_partition_info(part, remote_rp_version, |
623 | !XPC_HB_ALLOWED(sn_partition_id, remote_vars)) { | 746 | &remote_rp_stamp, remote_rp_pa, |
747 | remote_vars_pa, remote_vars); | ||
748 | reactivate = 1; | ||
749 | |||
750 | } else { | ||
751 | DBUG_ON(!XPC_SUPPORTS_DISENGAGE_REQUEST(remote_vars->version)); | ||
624 | 752 | ||
753 | stamp_diff = xpc_compare_stamps(&part->remote_rp_stamp, | ||
754 | &remote_rp_stamp); | ||
755 | if (stamp_diff != 0) { | ||
756 | DBUG_ON(stamp_diff >= 0); | ||
757 | |||
758 | /* | ||
759 | * Other side rebooted and the previous XPC did support | ||
760 | * the disengage request, as does the new one. | ||
761 | */ | ||
762 | |||
763 | DBUG_ON(xpc_partition_engaged(1UL << partid)); | ||
764 | DBUG_ON(xpc_partition_disengage_requested(1UL << | ||
765 | partid)); | ||
766 | |||
767 | xpc_update_partition_info(part, remote_rp_version, | ||
768 | &remote_rp_stamp, remote_rp_pa, | ||
769 | remote_vars_pa, remote_vars); | ||
770 | reactivate = 1; | ||
771 | } | ||
772 | } | ||
773 | |||
774 | if (!xpc_partition_disengaged(part)) { | ||
775 | /* still waiting on other side to disengage from us */ | ||
776 | return; | ||
777 | } | ||
778 | |||
779 | if (reactivate) { | ||
625 | part->reactivate_nasid = nasid; | 780 | part->reactivate_nasid = nasid; |
626 | XPC_DEACTIVATE_PARTITION(part, xpcReactivating); | 781 | XPC_DEACTIVATE_PARTITION(part, xpcReactivating); |
782 | |||
783 | } else if (XPC_SUPPORTS_DISENGAGE_REQUEST(part->remote_vars_version) && | ||
784 | xpc_partition_disengage_requested(1UL << partid)) { | ||
785 | XPC_DEACTIVATE_PARTITION(part, xpcOtherGoingDown); | ||
627 | } | 786 | } |
628 | } | 787 | } |
629 | 788 | ||
@@ -643,14 +802,17 @@ xpc_identify_act_IRQ_sender(void) | |||
643 | u64 nasid; /* remote nasid */ | 802 | u64 nasid; /* remote nasid */ |
644 | int n_IRQs_detected = 0; | 803 | int n_IRQs_detected = 0; |
645 | AMO_t *act_amos; | 804 | AMO_t *act_amos; |
646 | struct xpc_rsvd_page *rp = (struct xpc_rsvd_page *) xpc_rsvd_page; | ||
647 | 805 | ||
648 | 806 | ||
649 | act_amos = xpc_vars->act_amos; | 807 | act_amos = xpc_vars->amos_page + XPC_ACTIVATE_IRQ_AMOS; |
650 | 808 | ||
651 | 809 | ||
652 | /* scan through act AMO variable looking for non-zero entries */ | 810 | /* scan through act AMO variable looking for non-zero entries */ |
653 | for (word = 0; word < XP_NASID_MASK_WORDS; word++) { | 811 | for (word = 0; word < xp_nasid_mask_words; word++) { |
812 | |||
813 | if (xpc_exiting) { | ||
814 | break; | ||
815 | } | ||
654 | 816 | ||
655 | nasid_mask = xpc_IPI_receive(&act_amos[word]); | 817 | nasid_mask = xpc_IPI_receive(&act_amos[word]); |
656 | if (nasid_mask == 0) { | 818 | if (nasid_mask == 0) { |
@@ -668,7 +830,7 @@ xpc_identify_act_IRQ_sender(void) | |||
668 | * remote nasid in our reserved pages machine mask. | 830 | * remote nasid in our reserved pages machine mask. |
669 | * This is used in the event of module reload. | 831 | * This is used in the event of module reload. |
670 | */ | 832 | */ |
671 | rp->mach_nasids[word] |= nasid_mask; | 833 | xpc_mach_nasids[word] |= nasid_mask; |
672 | 834 | ||
673 | 835 | ||
674 | /* locate the nasid(s) which sent interrupts */ | 836 | /* locate the nasid(s) which sent interrupts */ |
@@ -688,6 +850,55 @@ xpc_identify_act_IRQ_sender(void) | |||
688 | 850 | ||
689 | 851 | ||
690 | /* | 852 | /* |
853 | * See if the other side has responded to a partition disengage request | ||
854 | * from us. | ||
855 | */ | ||
856 | int | ||
857 | xpc_partition_disengaged(struct xpc_partition *part) | ||
858 | { | ||
859 | partid_t partid = XPC_PARTID(part); | ||
860 | int disengaged; | ||
861 | |||
862 | |||
863 | disengaged = (xpc_partition_engaged(1UL << partid) == 0); | ||
864 | if (part->disengage_request_timeout) { | ||
865 | if (!disengaged) { | ||
866 | if (jiffies < part->disengage_request_timeout) { | ||
867 | /* timelimit hasn't been reached yet */ | ||
868 | return 0; | ||
869 | } | ||
870 | |||
871 | /* | ||
872 | * Other side hasn't responded to our disengage | ||
873 | * request in a timely fashion, so assume it's dead. | ||
874 | */ | ||
875 | |||
876 | xpc_clear_partition_engaged(1UL << partid); | ||
877 | disengaged = 1; | ||
878 | } | ||
879 | part->disengage_request_timeout = 0; | ||
880 | |||
881 | /* cancel the timer function, provided it's not us */ | ||
882 | if (!in_interrupt()) { | ||
883 | del_singleshot_timer_sync(&part-> | ||
884 | disengage_request_timer); | ||
885 | } | ||
886 | |||
887 | DBUG_ON(part->act_state != XPC_P_DEACTIVATING && | ||
888 | part->act_state != XPC_P_INACTIVE); | ||
889 | if (part->act_state != XPC_P_INACTIVE) { | ||
890 | xpc_wakeup_channel_mgr(part); | ||
891 | } | ||
892 | |||
893 | if (XPC_SUPPORTS_DISENGAGE_REQUEST(part->remote_vars_version)) { | ||
894 | xpc_cancel_partition_disengage_request(part); | ||
895 | } | ||
896 | } | ||
897 | return disengaged; | ||
898 | } | ||
899 | |||
900 | |||
901 | /* | ||
691 | * Mark specified partition as active. | 902 | * Mark specified partition as active. |
692 | */ | 903 | */ |
693 | enum xpc_retval | 904 | enum xpc_retval |
@@ -721,7 +932,6 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part, | |||
721 | enum xpc_retval reason) | 932 | enum xpc_retval reason) |
722 | { | 933 | { |
723 | unsigned long irq_flags; | 934 | unsigned long irq_flags; |
724 | partid_t partid = XPC_PARTID(part); | ||
725 | 935 | ||
726 | 936 | ||
727 | spin_lock_irqsave(&part->act_lock, irq_flags); | 937 | spin_lock_irqsave(&part->act_lock, irq_flags); |
@@ -749,17 +959,27 @@ xpc_deactivate_partition(const int line, struct xpc_partition *part, | |||
749 | 959 | ||
750 | spin_unlock_irqrestore(&part->act_lock, irq_flags); | 960 | spin_unlock_irqrestore(&part->act_lock, irq_flags); |
751 | 961 | ||
752 | XPC_DISALLOW_HB(partid, xpc_vars); | 962 | if (XPC_SUPPORTS_DISENGAGE_REQUEST(part->remote_vars_version)) { |
963 | xpc_request_partition_disengage(part); | ||
964 | xpc_IPI_send_disengage(part); | ||
753 | 965 | ||
754 | dev_dbg(xpc_part, "bringing partition %d down, reason = %d\n", partid, | 966 | /* set a timelimit on the disengage request */ |
755 | reason); | 967 | part->disengage_request_timeout = jiffies + |
968 | (xpc_disengage_request_timelimit * HZ); | ||
969 | part->disengage_request_timer.expires = | ||
970 | part->disengage_request_timeout; | ||
971 | add_timer(&part->disengage_request_timer); | ||
972 | } | ||
973 | |||
974 | dev_dbg(xpc_part, "bringing partition %d down, reason = %d\n", | ||
975 | XPC_PARTID(part), reason); | ||
756 | 976 | ||
757 | xpc_partition_down(part, reason); | 977 | xpc_partition_going_down(part, reason); |
758 | } | 978 | } |
759 | 979 | ||
760 | 980 | ||
761 | /* | 981 | /* |
762 | * Mark specified partition as active. | 982 | * Mark specified partition as inactive. |
763 | */ | 983 | */ |
764 | void | 984 | void |
765 | xpc_mark_partition_inactive(struct xpc_partition *part) | 985 | xpc_mark_partition_inactive(struct xpc_partition *part) |
@@ -792,9 +1012,10 @@ xpc_discovery(void) | |||
792 | void *remote_rp_base; | 1012 | void *remote_rp_base; |
793 | struct xpc_rsvd_page *remote_rp; | 1013 | struct xpc_rsvd_page *remote_rp; |
794 | struct xpc_vars *remote_vars; | 1014 | struct xpc_vars *remote_vars; |
795 | u64 remote_rsvd_page_pa; | 1015 | u64 remote_rp_pa; |
796 | u64 remote_vars_pa; | 1016 | u64 remote_vars_pa; |
797 | int region; | 1017 | int region; |
1018 | int region_size; | ||
798 | int max_regions; | 1019 | int max_regions; |
799 | int nasid; | 1020 | int nasid; |
800 | struct xpc_rsvd_page *rp; | 1021 | struct xpc_rsvd_page *rp; |
@@ -804,7 +1025,8 @@ xpc_discovery(void) | |||
804 | enum xpc_retval ret; | 1025 | enum xpc_retval ret; |
805 | 1026 | ||
806 | 1027 | ||
807 | remote_rp = xpc_kmalloc_cacheline_aligned(XPC_RSVD_PAGE_ALIGNED_SIZE, | 1028 | remote_rp = xpc_kmalloc_cacheline_aligned(XPC_RP_HEADER_SIZE + |
1029 | xp_nasid_mask_bytes, | ||
808 | GFP_KERNEL, &remote_rp_base); | 1030 | GFP_KERNEL, &remote_rp_base); |
809 | if (remote_rp == NULL) { | 1031 | if (remote_rp == NULL) { |
810 | return; | 1032 | return; |
@@ -812,13 +1034,13 @@ xpc_discovery(void) | |||
812 | remote_vars = (struct xpc_vars *) remote_rp; | 1034 | remote_vars = (struct xpc_vars *) remote_rp; |
813 | 1035 | ||
814 | 1036 | ||
815 | discovered_nasids = kmalloc(sizeof(u64) * XP_NASID_MASK_WORDS, | 1037 | discovered_nasids = kmalloc(sizeof(u64) * xp_nasid_mask_words, |
816 | GFP_KERNEL); | 1038 | GFP_KERNEL); |
817 | if (discovered_nasids == NULL) { | 1039 | if (discovered_nasids == NULL) { |
818 | kfree(remote_rp_base); | 1040 | kfree(remote_rp_base); |
819 | return; | 1041 | return; |
820 | } | 1042 | } |
821 | memset(discovered_nasids, 0, sizeof(u64) * XP_NASID_MASK_WORDS); | 1043 | memset(discovered_nasids, 0, sizeof(u64) * xp_nasid_mask_words); |
822 | 1044 | ||
823 | rp = (struct xpc_rsvd_page *) xpc_rsvd_page; | 1045 | rp = (struct xpc_rsvd_page *) xpc_rsvd_page; |
824 | 1046 | ||
@@ -827,11 +1049,19 @@ xpc_discovery(void) | |||
827 | * nodes that can comprise an access protection grouping. The access | 1049 | * nodes that can comprise an access protection grouping. The access |
828 | * protection is in regards to memory, IOI and IPI. | 1050 | * protection is in regards to memory, IOI and IPI. |
829 | */ | 1051 | */ |
830 | //>>> move the next two #defines into either include/asm-ia64/sn/arch.h or | 1052 | max_regions = 64; |
831 | //>>> include/asm-ia64/sn/addrs.h | 1053 | region_size = sn_region_size; |
832 | #define SH1_MAX_REGIONS 64 | 1054 | |
833 | #define SH2_MAX_REGIONS 256 | 1055 | switch (region_size) { |
834 | max_regions = is_shub2() ? SH2_MAX_REGIONS : SH1_MAX_REGIONS; | 1056 | case 128: |
1057 | max_regions *= 2; | ||
1058 | case 64: | ||
1059 | max_regions *= 2; | ||
1060 | case 32: | ||
1061 | max_regions *= 2; | ||
1062 | region_size = 16; | ||
1063 | DBUG_ON(!is_shub2()); | ||
1064 | } | ||
835 | 1065 | ||
836 | for (region = 0; region < max_regions; region++) { | 1066 | for (region = 0; region < max_regions; region++) { |
837 | 1067 | ||
@@ -841,8 +1071,8 @@ xpc_discovery(void) | |||
841 | 1071 | ||
842 | dev_dbg(xpc_part, "searching region %d\n", region); | 1072 | dev_dbg(xpc_part, "searching region %d\n", region); |
843 | 1073 | ||
844 | for (nasid = (region * sn_region_size * 2); | 1074 | for (nasid = (region * region_size * 2); |
845 | nasid < ((region + 1) * sn_region_size * 2); | 1075 | nasid < ((region + 1) * region_size * 2); |
846 | nasid += 2) { | 1076 | nasid += 2) { |
847 | 1077 | ||
848 | if ((volatile int) xpc_exiting) { | 1078 | if ((volatile int) xpc_exiting) { |
@@ -852,14 +1082,14 @@ xpc_discovery(void) | |||
852 | dev_dbg(xpc_part, "checking nasid %d\n", nasid); | 1082 | dev_dbg(xpc_part, "checking nasid %d\n", nasid); |
853 | 1083 | ||
854 | 1084 | ||
855 | if (XPC_NASID_IN_ARRAY(nasid, rp->part_nasids)) { | 1085 | if (XPC_NASID_IN_ARRAY(nasid, xpc_part_nasids)) { |
856 | dev_dbg(xpc_part, "PROM indicates Nasid %d is " | 1086 | dev_dbg(xpc_part, "PROM indicates Nasid %d is " |
857 | "part of the local partition; skipping " | 1087 | "part of the local partition; skipping " |
858 | "region\n", nasid); | 1088 | "region\n", nasid); |
859 | break; | 1089 | break; |
860 | } | 1090 | } |
861 | 1091 | ||
862 | if (!(XPC_NASID_IN_ARRAY(nasid, rp->mach_nasids))) { | 1092 | if (!(XPC_NASID_IN_ARRAY(nasid, xpc_mach_nasids))) { |
863 | dev_dbg(xpc_part, "PROM indicates Nasid %d was " | 1093 | dev_dbg(xpc_part, "PROM indicates Nasid %d was " |
864 | "not on Numa-Link network at reset\n", | 1094 | "not on Numa-Link network at reset\n", |
865 | nasid); | 1095 | nasid); |
@@ -877,7 +1107,7 @@ xpc_discovery(void) | |||
877 | /* pull over the reserved page structure */ | 1107 | /* pull over the reserved page structure */ |
878 | 1108 | ||
879 | ret = xpc_get_remote_rp(nasid, discovered_nasids, | 1109 | ret = xpc_get_remote_rp(nasid, discovered_nasids, |
880 | remote_rp, &remote_rsvd_page_pa); | 1110 | remote_rp, &remote_rp_pa); |
881 | if (ret != xpcSuccess) { | 1111 | if (ret != xpcSuccess) { |
882 | dev_dbg(xpc_part, "unable to get reserved page " | 1112 | dev_dbg(xpc_part, "unable to get reserved page " |
883 | "from nasid %d, reason=%d\n", nasid, | 1113 | "from nasid %d, reason=%d\n", nasid, |
@@ -948,6 +1178,13 @@ xpc_discovery(void) | |||
948 | remote_vars->act_nasid, | 1178 | remote_vars->act_nasid, |
949 | remote_vars->act_phys_cpuid); | 1179 | remote_vars->act_phys_cpuid); |
950 | 1180 | ||
1181 | if (XPC_SUPPORTS_DISENGAGE_REQUEST(remote_vars-> | ||
1182 | version)) { | ||
1183 | part->remote_amos_page_pa = | ||
1184 | remote_vars->amos_page_pa; | ||
1185 | xpc_mark_partition_disengaged(part); | ||
1186 | xpc_cancel_partition_disengage_request(part); | ||
1187 | } | ||
951 | xpc_IPI_send_activate(remote_vars); | 1188 | xpc_IPI_send_activate(remote_vars); |
952 | } | 1189 | } |
953 | } | 1190 | } |
@@ -974,12 +1211,12 @@ xpc_initiate_partid_to_nasids(partid_t partid, void *nasid_mask) | |||
974 | return xpcPartitionDown; | 1211 | return xpcPartitionDown; |
975 | } | 1212 | } |
976 | 1213 | ||
977 | part_nasid_pa = part->remote_rp_pa + | 1214 | memset(nasid_mask, 0, XP_NASID_MASK_BYTES); |
978 | (u64) &((struct xpc_rsvd_page *) 0)->part_nasids; | 1215 | |
1216 | part_nasid_pa = (u64) XPC_RP_PART_NASIDS(part->remote_rp_pa); | ||
979 | 1217 | ||
980 | bte_res = xp_bte_copy(part_nasid_pa, ia64_tpa((u64) nasid_mask), | 1218 | bte_res = xp_bte_copy(part_nasid_pa, ia64_tpa((u64) nasid_mask), |
981 | L1_CACHE_ALIGN(XP_NASID_MASK_BYTES), | 1219 | xp_nasid_mask_bytes, (BTE_NOTIFY | BTE_WACQUIRE), NULL); |
982 | (BTE_NOTIFY | BTE_WACQUIRE), NULL); | ||
983 | 1220 | ||
984 | return xpc_map_bte_errors(bte_res); | 1221 | return xpc_map_bte_errors(bte_res); |
985 | } | 1222 | } |
diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c index 0e4b9ad9ef02..abdf6eea6ac8 100644 --- a/arch/ia64/sn/pci/pci_dma.c +++ b/arch/ia64/sn/pci/pci_dma.c | |||
@@ -326,6 +326,29 @@ int sn_pci_legacy_read(struct pci_bus *bus, u16 port, u32 *val, u8 size) | |||
326 | { | 326 | { |
327 | unsigned long addr; | 327 | unsigned long addr; |
328 | int ret; | 328 | int ret; |
329 | struct ia64_sal_retval isrv; | ||
330 | |||
331 | /* | ||
332 | * First, try the SN_SAL_IOIF_PCI_SAFE SAL call which can work | ||
333 | * around hw issues at the pci bus level. SGI proms older than | ||
334 | * 4.10 don't implment this. | ||
335 | */ | ||
336 | |||
337 | SAL_CALL(isrv, SN_SAL_IOIF_PCI_SAFE, | ||
338 | pci_domain_nr(bus), bus->number, | ||
339 | 0, /* io */ | ||
340 | 0, /* read */ | ||
341 | port, size, __pa(val)); | ||
342 | |||
343 | if (isrv.status == 0) | ||
344 | return size; | ||
345 | |||
346 | /* | ||
347 | * If the above failed, retry using the SAL_PROBE call which should | ||
348 | * be present in all proms (but which cannot work round PCI chipset | ||
349 | * bugs). This code is retained for compatability with old | ||
350 | * pre-4.10 proms, and should be removed at some point in the future. | ||
351 | */ | ||
329 | 352 | ||
330 | if (!SN_PCIBUS_BUSSOFT(bus)) | 353 | if (!SN_PCIBUS_BUSSOFT(bus)) |
331 | return -ENODEV; | 354 | return -ENODEV; |
@@ -349,6 +372,29 @@ int sn_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size) | |||
349 | int ret = size; | 372 | int ret = size; |
350 | unsigned long paddr; | 373 | unsigned long paddr; |
351 | unsigned long *addr; | 374 | unsigned long *addr; |
375 | struct ia64_sal_retval isrv; | ||
376 | |||
377 | /* | ||
378 | * First, try the SN_SAL_IOIF_PCI_SAFE SAL call which can work | ||
379 | * around hw issues at the pci bus level. SGI proms older than | ||
380 | * 4.10 don't implment this. | ||
381 | */ | ||
382 | |||
383 | SAL_CALL(isrv, SN_SAL_IOIF_PCI_SAFE, | ||
384 | pci_domain_nr(bus), bus->number, | ||
385 | 0, /* io */ | ||
386 | 1, /* write */ | ||
387 | port, size, __pa(&val)); | ||
388 | |||
389 | if (isrv.status == 0) | ||
390 | return size; | ||
391 | |||
392 | /* | ||
393 | * If the above failed, retry using the SAL_PROBE call which should | ||
394 | * be present in all proms (but which cannot work round PCI chipset | ||
395 | * bugs). This code is retained for compatability with old | ||
396 | * pre-4.10 proms, and should be removed at some point in the future. | ||
397 | */ | ||
352 | 398 | ||
353 | if (!SN_PCIBUS_BUSSOFT(bus)) { | 399 | if (!SN_PCIBUS_BUSSOFT(bus)) { |
354 | ret = -ENODEV; | 400 | ret = -ENODEV; |
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_reg.c b/arch/ia64/sn/pci/pcibr/pcibr_reg.c index 21426d02fbe6..4f718c3e93d3 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_reg.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_reg.c | |||
@@ -8,6 +8,7 @@ | |||
8 | 8 | ||
9 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
11 | #include <asm/sn/io.h> | ||
11 | #include <asm/sn/pcibr_provider.h> | 12 | #include <asm/sn/pcibr_provider.h> |
12 | #include <asm/sn/pcibus_provider_defs.h> | 13 | #include <asm/sn/pcibus_provider_defs.h> |
13 | #include <asm/sn/pcidev.h> | 14 | #include <asm/sn/pcidev.h> |
@@ -29,10 +30,10 @@ void pcireg_control_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits) | |||
29 | if (pcibus_info) { | 30 | if (pcibus_info) { |
30 | switch (pcibus_info->pbi_bridge_type) { | 31 | switch (pcibus_info->pbi_bridge_type) { |
31 | case PCIBR_BRIDGETYPE_TIOCP: | 32 | case PCIBR_BRIDGETYPE_TIOCP: |
32 | ptr->tio.cp_control &= ~bits; | 33 | __sn_clrq_relaxed(&ptr->tio.cp_control, bits); |
33 | break; | 34 | break; |
34 | case PCIBR_BRIDGETYPE_PIC: | 35 | case PCIBR_BRIDGETYPE_PIC: |
35 | ptr->pic.p_wid_control &= ~bits; | 36 | __sn_clrq_relaxed(&ptr->pic.p_wid_control, bits); |
36 | break; | 37 | break; |
37 | default: | 38 | default: |
38 | panic | 39 | panic |
@@ -49,10 +50,10 @@ void pcireg_control_bit_set(struct pcibus_info *pcibus_info, uint64_t bits) | |||
49 | if (pcibus_info) { | 50 | if (pcibus_info) { |
50 | switch (pcibus_info->pbi_bridge_type) { | 51 | switch (pcibus_info->pbi_bridge_type) { |
51 | case PCIBR_BRIDGETYPE_TIOCP: | 52 | case PCIBR_BRIDGETYPE_TIOCP: |
52 | ptr->tio.cp_control |= bits; | 53 | __sn_setq_relaxed(&ptr->tio.cp_control, bits); |
53 | break; | 54 | break; |
54 | case PCIBR_BRIDGETYPE_PIC: | 55 | case PCIBR_BRIDGETYPE_PIC: |
55 | ptr->pic.p_wid_control |= bits; | 56 | __sn_setq_relaxed(&ptr->pic.p_wid_control, bits); |
56 | break; | 57 | break; |
57 | default: | 58 | default: |
58 | panic | 59 | panic |
@@ -73,10 +74,10 @@ uint64_t pcireg_tflush_get(struct pcibus_info *pcibus_info) | |||
73 | if (pcibus_info) { | 74 | if (pcibus_info) { |
74 | switch (pcibus_info->pbi_bridge_type) { | 75 | switch (pcibus_info->pbi_bridge_type) { |
75 | case PCIBR_BRIDGETYPE_TIOCP: | 76 | case PCIBR_BRIDGETYPE_TIOCP: |
76 | ret = ptr->tio.cp_tflush; | 77 | ret = __sn_readq_relaxed(&ptr->tio.cp_tflush); |
77 | break; | 78 | break; |
78 | case PCIBR_BRIDGETYPE_PIC: | 79 | case PCIBR_BRIDGETYPE_PIC: |
79 | ret = ptr->pic.p_wid_tflush; | 80 | ret = __sn_readq_relaxed(&ptr->pic.p_wid_tflush); |
80 | break; | 81 | break; |
81 | default: | 82 | default: |
82 | panic | 83 | panic |
@@ -103,10 +104,10 @@ uint64_t pcireg_intr_status_get(struct pcibus_info * pcibus_info) | |||
103 | if (pcibus_info) { | 104 | if (pcibus_info) { |
104 | switch (pcibus_info->pbi_bridge_type) { | 105 | switch (pcibus_info->pbi_bridge_type) { |
105 | case PCIBR_BRIDGETYPE_TIOCP: | 106 | case PCIBR_BRIDGETYPE_TIOCP: |
106 | ret = ptr->tio.cp_int_status; | 107 | ret = __sn_readq_relaxed(&ptr->tio.cp_int_status); |
107 | break; | 108 | break; |
108 | case PCIBR_BRIDGETYPE_PIC: | 109 | case PCIBR_BRIDGETYPE_PIC: |
109 | ret = ptr->pic.p_int_status; | 110 | ret = __sn_readq_relaxed(&ptr->pic.p_int_status); |
110 | break; | 111 | break; |
111 | default: | 112 | default: |
112 | panic | 113 | panic |
@@ -127,10 +128,10 @@ void pcireg_intr_enable_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits) | |||
127 | if (pcibus_info) { | 128 | if (pcibus_info) { |
128 | switch (pcibus_info->pbi_bridge_type) { | 129 | switch (pcibus_info->pbi_bridge_type) { |
129 | case PCIBR_BRIDGETYPE_TIOCP: | 130 | case PCIBR_BRIDGETYPE_TIOCP: |
130 | ptr->tio.cp_int_enable &= ~bits; | 131 | __sn_clrq_relaxed(&ptr->tio.cp_int_enable, bits); |
131 | break; | 132 | break; |
132 | case PCIBR_BRIDGETYPE_PIC: | 133 | case PCIBR_BRIDGETYPE_PIC: |
133 | ptr->pic.p_int_enable &= ~bits; | 134 | __sn_clrq_relaxed(&ptr->pic.p_int_enable, ~bits); |
134 | break; | 135 | break; |
135 | default: | 136 | default: |
136 | panic | 137 | panic |
@@ -147,10 +148,10 @@ void pcireg_intr_enable_bit_set(struct pcibus_info *pcibus_info, uint64_t bits) | |||
147 | if (pcibus_info) { | 148 | if (pcibus_info) { |
148 | switch (pcibus_info->pbi_bridge_type) { | 149 | switch (pcibus_info->pbi_bridge_type) { |
149 | case PCIBR_BRIDGETYPE_TIOCP: | 150 | case PCIBR_BRIDGETYPE_TIOCP: |
150 | ptr->tio.cp_int_enable |= bits; | 151 | __sn_setq_relaxed(&ptr->tio.cp_int_enable, bits); |
151 | break; | 152 | break; |
152 | case PCIBR_BRIDGETYPE_PIC: | 153 | case PCIBR_BRIDGETYPE_PIC: |
153 | ptr->pic.p_int_enable |= bits; | 154 | __sn_setq_relaxed(&ptr->pic.p_int_enable, bits); |
154 | break; | 155 | break; |
155 | default: | 156 | default: |
156 | panic | 157 | panic |
@@ -171,14 +172,16 @@ void pcireg_intr_addr_addr_set(struct pcibus_info *pcibus_info, int int_n, | |||
171 | if (pcibus_info) { | 172 | if (pcibus_info) { |
172 | switch (pcibus_info->pbi_bridge_type) { | 173 | switch (pcibus_info->pbi_bridge_type) { |
173 | case PCIBR_BRIDGETYPE_TIOCP: | 174 | case PCIBR_BRIDGETYPE_TIOCP: |
174 | ptr->tio.cp_int_addr[int_n] &= ~TIOCP_HOST_INTR_ADDR; | 175 | __sn_clrq_relaxed(&ptr->tio.cp_int_addr[int_n], |
175 | ptr->tio.cp_int_addr[int_n] |= | 176 | TIOCP_HOST_INTR_ADDR); |
176 | (addr & TIOCP_HOST_INTR_ADDR); | 177 | __sn_setq_relaxed(&ptr->tio.cp_int_addr[int_n], |
178 | (addr & TIOCP_HOST_INTR_ADDR)); | ||
177 | break; | 179 | break; |
178 | case PCIBR_BRIDGETYPE_PIC: | 180 | case PCIBR_BRIDGETYPE_PIC: |
179 | ptr->pic.p_int_addr[int_n] &= ~PIC_HOST_INTR_ADDR; | 181 | __sn_clrq_relaxed(&ptr->pic.p_int_addr[int_n], |
180 | ptr->pic.p_int_addr[int_n] |= | 182 | PIC_HOST_INTR_ADDR); |
181 | (addr & PIC_HOST_INTR_ADDR); | 183 | __sn_setq_relaxed(&ptr->pic.p_int_addr[int_n], |
184 | (addr & PIC_HOST_INTR_ADDR)); | ||
182 | break; | 185 | break; |
183 | default: | 186 | default: |
184 | panic | 187 | panic |
@@ -198,10 +201,10 @@ void pcireg_force_intr_set(struct pcibus_info *pcibus_info, int int_n) | |||
198 | if (pcibus_info) { | 201 | if (pcibus_info) { |
199 | switch (pcibus_info->pbi_bridge_type) { | 202 | switch (pcibus_info->pbi_bridge_type) { |
200 | case PCIBR_BRIDGETYPE_TIOCP: | 203 | case PCIBR_BRIDGETYPE_TIOCP: |
201 | ptr->tio.cp_force_pin[int_n] = 1; | 204 | writeq(1, &ptr->tio.cp_force_pin[int_n]); |
202 | break; | 205 | break; |
203 | case PCIBR_BRIDGETYPE_PIC: | 206 | case PCIBR_BRIDGETYPE_PIC: |
204 | ptr->pic.p_force_pin[int_n] = 1; | 207 | writeq(1, &ptr->pic.p_force_pin[int_n]); |
205 | break; | 208 | break; |
206 | default: | 209 | default: |
207 | panic | 210 | panic |
@@ -222,10 +225,12 @@ uint64_t pcireg_wrb_flush_get(struct pcibus_info *pcibus_info, int device) | |||
222 | if (pcibus_info) { | 225 | if (pcibus_info) { |
223 | switch (pcibus_info->pbi_bridge_type) { | 226 | switch (pcibus_info->pbi_bridge_type) { |
224 | case PCIBR_BRIDGETYPE_TIOCP: | 227 | case PCIBR_BRIDGETYPE_TIOCP: |
225 | ret = ptr->tio.cp_wr_req_buf[device]; | 228 | ret = |
229 | __sn_readq_relaxed(&ptr->tio.cp_wr_req_buf[device]); | ||
226 | break; | 230 | break; |
227 | case PCIBR_BRIDGETYPE_PIC: | 231 | case PCIBR_BRIDGETYPE_PIC: |
228 | ret = ptr->pic.p_wr_req_buf[device]; | 232 | ret = |
233 | __sn_readq_relaxed(&ptr->pic.p_wr_req_buf[device]); | ||
229 | break; | 234 | break; |
230 | default: | 235 | default: |
231 | panic("pcireg_wrb_flush_get: unknown bridgetype bridge 0x%p", (void *)ptr); | 236 | panic("pcireg_wrb_flush_get: unknown bridgetype bridge 0x%p", (void *)ptr); |
@@ -244,10 +249,10 @@ void pcireg_int_ate_set(struct pcibus_info *pcibus_info, int ate_index, | |||
244 | if (pcibus_info) { | 249 | if (pcibus_info) { |
245 | switch (pcibus_info->pbi_bridge_type) { | 250 | switch (pcibus_info->pbi_bridge_type) { |
246 | case PCIBR_BRIDGETYPE_TIOCP: | 251 | case PCIBR_BRIDGETYPE_TIOCP: |
247 | ptr->tio.cp_int_ate_ram[ate_index] = (uint64_t) val; | 252 | writeq(val, &ptr->tio.cp_int_ate_ram[ate_index]); |
248 | break; | 253 | break; |
249 | case PCIBR_BRIDGETYPE_PIC: | 254 | case PCIBR_BRIDGETYPE_PIC: |
250 | ptr->pic.p_int_ate_ram[ate_index] = (uint64_t) val; | 255 | writeq(val, &ptr->pic.p_int_ate_ram[ate_index]); |
251 | break; | 256 | break; |
252 | default: | 257 | default: |
253 | panic | 258 | panic |
@@ -265,12 +270,10 @@ uint64_t *pcireg_int_ate_addr(struct pcibus_info *pcibus_info, int ate_index) | |||
265 | if (pcibus_info) { | 270 | if (pcibus_info) { |
266 | switch (pcibus_info->pbi_bridge_type) { | 271 | switch (pcibus_info->pbi_bridge_type) { |
267 | case PCIBR_BRIDGETYPE_TIOCP: | 272 | case PCIBR_BRIDGETYPE_TIOCP: |
268 | ret = | 273 | ret = &ptr->tio.cp_int_ate_ram[ate_index]; |
269 | (uint64_t *) & (ptr->tio.cp_int_ate_ram[ate_index]); | ||
270 | break; | 274 | break; |
271 | case PCIBR_BRIDGETYPE_PIC: | 275 | case PCIBR_BRIDGETYPE_PIC: |
272 | ret = | 276 | ret = &ptr->pic.p_int_ate_ram[ate_index]; |
273 | (uint64_t *) & (ptr->pic.p_int_ate_ram[ate_index]); | ||
274 | break; | 277 | break; |
275 | default: | 278 | default: |
276 | panic | 279 | panic |
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index 19bced34d5f1..46b646a6d345 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/pci.h> | 11 | #include <linux/pci.h> |
12 | #include <asm/sn/sn_sal.h> | 12 | #include <asm/sn/sn_sal.h> |
13 | #include <asm/sn/addrs.h> | 13 | #include <asm/sn/addrs.h> |
14 | #include <asm/sn/io.h> | ||
14 | #include <asm/sn/pcidev.h> | 15 | #include <asm/sn/pcidev.h> |
15 | #include <asm/sn/pcibus_provider_defs.h> | 16 | #include <asm/sn/pcibus_provider_defs.h> |
16 | #include <asm/sn/tioca_provider.h> | 17 | #include <asm/sn/tioca_provider.h> |
@@ -37,7 +38,7 @@ tioca_gart_init(struct tioca_kernel *tioca_kern) | |||
37 | uint64_t offset; | 38 | uint64_t offset; |
38 | struct page *tmp; | 39 | struct page *tmp; |
39 | struct tioca_common *tioca_common; | 40 | struct tioca_common *tioca_common; |
40 | volatile struct tioca *ca_base; | 41 | struct tioca *ca_base; |
41 | 42 | ||
42 | tioca_common = tioca_kern->ca_common; | 43 | tioca_common = tioca_kern->ca_common; |
43 | ca_base = (struct tioca *)tioca_common->ca_common.bs_base; | 44 | ca_base = (struct tioca *)tioca_common->ca_common.bs_base; |
@@ -174,27 +175,29 @@ tioca_gart_init(struct tioca_kernel *tioca_kern) | |||
174 | * DISABLE GART PREFETCHING due to hw bug tracked in SGI PV930029 | 175 | * DISABLE GART PREFETCHING due to hw bug tracked in SGI PV930029 |
175 | */ | 176 | */ |
176 | 177 | ||
177 | ca_base->ca_control1 |= CA_AGPDMA_OP_ENB_COMBDELAY; /* PV895469 ? */ | 178 | __sn_setq_relaxed(&ca_base->ca_control1, |
178 | ca_base->ca_control2 &= ~(CA_GART_MEM_PARAM); | 179 | CA_AGPDMA_OP_ENB_COMBDELAY); /* PV895469 ? */ |
179 | ca_base->ca_control2 |= (0x2ull << CA_GART_MEM_PARAM_SHFT); | 180 | __sn_clrq_relaxed(&ca_base->ca_control2, CA_GART_MEM_PARAM); |
181 | __sn_setq_relaxed(&ca_base->ca_control2, | ||
182 | (0x2ull << CA_GART_MEM_PARAM_SHFT)); | ||
180 | tioca_kern->ca_gart_iscoherent = 1; | 183 | tioca_kern->ca_gart_iscoherent = 1; |
181 | ca_base->ca_control2 &= | 184 | __sn_clrq_relaxed(&ca_base->ca_control2, |
182 | ~(CA_GART_WR_PREFETCH_ENB | CA_GART_RD_PREFETCH_ENB); | 185 | (CA_GART_WR_PREFETCH_ENB | CA_GART_RD_PREFETCH_ENB)); |
183 | 186 | ||
184 | /* | 187 | /* |
185 | * Unmask GART fetch error interrupts. Clear residual errors first. | 188 | * Unmask GART fetch error interrupts. Clear residual errors first. |
186 | */ | 189 | */ |
187 | 190 | ||
188 | ca_base->ca_int_status_alias = CA_GART_FETCH_ERR; | 191 | writeq(CA_GART_FETCH_ERR, &ca_base->ca_int_status_alias); |
189 | ca_base->ca_mult_error_alias = CA_GART_FETCH_ERR; | 192 | writeq(CA_GART_FETCH_ERR, &ca_base->ca_mult_error_alias); |
190 | ca_base->ca_int_mask &= ~CA_GART_FETCH_ERR; | 193 | __sn_clrq_relaxed(&ca_base->ca_int_mask, CA_GART_FETCH_ERR); |
191 | 194 | ||
192 | /* | 195 | /* |
193 | * Program the aperature and gart registers in TIOCA | 196 | * Program the aperature and gart registers in TIOCA |
194 | */ | 197 | */ |
195 | 198 | ||
196 | ca_base->ca_gart_aperature = ap_reg; | 199 | writeq(ap_reg, &ca_base->ca_gart_aperature); |
197 | ca_base->ca_gart_ptr_table = tioca_kern->ca_gart_coretalk_addr | 1; | 200 | writeq(tioca_kern->ca_gart_coretalk_addr|1, &ca_base->ca_gart_ptr_table); |
198 | 201 | ||
199 | return 0; | 202 | return 0; |
200 | } | 203 | } |
@@ -211,7 +214,6 @@ void | |||
211 | tioca_fastwrite_enable(struct tioca_kernel *tioca_kern) | 214 | tioca_fastwrite_enable(struct tioca_kernel *tioca_kern) |
212 | { | 215 | { |
213 | int cap_ptr; | 216 | int cap_ptr; |
214 | uint64_t ca_control1; | ||
215 | uint32_t reg; | 217 | uint32_t reg; |
216 | struct tioca *tioca_base; | 218 | struct tioca *tioca_base; |
217 | struct pci_dev *pdev; | 219 | struct pci_dev *pdev; |
@@ -256,9 +258,7 @@ tioca_fastwrite_enable(struct tioca_kernel *tioca_kern) | |||
256 | */ | 258 | */ |
257 | 259 | ||
258 | tioca_base = (struct tioca *)common->ca_common.bs_base; | 260 | tioca_base = (struct tioca *)common->ca_common.bs_base; |
259 | ca_control1 = tioca_base->ca_control1; | 261 | __sn_setq_relaxed(&tioca_base->ca_control1, CA_AGP_FW_ENABLE); |
260 | ca_control1 |= CA_AGP_FW_ENABLE; | ||
261 | tioca_base->ca_control1 = ca_control1; | ||
262 | } | 262 | } |
263 | 263 | ||
264 | EXPORT_SYMBOL(tioca_fastwrite_enable); /* used by agp-sgi */ | 264 | EXPORT_SYMBOL(tioca_fastwrite_enable); /* used by agp-sgi */ |
@@ -345,7 +345,7 @@ tioca_dma_d48(struct pci_dev *pdev, uint64_t paddr) | |||
345 | return 0; | 345 | return 0; |
346 | } | 346 | } |
347 | 347 | ||
348 | agp_dma_extn = ca_base->ca_agp_dma_addr_extn; | 348 | agp_dma_extn = __sn_readq_relaxed(&ca_base->ca_agp_dma_addr_extn); |
349 | if (node_upper != (agp_dma_extn >> CA_AGP_DMA_NODE_ID_SHFT)) { | 349 | if (node_upper != (agp_dma_extn >> CA_AGP_DMA_NODE_ID_SHFT)) { |
350 | printk(KERN_ERR "%s: coretalk upper node (%u) " | 350 | printk(KERN_ERR "%s: coretalk upper node (%u) " |
351 | "mismatch with ca_agp_dma_addr_extn (%lu)\n", | 351 | "mismatch with ca_agp_dma_addr_extn (%lu)\n", |
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c index 8e75db2b825d..9f03d4e5121c 100644 --- a/arch/ia64/sn/pci/tioce_provider.c +++ b/arch/ia64/sn/pci/tioce_provider.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/pci.h> | 11 | #include <linux/pci.h> |
12 | #include <asm/sn/sn_sal.h> | 12 | #include <asm/sn/sn_sal.h> |
13 | #include <asm/sn/addrs.h> | 13 | #include <asm/sn/addrs.h> |
14 | #include <asm/sn/io.h> | ||
14 | #include <asm/sn/pcidev.h> | 15 | #include <asm/sn/pcidev.h> |
15 | #include <asm/sn/pcibus_provider_defs.h> | 16 | #include <asm/sn/pcibus_provider_defs.h> |
16 | #include <asm/sn/tioce_provider.h> | 17 | #include <asm/sn/tioce_provider.h> |
@@ -227,7 +228,7 @@ tioce_alloc_map(struct tioce_kernel *ce_kern, int type, int port, | |||
227 | 228 | ||
228 | ate = ATE_MAKE(addr, pagesize); | 229 | ate = ATE_MAKE(addr, pagesize); |
229 | ate_shadow[i + j] = ate; | 230 | ate_shadow[i + j] = ate; |
230 | ate_reg[i + j] = ate; | 231 | writeq(ate, &ate_reg[i + j]); |
231 | addr += pagesize; | 232 | addr += pagesize; |
232 | } | 233 | } |
233 | 234 | ||
@@ -268,10 +269,10 @@ tioce_dma_d32(struct pci_dev *pdev, uint64_t ct_addr) | |||
268 | pcidev_to_tioce(pdev, &ce_mmr, &ce_kern, &port); | 269 | pcidev_to_tioce(pdev, &ce_mmr, &ce_kern, &port); |
269 | 270 | ||
270 | if (ce_kern->ce_port[port].dirmap_refcnt == 0) { | 271 | if (ce_kern->ce_port[port].dirmap_refcnt == 0) { |
271 | volatile uint64_t tmp; | 272 | uint64_t tmp; |
272 | 273 | ||
273 | ce_kern->ce_port[port].dirmap_shadow = ct_upper; | 274 | ce_kern->ce_port[port].dirmap_shadow = ct_upper; |
274 | ce_mmr->ce_ure_dir_map[port] = ct_upper; | 275 | writeq(ct_upper, &ce_mmr->ce_ure_dir_map[port]); |
275 | tmp = ce_mmr->ce_ure_dir_map[port]; | 276 | tmp = ce_mmr->ce_ure_dir_map[port]; |
276 | dma_ok = 1; | 277 | dma_ok = 1; |
277 | } else | 278 | } else |
@@ -343,7 +344,7 @@ tioce_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir) | |||
343 | if (TIOCE_D32_ADDR(bus_addr)) { | 344 | if (TIOCE_D32_ADDR(bus_addr)) { |
344 | if (--ce_kern->ce_port[port].dirmap_refcnt == 0) { | 345 | if (--ce_kern->ce_port[port].dirmap_refcnt == 0) { |
345 | ce_kern->ce_port[port].dirmap_shadow = 0; | 346 | ce_kern->ce_port[port].dirmap_shadow = 0; |
346 | ce_mmr->ce_ure_dir_map[port] = 0; | 347 | writeq(0, &ce_mmr->ce_ure_dir_map[port]); |
347 | } | 348 | } |
348 | } else { | 349 | } else { |
349 | struct tioce_dmamap *map; | 350 | struct tioce_dmamap *map; |
@@ -582,18 +583,18 @@ tioce_kern_init(struct tioce_common *tioce_common) | |||
582 | */ | 583 | */ |
583 | 584 | ||
584 | tioce_mmr = (struct tioce *)tioce_common->ce_pcibus.bs_base; | 585 | tioce_mmr = (struct tioce *)tioce_common->ce_pcibus.bs_base; |
585 | tioce_mmr->ce_ure_page_map &= ~CE_URE_PAGESIZE_MASK; | 586 | __sn_clrq_relaxed(&tioce_mmr->ce_ure_page_map, CE_URE_PAGESIZE_MASK); |
586 | tioce_mmr->ce_ure_page_map |= CE_URE_256K_PAGESIZE; | 587 | __sn_setq_relaxed(&tioce_mmr->ce_ure_page_map, CE_URE_256K_PAGESIZE); |
587 | tioce_kern->ce_ate3240_pagesize = KB(256); | 588 | tioce_kern->ce_ate3240_pagesize = KB(256); |
588 | 589 | ||
589 | for (i = 0; i < TIOCE_NUM_M40_ATES; i++) { | 590 | for (i = 0; i < TIOCE_NUM_M40_ATES; i++) { |
590 | tioce_kern->ce_ate40_shadow[i] = 0; | 591 | tioce_kern->ce_ate40_shadow[i] = 0; |
591 | tioce_mmr->ce_ure_ate40[i] = 0; | 592 | writeq(0, &tioce_mmr->ce_ure_ate40[i]); |
592 | } | 593 | } |
593 | 594 | ||
594 | for (i = 0; i < TIOCE_NUM_M3240_ATES; i++) { | 595 | for (i = 0; i < TIOCE_NUM_M3240_ATES; i++) { |
595 | tioce_kern->ce_ate3240_shadow[i] = 0; | 596 | tioce_kern->ce_ate3240_shadow[i] = 0; |
596 | tioce_mmr->ce_ure_ate3240[i] = 0; | 597 | writeq(0, &tioce_mmr->ce_ure_ate3240[i]); |
597 | } | 598 | } |
598 | 599 | ||
599 | return tioce_kern; | 600 | return tioce_kern; |
@@ -665,7 +666,7 @@ tioce_force_interrupt(struct sn_irq_info *sn_irq_info) | |||
665 | default: | 666 | default: |
666 | return; | 667 | return; |
667 | } | 668 | } |
668 | ce_mmr->ce_adm_force_int = force_int_val; | 669 | writeq(force_int_val, &ce_mmr->ce_adm_force_int); |
669 | } | 670 | } |
670 | 671 | ||
671 | /** | 672 | /** |
@@ -686,6 +687,7 @@ tioce_target_interrupt(struct sn_irq_info *sn_irq_info) | |||
686 | struct tioce_common *ce_common; | 687 | struct tioce_common *ce_common; |
687 | struct tioce *ce_mmr; | 688 | struct tioce *ce_mmr; |
688 | int bit; | 689 | int bit; |
690 | uint64_t vector; | ||
689 | 691 | ||
690 | pcidev_info = (struct pcidev_info *)sn_irq_info->irq_pciioinfo; | 692 | pcidev_info = (struct pcidev_info *)sn_irq_info->irq_pciioinfo; |
691 | if (!pcidev_info) | 693 | if (!pcidev_info) |
@@ -696,11 +698,11 @@ tioce_target_interrupt(struct sn_irq_info *sn_irq_info) | |||
696 | 698 | ||
697 | bit = sn_irq_info->irq_int_bit; | 699 | bit = sn_irq_info->irq_int_bit; |
698 | 700 | ||
699 | ce_mmr->ce_adm_int_mask |= (1UL << bit); | 701 | __sn_setq_relaxed(&ce_mmr->ce_adm_int_mask, (1UL << bit)); |
700 | ce_mmr->ce_adm_int_dest[bit] = | 702 | vector = (uint64_t)sn_irq_info->irq_irq << INTR_VECTOR_SHFT; |
701 | ((uint64_t)sn_irq_info->irq_irq << INTR_VECTOR_SHFT) | | 703 | vector |= sn_irq_info->irq_xtalkaddr; |
702 | sn_irq_info->irq_xtalkaddr; | 704 | writeq(vector, &ce_mmr->ce_adm_int_dest[bit]); |
703 | ce_mmr->ce_adm_int_mask &= ~(1UL << bit); | 705 | __sn_clrq_relaxed(&ce_mmr->ce_adm_int_mask, (1UL << bit)); |
704 | 706 | ||
705 | tioce_force_interrupt(sn_irq_info); | 707 | tioce_force_interrupt(sn_irq_info); |
706 | } | 708 | } |