for-2.6.23 branch in powerpc.git created

I have created a for-2.6.23 branch in the powerpc.git repository
(git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git)
where I have started queueing up patches to go in once the 2.6.23 merge window opens. For now at least it's the same as the master branch.

The patches I put in are listed below. If you have a patch that should go in but isn't listed, remind me about it.

Paul.

 Documentation/cachetlb.txt                   |    2 
 arch/powerpc/Kconfig                         |  256 -------------------
 arch/powerpc/boot/44x.c                      |   45 +++
 arch/powerpc/boot/44x.h                      |    3 
 arch/powerpc/boot/Makefile                   |    4 
 arch/powerpc/boot/cuboot-83xx.c              |   13 -
 arch/powerpc/boot/cuboot-85xx.c              |   13 -
 arch/powerpc/boot/cuboot-ebony.c             |   16 -
 arch/powerpc/boot/cuboot.c                   |   35 +++
 arch/powerpc/boot/cuboot.h                   |   14 +
 arch/powerpc/boot/dcr.h                      |   37 +++
 arch/powerpc/boot/dts/ebony.dts              |    8 -
 arch/powerpc/boot/dts/holly.dts              |   52 ++--
 arch/powerpc/boot/dts/mpc7448hpc2.dts        |   33 +-
 arch/powerpc/boot/ebony.c                    |   19 -
 arch/powerpc/boot/of.c                       |  188 +-------------
 arch/powerpc/boot/of.h                       |   15 +
 arch/powerpc/boot/ofconsole.c                |   45 +++
 arch/powerpc/boot/oflib.c                    |  172 ++++++++++++
 arch/powerpc/configs/holly_defconfig         |    3 
 arch/powerpc/kernel/Makefile                 |    5 
 arch/powerpc/kernel/head_32.S                |  122 ---------
 arch/powerpc/kernel/irq.c                    |    1 
 arch/powerpc/kernel/isa-bridge.c             |  271 ++++++++++++++++++++
 arch/powerpc/kernel/misc_32.S                |   10 -
 arch/powerpc/kernel/of_platform.c            |    8 -
 arch/powerpc/kernel/pci_64.c                 |  358 +++++++++-----------------
 arch/powerpc/kernel/process.c                |   14 +
 arch/powerpc/kernel/prom_init.c              |    4 
 arch/powerpc/kernel/ptrace-common.h          |  161 ------------
 arch/powerpc/kernel/ptrace.c                 |  325 ++++++++++++++++--------
 arch/powerpc/kernel/ptrace32.c               |  239 ++++++++---------
 arch/powerpc/kernel/rtas_pci.c               |    7 -
 arch/powerpc/kernel/setup_32.c               |   12 -
 arch/powerpc/kernel/signal.c                 |  180 +++++++++++++
 arch/powerpc/kernel/signal.h                 |   55 ++++
 arch/powerpc/kernel/signal_32.c              |  191 ++------------
 arch/powerpc/kernel/signal_64.c              |  182 -------------
 arch/powerpc/kernel/vdso.c                   |    2 
 arch/powerpc/mm/44x_mmu.c                    |    1 
 arch/powerpc/mm/4xx_mmu.c                    |    1 
 arch/powerpc/mm/Makefile                     |    3 
 arch/powerpc/mm/fault.c                      |    2 
 arch/powerpc/mm/fsl_booke_mmu.c              |    1 
 arch/powerpc/mm/hash_native_64.c             |   25 +-
 arch/powerpc/mm/hash_utils_64.c              |    2 
 arch/powerpc/mm/imalloc.c                    |  313 -----------------------
 arch/powerpc/mm/init_32.c                    |    1 
 arch/powerpc/mm/init_64.c                    |    1 
 arch/powerpc/mm/mem.c                        |    1 
 arch/powerpc/mm/mmu_context_32.c             |    1 
 arch/powerpc/mm/mmu_decl.h                   |   17 -
 arch/powerpc/mm/pgtable_32.c                 |  123 ---------
 arch/powerpc/mm/pgtable_64.c                 |  206 ++++-----------
 arch/powerpc/mm/ppc_mmu_32.c                 |    7 -
 arch/powerpc/mm/tlb_32.c                     |    1 
 arch/powerpc/mm/tlb_64.c                     |   57 ++++
 arch/powerpc/platforms/Kconfig               |    7 -
 arch/powerpc/platforms/Kconfig.cputype       |  252 ++++++++++++++++++
 arch/powerpc/platforms/apus/Kconfig          |  130 ---------
 arch/powerpc/platforms/cell/io-workarounds.c |    2 
 arch/powerpc/platforms/cell/spufs/file.c     |   27 ++
 arch/powerpc/platforms/cell/spufs/run.c      |   12 +
 arch/powerpc/platforms/iseries/call_hpt.h    |    9 -
 arch/powerpc/platforms/iseries/htab.c        |    8 -
 arch/powerpc/platforms/iseries/pci.c         |    5 
 arch/powerpc/platforms/maple/pci.c           |   35 ---
 arch/powerpc/platforms/pasemi/pci.c          |   20 -
 arch/powerpc/platforms/powermac/pci.c        |   32 --
 arch/powerpc/platforms/ps3/htab.c            |   14 +
 arch/powerpc/platforms/pseries/Makefile      |    2 
 arch/powerpc/platforms/pseries/eeh.c         |   19 +
 arch/powerpc/platforms/pseries/eeh_cache.c   |    5 
 arch/powerpc/platforms/pseries/eeh_driver.c  |    6 
 arch/powerpc/platforms/pseries/eeh_sysfs.c   |   87 ++++++
 arch/powerpc/platforms/pseries/pci_dlpar.c   |    9 -
 arch/powerpc/platforms/pseries/pseries.h     |    2 
 arch/powerpc/platforms/pseries/setup.c       |    2 
 arch/powerpc/sysdev/tsi108_dev.c             |   33 ++
 arch/ppc/kernel/misc.S                       |    8 -
 arch/ppc/kernel/setup.c                      |    2 
 drivers/pci/hotplug/rpadlpar_core.c          |    6 
 include/asm-powerpc/cputable.h               |   95 +++----
 include/asm-powerpc/floppy.h                 |    6 
 include/asm-powerpc/io.h                     |   26 +-
 include/asm-powerpc/lppaca.h                 |    2 
 include/asm-powerpc/mmu-hash32.h             |   91 +++++++
 include/asm-powerpc/mmu-hash64.h             |    6 
 include/asm-powerpc/mmu.h                    |    3 
 include/asm-powerpc/pci-bridge.h             |   23 +-
 include/asm-powerpc/pci.h                    |    4 
 include/asm-powerpc/pgtable-ppc32.h          |   50 ----
 include/asm-powerpc/pgtable-ppc64.h          |   50 +---
 include/asm-powerpc/pgtable.h                |   28 ++
 include/asm-powerpc/ppc-pci.h                |    9 -
 include/asm-powerpc/ptrace.h                 |   22 +-
 include/asm-powerpc/syscalls.h               |    7 -
 include/asm-powerpc/thread_info.h            |   12 +
 include/asm-powerpc/tlbflush.h               |    5 
 include/linux/vmalloc.h                      |    3 
 mm/vmalloc.c                                 |   13 +
 101 files changed, 2299 insertions(+), 2773 deletions(-)
 create mode 100644 arch/powerpc/boot/cuboot.c
 create mode 100644 arch/powerpc/boot/cuboot.h
 create mode 100644 arch/powerpc/boot/of.h
 create mode 100644 arch/powerpc/boot/ofconsole.c
 create mode 100644 arch/powerpc/boot/oflib.c
 create mode 100644 arch/powerpc/kernel/isa-bridge.c
 delete mode 100644 arch/powerpc/kernel/ptrace-common.h
 create mode 100644 arch/powerpc/kernel/signal.c
 create mode 100644 arch/powerpc/kernel/signal.h
 delete mode 100644 arch/powerpc/mm/imalloc.c
 create mode 100644 arch/powerpc/platforms/Kconfig.cputype
 delete mode 100644 arch/powerpc/platforms/apus/Kconfig
 create mode 100644 arch/powerpc/platforms/pseries/eeh_sysfs.c
 create mode 100644 include/asm-powerpc/mmu-hash32.h

