summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
Commit message (Collapse)AuthorAgeFilesLines
* [POWERPC] Merge libfdt upstream sourceDavid Gibson2007-12-1110-0/+2568
| | | | | | | | | | This incorporates a copy of dtc libfdt into the kernel source, in arch/powerpc/boot/libfdt. This only imports the upstream sources verbatim, later patches are needed to actually link it into the kernel Makefiles. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] EEH: Avoid a possible NULL pointer dereferenceStephen Rothwell2007-12-111-2/+2
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: Merge vpdinfo.c into pci.cStephen Rothwell2007-12-114-259/+219
| | | | | | | | There was only one global function in vpdinfo.c and it was only called from pci.c, so merge them and make the function static. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: Clean up and simplify vdpinfo.cStephen Rothwell2007-12-111-54/+46
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: DeCamelCase vpdinfo.cStephen Rothwell2007-12-113-97/+95
| | | | | | | This is a purely mechanical transformation. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Update xmon slb codewill schmidt2007-12-111-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a bit more detail to the xmon SLB output. When the valid bit is set, this displays the ESID and VSID values, as well as decoding the segment size -- 1T or 256M -- and displaying the LLP bits. This supresses the output for any slb entries that contain only zeros. sample output from power6 (1T segment support): 00 c000000008000000 40004f7ca3000500 1T ESID= c00000 VSID= 4f7ca3 LLP:100 01 d000000008000000 4000eb71b0000400 1T ESID= d00000 VSID= eb71b0 LLP: 0 08 0000000018000000 0000c8499f8ccc80 256M ESID= 1 VSID= c8499f8cc LLP: 0 09 00000000f8000000 0000d2c1a8e46c80 256M ESID= f VSID= d2c1a8e46 LLP: 0 10 0000000048000000 0000ca87eab1dc80 256M ESID= 4 VSID= ca87eab1d LLP: 0 43 cf00000008000000 400011b260000500 1T ESID= cf0000 VSID= 11b260 LLP:100 sample output from power5 (notice the non-valid but non-zero entries) 10 0000000008000000 00004fd0e077ac80 256M ESID= 0 VSID= 4fd0e077a LLP: 0 11 00000000f8000000 00005b085830fc80 256M ESID= f VSID= 5b085830f LLP: 0 12 0000000048000000 000052ce99fe6c80 256M ESID= 4 VSID= 52ce99fe6 LLP: 0 13 0000000018000000 000050904ed95c80 256M ESID= 1 VSID= 50904ed95 LLP: 0 14 cf00000008000000 0000d59aca40f500 256M ESID=cf0000000 VSID= d59aca40f LLP:100 15 c000000078000000 000045cb97751500 256M ESID=c00000007 VSID= 45cb97751 LLP:100 Tested on power5 and power6. Signed-Off-By: Will Schmidt <will_schmidt@vnet.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Use SLB size from the device treeMichael Neuling2007-12-116-4/+25
| | | | | | | | | | | | | Currently we hardwire the number of SLBs to 64, but PAPR says we should use the ibm,slb-size property to obtain the number of SLB entries. This uses this property instead of assuming 64. If no property is found, we assume 64 entries as before. This soft patches the SLB handler, so it shouldn't change performance at all. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] pci_controller->arch_data really is a struct device_node *Stephen Rothwell2007-12-1117-30/+28
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Don't special case pci_domain_nr() for iSeriesStephen Rothwell2007-12-112-7/+4
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Remove some iSeries platform checks from the PCI codeStephen Rothwell2007-12-112-15/+10
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: hose->buid is always zero for iSeriesStephen Rothwell2007-12-111-6/+2
| | | | | | | so remove a firmware feature test. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: Call iSeries_pcibios_init from setup_archStephen Rothwell2007-12-113-4/+5
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Inline pci_setup_pci_controller as it has become trivialStephen Rothwell2007-12-111-15/+6
| | | | | | | and it becomes clear that we should use zalloc_maybe_bootmem. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: Make pcibios_final_fixup not depend on pci_dnStephen Rothwell2007-12-111-15/+12
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: Reduce dependence on pci_dn bussubnoStephen Rothwell2007-12-111-9/+9
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: iseries_ds_addr is only used in pci.cStephen Rothwell2007-12-112-12/+12
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: Remove pci_dn dependency from iSeries_Device_InformationStephen Rothwell2007-12-113-17/+6
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: Remove one layer of IO routinesStephen Rothwell2007-12-111-49/+19
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: Consoldiate PCI IO error checkStephen Rothwell2007-12-111-79/+26
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: Unindent and clean iSeries_pci_final_fixupStephen Rothwell2007-12-111-33/+35
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: Remove some dead code from pci.cStephen Rothwell2007-12-111-18/+1
| | | | | | | and an unnecessary cast. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: DeCamelCase pci.cStephen Rothwell2007-12-111-108/+108
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: Cleanup PCI retry code a littleStephen Rothwell2007-12-111-4/+4
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iSeries: Move find_Device_Node to avoid a forward declarationStephen Rothwell2007-12-111-23/+16
| | | | | | | Also remove another unnecessary forward declaration. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] pSeries: Remove dependency on pci_dn bussubnoStephen Rothwell2007-12-111-17/+7
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] iommu_free_table doesn't need the device_nodeStephen Rothwell2007-12-112-6/+4
| | | | | | | | | It only needs the iommu_table address. It also makes use of the node name to print error messages. So just pass it the things it needs. This reduces the places that know about the pci_dn by one. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] lparcfg: Remove useless buffer allocationNathan Lynch2007-12-111-11/+1
| | | | | | | | | | The 'data' member of proc_ppc64_lparcfg is unused, but the lparcfg module's init routine allocates 4K for it. Remove the code which allocates and frees this buffer. Signed-off-by: Nathan Lynch <ntl@pobox.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Update celleb_defconfig to add support for native CBEIshizaki Kou2007-12-111-19/+19
| | | | | Signed-off-by: Kou Ishizaki <Kou.Ishizaki@toshiba.co.jp> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] celleb: Add support for native CBEIshizaki Kou2007-12-114-23/+85
| | | | | | | | | This adds support for native CBE on Celleb, that is, without the BEAT hypervisor. Many codes in platforms/cell/ are used in native CBE environment. Signed-off-by: Kou Ishizaki <Kou.Ishizaki@toshiba.co.jp> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] cell: Fix undefined reference to mmio_nvram_initIshizaki Kou2007-12-111-0/+2
| | | | | | | | | | | This fixes the following link error with CONFIG_PPC_CELL_NATIVE=y and CONFIG_PPC_CELL_BLADE=n: arch/powerpc/platforms/built-in.o: In function `.cell_setup_arch': setup.c:(.init.text+0xe80): undefined reference to `.mmio_nvram_init' Signed-off-by: Kou Ishizaki <Kou.Ishizaki@toshiba.co.jp> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] kernel_execve is identical in 32 and 64 bitStephen Rothwell2007-12-113-14/+8
| | | | | | | so consolidate it into misc.S. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [POWERPC] Use of_register_driver to implement of_register_platform_driverStephen Rothwell2007-12-111-20/+0
| | | | | | | Also use of_unregister_driver to implement of_unregister_platform_driver. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* Merge branch 'linux-2.6'Paul Mackerras2007-12-1048-2452/+2658
|\
| * ibm_newemac: Cleanup/fix support for STACR register variantsBenjamin Herrenschmidt2007-12-071-0/+4
| | | | | | | | | | | | | | | | | | | | There are a few variants of the STACR register that affect more than just the "AXON" version of EMAC. Replace the current test of various chip models with tests for generic properties in the device-tree. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Stefan Roese <sr@denx.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * ibm_newemac: Cleanup/Fix RGMII MDIO support detectionBenjamin Herrenschmidt2007-12-071-0/+1
| | | | | | | | | | | | | | | | | | | | More than just "AXON" version of EMAC RGMII supports MDIO, so replace the current test with a generic property in the device-tree that indicates such support. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Stefan Roese <sr@denx.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * Merge branch 'merge' of ↵Linus Torvalds2007-12-0642-2446/+2648
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] virtex bug fix: Use canonical value for AC97 interrupt xparams [POWERPC] Update defconfigs [POWERPC] PS3: Update ps3_defconfig [POWERPC] Update iseries_defconfig [POWERPC] Fix hardware IRQ time accounting problem.
| | * [POWERPC] Update defconfigsPaul Mackerras2007-12-0639-2298/+2494
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates all the defconfigs in arch/powerpc/configs except iseries and ps3, which were updated by the preceding commits. This mostly takes the defaults, except that I turned on tickless idle and high-resolution timers for everything, and turned off instrumentation support and "Fair group CPU scheduler" for the smaller/embedded platforms. Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * [POWERPC] PS3: Update ps3_defconfigGeoff Levand2007-12-061-88/+89
| | | | | | | | | | | | | | | | | | | | | Update ps3_defconfig. Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * [POWERPC] Update iseries_defconfigStephen Rothwell2007-12-061-59/+64
| | | | | | | | | | | | | | | | | | | | | The notable changes here are the enabling of NO_HZ and HIGH_RES_TIMERS. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * [POWERPC] Fix hardware IRQ time accounting problem.Tony Breeds2007-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit fa13a5a1f25f671d084d8884be96fc48d9b68275 (sched: restore deterministic CPU accounting on powerpc), unconditionally calls update_process_tick() in system context. In the deterministic accounting case this is the correct thing to do. However, in the non-deterministic accounting case we need to not do this, since doing this results in the time accounted as hardware irq time being artificially elevated. Also this collapses 2 consecutive '#ifdef CONFIG_VIRT_CPU_ACCOUNTING' checks in time.h into one for neatness. Signed-off-by: Tony Breeds <tony@bakeyournoodle.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Fix swapper_pg_dir size when CONFIG_PTE_64BIT=y on FSL_BOOKEKumar Gala2007-12-065-6/+5
| |/ | | | | | | | | | | | | | | | | The size of swapper_pg_dir is 8k instead of 4k when using 64-bit PTEs (CONFIG_PTE_64BIT). This was reported by Cedric Hombourger <chombourger@gmail.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | [POWERPC] Implement 'make bootwrapper_install'David Woodhouse2007-12-062-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | This adds a 'bootwrapper_install' make target for the powerpc architecture, which installs the wrapper script, intermediate object files and device-tree sources for later use. This will then allow bootable zImages to be created other than in the context of a kernel build. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [POWERPC] Allow for bootwrapper utilities being in different directory to ↵David Woodhouse2007-12-061-3/+5
| | | | | | | | | | | | | | | | | | | | | | objects It's possible that the executables which are built as helpers for the bootwrapper stuff might end up in a different place to the intermediate object files. Handle that. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [POWERPC] Find device-tree source file in default directoryDavid Woodhouse2007-12-061-0/+3
| | | | | | | | | | | | | | | | If a .dts file is given to the bootwrapper script without a full path name, look in a sensible place for it. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [POWERPC] Create otheros.bld next to specified output file, not in $object ↵David Woodhouse2007-12-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory The bootwrapper script currently generates an 'otheros.bld' file in addition to the file specified by the -o option, when asked to build a wrapper for PS3. It should do that in the same directory as the output, not the directory where the wrapper objects are kept (which might potentially not be writable when the script runs). Arguably, the 'otheros.bld' ought to be created with the filename specified as the -o argument. But that's a more intrusive change. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [POWERPC] CELLEB: Fix possible NULL pointer dereferenceCyrill Gorcunov2007-12-061-3/+8
| | | | | | | | | | | | | | | | | | This adds checking for NULL returned value from of_get_property to prevent possible NULL pointer dereference in the case when expected properties are not present. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [POWERPC] Clean out asm/of_{platform, device}.h from sysdev/Jon Loeliger2007-12-062-4/+5
| | | | | | | | | | | | | | | | Convert #include of asm/of_{platform, device}.h into linux/of_{platform,device}.h for remaining arch/powerpc files. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [POWERPC] Clean out asm/of_{platform, device}.hJon Loeliger2007-12-064-5/+5
| | | | | | | | | | | | | | | | Convert #include of asm/of_{platform, device}.h into linux/of_{platform,device}.h for a few scattered platforms. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | Merge branch 'for-2.6.25' of ↵Paul Mackerras2007-12-056-43/+105
|\ \ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/olof/pasemi into for-2.6.25
| * | [POWERPC] pasemi: Fix module information for gpio-mdioOlof Johansson2007-12-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fix up the module information for gpio-mdio, it wouldn't load because of lacking license, and wouldn't auto-load because of missing MODULE_DEVICE_TABLE. Signed-off-by: Olof Johansson <olof@lixom.net>
OpenPOWER on IntegriCloud