diff options
author | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /arch/powerpc | |
parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) |
Merge ../powerpc-merge
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/Makefile | 6 | ||||
-rw-r--r-- | arch/powerpc/kernel/signal_32.c | 18 | ||||
-rw-r--r-- | arch/powerpc/kernel/signal_64.c | 4 | ||||
-rw-r--r-- | arch/powerpc/kernel/systbl.S | 3 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/low_i2c.c | 3 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/pci.c | 89 | ||||
-rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/eeh_driver.c | 8 | ||||
-rw-r--r-- | arch/powerpc/sysdev/dart_iommu.c | 2 |
9 files changed, 62 insertions, 73 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index c287980b7e65..80e9fe2632b8 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -12,10 +12,10 @@ endif | |||
12 | 12 | ||
13 | obj-y := semaphore.o cputable.o ptrace.o syscalls.o \ | 13 | obj-y := semaphore.o cputable.o ptrace.o syscalls.o \ |
14 | irq.o align.o signal_32.o pmc.o vdso.o \ | 14 | irq.o align.o signal_32.o pmc.o vdso.o \ |
15 | init_task.o process.o | 15 | init_task.o process.o systbl.o |
16 | obj-y += vdso32/ | 16 | obj-y += vdso32/ |
17 | obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \ | 17 | obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \ |
18 | signal_64.o ptrace32.o systbl.o \ | 18 | signal_64.o ptrace32.o \ |
19 | paca.o cpu_setup_power4.o \ | 19 | paca.o cpu_setup_power4.o \ |
20 | firmware.o sysfs.o idle_64.o | 20 | firmware.o sysfs.o idle_64.o |
21 | obj-$(CONFIG_PPC64) += vdso64/ | 21 | obj-$(CONFIG_PPC64) += vdso64/ |
@@ -46,7 +46,7 @@ extra-$(CONFIG_8xx) := head_8xx.o | |||
46 | extra-y += vmlinux.lds | 46 | extra-y += vmlinux.lds |
47 | 47 | ||
48 | obj-y += time.o prom.o traps.o setup-common.o udbg.o | 48 | obj-y += time.o prom.o traps.o setup-common.o udbg.o |
49 | obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o systbl.o | 49 | obj-$(CONFIG_PPC32) += entry_32.o setup_32.o misc_32.o |
50 | obj-$(CONFIG_PPC64) += misc_64.o dma_64.o iommu.o | 50 | obj-$(CONFIG_PPC64) += misc_64.o dma_64.o iommu.o |
51 | obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o | 51 | obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o |
52 | obj-$(CONFIG_MODULES) += ppc_ksyms.o | 52 | obj-$(CONFIG_MODULES) += ppc_ksyms.o |
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index c6d0595da6b5..bd837b5dbf06 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c | |||
@@ -142,11 +142,7 @@ static inline int get_old_sigaction(struct k_sigaction *new_ka, | |||
142 | return 0; | 142 | return 0; |
143 | } | 143 | } |
144 | 144 | ||
145 | static inline compat_uptr_t to_user_ptr(void *kp) | 145 | #define to_user_ptr(p) ptr_to_compat(p) |
146 | { | ||
147 | return (compat_uptr_t)(u64)kp; | ||
148 | } | ||
149 | |||
150 | #define from_user_ptr(p) compat_ptr(p) | 146 | #define from_user_ptr(p) compat_ptr(p) |
151 | 147 | ||
152 | static inline int save_general_regs(struct pt_regs *regs, | 148 | static inline int save_general_regs(struct pt_regs *regs, |
@@ -213,8 +209,8 @@ static inline int get_old_sigaction(struct k_sigaction *new_ka, | |||
213 | return 0; | 209 | return 0; |
214 | } | 210 | } |
215 | 211 | ||
216 | #define to_user_ptr(p) (p) | 212 | #define to_user_ptr(p) ((unsigned long)(p)) |
217 | #define from_user_ptr(p) (p) | 213 | #define from_user_ptr(p) ((void __user *)(p)) |
218 | 214 | ||
219 | static inline int save_general_regs(struct pt_regs *regs, | 215 | static inline int save_general_regs(struct pt_regs *regs, |
220 | struct mcontext __user *frame) | 216 | struct mcontext __user *frame) |
@@ -526,7 +522,7 @@ long compat_sys_rt_sigaction(int sig, const struct sigaction32 __user *act, | |||
526 | 522 | ||
527 | ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL); | 523 | ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL); |
528 | if (!ret && oact) { | 524 | if (!ret && oact) { |
529 | ret = put_user((long)old_ka.sa.sa_handler, &oact->sa_handler); | 525 | ret = put_user(to_user_ptr(old_ka.sa.sa_handler), &oact->sa_handler); |
530 | ret |= put_sigset_t(&oact->sa_mask, &old_ka.sa.sa_mask); | 526 | ret |= put_sigset_t(&oact->sa_mask, &old_ka.sa.sa_mask); |
531 | ret |= __put_user(old_ka.sa.sa_flags, &oact->sa_flags); | 527 | ret |= __put_user(old_ka.sa.sa_flags, &oact->sa_flags); |
532 | } | 528 | } |
@@ -675,8 +671,8 @@ long compat_sys_rt_sigqueueinfo(u32 pid, u32 sig, compat_siginfo_t __user *uinfo | |||
675 | int compat_sys_sigaltstack(u32 __new, u32 __old, int r5, | 671 | int compat_sys_sigaltstack(u32 __new, u32 __old, int r5, |
676 | int r6, int r7, int r8, struct pt_regs *regs) | 672 | int r6, int r7, int r8, struct pt_regs *regs) |
677 | { | 673 | { |
678 | stack_32_t __user * newstack = (stack_32_t __user *)(long) __new; | 674 | stack_32_t __user * newstack = compat_ptr(__new); |
679 | stack_32_t __user * oldstack = (stack_32_t __user *)(long) __old; | 675 | stack_32_t __user * oldstack = compat_ptr(__old); |
680 | stack_t uss, uoss; | 676 | stack_t uss, uoss; |
681 | int ret; | 677 | int ret; |
682 | mm_segment_t old_fs; | 678 | mm_segment_t old_fs; |
@@ -708,7 +704,7 @@ int compat_sys_sigaltstack(u32 __new, u32 __old, int r5, | |||
708 | set_fs(old_fs); | 704 | set_fs(old_fs); |
709 | /* Copy the stack information to the user output buffer */ | 705 | /* Copy the stack information to the user output buffer */ |
710 | if (!ret && oldstack && | 706 | if (!ret && oldstack && |
711 | (put_user((long)uoss.ss_sp, &oldstack->ss_sp) || | 707 | (put_user(ptr_to_compat(uoss.ss_sp), &oldstack->ss_sp) || |
712 | __put_user(uoss.ss_flags, &oldstack->ss_flags) || | 708 | __put_user(uoss.ss_flags, &oldstack->ss_flags) || |
713 | __put_user(uoss.ss_size, &oldstack->ss_size))) | 709 | __put_user(uoss.ss_size, &oldstack->ss_size))) |
714 | return -EFAULT; | 710 | return -EFAULT; |
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index b3193116e686..497a5d3df359 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c | |||
@@ -60,8 +60,8 @@ struct rt_sigframe { | |||
60 | struct ucontext uc; | 60 | struct ucontext uc; |
61 | unsigned long _unused[2]; | 61 | unsigned long _unused[2]; |
62 | unsigned int tramp[TRAMP_SIZE]; | 62 | unsigned int tramp[TRAMP_SIZE]; |
63 | struct siginfo *pinfo; | 63 | struct siginfo __user *pinfo; |
64 | void *puc; | 64 | void __user *puc; |
65 | struct siginfo info; | 65 | struct siginfo info; |
66 | /* 64 bit ABI allows for 288 bytes below sp before decrementing it. */ | 66 | /* 64 bit ABI allows for 288 bytes below sp before decrementing it. */ |
67 | char abigap[288]; | 67 | char abigap[288]; |
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S index 007b15ee36d2..8a9f994ed917 100644 --- a/arch/powerpc/kernel/systbl.S +++ b/arch/powerpc/kernel/systbl.S | |||
@@ -36,8 +36,6 @@ | |||
36 | #ifdef CONFIG_PPC64 | 36 | #ifdef CONFIG_PPC64 |
37 | #define sys_sigpending sys_ni_syscall | 37 | #define sys_sigpending sys_ni_syscall |
38 | #define sys_old_getrlimit sys_ni_syscall | 38 | #define sys_old_getrlimit sys_ni_syscall |
39 | #else | ||
40 | #define ppc_rtas sys_ni_syscall | ||
41 | #endif | 39 | #endif |
42 | 40 | ||
43 | _GLOBAL(sys_call_table) | 41 | _GLOBAL(sys_call_table) |
@@ -323,3 +321,4 @@ SYSCALL(spu_run) | |||
323 | SYSCALL(spu_create) | 321 | SYSCALL(spu_create) |
324 | COMPAT_SYS(pselect6) | 322 | COMPAT_SYS(pselect6) |
325 | COMPAT_SYS(ppoll) | 323 | COMPAT_SYS(ppoll) |
324 | SYSCALL(unshare) | ||
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c index 535c802b369f..87eb6bb7f0e7 100644 --- a/arch/powerpc/platforms/powermac/low_i2c.c +++ b/arch/powerpc/platforms/powermac/low_i2c.c | |||
@@ -1052,8 +1052,7 @@ struct pmac_i2c_bus *pmac_i2c_adapter_to_bus(struct i2c_adapter *adapter) | |||
1052 | } | 1052 | } |
1053 | EXPORT_SYMBOL_GPL(pmac_i2c_adapter_to_bus); | 1053 | EXPORT_SYMBOL_GPL(pmac_i2c_adapter_to_bus); |
1054 | 1054 | ||
1055 | extern int pmac_i2c_match_adapter(struct device_node *dev, | 1055 | int pmac_i2c_match_adapter(struct device_node *dev, struct i2c_adapter *adapter) |
1056 | struct i2c_adapter *adapter) | ||
1057 | { | 1056 | { |
1058 | struct pmac_i2c_bus *bus = pmac_i2c_find_bus(dev); | 1057 | struct pmac_i2c_bus *bus = pmac_i2c_find_bus(dev); |
1059 | 1058 | ||
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index f671ed253901..de3f30e6b333 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c | |||
@@ -136,14 +136,14 @@ static void __init fixup_bus_range(struct device_node *bridge) | |||
136 | |(((unsigned int)(off)) & 0xFCUL) \ | 136 | |(((unsigned int)(off)) & 0xFCUL) \ |
137 | |1UL) | 137 | |1UL) |
138 | 138 | ||
139 | static unsigned long macrisc_cfg_access(struct pci_controller* hose, | 139 | static volatile void __iomem *macrisc_cfg_access(struct pci_controller* hose, |
140 | u8 bus, u8 dev_fn, u8 offset) | 140 | u8 bus, u8 dev_fn, u8 offset) |
141 | { | 141 | { |
142 | unsigned int caddr; | 142 | unsigned int caddr; |
143 | 143 | ||
144 | if (bus == hose->first_busno) { | 144 | if (bus == hose->first_busno) { |
145 | if (dev_fn < (11 << 3)) | 145 | if (dev_fn < (11 << 3)) |
146 | return 0; | 146 | return NULL; |
147 | caddr = MACRISC_CFA0(dev_fn, offset); | 147 | caddr = MACRISC_CFA0(dev_fn, offset); |
148 | } else | 148 | } else |
149 | caddr = MACRISC_CFA1(bus, dev_fn, offset); | 149 | caddr = MACRISC_CFA1(bus, dev_fn, offset); |
@@ -154,14 +154,14 @@ static unsigned long macrisc_cfg_access(struct pci_controller* hose, | |||
154 | } while (in_le32(hose->cfg_addr) != caddr); | 154 | } while (in_le32(hose->cfg_addr) != caddr); |
155 | 155 | ||
156 | offset &= has_uninorth ? 0x07 : 0x03; | 156 | offset &= has_uninorth ? 0x07 : 0x03; |
157 | return ((unsigned long)hose->cfg_data) + offset; | 157 | return hose->cfg_data + offset; |
158 | } | 158 | } |
159 | 159 | ||
160 | static int macrisc_read_config(struct pci_bus *bus, unsigned int devfn, | 160 | static int macrisc_read_config(struct pci_bus *bus, unsigned int devfn, |
161 | int offset, int len, u32 *val) | 161 | int offset, int len, u32 *val) |
162 | { | 162 | { |
163 | struct pci_controller *hose; | 163 | struct pci_controller *hose; |
164 | unsigned long addr; | 164 | volatile void __iomem *addr; |
165 | 165 | ||
166 | hose = pci_bus_to_host(bus); | 166 | hose = pci_bus_to_host(bus); |
167 | if (hose == NULL) | 167 | if (hose == NULL) |
@@ -177,13 +177,13 @@ static int macrisc_read_config(struct pci_bus *bus, unsigned int devfn, | |||
177 | */ | 177 | */ |
178 | switch (len) { | 178 | switch (len) { |
179 | case 1: | 179 | case 1: |
180 | *val = in_8((u8 *)addr); | 180 | *val = in_8(addr); |
181 | break; | 181 | break; |
182 | case 2: | 182 | case 2: |
183 | *val = in_le16((u16 *)addr); | 183 | *val = in_le16(addr); |
184 | break; | 184 | break; |
185 | default: | 185 | default: |
186 | *val = in_le32((u32 *)addr); | 186 | *val = in_le32(addr); |
187 | break; | 187 | break; |
188 | } | 188 | } |
189 | return PCIBIOS_SUCCESSFUL; | 189 | return PCIBIOS_SUCCESSFUL; |
@@ -193,7 +193,7 @@ static int macrisc_write_config(struct pci_bus *bus, unsigned int devfn, | |||
193 | int offset, int len, u32 val) | 193 | int offset, int len, u32 val) |
194 | { | 194 | { |
195 | struct pci_controller *hose; | 195 | struct pci_controller *hose; |
196 | unsigned long addr; | 196 | volatile void __iomem *addr; |
197 | 197 | ||
198 | hose = pci_bus_to_host(bus); | 198 | hose = pci_bus_to_host(bus); |
199 | if (hose == NULL) | 199 | if (hose == NULL) |
@@ -209,16 +209,16 @@ static int macrisc_write_config(struct pci_bus *bus, unsigned int devfn, | |||
209 | */ | 209 | */ |
210 | switch (len) { | 210 | switch (len) { |
211 | case 1: | 211 | case 1: |
212 | out_8((u8 *)addr, val); | 212 | out_8(addr, val); |
213 | (void) in_8((u8 *)addr); | 213 | (void) in_8(addr); |
214 | break; | 214 | break; |
215 | case 2: | 215 | case 2: |
216 | out_le16((u16 *)addr, val); | 216 | out_le16(addr, val); |
217 | (void) in_le16((u16 *)addr); | 217 | (void) in_le16(addr); |
218 | break; | 218 | break; |
219 | default: | 219 | default: |
220 | out_le32((u32 *)addr, val); | 220 | out_le32(addr, val); |
221 | (void) in_le32((u32 *)addr); | 221 | (void) in_le32(addr); |
222 | break; | 222 | break; |
223 | } | 223 | } |
224 | return PCIBIOS_SUCCESSFUL; | 224 | return PCIBIOS_SUCCESSFUL; |
@@ -348,25 +348,23 @@ static int u3_ht_skip_device(struct pci_controller *hose, | |||
348 | + (((unsigned int)bus) << 16) \ | 348 | + (((unsigned int)bus) << 16) \ |
349 | + 0x01000000UL) | 349 | + 0x01000000UL) |
350 | 350 | ||
351 | static unsigned long u3_ht_cfg_access(struct pci_controller* hose, | 351 | static volatile void __iomem *u3_ht_cfg_access(struct pci_controller* hose, |
352 | u8 bus, u8 devfn, u8 offset) | 352 | u8 bus, u8 devfn, u8 offset) |
353 | { | 353 | { |
354 | if (bus == hose->first_busno) { | 354 | if (bus == hose->first_busno) { |
355 | /* For now, we don't self probe U3 HT bridge */ | 355 | /* For now, we don't self probe U3 HT bridge */ |
356 | if (PCI_SLOT(devfn) == 0) | 356 | if (PCI_SLOT(devfn) == 0) |
357 | return 0; | 357 | return NULL; |
358 | return ((unsigned long)hose->cfg_data) + | 358 | return hose->cfg_data + U3_HT_CFA0(devfn, offset); |
359 | U3_HT_CFA0(devfn, offset); | ||
360 | } else | 359 | } else |
361 | return ((unsigned long)hose->cfg_data) + | 360 | return hose->cfg_data + U3_HT_CFA1(bus, devfn, offset); |
362 | U3_HT_CFA1(bus, devfn, offset); | ||
363 | } | 361 | } |
364 | 362 | ||
365 | static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn, | 363 | static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn, |
366 | int offset, int len, u32 *val) | 364 | int offset, int len, u32 *val) |
367 | { | 365 | { |
368 | struct pci_controller *hose; | 366 | struct pci_controller *hose; |
369 | unsigned long addr; | 367 | volatile void __iomem *addr; |
370 | 368 | ||
371 | hose = pci_bus_to_host(bus); | 369 | hose = pci_bus_to_host(bus); |
372 | if (hose == NULL) | 370 | if (hose == NULL) |
@@ -400,13 +398,13 @@ static int u3_ht_read_config(struct pci_bus *bus, unsigned int devfn, | |||
400 | */ | 398 | */ |
401 | switch (len) { | 399 | switch (len) { |
402 | case 1: | 400 | case 1: |
403 | *val = in_8((u8 *)addr); | 401 | *val = in_8(addr); |
404 | break; | 402 | break; |
405 | case 2: | 403 | case 2: |
406 | *val = in_le16((u16 *)addr); | 404 | *val = in_le16(addr); |
407 | break; | 405 | break; |
408 | default: | 406 | default: |
409 | *val = in_le32((u32 *)addr); | 407 | *val = in_le32(addr); |
410 | break; | 408 | break; |
411 | } | 409 | } |
412 | return PCIBIOS_SUCCESSFUL; | 410 | return PCIBIOS_SUCCESSFUL; |
@@ -416,7 +414,7 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn, | |||
416 | int offset, int len, u32 val) | 414 | int offset, int len, u32 val) |
417 | { | 415 | { |
418 | struct pci_controller *hose; | 416 | struct pci_controller *hose; |
419 | unsigned long addr; | 417 | volatile void __iomem *addr; |
420 | 418 | ||
421 | hose = pci_bus_to_host(bus); | 419 | hose = pci_bus_to_host(bus); |
422 | if (hose == NULL) | 420 | if (hose == NULL) |
@@ -442,16 +440,16 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn, | |||
442 | */ | 440 | */ |
443 | switch (len) { | 441 | switch (len) { |
444 | case 1: | 442 | case 1: |
445 | out_8((u8 *)addr, val); | 443 | out_8(addr, val); |
446 | (void) in_8((u8 *)addr); | 444 | (void) in_8(addr); |
447 | break; | 445 | break; |
448 | case 2: | 446 | case 2: |
449 | out_le16((u16 *)addr, val); | 447 | out_le16(addr, val); |
450 | (void) in_le16((u16 *)addr); | 448 | (void) in_le16(addr); |
451 | break; | 449 | break; |
452 | default: | 450 | default: |
453 | out_le32((u32 *)addr, val); | 451 | out_le32((u32 __iomem *)addr, val); |
454 | (void) in_le32((u32 *)addr); | 452 | (void) in_le32(addr); |
455 | break; | 453 | break; |
456 | } | 454 | } |
457 | return PCIBIOS_SUCCESSFUL; | 455 | return PCIBIOS_SUCCESSFUL; |
@@ -476,7 +474,7 @@ static struct pci_ops u3_ht_pci_ops = | |||
476 | |(((unsigned int)(off)) & 0xfcU) \ | 474 | |(((unsigned int)(off)) & 0xfcU) \ |
477 | |1UL) | 475 | |1UL) |
478 | 476 | ||
479 | static unsigned long u4_pcie_cfg_access(struct pci_controller* hose, | 477 | static volatile void __iomem *u4_pcie_cfg_access(struct pci_controller* hose, |
480 | u8 bus, u8 dev_fn, int offset) | 478 | u8 bus, u8 dev_fn, int offset) |
481 | { | 479 | { |
482 | unsigned int caddr; | 480 | unsigned int caddr; |
@@ -492,14 +490,14 @@ static unsigned long u4_pcie_cfg_access(struct pci_controller* hose, | |||
492 | } while (in_le32(hose->cfg_addr) != caddr); | 490 | } while (in_le32(hose->cfg_addr) != caddr); |
493 | 491 | ||
494 | offset &= 0x03; | 492 | offset &= 0x03; |
495 | return ((unsigned long)hose->cfg_data) + offset; | 493 | return hose->cfg_data + offset; |
496 | } | 494 | } |
497 | 495 | ||
498 | static int u4_pcie_read_config(struct pci_bus *bus, unsigned int devfn, | 496 | static int u4_pcie_read_config(struct pci_bus *bus, unsigned int devfn, |
499 | int offset, int len, u32 *val) | 497 | int offset, int len, u32 *val) |
500 | { | 498 | { |
501 | struct pci_controller *hose; | 499 | struct pci_controller *hose; |
502 | unsigned long addr; | 500 | volatile void __iomem *addr; |
503 | 501 | ||
504 | hose = pci_bus_to_host(bus); | 502 | hose = pci_bus_to_host(bus); |
505 | if (hose == NULL) | 503 | if (hose == NULL) |
@@ -515,13 +513,13 @@ static int u4_pcie_read_config(struct pci_bus *bus, unsigned int devfn, | |||
515 | */ | 513 | */ |
516 | switch (len) { | 514 | switch (len) { |
517 | case 1: | 515 | case 1: |
518 | *val = in_8((u8 *)addr); | 516 | *val = in_8(addr); |
519 | break; | 517 | break; |
520 | case 2: | 518 | case 2: |
521 | *val = in_le16((u16 *)addr); | 519 | *val = in_le16(addr); |
522 | break; | 520 | break; |
523 | default: | 521 | default: |
524 | *val = in_le32((u32 *)addr); | 522 | *val = in_le32(addr); |
525 | break; | 523 | break; |
526 | } | 524 | } |
527 | return PCIBIOS_SUCCESSFUL; | 525 | return PCIBIOS_SUCCESSFUL; |
@@ -531,7 +529,7 @@ static int u4_pcie_write_config(struct pci_bus *bus, unsigned int devfn, | |||
531 | int offset, int len, u32 val) | 529 | int offset, int len, u32 val) |
532 | { | 530 | { |
533 | struct pci_controller *hose; | 531 | struct pci_controller *hose; |
534 | unsigned long addr; | 532 | volatile void __iomem *addr; |
535 | 533 | ||
536 | hose = pci_bus_to_host(bus); | 534 | hose = pci_bus_to_host(bus); |
537 | if (hose == NULL) | 535 | if (hose == NULL) |
@@ -547,16 +545,16 @@ static int u4_pcie_write_config(struct pci_bus *bus, unsigned int devfn, | |||
547 | */ | 545 | */ |
548 | switch (len) { | 546 | switch (len) { |
549 | case 1: | 547 | case 1: |
550 | out_8((u8 *)addr, val); | 548 | out_8(addr, val); |
551 | (void) in_8((u8 *)addr); | 549 | (void) in_8(addr); |
552 | break; | 550 | break; |
553 | case 2: | 551 | case 2: |
554 | out_le16((u16 *)addr, val); | 552 | out_le16(addr, val); |
555 | (void) in_le16((u16 *)addr); | 553 | (void) in_le16(addr); |
556 | break; | 554 | break; |
557 | default: | 555 | default: |
558 | out_le32((u32 *)addr, val); | 556 | out_le32(addr, val); |
559 | (void) in_le32((u32 *)addr); | 557 | (void) in_le32(addr); |
560 | break; | 558 | break; |
561 | } | 559 | } |
562 | return PCIBIOS_SUCCESSFUL; | 560 | return PCIBIOS_SUCCESSFUL; |
@@ -773,8 +771,7 @@ static void __init setup_u3_ht(struct pci_controller* hose) | |||
773 | * the reg address cell, we shall fix that by killing struct | 771 | * the reg address cell, we shall fix that by killing struct |
774 | * reg_property and using some accessor functions instead | 772 | * reg_property and using some accessor functions instead |
775 | */ | 773 | */ |
776 | hose->cfg_data = (volatile unsigned char *)ioremap(0xf2000000, | 774 | hose->cfg_data = ioremap(0xf2000000, 0x02000000); |
777 | 0x02000000); | ||
778 | 775 | ||
779 | /* | 776 | /* |
780 | * /ht node doesn't expose a "ranges" property, so we "remove" | 777 | * /ht node doesn't expose a "ranges" property, so we "remove" |
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 616b1e3ebe04..97c54e19c1b5 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c | |||
@@ -82,8 +82,6 @@ | |||
82 | 82 | ||
83 | #undef SHOW_GATWICK_IRQS | 83 | #undef SHOW_GATWICK_IRQS |
84 | 84 | ||
85 | unsigned char drive_info; | ||
86 | |||
87 | int ppc_override_l2cr = 0; | 85 | int ppc_override_l2cr = 0; |
88 | int ppc_override_l2cr_value; | 86 | int ppc_override_l2cr_value; |
89 | int has_l2cache = 0; | 87 | int has_l2cache = 0; |
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c index 6373372932ba..e3cbba49fd6e 100644 --- a/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/arch/powerpc/platforms/pseries/eeh_driver.c | |||
@@ -333,7 +333,7 @@ void handle_eeh_events (struct eeh_event *event) | |||
333 | rc = eeh_reset_device(frozen_pdn, NULL); | 333 | rc = eeh_reset_device(frozen_pdn, NULL); |
334 | if (rc) | 334 | if (rc) |
335 | goto hard_fail; | 335 | goto hard_fail; |
336 | pci_walk_bus(frozen_bus, eeh_report_reset, 0); | 336 | pci_walk_bus(frozen_bus, eeh_report_reset, NULL); |
337 | } | 337 | } |
338 | 338 | ||
339 | /* If all devices reported they can proceed, the re-enable PIO */ | 339 | /* If all devices reported they can proceed, the re-enable PIO */ |
@@ -342,11 +342,11 @@ void handle_eeh_events (struct eeh_event *event) | |||
342 | rc = eeh_reset_device(frozen_pdn, NULL); | 342 | rc = eeh_reset_device(frozen_pdn, NULL); |
343 | if (rc) | 343 | if (rc) |
344 | goto hard_fail; | 344 | goto hard_fail; |
345 | pci_walk_bus(frozen_bus, eeh_report_reset, 0); | 345 | pci_walk_bus(frozen_bus, eeh_report_reset, NULL); |
346 | } | 346 | } |
347 | 347 | ||
348 | /* Tell all device drivers that they can resume operations */ | 348 | /* Tell all device drivers that they can resume operations */ |
349 | pci_walk_bus(frozen_bus, eeh_report_resume, 0); | 349 | pci_walk_bus(frozen_bus, eeh_report_resume, NULL); |
350 | 350 | ||
351 | return; | 351 | return; |
352 | 352 | ||
@@ -367,7 +367,7 @@ hard_fail: | |||
367 | eeh_slot_error_detail(frozen_pdn, 2 /* Permanent Error */); | 367 | eeh_slot_error_detail(frozen_pdn, 2 /* Permanent Error */); |
368 | 368 | ||
369 | /* Notify all devices that they're about to go down. */ | 369 | /* Notify all devices that they're about to go down. */ |
370 | pci_walk_bus(frozen_bus, eeh_report_failure, 0); | 370 | pci_walk_bus(frozen_bus, eeh_report_failure, NULL); |
371 | 371 | ||
372 | /* Shut down the device drivers for good. */ | 372 | /* Shut down the device drivers for good. */ |
373 | pcibios_remove_pci_devices(frozen_bus); | 373 | pcibios_remove_pci_devices(frozen_bus); |
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c index 929ad2333aab..61d317428610 100644 --- a/arch/powerpc/sysdev/dart_iommu.c +++ b/arch/powerpc/sysdev/dart_iommu.c | |||
@@ -59,7 +59,7 @@ static unsigned long dart_tablesize; | |||
59 | static u32 *dart_vbase; | 59 | static u32 *dart_vbase; |
60 | 60 | ||
61 | /* Mapped base address for the dart */ | 61 | /* Mapped base address for the dart */ |
62 | static unsigned int *__iomem dart; | 62 | static unsigned int __iomem *dart; |
63 | 63 | ||
64 | /* Dummy val that entries are set to when unused */ | 64 | /* Dummy val that entries are set to when unused */ |
65 | static unsigned int dart_emptyval; | 65 | static unsigned int dart_emptyval; |