Anton Blanchard (1):
[POWERPC] Reserve threadinfo flags for perfmon2

Arnd Bergmann (1):
[POWERPC] Split out CPU specific options into a new Kconfig file

Benjamin Herrenschmidt (18):
[POWERPC] unmap_vm_area becomes unmap_kernel_range for the public [POWERPC] Rewrite IO allocation & mapping on powerpc64 [POWERPC] spufs: Add support for SPU single stepping [POWERPC] spufs: Add a "capabilities" file to spu contexts [POWERPC] Disable broken PPC_PTRACE_GETFPREGS on 32 bits [POWERPC] ptrace cleanups
[POWERPC] ptrace updates & new, better requests [POWERPC] Uninline common ptrace bits
[POWERPC] Remove some useless ifdef's in ptrace [POWERPC] Allow ptrace write to pt_regs trap and orig_r3 [POWERPC] ptrace shouldn't touch FP exec mode [POWERPC] powerpc: ptrace can set DABR on both 32 and 64 bits [POWERPC] Always apply DABR changes on context switches [POWERPC] Make syscall restart code more common [POWERPC] Remove obsolete freezer bits
[POWERPC] Merge creation of signal frame
[POWERPC] Remove #ifdef around set_dabr in signal code [POWERPC] Less ifdef's in signal.c/signal.h

