summaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* powerpc: Move remaining .c files from arch/ppc64 to arch/powerpcPaul Mackerras2005-11-181-7/+0
| | | | | | | | | | | This also deletes the now-unused Makefiles under arch/ppc64. Both of the files moved over could use some merging, but for now I have moved them as-is and arranged for them to be used only in 64-bit kernels. For 32-bit kernels we still use arch/ppc/kernel/idle.c and drivers/char/generic_nvram.c as before. Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: merge align.cBenjamin Herrenschmidt2005-11-181-1/+1
| | | | | | | | | | | | | | This patch merges align.c, the result isn't quite what was in ppc64 nor what was in ppc32 :) It should implement all the functionalities of both though. Kumar, since you played with that in the past, I suppose you have some test cases for verifying that it works properly before I dig out the 601 machine ? :) Since it's likely that I won't be able to test all scenario, code inspection is much welcome. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: Move most remaining ppc64 files over to arch/powerpcPaul Mackerras2005-11-141-39/+1
| | | | | | | Also deletes files in arch/ppc64 that are no longer used now that we don't compile with ARCH=ppc64 any more. Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: kill ppc64 rtc.c, use genrtc insteadBenjamin Herrenschmidt2005-11-141-1/+0
| | | | | | | | | | | This moves the rtas RTC callbacks to rtas-rtc.c in arch/powerpc/kernel, and kills the rest of arch/ppc64/kernel/rtc.c which was just a duplicate of the genrtc functionality. Also enable build of genrtc for CONFIG_PPC64 (it just works are we already have the required callbacks) and enable it in all defconfigs. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernelBenjamin Herrenschmidt2005-11-111-2/+1
| | | | | | | | | | | | | | | | | | | | | This patch moves the vdso's to arch/powerpc, adds support for the 32 bits vdso to the 32 bits kernel, rename systemcfg (finally !), and adds some new (still untested) routines to both vdso's: clock_gettime() with support for CLOCK_REALTIME and CLOCK_MONOTONIC, clock_getres() (same clocks) and get_tbfreq() for glibc to retreive the timebase frequency. Tom,Steve: The implementation of get_tbfreq() I've done for 32 bits returns a long long (r3, r4) not a long. This is such that if we ever add support for >4Ghz timebases on ppc32, the userland interface won't have to change. I have tested gettimeofday() using some glibc patches in both ppc32 and ppc64 kernels using 32 bits userland (I haven't had a chance to test a 64 bits userland yet, but the implementation didn't change and was tested earlier). I haven't tested yet the new functions. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: Move udbg code to arch/powerpcDavid Gibson2005-11-111-7/+0
| | | | | | | | | | | | | | | | | Since the udbg code in ppc64 has no ppc32 equivalent, move it straight over into arch/powerpc (and include/asm-powerpc for udbg.h). In time, we probably want to meld the various bits and pieces of 32-bit early debugging code into udbg, but for now only include it on CONFIG_PPC64=y builds. The only change during the move is to standardise the protecting #ifdef/#define in udbg.h, and move its banner comment above the initial #ifdef (which seems to be normal practice). Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64). Built for 32bit multiplatform (ARCH=powerpc). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: Move more ppc64 files with no ppc32 equivalent to powerpcDavid Gibson2005-11-101-4/+1
| | | | | | | | | | | | | | | | | | | | | | | This patch moves a bunch more files from arch/ppc64 and include/asm-ppc64 which have no equivalents in ppc32 code into arch/powerpc and include/asm-powerpc. The file affected are: hvcall.h proc_ppc64.c sysfs.c lparcfg.c rtas_pci.c The only changes apart from the move and corresponding Makefile changes are: - #ifndef/#define in includes updated to _ASM_POWERPC_ form - trailing whitespace removed - comments giving full paths removed Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64), built for 32-bit powermac (ARCH=powerpc). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: Move scanlog.c to platforms/pseriesDavid Gibson2005-11-101-1/+0
| | | | | | | | | | | scanlog.c is only compiled on pSeries. Thus, this patch moves it to platforms/pseries. Built and booted on pSeries LPAR (ARCH=powerpc and ARCH=ppc64). Built for iSeries (ARCH=powerpc). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* Merge git://oak/home/sfr/kernels/iseries/workPaul Mackerras2005-11-101-1/+1
|\
| * powerpc: merge irq.cStephen Rothwell2005-11-091-1/+1
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* | [PATCH] ppc64: move eeh.c to powerpc directory from ppc64Linas Vepstas2005-11-101-1/+0
| | | | | | | | | | | | | | | | | | | | 11-eeh-move-to-powerpc.patch Move arch/ppc64/kernel/eeh.c to arch//powerpc/platforms/pseries/eeh.c No other changes (except for Makefile to build it) Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] powerpc: Move various ppc64 files with no ppc32 equivalent to powerpcDavid Gibson2005-11-101-6/+3
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves a bunch of files from arch/ppc64 and include/asm-ppc64 which have no equivalents in ppc32 code into arch/powerpc and include/asm-powerpc. The file affected are: abs_addr.h compat.h lppaca.h paca.h tce.h cpu_setup_power4.S ioctl32.c firmware.c pacaData.c The only changes apart from the move and corresponding Makefile changes are: - #ifndef/#define in includes updated to _ASM_POWERPC_ form - trailing whitespace removed - comments giving full paths removed - pacaData.c renamed paca.c to remove studlyCaps - Misplaced { moved in lppaca.h Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64), built for 32-bit powermac (ARCH=powerpc). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: Merge smp.c and smp.hPaul Mackerras2005-11-051-1/+0
| | | | | | | This also moves setup_cpu_maps to setup-common.c (calling it smp_setup_cpu_maps) and uses it on both 32-bit and 64-bit. Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: Merge smp-tbsync.c (the generic timebase sync routine)Paul Mackerras2005-11-041-5/+0
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: move ppc64/kernel/signal.c to arch/powerpcStephen Rothwell2005-11-031-1/+0
| | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* powerpc: Merge remaining RTAS codePaul Mackerras2005-11-031-3/+1
| | | | | | | | | This moves rtas-proc.c and rtas_flash.c into arch/powerpc/kernel, since cell wants them as well as pseries (and chrp can use rtas-proc.c too, at least in principle). rtas_fw.c is gone, with its bits moved into rtas_flash.c and rtas.c. Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: Merge bitops.hDavid Gibson2005-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here's a revised version. This re-introduces the set_bits() function from ppc64, which I removed because I thought it was unused (it exists on no other arch). In fact it is used in the powermac interrupt code (but not on pSeries). - We use LARXL/STCXL macros to generate the right (32 or 64 bit) instructions, similar to LDL/STL from ppc_asm.h, used in fpu.S - ppc32 previously used a full "sync" barrier at the end of test_and_*_bit(), whereas ppc64 used an "isync". The merged version uses "isync", since I believe that's sufficient. - The ppc64 versions of then minix_*() bitmap functions have changed semantics. Previously on ppc64, these functions were big-endian (that is bit 0 was the LSB in the first 64-bit, big-endian word). On ppc32 (and x86, for that matter, they were little-endian. As far as I can tell, the big-endian usage was simply wrong - I guess no-one ever tried to use minixfs on ppc64. - On ppc32 find_next_bit() and find_next_zero_bit() are no longer inline (they were already out-of-line on ppc64). - For ppc64, sched_find_first_bit() has moved from mmu_context.h to the merged bitops. What it was doing in mmu_context.h in the first place, I have no idea. - The fls() function is now implemented using the cntlzw instruction on ppc64, instead of generic_fls(), as it already was on ppc32. - For ARCH=ppc, this patch requires adding arch/powerpc/lib to the arch/ppc/Makefile. This in turn requires some changes to arch/powerpc/lib/Makefile which didn't correctly handle ARCH=ppc. Built and running on G5. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: move arch/ppc64/kernel/bpa* to arch/powerpc/platforms/cellArnd Bergmann2005-11-011-3/+0
| | | | | | | | This patch simply moves files over to arch/powerpc without making any changes to them. Signed-off-by: Arnd Bergmann <arndb@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: move mmio_nvram.c over to arch/powerpcArnd Bergmann2005-11-011-1/+1
| | | | | | | | | | | The nvram code formally known as bpa_nvram.c is rather generic really, so it is quite likely to be useful to future boards not based on cell. This patch puts it into arch/powerpc/sysdev. Signed-off-by: Arnd Bergmann <arndb@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: Rename BPA to CellArnd Bergmann2005-11-011-1/+1
| | | | | | | | | The official name for BPA is now CBEA (Cell Broadband Engine Architecture). This patch renames all occurences of the term BPA to 'Cell' for easier recognition. Signed-off-by: Arnd Bergmann <arndb@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: Merge maple support code to arch/powerpc/platforms/maplePaul Mackerras2005-10-291-2/+1
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: Move xics.[ch] into platforms/pseriesDavid Gibson2005-10-281-2/+0
| | | | | | | | | | | This patch moves the XICS interrupt controller code into the platforms/pseries directory, since it only appears on pSeries machines. If it ever appears on some other machine we can move it to sysdev, although xics.c itself will need a bunch of changes in that case to remove pSeries specific assumptions. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* ppc64: use the merged syscall tableStephen Rothwell2005-10-281-1/+1
| | | | | | | This allows us to also use entry_64.S from the merged tree and reverts the setup_64.c part of fda262b8978d0089758ef9444508434c74113a61. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* powerpc: Move U3 IOMMU driver to arch/powerpc/sysdevPaul Mackerras2005-10-281-2/+0
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] ppc64: remove arch/ppc64/kernel/setup.cPaul Mackerras2005-10-271-1/+1
| | | | | | | | and use setup_64.c from the merged tree instead. The only difference between them was the code to set up the syscall maps. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: Merge rtas.c into arch/powerpc/kernelPaul Mackerras2005-10-261-1/+1
| | | | | | | | | | | | | This splits arch/ppc64/kernel/rtas.c into arch/powerpc/kernel/rtas.c, which contains generic RTAS functions useful on any CHRP platform, and arch/powerpc/platforms/pseries/rtas-fw.[ch], which contain some pSeries-specific firmware flashing bits. The parts of rtas.c that are to do with pSeries-specific error logging are protected by a new CONFIG_RTAS_ERROR_LOGGING symbol. The inclusion of rtas.o is controlled by the CONFIG_PPC_RTAS symbol, and the relevant platforms select that. Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: Merge i8259.c into arch/powerpc/sysdevPaul Mackerras2005-10-261-1/+1
| | | | | | | | | | | | This changes the parameters for i8259_init so that it takes two parameters: a physical address for generating an interrupt acknowledge cycle, and an interrupt number offset. i8259_init now sets the irq_desc[] for its interrupts; all the callers were doing this, and that code is gone now. This also defines a CONFIG_PPC_I8259 symbol to select i8259.o for inclusion, and makes the platforms that need it select that symbol. Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: Move ras.c into arch/powerpc/platforms/pseriesMichael Ellerman2005-10-261-1/+1
| | | | | | | | ras.o is only built for CONFIG_PPC_PSERIES, so move it into arch/powerpc/platforms/pseries. Update Makefiles to suit. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: Merge arch/ppc64/kernel/vio.c into arch/powerpc/kernel/vio.cStephen Rothwell2005-10-241-1/+0
| | | | | | | | | | | Merge arch/ppc64/kernel/vio.c into arch/powerpc/kernel/vio.c, update the Makefiles to make it work, and make ARCH=ppc64 still work. Michael's version put vio.c in arch/powerpc/sysedv but after consolting Paulus, this one puts it in arch/powerpc/kernel. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* ppc64: Use arch/powerpc/platforms/powermac for powermac build.Paul Mackerras2005-10-221-8/+2
| | | | | | | This switches the ARCH=ppc64 build to use arch/powerpc/platforms/powermac instead of arch/ppc64/kernel/pmac*, and deletes the latter set of files. Signed-off-by: Paul Mackerras <paulus@samba.org>
* ppc64: Use the merged mpic.cPaul Mackerras2005-10-201-2/+1
| | | | | | This means we now compile in arch/powerpc/sysdev for ARCH=ppc64. Signed-off-by: Paul Mackerras <paulus@samba.org>
* [PATCH] powerpc: Merge ppc64 pmc.[ch] with ppc32 perfmon.[ch]David Gibson2005-10-201-1/+1
| | | | | | | | | | | | | | This patches the ppc32 and ppc64 versions of the headers and .c files with helper functions for manipulating the performance counting hardware. As a side effect, it removes use of the term "perfmon" from ppc32, thus avoiding confusion with the unrelated performance counter interface from HP Labs also called "perfmon". Built, but not booted, for g5, pSeries, iSeries, and 32-bit Powermac with both ARCH=powerpc and ARCH=ppc{,64} as appropriate. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: Merge time.c and asm/time.h.Paul Mackerras2005-10-201-1/+1
| | | | | | | | | | We now use the merged time.c for both 32-bit and 64-bit compilation with ARCH=powerpc, and for ARCH=ppc64, but not for ARCH=ppc32. This removes setup_default_decr (folds its function into time_init) and moves wakeup_decrementer into time.c. This also makes an asm-powerpc/rtc.h. Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: Move ptrace32.c from arch/ppc64 to arch/powerpcPaul Mackerras2005-10-201-1/+1
| | | | | | | Also corrected my email address in ptrace.c and updated the comments at the top of ptrace32.c. Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: merge ppc signal.c and ppc64 signal32.cStephen Rothwell2005-10-181-1/+1
| | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* powerpc: Merge syscalls.c and sys_ppc32.c.Paul Mackerras2005-10-171-2/+2
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: merge ptrace.cStephen Rothwell2005-10-131-1/+1
| | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* ppc64: use powerpc of_device.cStephen Rothwell2005-10-131-1/+0
| | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* ppc64: fix arch/ppc64/kernel/MakefileStephen Rothwell2005-10-131-2/+1
| | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* ppc64: merge binfmt_elf32.cStephen Rothwell2005-10-131-1/+1
| | | | | | and use start_thread for both 32 and 64 bit bineries. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* powerpc: consolidate cputable.cStephen Rothwell2005-10-131-61/+24
| | | | | | Also simplify arch/ppc64/kernel/Makefile Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* ppc64: Use merged versions of init_task.c and process.c.Paul Mackerras2005-10-111-2/+2
| | | | | | | These two files are now built in arch/powerpc/kernel instead of arch/ppc64/kernel. Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: Get 64-bit configs to compile with ARCH=powerpcPaul Mackerras2005-10-101-7/+57
| | | | | | | | This is a bunch of mostly small fixes that are needed to get ARCH=powerpc to compile for 64-bit. This adds setup_64.c from arch/ppc64/kernel/setup.c and locks.c from arch/ppc64/lib/locks.c. Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: move lparmap.c to arch/powerpc/kernelPaul Mackerras2005-10-101-2/+2
| | | | | | | Since lparmap.s gets included in arch/powerpc/kernel/head_64.S, this avoids depending on a file in another directory. Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: move pSeries files to arch/powerpc/platforms/pseriesPaul Mackerras2005-10-101-3/+1
| | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* ppc64: Use the merged lmb routinesPaul Mackerras2005-10-101-1/+1
| | | | | | | The only real change here is that lmb_enforce_memory_limit now takes the memory_limit as a parameter instead of as a global variable. Signed-off-by: Paul Mackerras <paulus@samba.org>
* powerpc: make iSeries buildStephen Rothwell2005-10-011-5/+3
| | | | | | | | Merge vmlinux.lds.S. Also remove arch/powerpc/kernel/vmlinux.lds which is a generated file. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* ppc64: simplify the build a littleStephen Rothwell2005-10-011-9/+2
| | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* powerpc: merge idle_power4.S and trapc.sStephen Rothwell2005-10-011-0/+8
| | | | | | | | | | | | | Use idle_power4.S from ppc64 as we are not going to support 32 bit power4 in the merged tree. Merge ppc64 traps.c into powerpc traps.c: use ppc64 versions of exception routine names (as they don't have StudlyCaps) make all the versions if die() have the same prototype Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
* powerpc: Move lparmap.c to powerpc/platformsStephen Rothwell2005-09-301-2/+2
| | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
OpenPOWER on IntegriCloud