diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 21:24:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 21:24:58 -0500 |
commit | 13d7d84e078f49f08b657a3fba0d7a0b7b44ba65 (patch) | |
tree | ae4957d183e2f5fcae62b2c1411b4a32c2f71f21 /arch | |
parent | cbb8fc07974073543fdc61da23713ab49ddd3ced (diff) | |
parent | 73c9ceab40b1269d6195e556773167c078ac8311 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (36 commits)
[POWERPC] Generic BUG for powerpc
[PPC] Fix compile failure do to introduction of PHY_POLL
[POWERPC] Only export __mtdcr/__mfdcr if CONFIG_PPC_DCR is set
[POWERPC] Remove old dcr.S
[POWERPC] Fix SPU coredump code for max_fdset removal
[POWERPC] Fix irq routing on some 32-bit PowerMacs
[POWERPC] ps3: Add vuart support
[POWERPC] Support ibm,dynamic-reconfiguration-memory nodes
[POWERPC] dont allow pSeries_probe to succeed without initialising MMU
[POWERPC] micro optimise pSeries_probe
[POWERPC] Add SPURR SPR to sysfs
[POWERPC] Add DSCR SPR to sysfs
[POWERPC] Fix 440SPe CPU table entry
[POWERPC] Add support for FP emulation for the e300c2 core
[POWERPC] of_device_register: propagate device_create_file return code
[POWERPC] Fix mmap of PCI resource with hack for X
[POWERPC] iSeries: head_64.o needs to depend on lparmap.s
[POWERPC] cbe_thermal: Fix initialization of sysfs attribute_group
[POWERPC] Remove QE header files from lite5200.c
[POWERPC] of_platform_make_bus_id(): make `magic' int
...
Diffstat (limited to 'arch')
38 files changed, 677 insertions, 510 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 56c3c4065eb0..8699dadcd096 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -107,6 +107,11 @@ config AUDIT_ARCH | |||
107 | bool | 107 | bool |
108 | default y | 108 | default y |
109 | 109 | ||
110 | config GENERIC_BUG | ||
111 | bool | ||
112 | default y | ||
113 | depends on BUG | ||
114 | |||
110 | config DEFAULT_UIMAGE | 115 | config DEFAULT_UIMAGE |
111 | bool | 116 | bool |
112 | help | 117 | help |
@@ -478,6 +483,7 @@ config PPC_MAPLE | |||
478 | select PPC_UDBG_16550 | 483 | select PPC_UDBG_16550 |
479 | select PPC_970_NAP | 484 | select PPC_970_NAP |
480 | select PPC_NATIVE | 485 | select PPC_NATIVE |
486 | select PPC_RTAS | ||
481 | default n | 487 | default n |
482 | help | 488 | help |
483 | This option enables support for the Maple 970FX Evaluation Board. | 489 | This option enables support for the Maple 970FX Evaluation Board. |
@@ -714,7 +720,7 @@ config FORCE_MAX_ZONEORDER | |||
714 | 720 | ||
715 | config MATH_EMULATION | 721 | config MATH_EMULATION |
716 | bool "Math emulation" | 722 | bool "Math emulation" |
717 | depends on 4xx || 8xx || E200 || E500 | 723 | depends on 4xx || 8xx || E200 || PPC_83xx || E500 |
718 | ---help--- | 724 | ---help--- |
719 | Some PowerPC chips designed for embedded applications do not have | 725 | Some PowerPC chips designed for embedded applications do not have |
720 | a floating-point unit and therefore do not implement the | 726 | a floating-point unit and therefore do not implement the |
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index f2d888e014a9..70ed61337f5c 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
@@ -157,6 +157,7 @@ CONFIG_SPU_BASE=y | |||
157 | CONFIG_PS3_HTAB_SIZE=20 | 157 | CONFIG_PS3_HTAB_SIZE=20 |
158 | CONFIG_PS3_DYNAMIC_DMA=y | 158 | CONFIG_PS3_DYNAMIC_DMA=y |
159 | CONFIG_PS3_USE_LPAR_ADDR=y | 159 | CONFIG_PS3_USE_LPAR_ADDR=y |
160 | CONFIG_PS3_VUART=y | ||
160 | 161 | ||
161 | # | 162 | # |
162 | # Kernel options | 163 | # Kernel options |
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 4fe53d08ab81..d2ded19e4064 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -77,6 +77,7 @@ endif | |||
77 | 77 | ||
78 | ifeq ($(CONFIG_PPC_ISERIES),y) | 78 | ifeq ($(CONFIG_PPC_ISERIES),y) |
79 | extra-y += lparmap.s | 79 | extra-y += lparmap.s |
80 | $(obj)/head_64.o: $(obj)/lparmap.s | ||
80 | AFLAGS_head_64.o += -I$(obj) | 81 | AFLAGS_head_64.o += -I$(obj) |
81 | endif | 82 | endif |
82 | 83 | ||
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 9d1614c3ce67..b742013bb9da 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -833,7 +833,7 @@ static struct cpu_spec cpu_specs[] = { | |||
833 | .pvr_mask = 0x7fff0000, | 833 | .pvr_mask = 0x7fff0000, |
834 | .pvr_value = 0x00840000, | 834 | .pvr_value = 0x00840000, |
835 | .cpu_name = "e300c2", | 835 | .cpu_name = "e300c2", |
836 | .cpu_features = CPU_FTRS_E300, | 836 | .cpu_features = CPU_FTRS_E300C2, |
837 | .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, | 837 | .cpu_user_features = PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU, |
838 | .icache_bsize = 32, | 838 | .icache_bsize = 32, |
839 | .dcache_bsize = 32, | 839 | .dcache_bsize = 32, |
@@ -1136,8 +1136,7 @@ static struct cpu_spec cpu_specs[] = { | |||
1136 | .pvr_mask = 0xff000fff, | 1136 | .pvr_mask = 0xff000fff, |
1137 | .pvr_value = 0x53000890, | 1137 | .pvr_value = 0x53000890, |
1138 | .cpu_name = "440SPe Rev. A", | 1138 | .cpu_name = "440SPe Rev. A", |
1139 | .cpu_features = CPU_FTR_SPLIT_ID_CACHE | | 1139 | .cpu_features = CPU_FTRS_44X, |
1140 | CPU_FTR_USE_TB, | ||
1141 | .cpu_user_features = COMMON_USER_BOOKE, | 1140 | .cpu_user_features = COMMON_USER_BOOKE, |
1142 | .icache_bsize = 32, | 1141 | .icache_bsize = 32, |
1143 | .dcache_bsize = 32, | 1142 | .dcache_bsize = 32, |
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index d88e182e40b3..9417cf5b4b7e 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S | |||
@@ -437,6 +437,13 @@ Alignment: | |||
437 | /* Floating-point unavailable */ | 437 | /* Floating-point unavailable */ |
438 | . = 0x800 | 438 | . = 0x800 |
439 | FPUnavailable: | 439 | FPUnavailable: |
440 | BEGIN_FTR_SECTION | ||
441 | /* | ||
442 | * Certain Freescale cores don't have a FPU and treat fp instructions | ||
443 | * as a FP Unavailable exception. Redirect to illegal/emulation handling. | ||
444 | */ | ||
445 | b ProgramCheck | ||
446 | END_FTR_SECTION_IFSET(CPU_FTR_FPU_UNAVAILABLE) | ||
440 | EXCEPTION_PROLOG | 447 | EXCEPTION_PROLOG |
441 | bne load_up_fpu /* if from user, just load it up */ | 448 | bne load_up_fpu /* if from user, just load it up */ |
442 | addi r3,r1,STACK_FRAME_OVERHEAD | 449 | addi r3,r1,STACK_FRAME_OVERHEAD |
diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c index e2c3c6a85f33..8339fd609de0 100644 --- a/arch/powerpc/kernel/module_32.c +++ b/arch/powerpc/kernel/module_32.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
25 | #include <linux/cache.h> | 25 | #include <linux/cache.h> |
26 | #include <linux/bug.h> | ||
26 | 27 | ||
27 | #include "setup.h" | 28 | #include "setup.h" |
28 | 29 | ||
@@ -290,23 +291,11 @@ int module_finalize(const Elf_Ehdr *hdr, | |||
290 | struct module *me) | 291 | struct module *me) |
291 | { | 292 | { |
292 | const Elf_Shdr *sect; | 293 | const Elf_Shdr *sect; |
294 | int err; | ||
293 | 295 | ||
294 | me->arch.bug_table = NULL; | 296 | err = module_bug_finalize(hdr, sechdrs, me); |
295 | me->arch.num_bugs = 0; | 297 | if (err) /* never true, currently */ |
296 | 298 | return err; | |
297 | /* Find the __bug_table section, if present */ | ||
298 | sect = find_section(hdr, sechdrs, "__bug_table"); | ||
299 | if (sect != NULL) { | ||
300 | me->arch.bug_table = (void *) sect->sh_addr; | ||
301 | me->arch.num_bugs = sect->sh_size / sizeof(struct bug_entry); | ||
302 | } | ||
303 | |||
304 | /* | ||
305 | * Strictly speaking this should have a spinlock to protect against | ||
306 | * traversals, but since we only traverse on BUG()s, a spinlock | ||
307 | * could potentially lead to deadlock and thus be counter-productive. | ||
308 | */ | ||
309 | list_add(&me->arch.bug_list, &module_bug_list); | ||
310 | 299 | ||
311 | /* Apply feature fixups */ | 300 | /* Apply feature fixups */ |
312 | sect = find_section(hdr, sechdrs, "__ftr_fixup"); | 301 | sect = find_section(hdr, sechdrs, "__ftr_fixup"); |
@@ -320,7 +309,7 @@ int module_finalize(const Elf_Ehdr *hdr, | |||
320 | 309 | ||
321 | void module_arch_cleanup(struct module *mod) | 310 | void module_arch_cleanup(struct module *mod) |
322 | { | 311 | { |
323 | list_del(&mod->arch.bug_list); | 312 | module_bug_cleanup(mod); |
324 | } | 313 | } |
325 | 314 | ||
326 | struct bug_entry *module_find_bug(unsigned long bugaddr) | 315 | struct bug_entry *module_find_bug(unsigned long bugaddr) |
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c index 8dd1f0aae5d6..75c7c4f19280 100644 --- a/arch/powerpc/kernel/module_64.c +++ b/arch/powerpc/kernel/module_64.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/moduleloader.h> | 20 | #include <linux/moduleloader.h> |
21 | #include <linux/err.h> | 21 | #include <linux/err.h> |
22 | #include <linux/vmalloc.h> | 22 | #include <linux/vmalloc.h> |
23 | #include <linux/bug.h> | ||
23 | #include <asm/module.h> | 24 | #include <asm/module.h> |
24 | #include <asm/uaccess.h> | 25 | #include <asm/uaccess.h> |
25 | #include <asm/firmware.h> | 26 | #include <asm/firmware.h> |
@@ -439,23 +440,11 @@ int module_finalize(const Elf_Ehdr *hdr, | |||
439 | const Elf_Shdr *sechdrs, struct module *me) | 440 | const Elf_Shdr *sechdrs, struct module *me) |
440 | { | 441 | { |
441 | const Elf_Shdr *sect; | 442 | const Elf_Shdr *sect; |
443 | int err; | ||
442 | 444 | ||
443 | me->arch.bug_table = NULL; | 445 | err = module_bug_finalize(hdr, sechdrs, me); |
444 | me->arch.num_bugs = 0; | 446 | if (err) |
445 | 447 | return err; | |
446 | /* Find the __bug_table section, if present */ | ||
447 | sect = find_section(hdr, sechdrs, "__bug_table"); | ||
448 | if (sect != NULL) { | ||
449 | me->arch.bug_table = (void *) sect->sh_addr; | ||
450 | me->arch.num_bugs = sect->sh_size / sizeof(struct bug_entry); | ||
451 | } | ||
452 | |||
453 | /* | ||
454 | * Strictly speaking this should have a spinlock to protect against | ||
455 | * traversals, but since we only traverse on BUG()s, a spinlock | ||
456 | * could potentially lead to deadlock and thus be counter-productive. | ||
457 | */ | ||
458 | list_add(&me->arch.bug_list, &module_bug_list); | ||
459 | 448 | ||
460 | /* Apply feature fixups */ | 449 | /* Apply feature fixups */ |
461 | sect = find_section(hdr, sechdrs, "__ftr_fixup"); | 450 | sect = find_section(hdr, sechdrs, "__ftr_fixup"); |
@@ -475,7 +464,7 @@ int module_finalize(const Elf_Ehdr *hdr, | |||
475 | 464 | ||
476 | void module_arch_cleanup(struct module *mod) | 465 | void module_arch_cleanup(struct module *mod) |
477 | { | 466 | { |
478 | list_del(&mod->arch.bug_list); | 467 | module_bug_cleanup(mod); |
479 | } | 468 | } |
480 | 469 | ||
481 | struct bug_entry *module_find_bug(unsigned long bugaddr) | 470 | struct bug_entry *module_find_bug(unsigned long bugaddr) |
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c index 8a06724e029e..e921514e655b 100644 --- a/arch/powerpc/kernel/of_device.c +++ b/arch/powerpc/kernel/of_device.c | |||
@@ -109,9 +109,7 @@ int of_device_register(struct of_device *ofdev) | |||
109 | if (rc) | 109 | if (rc) |
110 | return rc; | 110 | return rc; |
111 | 111 | ||
112 | device_create_file(&ofdev->dev, &dev_attr_devspec); | 112 | return device_create_file(&ofdev->dev, &dev_attr_devspec); |
113 | |||
114 | return 0; | ||
115 | } | 113 | } |
116 | 114 | ||
117 | void of_device_unregister(struct of_device *ofdev) | 115 | void of_device_unregister(struct of_device *ofdev) |
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index b3189d0161b8..3002ea3a61a2 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c | |||
@@ -169,7 +169,7 @@ static void of_platform_make_bus_id(struct of_device *dev) | |||
169 | char *name = dev->dev.bus_id; | 169 | char *name = dev->dev.bus_id; |
170 | const u32 *reg; | 170 | const u32 *reg; |
171 | u64 addr; | 171 | u64 addr; |
172 | long magic; | 172 | int magic; |
173 | 173 | ||
174 | /* | 174 | /* |
175 | * If it's a DCR based device, use 'd' for native DCRs | 175 | * If it's a DCR based device, use 'd' for native DCRs |
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index 2f54cd81dea5..8336deafc624 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
@@ -736,25 +736,51 @@ scan_OF_pci_childs(struct device_node* node, pci_OF_scan_iterator filter, void* | |||
736 | return NULL; | 736 | return NULL; |
737 | } | 737 | } |
738 | 738 | ||
739 | static int | 739 | static struct device_node *scan_OF_for_pci_dev(struct device_node *parent, |
740 | scan_OF_pci_childs_iterator(struct device_node* node, void* data) | 740 | unsigned int devfn) |
741 | { | 741 | { |
742 | const unsigned int *reg; | 742 | struct device_node *np = NULL; |
743 | u8* fdata = (u8*)data; | 743 | const u32 *reg; |
744 | 744 | unsigned int psize; | |
745 | reg = get_property(node, "reg", NULL); | 745 | |
746 | if (reg && ((reg[0] >> 8) & 0xff) == fdata[1] | 746 | while ((np = of_get_next_child(parent, np)) != NULL) { |
747 | && ((reg[0] >> 16) & 0xff) == fdata[0]) | 747 | reg = get_property(np, "reg", &psize); |
748 | return 1; | 748 | if (reg == NULL || psize < 4) |
749 | return 0; | 749 | continue; |
750 | if (((reg[0] >> 8) & 0xff) == devfn) | ||
751 | return np; | ||
752 | } | ||
753 | return NULL; | ||
750 | } | 754 | } |
751 | 755 | ||
752 | static struct device_node* | 756 | |
753 | scan_OF_childs_for_device(struct device_node* node, u8 bus, u8 dev_fn) | 757 | static struct device_node *scan_OF_for_pci_bus(struct pci_bus *bus) |
754 | { | 758 | { |
755 | u8 filter_data[2] = {bus, dev_fn}; | 759 | struct device_node *parent, *np; |
760 | |||
761 | /* Are we a root bus ? */ | ||
762 | if (bus->self == NULL || bus->parent == NULL) { | ||
763 | struct pci_controller *hose = pci_bus_to_hose(bus->number); | ||
764 | if (hose == NULL) | ||
765 | return NULL; | ||
766 | return of_node_get(hose->arch_data); | ||
767 | } | ||
768 | |||
769 | /* not a root bus, we need to get our parent */ | ||
770 | parent = scan_OF_for_pci_bus(bus->parent); | ||
771 | if (parent == NULL) | ||
772 | return NULL; | ||
773 | |||
774 | /* now iterate for children for a match */ | ||
775 | np = scan_OF_for_pci_dev(parent, bus->self->devfn); | ||
776 | of_node_put(parent); | ||
756 | 777 | ||
757 | return scan_OF_pci_childs(node, scan_OF_pci_childs_iterator, filter_data); | 778 | /* sanity check */ |
779 | if (strcmp(np->type, "pci") != 0) | ||
780 | printk(KERN_WARNING "pci: wrong type \"%s\" for bridge %s\n", | ||
781 | np->type, np->full_name); | ||
782 | |||
783 | return np; | ||
758 | } | 784 | } |
759 | 785 | ||
760 | /* | 786 | /* |
@@ -763,43 +789,25 @@ scan_OF_childs_for_device(struct device_node* node, u8 bus, u8 dev_fn) | |||
763 | struct device_node * | 789 | struct device_node * |
764 | pci_busdev_to_OF_node(struct pci_bus *bus, int devfn) | 790 | pci_busdev_to_OF_node(struct pci_bus *bus, int devfn) |
765 | { | 791 | { |
766 | struct pci_controller *hose; | 792 | struct device_node *parent, *np; |
767 | struct device_node *node; | ||
768 | int busnr; | ||
769 | 793 | ||
770 | if (!have_of) | 794 | if (!have_of) |
771 | return NULL; | 795 | return NULL; |
772 | |||
773 | /* Lookup the hose */ | ||
774 | busnr = bus->number; | ||
775 | hose = pci_bus_to_hose(busnr); | ||
776 | if (!hose) | ||
777 | return NULL; | ||
778 | 796 | ||
779 | /* Check it has an OF node associated */ | 797 | DBG("pci_busdev_to_OF_node(%d,0x%x)\n", bus->number, devfn); |
780 | node = (struct device_node *) hose->arch_data; | 798 | parent = scan_OF_for_pci_bus(bus); |
781 | if (!node) | 799 | if (parent == NULL) |
782 | return NULL; | 800 | return NULL; |
783 | 801 | DBG(" parent is %s\n", parent ? parent->full_name : "<NULL>"); | |
784 | /* Fixup bus number according to what OF think it is. */ | 802 | np = scan_OF_for_pci_dev(parent, devfn); |
785 | #ifdef CONFIG_PPC_PMAC | 803 | of_node_put(parent); |
786 | /* The G5 need a special case here. Basically, we don't remap all | 804 | DBG(" result is %s\n", np ? np->full_name : "<NULL>"); |
787 | * busses on it so we don't create the pci-OF-map. However, we do | 805 | |
788 | * remap the AGP bus and so have to deal with it. A future better | 806 | /* XXX most callers don't release the returned node |
789 | * fix has to be done by making the remapping per-host and always | 807 | * mostly because ppc64 doesn't increase the refcount, |
790 | * filling the pci_to_OF map. --BenH | 808 | * we need to fix that. |
791 | */ | 809 | */ |
792 | if (machine_is(powermac) && busnr >= 0xf0) | 810 | return np; |
793 | busnr -= 0xf0; | ||
794 | else | ||
795 | #endif | ||
796 | if (pci_to_OF_bus_map) | ||
797 | busnr = pci_to_OF_bus_map[busnr]; | ||
798 | if (busnr == 0xff) | ||
799 | return NULL; | ||
800 | |||
801 | /* Now, lookup childs of the hose */ | ||
802 | return scan_OF_childs_for_device(node->child, busnr, devfn); | ||
803 | } | 811 | } |
804 | EXPORT_SYMBOL(pci_busdev_to_OF_node); | 812 | EXPORT_SYMBOL(pci_busdev_to_OF_node); |
805 | 813 | ||
@@ -1544,7 +1552,7 @@ pci_resource_to_bus(struct pci_dev *pdev, struct resource *res) | |||
1544 | 1552 | ||
1545 | 1553 | ||
1546 | static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, | 1554 | static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, |
1547 | unsigned long *offset, | 1555 | resource_size_t *offset, |
1548 | enum pci_mmap_state mmap_state) | 1556 | enum pci_mmap_state mmap_state) |
1549 | { | 1557 | { |
1550 | struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); | 1558 | struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); |
@@ -1556,7 +1564,9 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, | |||
1556 | 1564 | ||
1557 | /* If memory, add on the PCI bridge address offset */ | 1565 | /* If memory, add on the PCI bridge address offset */ |
1558 | if (mmap_state == pci_mmap_mem) { | 1566 | if (mmap_state == pci_mmap_mem) { |
1567 | #if 0 /* See comment in pci_resource_to_user() for why this is disabled */ | ||
1559 | *offset += hose->pci_mem_offset; | 1568 | *offset += hose->pci_mem_offset; |
1569 | #endif | ||
1560 | res_bit = IORESOURCE_MEM; | 1570 | res_bit = IORESOURCE_MEM; |
1561 | } else { | 1571 | } else { |
1562 | io_offset = hose->io_base_virt - (void __iomem *)_IO_BASE; | 1572 | io_offset = hose->io_base_virt - (void __iomem *)_IO_BASE; |
@@ -1624,9 +1634,6 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp, | |||
1624 | else | 1634 | else |
1625 | prot |= _PAGE_GUARDED; | 1635 | prot |= _PAGE_GUARDED; |
1626 | 1636 | ||
1627 | printk("PCI map for %s:%llx, prot: %lx\n", pci_name(dev), | ||
1628 | (unsigned long long)rp->start, prot); | ||
1629 | |||
1630 | return __pgprot(prot); | 1637 | return __pgprot(prot); |
1631 | } | 1638 | } |
1632 | 1639 | ||
@@ -1695,7 +1702,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
1695 | enum pci_mmap_state mmap_state, | 1702 | enum pci_mmap_state mmap_state, |
1696 | int write_combine) | 1703 | int write_combine) |
1697 | { | 1704 | { |
1698 | unsigned long offset = vma->vm_pgoff << PAGE_SHIFT; | 1705 | resource_size_t offset = vma->vm_pgoff << PAGE_SHIFT; |
1699 | struct resource *rp; | 1706 | struct resource *rp; |
1700 | int ret; | 1707 | int ret; |
1701 | 1708 | ||
@@ -1808,22 +1815,42 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar, | |||
1808 | resource_size_t *start, resource_size_t *end) | 1815 | resource_size_t *start, resource_size_t *end) |
1809 | { | 1816 | { |
1810 | struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); | 1817 | struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); |
1811 | unsigned long offset = 0; | 1818 | resource_size_t offset = 0; |
1812 | 1819 | ||
1813 | if (hose == NULL) | 1820 | if (hose == NULL) |
1814 | return; | 1821 | return; |
1815 | 1822 | ||
1816 | if (rsrc->flags & IORESOURCE_IO) | 1823 | if (rsrc->flags & IORESOURCE_IO) |
1817 | offset = (void __iomem *)_IO_BASE - hose->io_base_virt | 1824 | offset = (unsigned long)hose->io_base_virt - _IO_BASE; |
1818 | + hose->io_base_phys; | 1825 | |
1826 | /* We pass a fully fixed up address to userland for MMIO instead of | ||
1827 | * a BAR value because X is lame and expects to be able to use that | ||
1828 | * to pass to /dev/mem ! | ||
1829 | * | ||
1830 | * That means that we'll have potentially 64 bits values where some | ||
1831 | * userland apps only expect 32 (like X itself since it thinks only | ||
1832 | * Sparc has 64 bits MMIO) but if we don't do that, we break it on | ||
1833 | * 32 bits CHRPs :-( | ||
1834 | * | ||
1835 | * Hopefully, the sysfs insterface is immune to that gunk. Once X | ||
1836 | * has been fixed (and the fix spread enough), we can re-enable the | ||
1837 | * 2 lines below and pass down a BAR value to userland. In that case | ||
1838 | * we'll also have to re-enable the matching code in | ||
1839 | * __pci_mmap_make_offset(). | ||
1840 | * | ||
1841 | * BenH. | ||
1842 | */ | ||
1843 | #if 0 | ||
1844 | else if (rsrc->flags & IORESOURCE_MEM) | ||
1845 | offset = hose->pci_mem_offset; | ||
1846 | #endif | ||
1819 | 1847 | ||
1820 | *start = rsrc->start + offset; | 1848 | *start = rsrc->start - offset; |
1821 | *end = rsrc->end + offset; | 1849 | *end = rsrc->end - offset; |
1822 | } | 1850 | } |
1823 | 1851 | ||
1824 | void __init | 1852 | void __init pci_init_resource(struct resource *res, resource_size_t start, |
1825 | pci_init_resource(struct resource *res, unsigned long start, unsigned long end, | 1853 | resource_size_t end, int flags, char *name) |
1826 | int flags, char *name) | ||
1827 | { | 1854 | { |
1828 | res->start = start; | 1855 | res->start = start; |
1829 | res->end = end; | 1856 | res->end = end; |
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index 6fa9a0a5c8db..a6b7692c7269 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c | |||
@@ -682,7 +682,7 @@ int pci_proc_domain(struct pci_bus *bus) | |||
682 | * Returns negative error code on failure, zero on success. | 682 | * Returns negative error code on failure, zero on success. |
683 | */ | 683 | */ |
684 | static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, | 684 | static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, |
685 | unsigned long *offset, | 685 | resource_size_t *offset, |
686 | enum pci_mmap_state mmap_state) | 686 | enum pci_mmap_state mmap_state) |
687 | { | 687 | { |
688 | struct pci_controller *hose = pci_bus_to_host(dev->bus); | 688 | struct pci_controller *hose = pci_bus_to_host(dev->bus); |
@@ -694,7 +694,9 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, | |||
694 | 694 | ||
695 | /* If memory, add on the PCI bridge address offset */ | 695 | /* If memory, add on the PCI bridge address offset */ |
696 | if (mmap_state == pci_mmap_mem) { | 696 | if (mmap_state == pci_mmap_mem) { |
697 | #if 0 /* See comment in pci_resource_to_user() for why this is disabled */ | ||
697 | *offset += hose->pci_mem_offset; | 698 | *offset += hose->pci_mem_offset; |
699 | #endif | ||
698 | res_bit = IORESOURCE_MEM; | 700 | res_bit = IORESOURCE_MEM; |
699 | } else { | 701 | } else { |
700 | io_offset = (unsigned long)hose->io_base_virt - pci_io_base; | 702 | io_offset = (unsigned long)hose->io_base_virt - pci_io_base; |
@@ -762,9 +764,6 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp, | |||
762 | else | 764 | else |
763 | prot |= _PAGE_GUARDED; | 765 | prot |= _PAGE_GUARDED; |
764 | 766 | ||
765 | printk(KERN_DEBUG "PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp->start, | ||
766 | prot); | ||
767 | |||
768 | return __pgprot(prot); | 767 | return __pgprot(prot); |
769 | } | 768 | } |
770 | 769 | ||
@@ -832,7 +831,7 @@ pgprot_t pci_phys_mem_access_prot(struct file *file, | |||
832 | int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | 831 | int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, |
833 | enum pci_mmap_state mmap_state, int write_combine) | 832 | enum pci_mmap_state mmap_state, int write_combine) |
834 | { | 833 | { |
835 | unsigned long offset = vma->vm_pgoff << PAGE_SHIFT; | 834 | resource_size_t offset = vma->vm_pgoff << PAGE_SHIFT; |
836 | struct resource *rp; | 835 | struct resource *rp; |
837 | int ret; | 836 | int ret; |
838 | 837 | ||
@@ -1333,20 +1332,41 @@ EXPORT_SYMBOL(pci_read_irq_line); | |||
1333 | 1332 | ||
1334 | void pci_resource_to_user(const struct pci_dev *dev, int bar, | 1333 | void pci_resource_to_user(const struct pci_dev *dev, int bar, |
1335 | const struct resource *rsrc, | 1334 | const struct resource *rsrc, |
1336 | u64 *start, u64 *end) | 1335 | resource_size_t *start, resource_size_t *end) |
1337 | { | 1336 | { |
1338 | struct pci_controller *hose = pci_bus_to_host(dev->bus); | 1337 | struct pci_controller *hose = pci_bus_to_host(dev->bus); |
1339 | unsigned long offset = 0; | 1338 | resource_size_t offset = 0; |
1340 | 1339 | ||
1341 | if (hose == NULL) | 1340 | if (hose == NULL) |
1342 | return; | 1341 | return; |
1343 | 1342 | ||
1344 | if (rsrc->flags & IORESOURCE_IO) | 1343 | if (rsrc->flags & IORESOURCE_IO) |
1345 | offset = pci_io_base - (unsigned long)hose->io_base_virt + | 1344 | offset = (unsigned long)hose->io_base_virt - pci_io_base; |
1346 | hose->io_base_phys; | 1345 | |
1346 | /* We pass a fully fixed up address to userland for MMIO instead of | ||
1347 | * a BAR value because X is lame and expects to be able to use that | ||
1348 | * to pass to /dev/mem ! | ||
1349 | * | ||
1350 | * That means that we'll have potentially 64 bits values where some | ||
1351 | * userland apps only expect 32 (like X itself since it thinks only | ||
1352 | * Sparc has 64 bits MMIO) but if we don't do that, we break it on | ||
1353 | * 32 bits CHRPs :-( | ||
1354 | * | ||
1355 | * Hopefully, the sysfs insterface is immune to that gunk. Once X | ||
1356 | * has been fixed (and the fix spread enough), we can re-enable the | ||
1357 | * 2 lines below and pass down a BAR value to userland. In that case | ||
1358 | * we'll also have to re-enable the matching code in | ||
1359 | * __pci_mmap_make_offset(). | ||
1360 | * | ||
1361 | * BenH. | ||
1362 | */ | ||
1363 | #if 0 | ||
1364 | else if (rsrc->flags & IORESOURCE_MEM) | ||
1365 | offset = hose->pci_mem_offset; | ||
1366 | #endif | ||
1347 | 1367 | ||
1348 | *start = rsrc->start + offset; | 1368 | *start = rsrc->start - offset; |
1349 | *end = rsrc->end + offset; | 1369 | *end = rsrc->end - offset; |
1350 | } | 1370 | } |
1351 | 1371 | ||
1352 | struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node) | 1372 | struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node) |
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index 9179f0739ea2..95776b6af4e2 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
@@ -208,7 +208,7 @@ EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */ | |||
208 | extern long *intercept_table; | 208 | extern long *intercept_table; |
209 | EXPORT_SYMBOL(intercept_table); | 209 | EXPORT_SYMBOL(intercept_table); |
210 | #endif /* CONFIG_PPC_STD_MMU_32 */ | 210 | #endif /* CONFIG_PPC_STD_MMU_32 */ |
211 | #if defined(CONFIG_40x) || defined(CONFIG_BOOKE) | 211 | #ifdef CONFIG_PPC_DCR_NATIVE |
212 | EXPORT_SYMBOL(__mtdcr); | 212 | EXPORT_SYMBOL(__mtdcr); |
213 | EXPORT_SYMBOL(__mfdcr); | 213 | EXPORT_SYMBOL(__mfdcr); |
214 | #endif | 214 | #endif |
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index c18dbe77fdc2..1fc732a552db 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -804,6 +804,56 @@ static unsigned long __init dt_mem_next_cell(int s, cell_t **cellp) | |||
804 | return of_read_ulong(p, s); | 804 | return of_read_ulong(p, s); |
805 | } | 805 | } |
806 | 806 | ||
807 | #ifdef CONFIG_PPC_PSERIES | ||
808 | /* | ||
809 | * Interpret the ibm,dynamic-memory property in the | ||
810 | * /ibm,dynamic-reconfiguration-memory node. | ||
811 | * This contains a list of memory blocks along with NUMA affinity | ||
812 | * information. | ||
813 | */ | ||
814 | static int __init early_init_dt_scan_drconf_memory(unsigned long node) | ||
815 | { | ||
816 | cell_t *dm, *ls; | ||
817 | unsigned long l, n; | ||
818 | unsigned long base, size, lmb_size, flags; | ||
819 | |||
820 | ls = (cell_t *)of_get_flat_dt_prop(node, "ibm,lmb-size", &l); | ||
821 | if (ls == NULL || l < dt_root_size_cells * sizeof(cell_t)) | ||
822 | return 0; | ||
823 | lmb_size = dt_mem_next_cell(dt_root_size_cells, &ls); | ||
824 | |||
825 | dm = (cell_t *)of_get_flat_dt_prop(node, "ibm,dynamic-memory", &l); | ||
826 | if (dm == NULL || l < sizeof(cell_t)) | ||
827 | return 0; | ||
828 | |||
829 | n = *dm++; /* number of entries */ | ||
830 | if (l < (n * (dt_root_addr_cells + 4) + 1) * sizeof(cell_t)) | ||
831 | return 0; | ||
832 | |||
833 | for (; n != 0; --n) { | ||
834 | base = dt_mem_next_cell(dt_root_addr_cells, &dm); | ||
835 | flags = dm[3]; | ||
836 | /* skip DRC index, pad, assoc. list index, flags */ | ||
837 | dm += 4; | ||
838 | /* skip this block if the reserved bit is set in flags (0x80) | ||
839 | or if the block is not assigned to this partition (0x8) */ | ||
840 | if ((flags & 0x80) || !(flags & 0x8)) | ||
841 | continue; | ||
842 | size = lmb_size; | ||
843 | if (iommu_is_off) { | ||
844 | if (base >= 0x80000000ul) | ||
845 | continue; | ||
846 | if ((base + size) > 0x80000000ul) | ||
847 | size = 0x80000000ul - base; | ||
848 | } | ||
849 | lmb_add(base, size); | ||
850 | } | ||
851 | lmb_dump_all(); | ||
852 | return 0; | ||
853 | } | ||
854 | #else | ||
855 | #define early_init_dt_scan_drconf_memory(node) 0 | ||
856 | #endif /* CONFIG_PPC_PSERIES */ | ||
807 | 857 | ||
808 | static int __init early_init_dt_scan_memory(unsigned long node, | 858 | static int __init early_init_dt_scan_memory(unsigned long node, |
809 | const char *uname, int depth, void *data) | 859 | const char *uname, int depth, void *data) |
@@ -812,6 +862,11 @@ static int __init early_init_dt_scan_memory(unsigned long node, | |||
812 | cell_t *reg, *endp; | 862 | cell_t *reg, *endp; |
813 | unsigned long l; | 863 | unsigned long l; |
814 | 864 | ||
865 | /* Look for the ibm,dynamic-reconfiguration-memory node */ | ||
866 | if (depth == 1 && | ||
867 | strcmp(uname, "ibm,dynamic-reconfiguration-memory") == 0) | ||
868 | return early_init_dt_scan_drconf_memory(node); | ||
869 | |||
815 | /* We are scanning "memory" nodes only */ | 870 | /* We are scanning "memory" nodes only */ |
816 | if (type == NULL) { | 871 | if (type == NULL) { |
817 | /* | 872 | /* |
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 46cf32670ddb..520ef42f642e 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
@@ -679,7 +679,7 @@ static unsigned char ibm_architecture_vec[] = { | |||
679 | /* option vector 5: PAPR/OF options */ | 679 | /* option vector 5: PAPR/OF options */ |
680 | 3 - 2, /* length */ | 680 | 3 - 2, /* length */ |
681 | 0, /* don't ignore, don't halt */ | 681 | 0, /* don't ignore, don't halt */ |
682 | OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES, | 682 | OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES | OV5_DRCONF_MEMORY, |
683 | }; | 683 | }; |
684 | 684 | ||
685 | /* Old method - ELF header with PT_NOTE sections */ | 685 | /* Old method - ELF header with PT_NOTE sections */ |
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 387ed0d9ad61..76b5d7ebdcc6 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c | |||
@@ -303,6 +303,12 @@ int rtas_token(const char *service) | |||
303 | } | 303 | } |
304 | EXPORT_SYMBOL(rtas_token); | 304 | EXPORT_SYMBOL(rtas_token); |
305 | 305 | ||
306 | int rtas_service_present(const char *service) | ||
307 | { | ||
308 | return rtas_token(service) != RTAS_UNKNOWN_SERVICE; | ||
309 | } | ||
310 | EXPORT_SYMBOL(rtas_service_present); | ||
311 | |||
306 | #ifdef CONFIG_RTAS_ERROR_LOGGING | 312 | #ifdef CONFIG_RTAS_ERROR_LOGGING |
307 | /* | 313 | /* |
308 | * Return the firmware-specified size of the error log buffer | 314 | * Return the firmware-specified size of the error log buffer |
@@ -810,32 +816,6 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs) | |||
810 | return 0; | 816 | return 0; |
811 | } | 817 | } |
812 | 818 | ||
813 | #ifdef CONFIG_HOTPLUG_CPU | ||
814 | /* This version can't take the spinlock, because it never returns */ | ||
815 | static struct rtas_args rtas_stop_self_args = { | ||
816 | /* The token is initialized for real in setup_system() */ | ||
817 | .token = RTAS_UNKNOWN_SERVICE, | ||
818 | .nargs = 0, | ||
819 | .nret = 1, | ||
820 | .rets = &rtas_stop_self_args.args[0], | ||
821 | }; | ||
822 | |||
823 | void rtas_stop_self(void) | ||
824 | { | ||
825 | struct rtas_args *rtas_args = &rtas_stop_self_args; | ||
826 | |||
827 | local_irq_disable(); | ||
828 | |||
829 | BUG_ON(rtas_args->token == RTAS_UNKNOWN_SERVICE); | ||
830 | |||
831 | printk("cpu %u (hwid %u) Ready to die...\n", | ||
832 | smp_processor_id(), hard_smp_processor_id()); | ||
833 | enter_rtas(__pa(rtas_args)); | ||
834 | |||
835 | panic("Alas, I survived.\n"); | ||
836 | } | ||
837 | #endif | ||
838 | |||
839 | /* | 819 | /* |
840 | * Call early during boot, before mem init or bootmem, to retrieve the RTAS | 820 | * Call early during boot, before mem init or bootmem, to retrieve the RTAS |
841 | * informations from the device-tree and allocate the RMO buffer for userland | 821 | * informations from the device-tree and allocate the RMO buffer for userland |
@@ -880,9 +860,6 @@ void __init rtas_initialize(void) | |||
880 | #endif | 860 | #endif |
881 | rtas_rmo_buf = lmb_alloc_base(RTAS_RMOBUF_MAX, PAGE_SIZE, rtas_region); | 861 | rtas_rmo_buf = lmb_alloc_base(RTAS_RMOBUF_MAX, PAGE_SIZE, rtas_region); |
882 | 862 | ||
883 | #ifdef CONFIG_HOTPLUG_CPU | ||
884 | rtas_stop_self_args.token = rtas_token("stop-self"); | ||
885 | #endif /* CONFIG_HOTPLUG_CPU */ | ||
886 | #ifdef CONFIG_RTAS_ERROR_LOGGING | 863 | #ifdef CONFIG_RTAS_ERROR_LOGGING |
887 | rtas_last_error_token = rtas_token("rtas-last-error"); | 864 | rtas_last_error_token = rtas_token("rtas-last-error"); |
888 | #endif | 865 | #endif |
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index 63ed265b7f09..400ab2b946e7 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c | |||
@@ -181,6 +181,8 @@ SYSFS_PMCSETUP(pmc6, SPRN_PMC6); | |||
181 | SYSFS_PMCSETUP(pmc7, SPRN_PMC7); | 181 | SYSFS_PMCSETUP(pmc7, SPRN_PMC7); |
182 | SYSFS_PMCSETUP(pmc8, SPRN_PMC8); | 182 | SYSFS_PMCSETUP(pmc8, SPRN_PMC8); |
183 | SYSFS_PMCSETUP(purr, SPRN_PURR); | 183 | SYSFS_PMCSETUP(purr, SPRN_PURR); |
184 | SYSFS_PMCSETUP(spurr, SPRN_SPURR); | ||
185 | SYSFS_PMCSETUP(dscr, SPRN_DSCR); | ||
184 | 186 | ||
185 | static SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0); | 187 | static SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0); |
186 | static SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1); | 188 | static SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1); |
@@ -194,6 +196,8 @@ static SYSDEV_ATTR(pmc6, 0600, show_pmc6, store_pmc6); | |||
194 | static SYSDEV_ATTR(pmc7, 0600, show_pmc7, store_pmc7); | 196 | static SYSDEV_ATTR(pmc7, 0600, show_pmc7, store_pmc7); |
195 | static SYSDEV_ATTR(pmc8, 0600, show_pmc8, store_pmc8); | 197 | static SYSDEV_ATTR(pmc8, 0600, show_pmc8, store_pmc8); |
196 | static SYSDEV_ATTR(purr, 0600, show_purr, NULL); | 198 | static SYSDEV_ATTR(purr, 0600, show_purr, NULL); |
199 | static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL); | ||
200 | static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr); | ||
197 | 201 | ||
198 | static void register_cpu_online(unsigned int cpu) | 202 | static void register_cpu_online(unsigned int cpu) |
199 | { | 203 | { |
@@ -231,6 +235,12 @@ static void register_cpu_online(unsigned int cpu) | |||
231 | 235 | ||
232 | if (cpu_has_feature(CPU_FTR_PURR)) | 236 | if (cpu_has_feature(CPU_FTR_PURR)) |
233 | sysdev_create_file(s, &attr_purr); | 237 | sysdev_create_file(s, &attr_purr); |
238 | |||
239 | if (cpu_has_feature(CPU_FTR_SPURR)) | ||
240 | sysdev_create_file(s, &attr_spurr); | ||
241 | |||
242 | if (cpu_has_feature(CPU_FTR_DSCR)) | ||
243 | sysdev_create_file(s, &attr_dscr); | ||
234 | } | 244 | } |
235 | 245 | ||
236 | #ifdef CONFIG_HOTPLUG_CPU | 246 | #ifdef CONFIG_HOTPLUG_CPU |
@@ -272,6 +282,12 @@ static void unregister_cpu_online(unsigned int cpu) | |||
272 | 282 | ||
273 | if (cpu_has_feature(CPU_FTR_PURR)) | 283 | if (cpu_has_feature(CPU_FTR_PURR)) |
274 | sysdev_remove_file(s, &attr_purr); | 284 | sysdev_remove_file(s, &attr_purr); |
285 | |||
286 | if (cpu_has_feature(CPU_FTR_SPURR)) | ||
287 | sysdev_remove_file(s, &attr_spurr); | ||
288 | |||
289 | if (cpu_has_feature(CPU_FTR_DSCR)) | ||
290 | sysdev_remove_file(s, &attr_dscr); | ||
275 | } | 291 | } |
276 | #endif /* CONFIG_HOTPLUG_CPU */ | 292 | #endif /* CONFIG_HOTPLUG_CPU */ |
277 | 293 | ||
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 0d4e203fa7a0..535f50665647 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/kprobes.h> | 32 | #include <linux/kprobes.h> |
33 | #include <linux/kexec.h> | 33 | #include <linux/kexec.h> |
34 | #include <linux/backlight.h> | 34 | #include <linux/backlight.h> |
35 | #include <linux/bug.h> | ||
35 | 36 | ||
36 | #include <asm/kdebug.h> | 37 | #include <asm/kdebug.h> |
37 | #include <asm/pgtable.h> | 38 | #include <asm/pgtable.h> |
@@ -727,54 +728,9 @@ static int emulate_instruction(struct pt_regs *regs) | |||
727 | return -EINVAL; | 728 | return -EINVAL; |
728 | } | 729 | } |
729 | 730 | ||
730 | /* | 731 | int is_valid_bugaddr(unsigned long addr) |
731 | * Look through the list of trap instructions that are used for BUG(), | ||
732 | * BUG_ON() and WARN_ON() and see if we hit one. At this point we know | ||
733 | * that the exception was caused by a trap instruction of some kind. | ||
734 | * Returns 1 if we should continue (i.e. it was a WARN_ON) or 0 | ||
735 | * otherwise. | ||
736 | */ | ||
737 | extern struct bug_entry __start___bug_table[], __stop___bug_table[]; | ||
738 | |||
739 | #ifndef CONFIG_MODULES | ||
740 | #define module_find_bug(x) NULL | ||
741 | #endif | ||
742 | |||
743 | struct bug_entry *find_bug(unsigned long bugaddr) | ||
744 | { | 732 | { |
745 | struct bug_entry *bug; | 733 | return is_kernel_addr(addr); |
746 | |||
747 | for (bug = __start___bug_table; bug < __stop___bug_table; ++bug) | ||
748 | if (bugaddr == bug->bug_addr) | ||
749 | return bug; | ||
750 | return module_find_bug(bugaddr); | ||
751 | } | ||
752 | |||
753 | static int check_bug_trap(struct pt_regs *regs) | ||
754 | { | ||
755 | struct bug_entry *bug; | ||
756 | unsigned long addr; | ||
757 | |||
758 | if (regs->msr & MSR_PR) | ||
759 | return 0; /* not in kernel */ | ||
760 | addr = regs->nip; /* address of trap instruction */ | ||
761 | if (addr < PAGE_OFFSET) | ||
762 | return 0; | ||
763 | bug = find_bug(regs->nip); | ||
764 | if (bug == NULL) | ||
765 | return 0; | ||
766 | if (bug->line & BUG_WARNING_TRAP) { | ||
767 | /* this is a WARN_ON rather than BUG/BUG_ON */ | ||
768 | printk(KERN_ERR "Badness in %s at %s:%ld\n", | ||
769 | bug->function, bug->file, | ||
770 | bug->line & ~BUG_WARNING_TRAP); | ||
771 | dump_stack(); | ||
772 | return 1; | ||
773 | } | ||
774 | printk(KERN_CRIT "kernel BUG in %s at %s:%ld!\n", | ||
775 | bug->function, bug->file, bug->line); | ||
776 | |||
777 | return 0; | ||
778 | } | 734 | } |
779 | 735 | ||
780 | void __kprobes program_check_exception(struct pt_regs *regs) | 736 | void __kprobes program_check_exception(struct pt_regs *regs) |
@@ -782,6 +738,8 @@ void __kprobes program_check_exception(struct pt_regs *regs) | |||
782 | unsigned int reason = get_reason(regs); | 738 | unsigned int reason = get_reason(regs); |
783 | extern int do_mathemu(struct pt_regs *regs); | 739 | extern int do_mathemu(struct pt_regs *regs); |
784 | 740 | ||
741 | /* We can now get here via a FP Unavailable exception if the core | ||
742 | * has no FPU, in that case no reason flags will be set */ | ||
785 | #ifdef CONFIG_MATH_EMULATION | 743 | #ifdef CONFIG_MATH_EMULATION |
786 | /* (reason & REASON_ILLEGAL) would be the obvious thing here, | 744 | /* (reason & REASON_ILLEGAL) would be the obvious thing here, |
787 | * but there seems to be a hardware bug on the 405GP (RevD) | 745 | * but there seems to be a hardware bug on the 405GP (RevD) |
@@ -808,7 +766,9 @@ void __kprobes program_check_exception(struct pt_regs *regs) | |||
808 | return; | 766 | return; |
809 | if (debugger_bpt(regs)) | 767 | if (debugger_bpt(regs)) |
810 | return; | 768 | return; |
811 | if (check_bug_trap(regs)) { | 769 | |
770 | if (!(regs->msr & MSR_PR) && /* not user-mode */ | ||
771 | report_bug(regs->nip) == BUG_TRAP_TYPE_WARN) { | ||
812 | regs->nip += 4; | 772 | regs->nip += 4; |
813 | return; | 773 | return; |
814 | } | 774 | } |
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 04b98671a060..04b8e71bf5b0 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S | |||
@@ -62,11 +62,7 @@ SECTIONS | |||
62 | __stop___ex_table = .; | 62 | __stop___ex_table = .; |
63 | } | 63 | } |
64 | 64 | ||
65 | __bug_table : { | 65 | BUG_TABLE |
66 | __start___bug_table = .; | ||
67 | *(__bug_table) | ||
68 | __stop___bug_table = .; | ||
69 | } | ||
70 | 66 | ||
71 | /* | 67 | /* |
72 | * Init sections discarded at runtime | 68 | * Init sections discarded at runtime |
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 9da01dc8cfd9..262790910ff2 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
@@ -295,6 +295,63 @@ static unsigned long __init numa_enforce_memory_limit(unsigned long start, | |||
295 | return lmb_end_of_DRAM() - start; | 295 | return lmb_end_of_DRAM() - start; |
296 | } | 296 | } |
297 | 297 | ||
298 | /* | ||
299 | * Extract NUMA information from the ibm,dynamic-reconfiguration-memory | ||
300 | * node. This assumes n_mem_{addr,size}_cells have been set. | ||
301 | */ | ||
302 | static void __init parse_drconf_memory(struct device_node *memory) | ||
303 | { | ||
304 | const unsigned int *lm, *dm, *aa; | ||
305 | unsigned int ls, ld, la; | ||
306 | unsigned int n, aam, aalen; | ||
307 | unsigned long lmb_size, size; | ||
308 | int nid, default_nid = 0; | ||
309 | unsigned int start, ai, flags; | ||
310 | |||
311 | lm = get_property(memory, "ibm,lmb-size", &ls); | ||
312 | dm = get_property(memory, "ibm,dynamic-memory", &ld); | ||
313 | aa = get_property(memory, "ibm,associativity-lookup-arrays", &la); | ||
314 | if (!lm || !dm || !aa || | ||
315 | ls < sizeof(unsigned int) || ld < sizeof(unsigned int) || | ||
316 | la < 2 * sizeof(unsigned int)) | ||
317 | return; | ||
318 | |||
319 | lmb_size = read_n_cells(n_mem_size_cells, &lm); | ||
320 | n = *dm++; /* number of LMBs */ | ||
321 | aam = *aa++; /* number of associativity lists */ | ||
322 | aalen = *aa++; /* length of each associativity list */ | ||
323 | if (ld < (n * (n_mem_addr_cells + 4) + 1) * sizeof(unsigned int) || | ||
324 | la < (aam * aalen + 2) * sizeof(unsigned int)) | ||
325 | return; | ||
326 | |||
327 | for (; n != 0; --n) { | ||
328 | start = read_n_cells(n_mem_addr_cells, &dm); | ||
329 | ai = dm[2]; | ||
330 | flags = dm[3]; | ||
331 | dm += 4; | ||
332 | /* 0x80 == reserved, 0x8 = assigned to us */ | ||
333 | if ((flags & 0x80) || !(flags & 0x8)) | ||
334 | continue; | ||
335 | nid = default_nid; | ||
336 | /* flags & 0x40 means associativity index is invalid */ | ||
337 | if (min_common_depth > 0 && min_common_depth <= aalen && | ||
338 | (flags & 0x40) == 0 && ai < aam) { | ||
339 | /* this is like of_node_to_nid_single */ | ||
340 | nid = aa[ai * aalen + min_common_depth - 1]; | ||
341 | if (nid == 0xffff || nid >= MAX_NUMNODES) | ||
342 | nid = default_nid; | ||
343 | } | ||
344 | node_set_online(nid); | ||
345 | |||
346 | size = numa_enforce_memory_limit(start, lmb_size); | ||
347 | if (!size) | ||
348 | continue; | ||
349 | |||
350 | add_active_range(nid, start >> PAGE_SHIFT, | ||
351 | (start >> PAGE_SHIFT) + (size >> PAGE_SHIFT)); | ||
352 | } | ||
353 | } | ||
354 | |||
298 | static int __init parse_numa_properties(void) | 355 | static int __init parse_numa_properties(void) |
299 | { | 356 | { |
300 | struct device_node *cpu = NULL; | 357 | struct device_node *cpu = NULL; |
@@ -385,6 +442,14 @@ new_range: | |||
385 | goto new_range; | 442 | goto new_range; |
386 | } | 443 | } |
387 | 444 | ||
445 | /* | ||
446 | * Now do the same thing for each LMB listed in the ibm,dynamic-memory | ||
447 | * property in the ibm,dynamic-reconfiguration-memory node. | ||
448 | */ | ||
449 | memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); | ||
450 | if (memory) | ||
451 | parse_drconf_memory(memory); | ||
452 | |||
388 | return 0; | 453 | return 0; |
389 | } | 454 | } |
390 | 455 | ||
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c index a375c15b4315..eaff71e74fb0 100644 --- a/arch/powerpc/platforms/52xx/lite5200.c +++ b/arch/powerpc/platforms/52xx/lite5200.c | |||
@@ -40,8 +40,6 @@ | |||
40 | #include <asm/prom.h> | 40 | #include <asm/prom.h> |
41 | #include <asm/udbg.h> | 41 | #include <asm/udbg.h> |
42 | #include <sysdev/fsl_soc.h> | 42 | #include <sysdev/fsl_soc.h> |
43 | #include <asm/qe.h> | ||
44 | #include <asm/qe_ic.h> | ||
45 | #include <asm/of_platform.h> | 43 | #include <asm/of_platform.h> |
46 | 44 | ||
47 | #include <asm/mpc52xx.h> | 45 | #include <asm/mpc52xx.h> |
diff --git a/arch/powerpc/platforms/cell/cbe_thermal.c b/arch/powerpc/platforms/cell/cbe_thermal.c index 616a0a3fd0e2..70e0d968d30f 100644 --- a/arch/powerpc/platforms/cell/cbe_thermal.c +++ b/arch/powerpc/platforms/cell/cbe_thermal.c | |||
@@ -115,6 +115,7 @@ static struct sysdev_attribute attr_spu_temperature = { | |||
115 | 115 | ||
116 | static struct attribute *spu_attributes[] = { | 116 | static struct attribute *spu_attributes[] = { |
117 | &attr_spu_temperature.attr, | 117 | &attr_spu_temperature.attr, |
118 | NULL, | ||
118 | }; | 119 | }; |
119 | 120 | ||
120 | static struct attribute_group spu_attribute_group = { | 121 | static struct attribute_group spu_attribute_group = { |
@@ -135,6 +136,7 @@ static struct sysdev_attribute attr_ppe_temperature1 = { | |||
135 | static struct attribute *ppe_attributes[] = { | 136 | static struct attribute *ppe_attributes[] = { |
136 | &attr_ppe_temperature0.attr, | 137 | &attr_ppe_temperature0.attr, |
137 | &attr_ppe_temperature1.attr, | 138 | &attr_ppe_temperature1.attr, |
139 | NULL, | ||
138 | }; | 140 | }; |
139 | 141 | ||
140 | static struct attribute_group ppe_attribute_group = { | 142 | static struct attribute_group ppe_attribute_group = { |
diff --git a/arch/powerpc/platforms/cell/pmu.c b/arch/powerpc/platforms/cell/pmu.c index 99c612025e8f..d04ae1671e6c 100644 --- a/arch/powerpc/platforms/cell/pmu.c +++ b/arch/powerpc/platforms/cell/pmu.c | |||
@@ -382,11 +382,14 @@ static irqreturn_t cbe_pm_irq(int irq, void *dev_id) | |||
382 | return IRQ_HANDLED; | 382 | return IRQ_HANDLED; |
383 | } | 383 | } |
384 | 384 | ||
385 | int __init cbe_init_pm_irq(void) | 385 | static int __init cbe_init_pm_irq(void) |
386 | { | 386 | { |
387 | unsigned int irq; | 387 | unsigned int irq; |
388 | int rc, node; | 388 | int rc, node; |
389 | 389 | ||
390 | if (!machine_is(cell)) | ||
391 | return 0; | ||
392 | |||
390 | for_each_node(node) { | 393 | for_each_node(node) { |
391 | irq = irq_create_mapping(NULL, IIC_IRQ_IOEX_PMI | | 394 | irq = irq_create_mapping(NULL, IIC_IRQ_IOEX_PMI | |
392 | (node << IIC_IRQ_NODE_SHIFT)); | 395 | (node << IIC_IRQ_NODE_SHIFT)); |
diff --git a/arch/powerpc/platforms/cell/spufs/coredump.c b/arch/powerpc/platforms/cell/spufs/coredump.c index 26945c491f6b..725e19561159 100644 --- a/arch/powerpc/platforms/cell/spufs/coredump.c +++ b/arch/powerpc/platforms/cell/spufs/coredump.c | |||
@@ -147,7 +147,7 @@ static int spufs_arch_notes_size(void) | |||
147 | struct fdtable *fdt = files_fdtable(current->files); | 147 | struct fdtable *fdt = files_fdtable(current->files); |
148 | int size = 0, fd; | 148 | int size = 0, fd; |
149 | 149 | ||
150 | for (fd = 0; fd < fdt->max_fdset && fd < fdt->max_fds; fd++) { | 150 | for (fd = 0; fd < fdt->max_fds; fd++) { |
151 | if (FD_ISSET(fd, fdt->open_fds)) { | 151 | if (FD_ISSET(fd, fdt->open_fds)) { |
152 | struct file *file = fcheck(fd); | 152 | struct file *file = fcheck(fd); |
153 | 153 | ||
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c index 3a32deda765d..3f6a69f67195 100644 --- a/arch/powerpc/platforms/maple/pci.c +++ b/arch/powerpc/platforms/maple/pci.c | |||
@@ -562,7 +562,7 @@ void __init maple_pci_init(void) | |||
562 | for (np = NULL; (np = of_get_next_child(root, np)) != NULL;) { | 562 | for (np = NULL; (np = of_get_next_child(root, np)) != NULL;) { |
563 | if (np->name == NULL) | 563 | if (np->name == NULL) |
564 | continue; | 564 | continue; |
565 | if (strcmp(np->name, "pci") == 0) { | 565 | if (!strcmp(np->name, "pci") || !strcmp(np->name, "pcie")) { |
566 | if (add_bridge(np) == 0) | 566 | if (add_bridge(np) == 0) |
567 | of_node_get(np); | 567 | of_node_get(np); |
568 | } | 568 | } |
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index 094989d50bab..f12d5c69e74d 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c | |||
@@ -60,6 +60,7 @@ | |||
60 | #include <asm/of_device.h> | 60 | #include <asm/of_device.h> |
61 | #include <asm/lmb.h> | 61 | #include <asm/lmb.h> |
62 | #include <asm/mpic.h> | 62 | #include <asm/mpic.h> |
63 | #include <asm/rtas.h> | ||
63 | #include <asm/udbg.h> | 64 | #include <asm/udbg.h> |
64 | 65 | ||
65 | #include "maple.h" | 66 | #include "maple.h" |
@@ -166,6 +167,16 @@ struct smp_ops_t maple_smp_ops = { | |||
166 | }; | 167 | }; |
167 | #endif /* CONFIG_SMP */ | 168 | #endif /* CONFIG_SMP */ |
168 | 169 | ||
170 | static void __init maple_use_rtas_reboot_and_halt_if_present(void) | ||
171 | { | ||
172 | if (rtas_service_present("system-reboot") && | ||
173 | rtas_service_present("power-off")) { | ||
174 | ppc_md.restart = rtas_restart; | ||
175 | ppc_md.power_off = rtas_power_off; | ||
176 | ppc_md.halt = rtas_halt; | ||
177 | } | ||
178 | } | ||
179 | |||
169 | void __init maple_setup_arch(void) | 180 | void __init maple_setup_arch(void) |
170 | { | 181 | { |
171 | /* init to some ~sane value until calibrate_delay() runs */ | 182 | /* init to some ~sane value until calibrate_delay() runs */ |
@@ -181,6 +192,7 @@ void __init maple_setup_arch(void) | |||
181 | #ifdef CONFIG_DUMMY_CONSOLE | 192 | #ifdef CONFIG_DUMMY_CONSOLE |
182 | conswitchp = &dummy_con; | 193 | conswitchp = &dummy_con; |
183 | #endif | 194 | #endif |
195 | maple_use_rtas_reboot_and_halt_if_present(); | ||
184 | 196 | ||
185 | printk(KERN_DEBUG "Using native/NAP idle loop\n"); | 197 | printk(KERN_DEBUG "Using native/NAP idle loop\n"); |
186 | } | 198 | } |
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig index 451bfcd5502e..de52ec4e9e58 100644 --- a/arch/powerpc/platforms/ps3/Kconfig +++ b/arch/powerpc/platforms/ps3/Kconfig | |||
@@ -40,4 +40,15 @@ config PS3_USE_LPAR_ADDR | |||
40 | 40 | ||
41 | If you have any doubt, choose the default y. | 41 | If you have any doubt, choose the default y. |
42 | 42 | ||
43 | config PS3_VUART | ||
44 | depends on PPC_PS3 | ||
45 | bool "PS3 Virtual UART support" | ||
46 | default y | ||
47 | help | ||
48 | Include support for the PS3 Virtual UART. | ||
49 | |||
50 | This support is required for several system services | ||
51 | including the System Manager and AV Settings. In | ||
52 | general, all users will say Y. | ||
53 | |||
43 | endmenu | 54 | endmenu |
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile index 997243a91be8..69590fbf83da 100644 --- a/arch/powerpc/platforms/pseries/Makefile +++ b/arch/powerpc/platforms/pseries/Makefile | |||
@@ -10,6 +10,8 @@ obj-$(CONFIG_XICS) += xics.o | |||
10 | obj-$(CONFIG_SCANLOG) += scanlog.o | 10 | obj-$(CONFIG_SCANLOG) += scanlog.o |
11 | obj-$(CONFIG_EEH) += eeh.o eeh_cache.o eeh_driver.o eeh_event.o | 11 | obj-$(CONFIG_EEH) += eeh.o eeh_cache.o eeh_driver.o eeh_event.o |
12 | 12 | ||
13 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug-cpu.o | ||
14 | |||
13 | obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o | 15 | obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o |
14 | obj-$(CONFIG_HVCS) += hvcserver.o | 16 | obj-$(CONFIG_HVCS) += hvcserver.o |
15 | obj-$(CONFIG_HCALL_STATS) += hvCall_inst.o | 17 | obj-$(CONFIG_HCALL_STATS) += hvCall_inst.o |
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c index 3c2d63ebf787..da6e5362e7cd 100644 --- a/arch/powerpc/platforms/pseries/eeh.c +++ b/arch/powerpc/platforms/pseries/eeh.c | |||
@@ -337,6 +337,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev) | |||
337 | printk (KERN_ERR "EEH: Device driver ignored %d bad reads, panicing\n", | 337 | printk (KERN_ERR "EEH: Device driver ignored %d bad reads, panicing\n", |
338 | pdn->eeh_check_count); | 338 | pdn->eeh_check_count); |
339 | dump_stack(); | 339 | dump_stack(); |
340 | msleep(5000); | ||
340 | 341 | ||
341 | /* re-read the slot reset state */ | 342 | /* re-read the slot reset state */ |
342 | if (read_slot_reset_state(pdn, rets) != 0) | 343 | if (read_slot_reset_state(pdn, rets) != 0) |
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c index c2bc9904f1cb..cbd6b0711ab4 100644 --- a/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/arch/powerpc/platforms/pseries/eeh_driver.c | |||
@@ -170,14 +170,19 @@ static void eeh_report_reset(struct pci_dev *dev, void *userdata) | |||
170 | static void eeh_report_resume(struct pci_dev *dev, void *userdata) | 170 | static void eeh_report_resume(struct pci_dev *dev, void *userdata) |
171 | { | 171 | { |
172 | struct pci_driver *driver = dev->driver; | 172 | struct pci_driver *driver = dev->driver; |
173 | struct device_node *dn = pci_device_to_OF_node(dev); | ||
173 | 174 | ||
174 | dev->error_state = pci_channel_io_normal; | 175 | dev->error_state = pci_channel_io_normal; |
175 | 176 | ||
176 | if (!driver) | 177 | if (!driver) |
177 | return; | 178 | return; |
178 | if (!driver->err_handler) | 179 | |
179 | return; | 180 | if ((PCI_DN(dn)->eeh_mode) & EEH_MODE_IRQ_DISABLED) { |
180 | if (!driver->err_handler->resume) | 181 | PCI_DN(dn)->eeh_mode &= ~EEH_MODE_IRQ_DISABLED; |
182 | enable_irq(dev->irq); | ||
183 | } | ||
184 | if (!driver->err_handler || | ||
185 | !driver->err_handler->resume) | ||
181 | return; | 186 | return; |
182 | 187 | ||
183 | driver->err_handler->resume(dev); | 188 | driver->err_handler->resume(dev); |
@@ -407,6 +412,8 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event) | |||
407 | 412 | ||
408 | if (rc) | 413 | if (rc) |
409 | result = PCI_ERS_RESULT_NEED_RESET; | 414 | result = PCI_ERS_RESULT_NEED_RESET; |
415 | else | ||
416 | result = PCI_ERS_RESULT_RECOVERED; | ||
410 | } | 417 | } |
411 | 418 | ||
412 | /* If any device has a hard failure, then shut off everything. */ | 419 | /* If any device has a hard failure, then shut off everything. */ |
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c new file mode 100644 index 000000000000..f460b9cbfd46 --- /dev/null +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c | |||
@@ -0,0 +1,275 @@ | |||
1 | /* | ||
2 | * pseries CPU Hotplug infrastructure. | ||
3 | * | ||
4 | * Split out from arch/powerpc/platforms/pseries/setup.c | ||
5 | * arch/powerpc/kernel/rtas.c, and arch/powerpc/platforms/pseries/smp.c | ||
6 | * | ||
7 | * Peter Bergner, IBM March 2001. | ||
8 | * Copyright (C) 2001 IBM. | ||
9 | * Dave Engebretsen, Peter Bergner, and | ||
10 | * Mike Corrigan {engebret|bergner|mikec}@us.ibm.com | ||
11 | * Plus various changes from other IBM teams... | ||
12 | * | ||
13 | * Copyright (C) 2006 Michael Ellerman, IBM Corporation | ||
14 | * | ||
15 | * This program is free software; you can redistribute it and/or | ||
16 | * modify it under the terms of the GNU General Public License | ||
17 | * as published by the Free Software Foundation; either version | ||
18 | * 2 of the License, or (at your option) any later version. | ||
19 | */ | ||
20 | |||
21 | #include <linux/kernel.h> | ||
22 | #include <linux/delay.h> | ||
23 | #include <linux/cpu.h> | ||
24 | #include <asm/system.h> | ||
25 | #include <asm/prom.h> | ||
26 | #include <asm/rtas.h> | ||
27 | #include <asm/firmware.h> | ||
28 | #include <asm/machdep.h> | ||
29 | #include <asm/vdso_datapage.h> | ||
30 | #include <asm/pSeries_reconfig.h> | ||
31 | #include "xics.h" | ||
32 | |||
33 | /* This version can't take the spinlock, because it never returns */ | ||
34 | static struct rtas_args rtas_stop_self_args = { | ||
35 | .token = RTAS_UNKNOWN_SERVICE, | ||
36 | .nargs = 0, | ||
37 | .nret = 1, | ||
38 | .rets = &rtas_stop_self_args.args[0], | ||
39 | }; | ||
40 | |||
41 | static void rtas_stop_self(void) | ||
42 | { | ||
43 | struct rtas_args *args = &rtas_stop_self_args; | ||
44 | |||
45 | local_irq_disable(); | ||
46 | |||
47 | BUG_ON(args->token == RTAS_UNKNOWN_SERVICE); | ||
48 | |||
49 | printk("cpu %u (hwid %u) Ready to die...\n", | ||
50 | smp_processor_id(), hard_smp_processor_id()); | ||
51 | enter_rtas(__pa(args)); | ||
52 | |||
53 | panic("Alas, I survived.\n"); | ||
54 | } | ||
55 | |||
56 | static void pseries_mach_cpu_die(void) | ||
57 | { | ||
58 | local_irq_disable(); | ||
59 | idle_task_exit(); | ||
60 | xics_teardown_cpu(0); | ||
61 | rtas_stop_self(); | ||
62 | /* Should never get here... */ | ||
63 | BUG(); | ||
64 | for(;;); | ||
65 | } | ||
66 | |||
67 | static int qcss_tok; /* query-cpu-stopped-state token */ | ||
68 | |||
69 | /* Get state of physical CPU. | ||
70 | * Return codes: | ||
71 | * 0 - The processor is in the RTAS stopped state | ||
72 | * 1 - stop-self is in progress | ||
73 | * 2 - The processor is not in the RTAS stopped state | ||
74 | * -1 - Hardware Error | ||
75 | * -2 - Hardware Busy, Try again later. | ||
76 | */ | ||
77 | static int query_cpu_stopped(unsigned int pcpu) | ||
78 | { | ||
79 | int cpu_status, status; | ||
80 | |||
81 | status = rtas_call(qcss_tok, 1, 2, &cpu_status, pcpu); | ||
82 | if (status != 0) { | ||
83 | printk(KERN_ERR | ||
84 | "RTAS query-cpu-stopped-state failed: %i\n", status); | ||
85 | return status; | ||
86 | } | ||
87 | |||
88 | return cpu_status; | ||
89 | } | ||
90 | |||
91 | static int pseries_cpu_disable(void) | ||
92 | { | ||
93 | int cpu = smp_processor_id(); | ||
94 | |||
95 | cpu_clear(cpu, cpu_online_map); | ||
96 | vdso_data->processorCount--; | ||
97 | |||
98 | /*fix boot_cpuid here*/ | ||
99 | if (cpu == boot_cpuid) | ||
100 | boot_cpuid = any_online_cpu(cpu_online_map); | ||
101 | |||
102 | /* FIXME: abstract this to not be platform specific later on */ | ||
103 | xics_migrate_irqs_away(); | ||
104 | return 0; | ||
105 | } | ||
106 | |||
107 | static void pseries_cpu_die(unsigned int cpu) | ||
108 | { | ||
109 | int tries; | ||
110 | int cpu_status; | ||
111 | unsigned int pcpu = get_hard_smp_processor_id(cpu); | ||
112 | |||
113 | for (tries = 0; tries < 25; tries++) { | ||
114 | cpu_status = query_cpu_stopped(pcpu); | ||
115 | if (cpu_status == 0 || cpu_status == -1) | ||
116 | break; | ||
117 | msleep(200); | ||
118 | } | ||
119 | if (cpu_status != 0) { | ||
120 | printk("Querying DEAD? cpu %i (%i) shows %i\n", | ||
121 | cpu, pcpu, cpu_status); | ||
122 | } | ||
123 | |||
124 | /* Isolation and deallocation are definatly done by | ||
125 | * drslot_chrp_cpu. If they were not they would be | ||
126 | * done here. Change isolate state to Isolate and | ||
127 | * change allocation-state to Unusable. | ||
128 | */ | ||
129 | paca[cpu].cpu_start = 0; | ||
130 | } | ||
131 | |||
132 | /* | ||
133 | * Update cpu_present_map and paca(s) for a new cpu node. The wrinkle | ||
134 | * here is that a cpu device node may represent up to two logical cpus | ||
135 | * in the SMT case. We must honor the assumption in other code that | ||
136 | * the logical ids for sibling SMT threads x and y are adjacent, such | ||
137 | * that x^1 == y and y^1 == x. | ||
138 | */ | ||
139 | static int pseries_add_processor(struct device_node *np) | ||
140 | { | ||
141 | unsigned int cpu; | ||
142 | cpumask_t candidate_map, tmp = CPU_MASK_NONE; | ||
143 | int err = -ENOSPC, len, nthreads, i; | ||
144 | const u32 *intserv; | ||
145 | |||
146 | intserv = get_property(np, "ibm,ppc-interrupt-server#s", &len); | ||
147 | if (!intserv) | ||
148 | return 0; | ||
149 | |||
150 | nthreads = len / sizeof(u32); | ||
151 | for (i = 0; i < nthreads; i++) | ||
152 | cpu_set(i, tmp); | ||
153 | |||
154 | lock_cpu_hotplug(); | ||
155 | |||
156 | BUG_ON(!cpus_subset(cpu_present_map, cpu_possible_map)); | ||
157 | |||
158 | /* Get a bitmap of unoccupied slots. */ | ||
159 | cpus_xor(candidate_map, cpu_possible_map, cpu_present_map); | ||
160 | if (cpus_empty(candidate_map)) { | ||
161 | /* If we get here, it most likely means that NR_CPUS is | ||
162 | * less than the partition's max processors setting. | ||
163 | */ | ||
164 | printk(KERN_ERR "Cannot add cpu %s; this system configuration" | ||
165 | " supports %d logical cpus.\n", np->full_name, | ||
166 | cpus_weight(cpu_possible_map)); | ||
167 | goto out_unlock; | ||
168 | } | ||
169 | |||
170 | while (!cpus_empty(tmp)) | ||
171 | if (cpus_subset(tmp, candidate_map)) | ||
172 | /* Found a range where we can insert the new cpu(s) */ | ||
173 | break; | ||
174 | else | ||
175 | cpus_shift_left(tmp, tmp, nthreads); | ||
176 | |||
177 | if (cpus_empty(tmp)) { | ||
178 | printk(KERN_ERR "Unable to find space in cpu_present_map for" | ||
179 | " processor %s with %d thread(s)\n", np->name, | ||
180 | nthreads); | ||
181 | goto out_unlock; | ||
182 | } | ||
183 | |||
184 | for_each_cpu_mask(cpu, tmp) { | ||
185 | BUG_ON(cpu_isset(cpu, cpu_present_map)); | ||
186 | cpu_set(cpu, cpu_present_map); | ||
187 | set_hard_smp_processor_id(cpu, *intserv++); | ||
188 | } | ||
189 | err = 0; | ||
190 | out_unlock: | ||
191 | unlock_cpu_hotplug(); | ||
192 | return err; | ||
193 | } | ||
194 | |||
195 | /* | ||
196 | * Update the present map for a cpu node which is going away, and set | ||
197 | * the hard id in the paca(s) to -1 to be consistent with boot time | ||
198 | * convention for non-present cpus. | ||
199 | */ | ||
200 | static void pseries_remove_processor(struct device_node *np) | ||
201 | { | ||
202 | unsigned int cpu; | ||
203 | int len, nthreads, i; | ||
204 | const u32 *intserv; | ||
205 | |||
206 | intserv = get_property(np, "ibm,ppc-interrupt-server#s", &len); | ||
207 | if (!intserv) | ||
208 | return; | ||
209 | |||
210 | nthreads = len / sizeof(u32); | ||
211 | |||
212 | lock_cpu_hotplug(); | ||
213 | for (i = 0; i < nthreads; i++) { | ||
214 | for_each_present_cpu(cpu) { | ||
215 | if (get_hard_smp_processor_id(cpu) != intserv[i]) | ||
216 | continue; | ||
217 | BUG_ON(cpu_online(cpu)); | ||
218 | cpu_clear(cpu, cpu_present_map); | ||
219 | set_hard_smp_processor_id(cpu, -1); | ||
220 | break; | ||
221 | } | ||
222 | if (cpu == NR_CPUS) | ||
223 | printk(KERN_WARNING "Could not find cpu to remove " | ||
224 | "with physical id 0x%x\n", intserv[i]); | ||
225 | } | ||
226 | unlock_cpu_hotplug(); | ||
227 | } | ||
228 | |||
229 | static int pseries_smp_notifier(struct notifier_block *nb, | ||
230 | unsigned long action, void *node) | ||
231 | { | ||
232 | int err = NOTIFY_OK; | ||
233 | |||
234 | switch (action) { | ||
235 | case PSERIES_RECONFIG_ADD: | ||
236 | if (pseries_add_processor(node)) | ||
237 | err = NOTIFY_BAD; | ||
238 | break; | ||
239 | case PSERIES_RECONFIG_REMOVE: | ||
240 | pseries_remove_processor(node); | ||
241 | break; | ||
242 | default: | ||
243 | err = NOTIFY_DONE; | ||
244 | break; | ||
245 | } | ||
246 | return err; | ||
247 | } | ||
248 | |||
249 | static struct notifier_block pseries_smp_nb = { | ||
250 | .notifier_call = pseries_smp_notifier, | ||
251 | }; | ||
252 | |||
253 | static int __init pseries_cpu_hotplug_init(void) | ||
254 | { | ||
255 | rtas_stop_self_args.token = rtas_token("stop-self"); | ||
256 | qcss_tok = rtas_token("query-cpu-stopped-state"); | ||
257 | |||
258 | if (rtas_stop_self_args.token == RTAS_UNKNOWN_SERVICE || | ||
259 | qcss_tok == RTAS_UNKNOWN_SERVICE) { | ||
260 | printk(KERN_INFO "CPU Hotplug not supported by firmware " | ||
261 | "- disabling.\n"); | ||
262 | return 0; | ||
263 | } | ||
264 | |||
265 | ppc_md.cpu_die = pseries_mach_cpu_die; | ||
266 | smp_ops->cpu_disable = pseries_cpu_disable; | ||
267 | smp_ops->cpu_die = pseries_cpu_die; | ||
268 | |||
269 | /* Processors can be added/removed only on LPAR */ | ||
270 | if (firmware_has_feature(FW_FEATURE_LPAR)) | ||
271 | pSeries_reconfig_notifier_register(&pseries_smp_nb); | ||
272 | |||
273 | return 0; | ||
274 | } | ||
275 | arch_initcall(pseries_cpu_hotplug_init); | ||
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 0dc2548ca9bc..042ecae107ac 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -347,21 +347,6 @@ static int __init pSeries_init_panel(void) | |||
347 | } | 347 | } |
348 | arch_initcall(pSeries_init_panel); | 348 | arch_initcall(pSeries_init_panel); |
349 | 349 | ||
350 | #ifdef CONFIG_HOTPLUG_CPU | ||
351 | static void pSeries_mach_cpu_die(void) | ||
352 | { | ||
353 | local_irq_disable(); | ||
354 | idle_task_exit(); | ||
355 | xics_teardown_cpu(0); | ||
356 | rtas_stop_self(); | ||
357 | /* Should never get here... */ | ||
358 | BUG(); | ||
359 | for(;;); | ||
360 | } | ||
361 | #else | ||
362 | #define pSeries_mach_cpu_die NULL | ||
363 | #endif | ||
364 | |||
365 | static int pseries_set_dabr(unsigned long dabr) | 350 | static int pseries_set_dabr(unsigned long dabr) |
366 | { | 351 | { |
367 | return plpar_hcall_norets(H_SET_DABR, dabr); | 352 | return plpar_hcall_norets(H_SET_DABR, dabr); |
@@ -437,19 +422,14 @@ static int __init pSeries_probe_hypertas(unsigned long node, | |||
437 | if (of_get_flat_dt_prop(node, "ibm,hypertas-functions", NULL) != NULL) | 422 | if (of_get_flat_dt_prop(node, "ibm,hypertas-functions", NULL) != NULL) |
438 | powerpc_firmware_features |= FW_FEATURE_LPAR; | 423 | powerpc_firmware_features |= FW_FEATURE_LPAR; |
439 | 424 | ||
440 | if (firmware_has_feature(FW_FEATURE_LPAR)) | ||
441 | hpte_init_lpar(); | ||
442 | else | ||
443 | hpte_init_native(); | ||
444 | |||
445 | return 1; | 425 | return 1; |
446 | } | 426 | } |
447 | 427 | ||
448 | static int __init pSeries_probe(void) | 428 | static int __init pSeries_probe(void) |
449 | { | 429 | { |
450 | unsigned long root = of_get_flat_dt_root(); | 430 | unsigned long root = of_get_flat_dt_root(); |
451 | char *dtype = of_get_flat_dt_prop(of_get_flat_dt_root(), | 431 | char *dtype = of_get_flat_dt_prop(root, "device_type", NULL); |
452 | "device_type", NULL); | 432 | |
453 | if (dtype == NULL) | 433 | if (dtype == NULL) |
454 | return 0; | 434 | return 0; |
455 | if (strcmp(dtype, "chrp")) | 435 | if (strcmp(dtype, "chrp")) |
@@ -467,6 +447,11 @@ static int __init pSeries_probe(void) | |||
467 | /* Now try to figure out if we are running on LPAR */ | 447 | /* Now try to figure out if we are running on LPAR */ |
468 | of_scan_flat_dt(pSeries_probe_hypertas, NULL); | 448 | of_scan_flat_dt(pSeries_probe_hypertas, NULL); |
469 | 449 | ||
450 | if (firmware_has_feature(FW_FEATURE_LPAR)) | ||
451 | hpte_init_lpar(); | ||
452 | else | ||
453 | hpte_init_native(); | ||
454 | |||
470 | DBG("Machine is%s LPAR !\n", | 455 | DBG("Machine is%s LPAR !\n", |
471 | (powerpc_firmware_features & FW_FEATURE_LPAR) ? "" : " not"); | 456 | (powerpc_firmware_features & FW_FEATURE_LPAR) ? "" : " not"); |
472 | 457 | ||
@@ -561,7 +546,6 @@ define_machine(pseries) { | |||
561 | .power_off = rtas_power_off, | 546 | .power_off = rtas_power_off, |
562 | .halt = rtas_halt, | 547 | .halt = rtas_halt, |
563 | .panic = rtas_os_term, | 548 | .panic = rtas_os_term, |
564 | .cpu_die = pSeries_mach_cpu_die, | ||
565 | .get_boot_time = rtas_get_boot_time, | 549 | .get_boot_time = rtas_get_boot_time, |
566 | .get_rtc_time = rtas_get_rtc_time, | 550 | .get_rtc_time = rtas_get_rtc_time, |
567 | .set_rtc_time = rtas_set_rtc_time, | 551 | .set_rtc_time = rtas_set_rtc_time, |
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c index c6624b8a0e77..4408518eaebe 100644 --- a/arch/powerpc/platforms/pseries/smp.c +++ b/arch/powerpc/platforms/pseries/smp.c | |||
@@ -64,197 +64,6 @@ static cpumask_t of_spin_map; | |||
64 | 64 | ||
65 | extern void generic_secondary_smp_init(unsigned long); | 65 | extern void generic_secondary_smp_init(unsigned long); |
66 | 66 | ||
67 | #ifdef CONFIG_HOTPLUG_CPU | ||
68 | |||
69 | /* Get state of physical CPU. | ||
70 | * Return codes: | ||
71 | * 0 - The processor is in the RTAS stopped state | ||
72 | * 1 - stop-self is in progress | ||
73 | * 2 - The processor is not in the RTAS stopped state | ||
74 | * -1 - Hardware Error | ||
75 | * -2 - Hardware Busy, Try again later. | ||
76 | */ | ||
77 | static int query_cpu_stopped(unsigned int pcpu) | ||
78 | { | ||
79 | int cpu_status; | ||
80 | int status, qcss_tok; | ||
81 | |||
82 | qcss_tok = rtas_token("query-cpu-stopped-state"); | ||
83 | if (qcss_tok == RTAS_UNKNOWN_SERVICE) | ||
84 | return -1; | ||
85 | status = rtas_call(qcss_tok, 1, 2, &cpu_status, pcpu); | ||
86 | if (status != 0) { | ||
87 | printk(KERN_ERR | ||
88 | "RTAS query-cpu-stopped-state failed: %i\n", status); | ||
89 | return status; | ||
90 | } | ||
91 | |||
92 | return cpu_status; | ||
93 | } | ||
94 | |||
95 | static int pSeries_cpu_disable(void) | ||
96 | { | ||
97 | int cpu = smp_processor_id(); | ||
98 | |||
99 | cpu_clear(cpu, cpu_online_map); | ||
100 | vdso_data->processorCount--; | ||
101 | |||
102 | /*fix boot_cpuid here*/ | ||
103 | if (cpu == boot_cpuid) | ||
104 | boot_cpuid = any_online_cpu(cpu_online_map); | ||
105 | |||
106 | /* FIXME: abstract this to not be platform specific later on */ | ||
107 | xics_migrate_irqs_away(); | ||
108 | return 0; | ||
109 | } | ||
110 | |||
111 | static void pSeries_cpu_die(unsigned int cpu) | ||
112 | { | ||
113 | int tries; | ||
114 | int cpu_status; | ||
115 | unsigned int pcpu = get_hard_smp_processor_id(cpu); | ||
116 | |||
117 | for (tries = 0; tries < 25; tries++) { | ||
118 | cpu_status = query_cpu_stopped(pcpu); | ||
119 | if (cpu_status == 0 || cpu_status == -1) | ||
120 | break; | ||
121 | msleep(200); | ||
122 | } | ||
123 | if (cpu_status != 0) { | ||
124 | printk("Querying DEAD? cpu %i (%i) shows %i\n", | ||
125 | cpu, pcpu, cpu_status); | ||
126 | } | ||
127 | |||
128 | /* Isolation and deallocation are definatly done by | ||
129 | * drslot_chrp_cpu. If they were not they would be | ||
130 | * done here. Change isolate state to Isolate and | ||
131 | * change allocation-state to Unusable. | ||
132 | */ | ||
133 | paca[cpu].cpu_start = 0; | ||
134 | } | ||
135 | |||
136 | /* | ||
137 | * Update cpu_present_map and paca(s) for a new cpu node. The wrinkle | ||
138 | * here is that a cpu device node may represent up to two logical cpus | ||
139 | * in the SMT case. We must honor the assumption in other code that | ||
140 | * the logical ids for sibling SMT threads x and y are adjacent, such | ||
141 | * that x^1 == y and y^1 == x. | ||
142 | */ | ||
143 | static int pSeries_add_processor(struct device_node *np) | ||
144 | { | ||
145 | unsigned int cpu; | ||
146 | cpumask_t candidate_map, tmp = CPU_MASK_NONE; | ||
147 | int err = -ENOSPC, len, nthreads, i; | ||
148 | const u32 *intserv; | ||
149 | |||
150 | intserv = get_property(np, "ibm,ppc-interrupt-server#s", &len); | ||
151 | if (!intserv) | ||
152 | return 0; | ||
153 | |||
154 | nthreads = len / sizeof(u32); | ||
155 | for (i = 0; i < nthreads; i++) | ||
156 | cpu_set(i, tmp); | ||
157 | |||
158 | lock_cpu_hotplug(); | ||
159 | |||
160 | BUG_ON(!cpus_subset(cpu_present_map, cpu_possible_map)); | ||
161 | |||
162 | /* Get a bitmap of unoccupied slots. */ | ||
163 | cpus_xor(candidate_map, cpu_possible_map, cpu_present_map); | ||
164 | if (cpus_empty(candidate_map)) { | ||
165 | /* If we get here, it most likely means that NR_CPUS is | ||
166 | * less than the partition's max processors setting. | ||
167 | */ | ||
168 | printk(KERN_ERR "Cannot add cpu %s; this system configuration" | ||
169 | " supports %d logical cpus.\n", np->full_name, | ||
170 | cpus_weight(cpu_possible_map)); | ||
171 | goto out_unlock; | ||
172 | } | ||
173 | |||
174 | while (!cpus_empty(tmp)) | ||
175 | if (cpus_subset(tmp, candidate_map)) | ||
176 | /* Found a range where we can insert the new cpu(s) */ | ||
177 | break; | ||
178 | else | ||
179 | cpus_shift_left(tmp, tmp, nthreads); | ||
180 | |||
181 | if (cpus_empty(tmp)) { | ||
182 | printk(KERN_ERR "Unable to find space in cpu_present_map for" | ||
183 | " processor %s with %d thread(s)\n", np->name, | ||
184 | nthreads); | ||
185 | goto out_unlock; | ||
186 | } | ||
187 | |||
188 | for_each_cpu_mask(cpu, tmp) { | ||
189 | BUG_ON(cpu_isset(cpu, cpu_present_map)); | ||
190 | cpu_set(cpu, cpu_present_map); | ||
191 | set_hard_smp_processor_id(cpu, *intserv++); | ||
192 | } | ||
193 | err = 0; | ||
194 | out_unlock: | ||
195 | unlock_cpu_hotplug(); | ||
196 | return err; | ||
197 | } | ||
198 | |||
199 | /* | ||
200 | * Update the present map for a cpu node which is going away, and set | ||
201 | * the hard id in the paca(s) to -1 to be consistent with boot time | ||
202 | * convention for non-present cpus. | ||
203 | */ | ||
204 | static void pSeries_remove_processor(struct device_node *np) | ||
205 | { | ||
206 | unsigned int cpu; | ||
207 | int len, nthreads, i; | ||
208 | const u32 *intserv; | ||
209 | |||
210 | intserv = get_property(np, "ibm,ppc-interrupt-server#s", &len); | ||
211 | if (!intserv) | ||
212 | return; | ||
213 | |||
214 | nthreads = len / sizeof(u32); | ||
215 | |||
216 | lock_cpu_hotplug(); | ||
217 | for (i = 0; i < nthreads; i++) { | ||
218 | for_each_present_cpu(cpu) { | ||
219 | if (get_hard_smp_processor_id(cpu) != intserv[i]) | ||
220 | continue; | ||
221 | BUG_ON(cpu_online(cpu)); | ||
222 | cpu_clear(cpu, cpu_present_map); | ||
223 | set_hard_smp_processor_id(cpu, -1); | ||
224 | break; | ||
225 | } | ||
226 | if (cpu == NR_CPUS) | ||
227 | printk(KERN_WARNING "Could not find cpu to remove " | ||
228 | "with physical id 0x%x\n", intserv[i]); | ||
229 | } | ||
230 | unlock_cpu_hotplug(); | ||
231 | } | ||
232 | |||
233 | static int pSeries_smp_notifier(struct notifier_block *nb, unsigned long action, void *node) | ||
234 | { | ||
235 | int err = NOTIFY_OK; | ||
236 | |||
237 | switch (action) { | ||
238 | case PSERIES_RECONFIG_ADD: | ||
239 | if (pSeries_add_processor(node)) | ||
240 | err = NOTIFY_BAD; | ||
241 | break; | ||
242 | case PSERIES_RECONFIG_REMOVE: | ||
243 | pSeries_remove_processor(node); | ||
244 | break; | ||
245 | default: | ||
246 | err = NOTIFY_DONE; | ||
247 | break; | ||
248 | } | ||
249 | return err; | ||
250 | } | ||
251 | |||
252 | static struct notifier_block pSeries_smp_nb = { | ||
253 | .notifier_call = pSeries_smp_notifier, | ||
254 | }; | ||
255 | |||
256 | #endif /* CONFIG_HOTPLUG_CPU */ | ||
257 | |||
258 | /** | 67 | /** |
259 | * smp_startup_cpu() - start the given cpu | 68 | * smp_startup_cpu() - start the given cpu |
260 | * | 69 | * |
@@ -422,15 +231,6 @@ static void __init smp_init_pseries(void) | |||
422 | 231 | ||
423 | DBG(" -> smp_init_pSeries()\n"); | 232 | DBG(" -> smp_init_pSeries()\n"); |
424 | 233 | ||
425 | #ifdef CONFIG_HOTPLUG_CPU | ||
426 | smp_ops->cpu_disable = pSeries_cpu_disable; | ||
427 | smp_ops->cpu_die = pSeries_cpu_die; | ||
428 | |||
429 | /* Processors can be added/removed only on LPAR */ | ||
430 | if (firmware_has_feature(FW_FEATURE_LPAR)) | ||
431 | pSeries_reconfig_notifier_register(&pSeries_smp_nb); | ||
432 | #endif | ||
433 | |||
434 | /* Mark threads which are still spinning in hold loops. */ | 234 | /* Mark threads which are still spinning in hold loops. */ |
435 | if (cpu_has_feature(CPU_FTR_SMT)) { | 235 | if (cpu_has_feature(CPU_FTR_SMT)) { |
436 | for_each_present_cpu(i) { | 236 | for_each_present_cpu(i) { |
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 6cc34597a620..04d4917eb303 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile | |||
@@ -5,7 +5,8 @@ endif | |||
5 | obj-$(CONFIG_MPIC) += mpic.o | 5 | obj-$(CONFIG_MPIC) += mpic.o |
6 | obj-$(CONFIG_PPC_INDIRECT_PCI) += indirect_pci.o | 6 | obj-$(CONFIG_PPC_INDIRECT_PCI) += indirect_pci.o |
7 | obj-$(CONFIG_PPC_MPC106) += grackle.o | 7 | obj-$(CONFIG_PPC_MPC106) += grackle.o |
8 | obj-$(CONFIG_PPC_DCR) += dcr.o dcr-low.o | 8 | obj-$(CONFIG_PPC_DCR) += dcr.o |
9 | obj-$(CONFIG_PPC_DCR_NATIVE) += dcr-low.o | ||
9 | obj-$(CONFIG_U3_DART) += dart_iommu.o | 10 | obj-$(CONFIG_U3_DART) += dart_iommu.o |
10 | obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o | 11 | obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o |
11 | obj-$(CONFIG_FSL_SOC) += fsl_soc.o | 12 | obj-$(CONFIG_FSL_SOC) += fsl_soc.o |
diff --git a/arch/powerpc/sysdev/dcr.S b/arch/powerpc/sysdev/dcr.S deleted file mode 100644 index 2078f39e2f17..000000000000 --- a/arch/powerpc/sysdev/dcr.S +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | /* | ||
2 | * "Indirect" DCR access | ||
3 | * | ||
4 | * Copyright (c) 2004 Eugene Surovegin <ebs@ebshome.net> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License as published by the | ||
8 | * Free Software Foundation; either version 2 of the License, or (at your | ||
9 | * option) any later version. | ||
10 | */ | ||
11 | |||
12 | #include <asm/ppc_asm.h> | ||
13 | #include <asm/processor.h> | ||
14 | |||
15 | #define DCR_ACCESS_PROLOG(table) \ | ||
16 | rlwinm r3,r3,4,18,27; \ | ||
17 | lis r5,table@h; \ | ||
18 | ori r5,r5,table@l; \ | ||
19 | add r3,r3,r5; \ | ||
20 | mtctr r3; \ | ||
21 | bctr | ||
22 | |||
23 | _GLOBAL(__mfdcr) | ||
24 | DCR_ACCESS_PROLOG(__mfdcr_table) | ||
25 | |||
26 | _GLOBAL(__mtdcr) | ||
27 | DCR_ACCESS_PROLOG(__mtdcr_table) | ||
28 | |||
29 | __mfdcr_table: | ||
30 | mfdcr r3,0; blr | ||
31 | __mtdcr_table: | ||
32 | mtdcr 0,r4; blr | ||
33 | |||
34 | dcr = 1 | ||
35 | .rept 1023 | ||
36 | mfdcr r3,dcr; blr | ||
37 | mtdcr dcr,r4; blr | ||
38 | dcr = dcr + 1 | ||
39 | .endr | ||
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c index 6995f51b9488..74e48d94f27c 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_ic.c +++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c | |||
@@ -223,23 +223,15 @@ static void qe_ic_mask_irq(unsigned int virq) | |||
223 | qe_ic_write(qe_ic->regs, qe_ic_info[src].mask_reg, | 223 | qe_ic_write(qe_ic->regs, qe_ic_info[src].mask_reg, |
224 | temp & ~qe_ic_info[src].mask); | 224 | temp & ~qe_ic_info[src].mask); |
225 | 225 | ||
226 | spin_unlock_irqrestore(&qe_ic_lock, flags); | 226 | /* Flush the above write before enabling interrupts; otherwise, |
227 | } | 227 | * spurious interrupts will sometimes happen. To be 100% sure |
228 | 228 | * that the write has reached the device before interrupts are | |
229 | static void qe_ic_mask_irq_and_ack(unsigned int virq) | 229 | * enabled, the mask register would have to be read back; however, |
230 | { | 230 | * this is not required for correctness, only to avoid wasting |
231 | struct qe_ic *qe_ic = qe_ic_from_irq(virq); | 231 | * time on a large number of spurious interrupts. In testing, |
232 | unsigned int src = virq_to_hw(virq); | 232 | * a sync reduced the observed spurious interrupts to zero. |
233 | unsigned long flags; | 233 | */ |
234 | u32 temp; | 234 | mb(); |
235 | |||
236 | spin_lock_irqsave(&qe_ic_lock, flags); | ||
237 | |||
238 | temp = qe_ic_read(qe_ic->regs, qe_ic_info[src].mask_reg); | ||
239 | qe_ic_write(qe_ic->regs, qe_ic_info[src].mask_reg, | ||
240 | temp & ~qe_ic_info[src].mask); | ||
241 | |||
242 | /* There is nothing to do for ack here, ack is handled in ISR */ | ||
243 | 235 | ||
244 | spin_unlock_irqrestore(&qe_ic_lock, flags); | 236 | spin_unlock_irqrestore(&qe_ic_lock, flags); |
245 | } | 237 | } |
@@ -248,7 +240,7 @@ static struct irq_chip qe_ic_irq_chip = { | |||
248 | .typename = " QEIC ", | 240 | .typename = " QEIC ", |
249 | .unmask = qe_ic_unmask_irq, | 241 | .unmask = qe_ic_unmask_irq, |
250 | .mask = qe_ic_mask_irq, | 242 | .mask = qe_ic_mask_irq, |
251 | .mask_ack = qe_ic_mask_irq_and_ack, | 243 | .mask_ack = qe_ic_mask_irq, |
252 | }; | 244 | }; |
253 | 245 | ||
254 | static int qe_ic_host_match(struct irq_host *h, struct device_node *node) | 246 | static int qe_ic_host_match(struct irq_host *h, struct device_node *node) |
@@ -331,34 +323,22 @@ unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic) | |||
331 | return irq_linear_revmap(qe_ic->irqhost, irq); | 323 | return irq_linear_revmap(qe_ic->irqhost, irq); |
332 | } | 324 | } |
333 | 325 | ||
334 | /* FIXME: We mask all the QE Low interrupts while handling. We should | ||
335 | * let other interrupt come in, but BAD interrupts are generated */ | ||
336 | void fastcall qe_ic_cascade_low(unsigned int irq, struct irq_desc *desc) | 326 | void fastcall qe_ic_cascade_low(unsigned int irq, struct irq_desc *desc) |
337 | { | 327 | { |
338 | struct qe_ic *qe_ic = desc->handler_data; | 328 | struct qe_ic *qe_ic = desc->handler_data; |
339 | struct irq_chip *chip = irq_desc[irq].chip; | ||
340 | |||
341 | unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic); | 329 | unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic); |
342 | 330 | ||
343 | chip->mask_ack(irq); | ||
344 | if (cascade_irq != NO_IRQ) | 331 | if (cascade_irq != NO_IRQ) |
345 | generic_handle_irq(cascade_irq); | 332 | generic_handle_irq(cascade_irq); |
346 | chip->unmask(irq); | ||
347 | } | 333 | } |
348 | 334 | ||
349 | /* FIXME: We mask all the QE High interrupts while handling. We should | ||
350 | * let other interrupt come in, but BAD interrupts are generated */ | ||
351 | void fastcall qe_ic_cascade_high(unsigned int irq, struct irq_desc *desc) | 335 | void fastcall qe_ic_cascade_high(unsigned int irq, struct irq_desc *desc) |
352 | { | 336 | { |
353 | struct qe_ic *qe_ic = desc->handler_data; | 337 | struct qe_ic *qe_ic = desc->handler_data; |
354 | struct irq_chip *chip = irq_desc[irq].chip; | ||
355 | |||
356 | unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic); | 338 | unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic); |
357 | 339 | ||
358 | chip->mask_ack(irq); | ||
359 | if (cascade_irq != NO_IRQ) | 340 | if (cascade_irq != NO_IRQ) |
360 | generic_handle_irq(cascade_irq); | 341 | generic_handle_irq(cascade_irq); |
361 | chip->unmask(irq); | ||
362 | } | 342 | } |
363 | 343 | ||
364 | void __init qe_ic_init(struct device_node *node, unsigned int flags) | 344 | void __init qe_ic_init(struct device_node *node, unsigned int flags) |
diff --git a/arch/powerpc/sysdev/rom.c b/arch/powerpc/sysdev/rom.c index bf5b3f10e6c6..c855a3b298a3 100644 --- a/arch/powerpc/sysdev/rom.c +++ b/arch/powerpc/sysdev/rom.c | |||
@@ -9,6 +9,7 @@ | |||
9 | 9 | ||
10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
11 | #include <asm/of_device.h> | 11 | #include <asm/of_device.h> |
12 | #include <asm/of_platform.h> | ||
12 | 13 | ||
13 | static int __init powerpc_flash_init(void) | 14 | static int __init powerpc_flash_init(void) |
14 | { | 15 | { |
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index a34ed49e0356..77540a2f7704 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/sysrq.h> | 22 | #include <linux/sysrq.h> |
23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
24 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
25 | #include <linux/bug.h> | ||
25 | 26 | ||
26 | #include <asm/ptrace.h> | 27 | #include <asm/ptrace.h> |
27 | #include <asm/string.h> | 28 | #include <asm/string.h> |
@@ -35,7 +36,6 @@ | |||
35 | #include <asm/cputable.h> | 36 | #include <asm/cputable.h> |
36 | #include <asm/rtas.h> | 37 | #include <asm/rtas.h> |
37 | #include <asm/sstep.h> | 38 | #include <asm/sstep.h> |
38 | #include <asm/bug.h> | ||
39 | #include <asm/irq_regs.h> | 39 | #include <asm/irq_regs.h> |
40 | #include <asm/spu.h> | 40 | #include <asm/spu.h> |
41 | #include <asm/spu_priv1.h> | 41 | #include <asm/spu_priv1.h> |
@@ -1346,7 +1346,7 @@ static void backtrace(struct pt_regs *excp) | |||
1346 | 1346 | ||
1347 | static void print_bug_trap(struct pt_regs *regs) | 1347 | static void print_bug_trap(struct pt_regs *regs) |
1348 | { | 1348 | { |
1349 | struct bug_entry *bug; | 1349 | const struct bug_entry *bug; |
1350 | unsigned long addr; | 1350 | unsigned long addr; |
1351 | 1351 | ||
1352 | if (regs->msr & MSR_PR) | 1352 | if (regs->msr & MSR_PR) |
@@ -1357,11 +1357,11 @@ static void print_bug_trap(struct pt_regs *regs) | |||
1357 | bug = find_bug(regs->nip); | 1357 | bug = find_bug(regs->nip); |
1358 | if (bug == NULL) | 1358 | if (bug == NULL) |
1359 | return; | 1359 | return; |
1360 | if (bug->line & BUG_WARNING_TRAP) | 1360 | if (is_warning_bug(bug)) |
1361 | return; | 1361 | return; |
1362 | 1362 | ||
1363 | printf("kernel BUG in %s at %s:%d!\n", | 1363 | printf("kernel BUG at %s:%u!\n", |
1364 | bug->function, bug->file, (unsigned int)bug->line); | 1364 | bug->file, bug->line); |
1365 | } | 1365 | } |
1366 | 1366 | ||
1367 | void excprint(struct pt_regs *fp) | 1367 | void excprint(struct pt_regs *fp) |
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c index 63808e01cb0b..5e723c4c2571 100644 --- a/arch/ppc/kernel/pci.c +++ b/arch/ppc/kernel/pci.c | |||
@@ -879,7 +879,7 @@ pci_resource_to_bus(struct pci_dev *pdev, struct resource *res) | |||
879 | 879 | ||
880 | 880 | ||
881 | static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, | 881 | static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, |
882 | unsigned long *offset, | 882 | resource_size_t *offset, |
883 | enum pci_mmap_state mmap_state) | 883 | enum pci_mmap_state mmap_state) |
884 | { | 884 | { |
885 | struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); | 885 | struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); |
@@ -891,7 +891,9 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, | |||
891 | 891 | ||
892 | /* If memory, add on the PCI bridge address offset */ | 892 | /* If memory, add on the PCI bridge address offset */ |
893 | if (mmap_state == pci_mmap_mem) { | 893 | if (mmap_state == pci_mmap_mem) { |
894 | #if 0 /* See comment in pci_resource_to_user() for why this is disabled */ | ||
894 | *offset += hose->pci_mem_offset; | 895 | *offset += hose->pci_mem_offset; |
896 | #endif | ||
895 | res_bit = IORESOURCE_MEM; | 897 | res_bit = IORESOURCE_MEM; |
896 | } else { | 898 | } else { |
897 | io_offset = hose->io_base_virt - ___IO_BASE; | 899 | io_offset = hose->io_base_virt - ___IO_BASE; |
@@ -1030,7 +1032,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
1030 | enum pci_mmap_state mmap_state, | 1032 | enum pci_mmap_state mmap_state, |
1031 | int write_combine) | 1033 | int write_combine) |
1032 | { | 1034 | { |
1033 | unsigned long offset = vma->vm_pgoff << PAGE_SHIFT; | 1035 | resource_size_t offset = vma->vm_pgoff << PAGE_SHIFT; |
1034 | struct resource *rp; | 1036 | struct resource *rp; |
1035 | int ret; | 1037 | int ret; |
1036 | 1038 | ||
@@ -1132,21 +1134,42 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar, | |||
1132 | resource_size_t *start, resource_size_t *end) | 1134 | resource_size_t *start, resource_size_t *end) |
1133 | { | 1135 | { |
1134 | struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); | 1136 | struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); |
1135 | unsigned long offset = 0; | 1137 | resource_size_t offset = 0; |
1136 | 1138 | ||
1137 | if (hose == NULL) | 1139 | if (hose == NULL) |
1138 | return; | 1140 | return; |
1139 | 1141 | ||
1140 | if (rsrc->flags & IORESOURCE_IO) | 1142 | if (rsrc->flags & IORESOURCE_IO) |
1141 | offset = ___IO_BASE - hose->io_base_virt + hose->io_base_phys; | 1143 | offset = (unsigned long)hose->io_base_virt - _IO_BASE; |
1144 | |||
1145 | /* We pass a fully fixed up address to userland for MMIO instead of | ||
1146 | * a BAR value because X is lame and expects to be able to use that | ||
1147 | * to pass to /dev/mem ! | ||
1148 | * | ||
1149 | * That means that we'll have potentially 64 bits values where some | ||
1150 | * userland apps only expect 32 (like X itself since it thinks only | ||
1151 | * Sparc has 64 bits MMIO) but if we don't do that, we break it on | ||
1152 | * 32 bits CHRPs :-( | ||
1153 | * | ||
1154 | * Hopefully, the sysfs insterface is immune to that gunk. Once X | ||
1155 | * has been fixed (and the fix spread enough), we can re-enable the | ||
1156 | * 2 lines below and pass down a BAR value to userland. In that case | ||
1157 | * we'll also have to re-enable the matching code in | ||
1158 | * __pci_mmap_make_offset(). | ||
1159 | * | ||
1160 | * BenH. | ||
1161 | */ | ||
1162 | #if 0 | ||
1163 | else if (rsrc->flags & IORESOURCE_MEM) | ||
1164 | offset = hose->pci_mem_offset; | ||
1165 | #endif | ||
1142 | 1166 | ||
1143 | *start = rsrc->start + offset; | 1167 | *start = rsrc->start - offset; |
1144 | *end = rsrc->end + offset; | 1168 | *end = rsrc->end - offset; |
1145 | } | 1169 | } |
1146 | 1170 | ||
1147 | void __init | 1171 | void __init pci_init_resource(struct resource *res, resource_size_t start, |
1148 | pci_init_resource(struct resource *res, unsigned long start, unsigned long end, | 1172 | resource_size_t end, int flags, char *name) |
1149 | int flags, char *name) | ||
1150 | { | 1173 | { |
1151 | res->start = start; | 1174 | res->start = start; |
1152 | res->end = end; | 1175 | res->end = end; |