Christoph Hellwig (3):
[POWERPC] Consolidate sys_sigaltstack
[POWERPC] Consolidate restore_sigmask
[POWERPC] Consolidate do_signal

David Gibson (13):
[POWERPC] Split low-level OF-related bootloader code into separate files [POWERPC] Split out asm-ppc/mmu.h portions for the "classic" hash-based MMU [POWERPC] Abolish iopa(), mm_ptov(), io_block_mapping() from arch/powerpc [POWERPC] Remove the dregs of APUS support from arch/powerpc [POWERPC] Remove a couple of unused definitions from pgtable_32.c [POWERPC] Start factoring pgtable-ppc32.h and pgtable-ppc64.h [POWERPC] Kill typedef-ed structs for hash PTEs and BATs [POWERPC] Merge CPU features pertaining to icache coherency [POWERPC] Factor zImage's 44x reset code out of ebony.c [POWERPC] Derive ebc ranges property from EBC registers [POWERPC] Consolidate cuboot initialization code
[POWERPC] Don't store a command line in the Holly device tree [POWERPC] Fix problems with device tree representation of TSI-1xx bridges

Jake Moilanen (1):
[POWERPC] Donate idle CPU cycles on dedicated partitions

Jon Tollefson (1):
[POWERPC] Move common code out of if/else

Linas Vepstas (5):
[POWERPC] pseries: asm/pci-bridge.h CONFIG_ minor cleanup [POWERPC] Add EEH sysfs blinkenlights
[POWERPC] Show EEH per-device false positives [POWERPC] Remove dead EEH code
[POWERPC] Tweak EEH copyright info

Segher Boessenkool (1):
[POWERPC] Fix VDSO compile warning

will schmidt (1):
[POWERPC] During VM oom condition, kill all threads in process group

Paul, the following patch isn't listed. Please consider for merge.

[PATCH] Fix Kexec/Kdump for power6

Thanks
-Sachin

* On Power machines supporting VRMA, Kexec/Kdump does not work.
* Hypervisor stores VRMA mapping used by the OS, in the hpte hash tables.
* Make sure these hpte entries are left untouched.
*
* This patch also adds plpar_pte_read_raw() on the lines of
* plpar_pte_remove_raw().

---

