aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc
AgeCommit message (Collapse)AuthorFilesLines
2011-01-03powerpc/5200: dts: refactor dts filesJohn Bonesio10-1503/+506
This patch creates mpc5200b.dtsi containing the information for the MPC5200b SoC then modifies all of the dts files for MPC5200b based systems to use mpc5200b.dtsi. Signed-off-by: John Bonesio <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2011-01-03powerpc/5200: dts: Change combatible strings on localbusJohn Bonesio4-4/+4
This patch changes some incorrect compatible strings on the local plus bus node in dts files for MPC5200b based systems. Signed-off-by: John Bonesio <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2011-01-03powerpc/5200: dts: remove unused propertiesJohn Bonesio6-13/+0
This patch remove unused properties in dts files in preparation of refactoring the dts files for MPC5200b based boards. Signed-off-by: John Bonesio <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2011-01-03powerpc/5200: dts: rename nodes to prepare for refactoring dts filesJohn Bonesio9-26/+26
This patch renames nodes in dts fils for MPC5200b files to prepare for refactoring of these files later. When refactoring it will be easier to verify the results if the node names aren't changing at the same time. Signed-off-by: John Bonesio <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2011-01-03powerpc/dts: fix syntax bugs in bluestone.dtsGrant Likely1-4/+4
Signed-off-by: Grant Likely <[email protected]>
2011-01-03ppc: fix comment typo singal -> signalJustin P. Mattock1-1/+1
The patches below fixes a typo "singal" to "signal". Signed-off-by: Justin P. Mattock <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2011-01-01of/flattree: Add of_flat_dt_match() helper functionGrant Likely9-76/+51
This patch adds of_flat_dt_match() which tests a node for compatibility with a list of values and converts the relevant powerpc platform code to use it. This approach simplifies the board support code a bit. Signed-off-by: Grant Likely <[email protected]> Reviewed-by: Stephen Neuendorffer <[email protected]>
2010-12-29powerpc/83xx: add mpc8308_p1m DMA controller device-tree nodeIlya Yanok1-0/+8
MPC8308 has DMA controller compatible with mpc512x_dma driver. This patch adds device-tree node to support DMA controller on MPC8308 P1M board. Signed-off-by: Ilya Yanok <[email protected]> Acked-by: Wolfgang Denk <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-12-29powerpc/83xx: add DMA controller to mpc8308 device-tree nodeIlya Yanok1-0/+8
MPC8308 has DMA controller compatible with mpc512x_dma driver. This patch adds device-tree node to support DMA controller on MPC8308RDB board. Signed-off-by: Ilya Yanok <[email protected]> Acked-by: Wolfgang Denk <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-12-29Merge v2.6.37-rc8 into powerpc/nextGrant Likely243-2330/+7435
2010-12-29of/flattree: Add Kconfig for EARLY_FLATTREEStephen Neuendorffer1-1/+1
The device tree code is now in two pieces: some which can be used generically on any platform which selects CONFIG_OF_FLATTREE, and some early which is used at boot time on only a few architectures. This patch segregates the early code so that only those architectures which care about it need compile it. This also means that some of the requirements in the early code (such as a cmd_line variable) that most architectures (e.g. X86) don't provide can be ignored. Signed-off-by: Stephen Neuendorffer <[email protected]> [[email protected]: remove extra blank line addition] [[email protected]: fixed incorrect #ifdef CONFIG_EARLY_FLATTREE check] [[email protected]: Made OF_EARLY_FLATTREE select instead of depend on OF_FLATTREE] Signed-off-by: Grant Likely <[email protected]>
2010-12-24powerpc/pcm{030,032}: add pagesize to dtsWolfram Sang2-1/+3
Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-12-23of/address: use proper endianess in get_flagsSebastian Andrzej Siewior1-1/+1
This patch changes u32 to __be32 for all "ranges", "prop" and "addr" and such. Those variables are pointing to the device tree which contains integers in big endian format. Most functions are doing it right because of_read_number() is doing the right thing for them. of_bus_isa_get_flags(), of_bus_pci_get_flags() and of_bus_isa_map() were accessing the data directly and were doing it wrong. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Acked-by: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-12-23of/powerpc: Use generic rule to build dtb'sDirk Brandewie1-5/+3
Modify arch/powerpc/boot/Makefile to use dtc command in scripts/Makefile.lib Signed-off-by: Dirk Brandewie <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-12-23powerpc/mpc5200: include fs.h in mpc52xx_gpt.cWolfram Sang1-0/+1
Fix build errors like these (from a randconfig and my defconfig for a custom board): src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:549: error: dereferencing pointer to incomplete type: 1 errors in 1 logs src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:636: error: implicit declaration of function 'nonseekable_open': 1 errors in 1 logs src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:657: error: variable 'mpc52xx_wdt_fops' has initializer but incomplete type: 1 errors in 1 logs src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:658: error: excess elements in struct initializer: 1 errors in 1 logs src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:658: error: unknown field 'owner' specified in initializer: 1 errors in 1 logs ... Reported-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Wolfram Sang <[email protected]> Cc: Grant Likely <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Andrew Morton <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-12-23Merge commit 'v2.6.37-rc7' into devicetree/nextGrant Likely17-20/+27
2010-12-22Merge branch 'master' into for-nextJiri Kosina17-20/+27
Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.
2010-12-16TTY: Add tty ioctl to figure device node of the system console.Werner Fink1-0/+1
This has been in the SuSE kernels for a very long time. Signed-off-by: Werner Fink <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-16perf: Dynamic pmu typesPeter Zijlstra2-2/+2
Extend the perf_pmu_register() interface to allow for named and dynamic pmu types. Because we need to support the existing static types we cannot use dynamic types for everything, hence provide a type argument. If we want to enumerate the PMUs they need a name, provide one. Signed-off-by: Peter Zijlstra <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2010-12-09powerpc/powermac: Make auto-loading of therm_pm72 possibleMarc Zyngier1-0/+9
The therm_pm72 driver, used on the PowerMac G5 range, cannot be auto-loaded, since the driver itself creates both the device node and the driver instance. Moving the device node creation to the platform setup code and adding the necessary MODULE_DEVICE_TABLE() information allows the driver to be automatically loaded by udev on any semi-modern distribution. It "fixes" a major source of problem on G5 machines where the driver wasn't explicitely loaded by default, and the system would automatically shutdown under load. Tested on an Xserve G5. Signed-off-by: Marc Zyngier <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09of/address: Use propper endianess in get_flagsSebastian Siewior1-1/+1
This patch changes u32 to __be32 for all "ranges", "prop" and "addr" and such. Those variables are pointing to the device tree which containts intergers in big endian format. Most functions are doing it right because of_read_number() is doing the right thing for them. of_bus_isa_get_flags(), of_bus_pci_get_flags() and of_bus_isa_map() were accessing the data directly and were doing it wrong. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Acked-by: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc/pci: Use printf extension %pR for struct resourceJoe Perches2-6/+5
Using %pR standardizes the struct resource output. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc: Remove unnecessary casts of void ptrJesper Juhl1-1/+1
Hi, The [vk][cmz]alloc(_node) family of functions return void pointers which it's completely unnecessary/pointless to cast to other pointer types since that happens implicitly. This patch removes such casts from arch/powerpc/ Signed-off-by: Jesper Juhl <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc: Disable VPHN polling during a suspend operationJesse Larrew2-0/+13
Tie the polling mechanism into the ibm,suspend-me rtas call to stop/restart polling before/after a suspend, hibernate, migrate, or checkpoint restart operation. This ensures that the system has a chance to disable the polling if the partition is migrated to a system that does not support VPHN (and vice versa). Signed-off-by: Jesse Larrew <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc/pseries: Poll VPA for topology changes and update NUMA mapsJesse Larrew2-11/+271
This patch sets a timer during boot that will periodically poll the associativity change counters in the VPA. When a change in associativity is detected, it retrieves the new associativity domain information via the H_HOME_NODE_ASSOCIATIVITY hcall and updates the NUMA node maps and sysfs entries accordingly. Note that since the ibm,associativity device tree property does not exist on configurations with both NUMA and SPLPAR enabled, no device tree updates are necessary. Signed-off-by: Jesse Larrew <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc: iommu: Add device name to iommu error printksAnton Blanchard1-6/+8
Right now its difficult to see which device is running out of iommu space: iommu_alloc failed, tbl c00000076e096660 vaddr c000000768806600 npages 1 Use dev_info() so we get the device name and location: ipr 0000:00:01.0: iommu_alloc failed, tbl c00000076e096660 vaddr c000000768806600 npages 1 Signed-off-by: Anton Blanchard <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc: Record vma->phys_addr in ioremap()Michael Ellerman2-0/+3
The vmalloc code can track the physical address of a vma, when the vma is used for ioremap, if set it is displayed in /proc/vmallocinfo. Because get_vm_area_caller() doesn't know it's being called for ioremap() it's up to the arch code to set the phys_addr. A bunch of other arch's do this, I'm not sure why powerpc doesn't? Signed-off-by: Michael Ellerman <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc: Update compat_arch_ptraceAndreas Schwab1-0/+7
Update compat_arch_ptrace to follow recent changes in PTRACE_GET_DEBUGREG and the addition of PPC_PTRACE_{GETHWDBGINFO|{SET|DEL}HWDEBUG}. The latter three can be forwarded to arch_ptrace unchanged. Signed-off-by: Andreas Schwab <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3SAndreas Schwab1-6/+16
Properly set the DABR_TRANSLATION/DABR_DATA_READ/DABR_DATA_READ bits in the dabr when setting the debug register via PPC_PTRACE_SETHWDEBUG. Also don't reject trigger type of PPC_BREAKPOINT_TRIGGER_READ. Signed-off-by: Andreas Schwab <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc/time: printk time stamp init not correctHeiko Schocher1-1/+1
problem: I see sometimes on my mpc5200 based board such printk timing information: [ 0.000000] NR_IRQS:512 nr_irqs:512 16 [ 0.000000] MPC52xx PIC is up and running! [ 0.000000] clocksource: timebase mult[79364d9] shift[22] registered [ 0.000000] console [ttyPSC0] enabled [ 130.300633] pid_max: default: 32768 minimum: 301 [ 130.305647] Mount-cache hash table entries: 512 [ 130.315818] NET: Registered protocol family 16 reason: if the tbu not starts from 0 when linux boots, boot_tb maybe could not store the real 64 bit tbu value, because boot_tp is only a 32 bit unsigned long. solution: change boot_tb to u64 [BenH: Made it u64 instead of unsigned long long] Signed-off-by: Heiko Schocher <[email protected]> cc: Wolfgang Denk <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc: Minor cleanups for machdep.hSonny Rao1-5/+1
Remove stale declaration of setup_pci_ptrs, aparently from ppc before 2.4.0 Remove #ifdef around struct existance delcaration Fix spelling of "linear" Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Sonny Rao <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09Powerpc: separate CONFIG_RELOCATABLE from CONFIG_CRASHDUMP in boot codeSonny Rao1-4/+2
Fix head_64.S so that we can build a relocatable kernel that isn't necessarily a crash-dump kernel Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Sonny Rao <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc: Fix incorrect comment about interrupt stack allocationAnton Blanchard1-2/+2
We now allow interrupt stacks anywhere in the first segment which can be 256M or 1TB. Fix the comment. Signed-off-by: Anton Blanchard <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc: Hardcode popcnt instructions for old assemblersAnton Blanchard2-7/+15
The popcnt instructions went into binutils relatively recently. As with a number of other instructions, create macros and hardcode them. Signed-off-by: Anton Blanchard <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc/pseries: Pass phb only to iommu_table_setparms_lparBenjamin Herrenschmidt1-7/+4
iommu_table_setparms_lpar needs either the phb or the subbusnumber (not both), pass the phb to make it similar to iommu_table_setparms. Note: In cases where a caller was passing bus->number previously to iommu_table_setparms_lpar() rather than phb->bus->number, this can lead to a different value in tbl->it_busno. The only example of this was the removed pci_dma_dev_setup_pSeriesLP(), removed in "ppc/iommu: remove unneeded pci_dma_dev_setup_pSeriesLP". [BenH: You updated only one of the two callers. Fixed that for you] Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Nishanth Aravamudan <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc/pseries: Do not need to check for dma_window == NULLNishanth Aravamudan1-6/+0
The block in pci_dma_dev_setup_pSeriesLP for dma_window == NULL can be removed because we will only teminate the loop if we had already allocated a iommu table for that node or we found a window. While there may be no window for the device, the intresting part is if we are reusing a table or creating it for the first device under it. Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Nishanth Aravamudan <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc/pseries: Checking for pdn->parent is redundantNishanth Aravamudan1-4/+1
The device tree root is never a pci bus, and will not have a PCI_DN(pdn), so the check for PCI_DN added in 650f7b3b2f0ead0673e90452cf3dedde97c537ba makes the check for pdn->parent redundant and it can be removed. Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Nishanth Aravamudan <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc/pseries: Do not search for dma-window property on dlpar removeNishanth Aravamudan1-5/+1
The iommu_table pointer in the pci auxiliary struct of device_node has not been used by the iommu ops since the dma refactor of 12d04eef927bf61328af2c7cbe756c96f98ac3bf, however this code still uses it to find tables for dlpar. By only setting the PCI_DN iommu_table pointer on nodes with dma window properties, we will be able to quickly find the node for later checks, and can remove the table without looking for the the dma window property on dlpar remove. Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Nishanth Aravamudan <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09powerpc/iommu: Use coherent_dma_mask for alloc_coherentNishanth Aravamudan2-1/+5
The IOMMU code has been passing the dma-mask instead of the coherent_dma_mask to the iommu allocator. Coherent allocations should be made using the coherent_dma_mask. Also update the vio code to ensure the coherent_dma_mask is set. Without this change drivers, such as ibmvscsi, fail to load with the corrected dma_iommu_alloc_coherent(). Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Nishanth Aravamudan <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-12-09Merge remote branch 'jwb/next' into nextBenjamin Herrenschmidt8-26/+387
2010-12-09Merge branch 'nvram' into nextBenjamin Herrenschmidt5-363/+381
2010-12-07Merge commit 'v2.6.37-rc5' into perf/coreIngo Molnar1-1/+1
Merge reason: Pick up the latest -rc. Signed-off-by: Ingo Molnar <[email protected]>
2010-11-30powerpc/nvram: Handle partition names >= 12 charsJim Keniston1-2/+3
The name field in the nvram_header can be < 12 chars, null-terminated, or 12 chars without the null. Handle this safely. Signed-off-by: Jim Keniston <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-11-30powerpc/nvram: Fix NVRAM partition list setupJim Keniston1-18/+8
Simplify creation and use of the NVRAM partition list. Signed-off-by: Jim Keniston <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-11-30powerpc/nvram: Rename ppc64,linux partition to ibm,rtas-logBenjamin Herrenschmidt1-10/+13
I'm not aware of any userspace tool accessing it by its name anyways, it's read back by the kernel itself on the next boot to get back older log entries Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-11-30powerpc/nvram: Move the log partition stuff to pseriesBenjamin Herrenschmidt3-237/+227
The nvram log partition stuff currently in nvram_64.c is really pseries specific. It isn't actually used on anything else (despite the fact that we ran the code to setup the partition on anything except powermac) and the log format is specific to pseries RTAS implementation. So move it where it belongs Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-11-30powerpc/nvram: Change nvram_setup_partition() to use new helperBenjamin Herrenschmidt1-39/+32
This changes the function to use nvram_find_partition() instead of doing the lookup "by hand". It also makes some of the logic clearer and prints out more useful diagnostic information. Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-11-30powerpc/nvram: Add nvram_find_partition()Benjamin Herrenschmidt1-0/+22
Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-11-30powerpc/nvram: Improve partition removalBenjamin Herrenschmidt1-48/+43
Existing code is nasty, has bugs etc... rewrite the function more simply, and make it take the signature and optional name of the partitions to remove as arguments, thus making it a more generic utility. We also try to remove a log partition that we find and is too small rather than creating a duplicate. Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2010-11-30powerpc/nvram: Shuffle code around in nvram_create_partition()Benjamin Herrenschmidt1-46/+62
This error log stuff is really pseries specific. As a first step we move the initialization of these variables to the caller of nvram_create_partition(), which is also slightly reorganized so we setup the free partition before we clear the new partition, so the chance of an error during clear leaving us with invalid headers is lessened. Signed-off-by: Benjamin Herrenschmidt <[email protected]>