diff -Naurp old/arch/powerpc/platforms/pseries/lpar.c new/arch/powerpc/platforms/pseries/lpar.c
@@ -373,12 +373,23 @@ static void pSeries_lpar_hptab_clear(voi
 {
 	unsigned long size_bytes = 1UL << ppc64_pft_size;
 	unsigned long hpte_count = size_bytes >> 4;
-	unsigned long dummy1, dummy2;
+	unsigned long dummy1, dummy2, dword0;
+	long lpar_rc;
 	int i;
 
 	/* TODO: Use bulk call */
-	for (i = 0; i < hpte_count; i++)
-		plpar_pte_remove_raw(0, i, 0, &dummy1, &dummy2);
+	for (i = 0; i < hpte_count; i++) {
+		/* dont remove HPTEs with VRMA mappings */
+		lpar_rc = plpar_pte_remove_raw(H_ANDCOND, i, HPTE_V_1TB_SEG,
+						&dummy1, &dummy2);
+		if (lpar_rc == H_NOT_FOUND) {
+			lpar_rc = plpar_pte_read_raw(0, i, &dword0, &dummy1);
+			if (!lpar_rc && ((dword0 & HPTE_V_VRMA_MASK)
+				!= HPTE_V_VRMA_MASK))
+				/* Can be hpte for 1TB Seg. So remove it */
+				plpar_pte_remove_raw(0, i, 0, &dummy1, &dummy2);
+		}
+	}
 }
 
 /*

diff -Naurp old/arch/powerpc/platforms/pseries/plpar_wrappers.h new/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -108,6 +108,21 @@ static inline long plpar_pte_read(unsign
 	return rc;
 }
 
+/* plpar_pte_read_raw can be called in real mode. It calls plpar_hcall_raw */
+static inline long plpar_pte_read_raw(unsigned long flags, unsigned long ptex,
+		unsigned long *old_pteh_ret, unsigned long *old_ptel_ret)
+{
+	long rc;
+	unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
+
+	rc = plpar_hcall_raw(H_READ, retbuf, flags, ptex);
+
+	*old_pteh_ret = retbuf[0];
+	*old_ptel_ret = retbuf[1];
+
+	return rc;
+}
+
 static inline long plpar_pte_protect(unsigned long flags, unsigned long ptex,
 		unsigned long avpn)
 {

diff -Naurp old/include/asm-powerpc/mmu-hash64.h new/include/asm-powerpc/mmu-hash64.h
@@ -94,6 +94,9 @@ extern char initial_stab[];
 #define HPTE_R_C		ASM_CONST(0x0000000000000080)
 #define HPTE_R_R		ASM_CONST(0x0000000000000100)
 
+#define HPTE_V_1TB_SEG		ASM_CONST(0x4000000000000000)
+#define HPTE_V_VRMA_MASK	ASM_CONST(0x4001ffffff000000)
+
 /* Values for PP (assumes Ks=0, Kp=1) */
 /* pp0 will always be 0 for linux     */
 #define PP_RWXX	0	/* Supervisor read/write, User none */

Paul,

Can you take these two:

"do firmware feature fixups after features are initialised"
http://patchwork.ozlabs.org/linuxppc/patch?id=11617

"fix stolen time for SMT without LPAR"
http://patchwork.ozlabs.org/linuxppc/patch?id=11616

Thanks,
Mikey

[mailto:[email protected]] On Behalf Of

[PATCH] qe_lib: export symbols for QE driver to compile as module [PATCH v4] 83xx USB platform code rework

- Leo

Hi Paul,

The first three patches in my MSI series from the other day are good to go in, they even got Ack'ed:

http://patchwork.ozlabs.org/linuxppc/patch?id=11502
http://patchwork.ozlabs.org/linuxppc/patch?id=11503
http://patchwork.ozlabs.org/linuxppc/patch?id=11504

The comments on the first patch were actually directed at the last patch in my series, which I'm still working on.

cheers

Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person

Hi Paul,

The following two were postponed to 2.6.23 (CF driver and IDE glue):

http://patchwork.ozlabs.org/linuxppc/patch?id=11094
http://patchwork.ozlabs.org/linuxppc/patch?id=11148

These two are marked "awaiting upstream" but never showed up:

http://patchwork.ozlabs.org/linuxppc/patch?id=11147
http://patchwork.ozlabs.org/linuxppc/patch?id=11452

Thanks,

-Olof

It looks to me like 11148 (Electra CF driver) and 11147 (pcmcia: ppc64 needs 32-bit ioaddr_t) need to go to the pcmcia maintainer. You can put Acked-by: Paul Mackerras <[email protected]> on them.

I'll put the other two in.

Paul.

Hi Paul. I have a few too:

3 patches cleaning boot/Makefile when wrapping a dt:

http://patchwork.ozlabs.org/linuxppc/patch?id=11428
http://patchwork.ozlabs.org/linuxppc/patch?id=11429
http://patchwork.ozlabs.org/linuxppc/patch?id=11430

2 patches for mv64x60/prpmc2800 to use 'add_preferred_console()':

http://patchwork.ozlabs.org/linuxppc/patch?id=11585
http://patchwork.ozlabs.org/linuxppc/patch?id=11586

Mark

Paul, can these go in? Thx!

1 patch to setup marvell EDAC platform devices
http://patchwork.ozlabs.org/linuxppc/patch?q=Dave%20Jiang&id=11275

1 patch for publishing 85xx soc dts entries as of_device so EDAC can use them
http://patchwork.ozlabs.org/linuxppc/patch?q=Dave%20Jiang&id=11276

2 patches for BOOKE watchdog handler
http://patchwork.ozlabs.org/linuxppc/patch?q=Dave%20Jiang&id=11392
http://patchwork.ozlabs.org/linuxppc/patch?q=Dave%20Jiang&id=11393

------------------------------------------------------
Dave Jiang
Software Engineer
MontaVista Software, Inc.
http://www.mvista.com
------------------------------------------------------

Hi Paul-

Please consider picking up "remove spinlock from struct cpu_purr_data" for 2.6.23:

http://patchwork.ozlabs.org/linuxppc/patch?id=11291

How about this one:

http://ozlabs.org/pipermail/linuxppc-dev/2007-May/036319.html

Don't think linking timer.o if CONFIG_RTC_CLASS is defined presents a problem now, but it will later, when platforms appear, that wish to use PM and use generic rtc.

These two i2c patches:

http://ozlabs.org/pipermail/linuxppc-dev/2007-June/037327.html
http://ozlabs.org/pipermail/linuxppc-dev/2007-June/037328.html

also would be nice to get in, although, they only make sense with an ack from Scott Wood and another patch from him, as explained in links above...

Thanks
Guennadi
---
Guennadi Liakhovetski

This looks OK as an interim measure, though at some point I'd like to get around to letting both devices and drivers specify a list of match names.

I'd leave out the device_type, and the "rtc" in "rtc-r5c372" is redundant if that's all the r5c372 chip does, but other than that it looks good.

I assume you mean "Call of_register_i2c_devices() for fsl-i2c"
(http://ozlabs.org/pipermail/linuxppc-dev/2007-May/036333.html)?

-Scott

No, it is not redundant, it has to match rs5c372_driver.driver.name.

Yes.

Thanks
Guennadi
---
Guennadi Liakhovetski

Sorry, I meant if you had control over what the driver calls itself... I'd misread the name, and thus my grep failed, so I assumed it was a new driver.

-Scott

Isn't that the one where you replied to yourself saying you'd posted the wrong patch? Did you ever post the right patch?

Paul.

I did, but discussion ensued, and the consensus was that the original patch is the way to do it.

-Scott

Looks OK, but the first of those two patches doesn't have a
Signed-off-by: line, and the description is not suitable.

Please repost that patch with a nice description that describes what the patch does and why, without references to other web pages. You don't need to describe what is different from previous patches or who suggested those changes.

Paul.

Sure, no problem, will repost with a description and a Signed-off-by... but, not giving Scott Wood credit for that patch doesn't seem right. Scott, is it ok with you if I repost that patch with your "Signed-off-by" first and mine second? And, Paul, as Scott noticed in another email and as I mentioned in the above post too, we also need this one, please:

http://ozlabs.org/pipermail/linuxppc-dev/2007-May/036333.html

As soon as we clarify these 2, I'll repost.

Thanks
Guennadi
---
Guennadi Liakhovetski

Sure.

-Scott

Ok, just reposted. I even used the original subject line and the description from Scott's email. I also removed the part for drivers/i2c/busses/i2c-mpc.c - it is a separate patch
http://ozlabs.org/pipermail/linuxppc-dev/2007-May/036079.html and I hope it'll make it in either via ppc or via i2c tree (it was cc'ed) as well as
http://ozlabs.org/pipermail/linuxppc-dev/2007-May/036333.html (sorry, Paul, for links again).

Speaking about [email protected] - which way should these patches go? Is it the usual separation drivers/i2c goes via i2c and arch/powerpc via ppc? Or should I also email i2c folks to tell them not to use the original patch from Scott?

Thanks
Guennadi
---
Guennadi Liakhovetski

Paul,

Please add "kexec: send slaves to new kernel earlier" It should apply offset about 40 lines.

http://patchwork.ozlabs.org/linuxppc/patch?id=10399

I've updated my kexec zImage support to 2.6.22-rc4 and made some fixes, so I'll resend those. The Makefile diffs always break, so I might wait until you merge some of the other pending boot patches.

milton

When adding the cputable entry for 440SPe Rev. B, we also need to adjust the existing entries for 440SP Rev. A and 440SPe Rev. B so that they look more bits of the PVR. The 440SPe Rev. B has PVR 53421891, which would match the current 440SP Rev. A pattern of 53xxx891. To distinguish between 440SP and 440SPe, we need to use the first three digits of the PVR, which are respectively 532 and 534.

---
Here's a patch I've had for a while -- I think it may as well go in, although I haven't had a chance to put much work into moving Yucca/Katmai 440SPe support to arch/powerpc, so I'll probably miss 2.6.23 for the rest of it.

 arch/powerpc/kernel/cputable.c   |   20 +++-
 arch/ppc/syslib/ppc440spe_pcie.c |  219 +++++++++++++++++++++++++++-----------
 2 files changed, 172 insertions(+), 67 deletions(-)

index b2b5d66..157e6e3 100644
@@ -1178,8 +1178,8 @@ static struct cpu_spec cpu_specs[] = {
 		.platform		= "ppc440",
 	},
 	{ /* 440SP Rev. A */
-		.pvr_mask		= 0xff000fff,
-		.pvr_value		= 0x53000891,
+		.pvr_mask		= 0xfff00fff,
+		.pvr_value		= 0x53200891,
 		.cpu_name		= "440SP Rev. A",
 		.cpu_features		= CPU_FTRS_44X,
 		.cpu_user_features	= COMMON_USER_BOOKE,

@@ -1188,9 +1188,19 @@ static struct cpu_spec cpu_specs[] = {
 		.platform		= "ppc440",
 	},
 	{ /* 440SPe Rev. A */
-		.pvr_mask		= 0xff000fff,
-		.pvr_value		= 0x53000890,
-		.cpu_name		= "440SPe Rev. A",
+		.pvr_mask               = 0xfff00fff,
+		.pvr_value              = 0x53400890,
+		.cpu_name               = "440SPe Rev. A",
+		.cpu_features		= CPU_FTRS_44X,
+		.cpu_user_features      = COMMON_USER_BOOKE,
+		.icache_bsize           = 32,
+		.dcache_bsize           = 32,
+		.platform               = "ppc440",
+	},
+	{ /* 440SPe Rev. B */
+		.pvr_mask		= 0xfff00fff,
+		.pvr_value		= 0x53400891,
+		.cpu_name		= "440SPe Rev. B",
 		.cpu_features		= CPU_FTRS_44X,
 		.cpu_user_features	= COMMON_USER_BOOKE,
 		.icache_bsize		= 32,

Hi,

I can see why you need to distinguish between 440SP and SPe, but do you really need separate cputable entries for rev A and B? Revisions are normally reported separately and the cputable entries look identical?

-Olof

You wanted to apply my patch to use mktime instead of rtc-lib, or did you push it for .22 still?

johannes

Hi Paul,

Can you take this?

http://patchwork.ozlabs.org/linuxppc/patch?id=11676

Regards,
Mohan.

Paul,
These patches should go in 2.6.23.
1 add cuboot for 7448hpc2 board
http://ozlabs.org/pipermail/linuxppc-dev/2007-May/036834.html

2. Remove redundant pci_read_irq_line() function for 85xx platform Acked by Ben
http://ozlabs.org/pipermail/linuxppc-dev/2007-June/037117.html

3. Fix e500 v2 core reboot bug
http://ozlabs.org/pipermail/linuxppc-dev/2007-June/037799.html

4. Document the global utilities node define and example

http://ozlabs.org/pipermail/linuxppc-dev/2007-June/038136.html
http://ozlabs.org/pipermail/linuxppc-dev/2007-June/038137.html

Roy