1 From benh@kernel.crashing.org Fri Oct 22 11:51:02 2010
2 Return-Path: <linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org>
3 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bilbo.ozlabs.org
5 X-Spam-Status: No, score=0.0 required=3.0 tests=none autolearn=disabled
7 X-Original-To: jk@ozlabs.org
8 Delivered-To: jk@ozlabs.org
9 Received: from bilbo.ozlabs.org (localhost [127.0.0.1])
10 by ozlabs.org (Postfix) with ESMTP id ED4B3100937
11 for <jk@ozlabs.org>; Fri, 22 Oct 2010 14:51:54 +1100 (EST)
12 Received: by ozlabs.org (Postfix)
13 id BF799B70CB; Fri, 22 Oct 2010 14:51:50 +1100 (EST)
14 Delivered-To: linuxppc-dev@ozlabs.org
15 Received: from gate.crashing.org (gate.crashing.org [63.228.1.57])
16 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
17 (Client did not present a certificate)
18 by ozlabs.org (Postfix) with ESMTPS id 94629B7043
19 for <linuxppc-dev@ozlabs.org>; Fri, 22 Oct 2010 14:51:49 +1100 (EST)
20 Received: from [IPv6:::1] (localhost.localdomain [127.0.0.1])
21 by gate.crashing.org (8.14.1/8.13.8) with ESMTP id o9M3p3SP018234;
22 Thu, 21 Oct 2010 22:51:04 -0500
23 Subject: [git pull] Please pull powerpc.git next branch
24 From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
25 To: Linus Torvalds <torvalds@linux-foundation.org>
26 Date: Fri, 22 Oct 2010 14:51:02 +1100
27 Message-ID: <1287719462.2198.37.camel@pasglop>
29 X-Mailer: Evolution 2.30.3
30 Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>,
31 Andrew Morton <akpm@linux-foundation.org>,
32 Linux Kernel list <linux-kernel@vger.kernel.org>
33 X-BeenThere: linuxppc-dev@lists.ozlabs.org
34 X-Mailman-Version: 2.1.13
36 List-Id: Linux on PowerPC Developers Mail List <cbe-oss-dev.ozlabs.org>
37 List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>,
38 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>
39 List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev>
40 List-Post: <mailto:linuxppc-dev@lists.ozlabs.org>
41 List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>
42 List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>,
43 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>
44 Content-Type: text/plain;
46 Content-Transfer-Encoding: 7bit
47 Sender: linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org
48 Errors-To: linuxppc-dev-bounces+jk=ozlabs.org@lists.ozlabs.org
53 X-KMail-EncryptionState:
54 X-KMail-SignatureState:
59 Here's powerpc's batch for this merge window. Mostly bits and pieces,
60 such as Anton doing some performance tuning left and right, and the
61 usual churn. One hilight is the support for the new Freescale e5500 core
62 (64-bit BookE). Another one is that we now wire up the whole lot of
63 socket calls as direct syscalls in addition to the old style indirect
69 The following changes since commit e10117d36ef758da0690c95ecffc09d5dd7da479:
71 Merge branch 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev
73 are available in the git repository at:
75 git+ssh://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git next
78 powerpc: Remove fpscr use from [kvm_]cvt_{fd,df}
81 powerpc: Optimise 64bit csum_partial
82 powerpc: Optimise 64bit csum_partial_copy_generic and add csum_and_copy_from_user
83 powerpc: Add 64bit csum_and_copy_to_user
84 powerpc: Feature nop out reservation clear when stcx checks address
85 powerpc: Check end of stack canary at oops time
88 powerpc/spufs: Use llseek in all file operations
90 Benjamin Herrenschmidt (4):
91 powerpc/dma: Add optional platform override of dma_set_mask()
92 powerpc/dart_iommu: Support for 64-bit iommu bypass window on PCIe
93 Merge remote branch 'kumar/merge' into next
94 Merge remote branch 'jwb/next' into next
97 powerpc: Use is_32bit_task() helper to test 32-bit binary
100 powerpc/85xx: add cache-sram support
103 powerpc: Wire up direct socket system calls
106 powerpc/mpc83xx: Support for MPC8308 P1M board
109 powerpc: Use static const char arrays
110 powerpc: Remove pr_<level> uses of KERN_<level>
113 powerpc/44x: Update ppc44x_defconfig
116 powerpc/via-pmu-led.c: Add of_node_put to avoid memory leak
117 powerpc/maple: Add of_node_put to avoid memory leak
118 powerpc/powermac/pfunc_core.c: Add of_node_put to avoid memory leak
119 powerpc/cell: Add of_node_put to avoid memory leak
120 powerpc/chrp/nvram.c: Add of_node_put to avoid memory leak
121 powerpc/irq.c: Add of_node_put to avoid memory leak
122 i2c/i2c-pasemi.c: Fix unsigned return type
125 powerpc/ppc64e: Fix link problem when building ppc64e_defconfig
126 powerpc/fsl-pci: Fix MSI support on 83xx platforms
127 powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers
128 powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips
129 powerpc/fsl-booke: Add p3041 DS board support
130 powerpc: Fix compile error with paca code on ppc64e
131 powerpc/fsl-booke: Add support for FSL 64-bit e5500 core
132 powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes
133 powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips
134 powerpc/fsl-booke: Add p5020 DS board support
135 powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig
137 Matthew McClintock (7):
138 powerpc/mm: Assume first cpu is boot_cpuid not 0
139 powerpc/kexec: make masking/disabling interrupts generic
140 powerpc/85xx: Remove call to mpic_teardown_this_cpu in kexec
141 powerpc/85xx: Minor fixups for kexec on 85xx
142 powerpc/85xx: flush dcache before resetting cores
143 powerpc/fsl_soc: Search all global-utilities nodes for rstccr
144 powerpc/fsl_booke: Add support to boot from core other than 0
147 powerpc: Move arch_sd_sibling_asym_packing() to smp.c
150 powerpc/pseries: Export device tree updating routines
151 powerpc/pseries: Export rtas_ibm_suspend_me()
152 powerpc/pseries: Partition migration in the kernel
154 Nishanth Aravamudan (8):
155 powerpc/pci: Fix return type of BUID_{HI,LO} macros
156 powerpc/dma: Fix dma_iommu_dma_supported compare
157 powerpc/dma: Fix check for direct DMA support
158 powerpc/vio: Use put_device() on device_register failure
159 powerpc/viobus: Free TCE table on device release
160 powerpc/pseries: Use kmemdup
161 powerpc/pci: Cleanup device dma setup code
162 powerpc/pseries/xics: Use cpu_possible_mask rather than cpu_all_mask
165 powerpc: Fix invalid page flags in create TLB CAM path for PTE_64BIT
168 powerpc: Abstract indexing of lppaca structs
169 powerpc: Dynamically allocate most lppaca structs
170 powerpc: Account time using timebase rather than PURR
171 powerpc/pseries: Re-enable dispatch trace log userspace interface
172 powerpc/perf: Fix sampling enable for PPC970
175 oprofile/fsl emb: Don't set MSR[PMM] until after clearing the interrupt.
178 powerpc: Fix incorrect .stabs entry for copy_32.S
179 powerpc: mtmsrd not defined
182 fsl_rio: Add comments for sRIO registers.
184 Stephen Rothwell (1):
185 powerpc: define a compat_sys_recv cond_syscall
188 powerpc: export ppc_proc_freq and ppc_tb_freq as GPL symbols
189 powerpc/watchdog: Allow the Book-E driver to be compiled as a module
190 powerpc/p1022: Add probing for individual DMA channels
191 powerpc/85xx: add ngPIXIS FPGA device tree node to the P1022DS board
192 powerpc/watchdog: Make default timeout for Book-E watchdog a Kconfig option
195 powerpc/44x: Add support for the AMCC APM821xx SoC
198 powerpc/Makefiles: Change to new flag variables
200 arch/powerpc/boot/addnote.c | 4 +-
201 arch/powerpc/boot/dts/bluestone.dts | 254 +++++++++++++
202 arch/powerpc/boot/dts/mpc8308_p1m.dts | 332 ++++++++++++++++
203 arch/powerpc/boot/dts/p1022ds.dts | 11 +
204 arch/powerpc/configs/44x/bluestone_defconfig | 68 ++++
205 arch/powerpc/configs/e55xx_smp_defconfig | 84 ++++
206 arch/powerpc/configs/ppc44x_defconfig | 9 +-
207 arch/powerpc/configs/ppc64e_defconfig | 4 +-
208 arch/powerpc/include/asm/checksum.h | 10 +
209 arch/powerpc/include/asm/compat.h | 4 +-
210 arch/powerpc/include/asm/cputable.h | 14 +-
211 arch/powerpc/include/asm/dma-mapping.h | 14 +-
212 arch/powerpc/include/asm/elf.h | 2 +-
213 arch/powerpc/include/asm/exception-64s.h | 3 +-
214 arch/powerpc/include/asm/fsl_85xx_cache_sram.h | 48 +++
215 arch/powerpc/include/asm/kexec.h | 1 +
216 arch/powerpc/include/asm/kvm_fpu.h | 4 +-
217 arch/powerpc/include/asm/lppaca.h | 29 ++
218 arch/powerpc/include/asm/machdep.h | 3 +
219 arch/powerpc/include/asm/mmu-book3e.h | 15 +
220 arch/powerpc/include/asm/paca.h | 10 +-
221 arch/powerpc/include/asm/page_64.h | 4 +-
222 arch/powerpc/include/asm/ppc-pci.h | 4 +-
223 arch/powerpc/include/asm/ppc_asm.h | 50 ++-
224 arch/powerpc/include/asm/processor.h | 4 +-
225 arch/powerpc/include/asm/pte-common.h | 7 +
226 arch/powerpc/include/asm/rtas.h | 1 +
227 arch/powerpc/include/asm/systbl.h | 19 +
228 arch/powerpc/include/asm/system.h | 4 +-
229 arch/powerpc/include/asm/time.h | 5 -
230 arch/powerpc/include/asm/unistd.h | 21 +-
231 arch/powerpc/kernel/Makefile | 4 +-
232 arch/powerpc/kernel/align.c | 4 +-
233 arch/powerpc/kernel/asm-offsets.c | 12 +-
234 arch/powerpc/kernel/cpu_setup_44x.S | 1 +
235 arch/powerpc/kernel/cpu_setup_fsl_booke.S | 15 +
236 arch/powerpc/kernel/cputable.c | 43 ++-
237 arch/powerpc/kernel/crash.c | 13 +-
238 arch/powerpc/kernel/dma-iommu.c | 21 +-
239 arch/powerpc/kernel/dma.c | 20 +-
240 arch/powerpc/kernel/entry_64.S | 40 ++
241 arch/powerpc/kernel/fpu.S | 10 -
242 arch/powerpc/kernel/head_fsl_booke.S | 10 +-
243 arch/powerpc/kernel/irq.c | 6 +-
244 arch/powerpc/kernel/lparcfg.c | 14 +-
245 arch/powerpc/kernel/machine_kexec.c | 24 ++
246 arch/powerpc/kernel/machine_kexec_32.c | 4 +
247 arch/powerpc/kernel/paca.c | 70 ++++-
248 arch/powerpc/kernel/pci-common.c | 4 +-
249 arch/powerpc/kernel/ppc970-pmu.c | 2 +
250 arch/powerpc/kernel/process.c | 12 -
251 arch/powerpc/kernel/ptrace.c | 2 +-
252 arch/powerpc/kernel/rtas.c | 4 +-
253 arch/powerpc/kernel/setup_32.c | 2 +-
254 arch/powerpc/kernel/smp.c | 14 +-
255 arch/powerpc/kernel/time.c | 275 +++++++-------
256 arch/powerpc/kernel/traps.c | 5 +
257 arch/powerpc/kernel/vdso.c | 6 +-
258 arch/powerpc/kernel/vdso32/Makefile | 6 +-
259 arch/powerpc/kernel/vdso64/Makefile | 6 +-
260 arch/powerpc/kernel/vio.c | 10 +-
261 arch/powerpc/kvm/Makefile | 2 +-
262 arch/powerpc/kvm/book3s_paired_singles.c | 44 +--
263 arch/powerpc/kvm/emulate.c | 4 +-
264 arch/powerpc/kvm/fpu.S | 8 -
265 arch/powerpc/lib/Makefile | 7 +-
266 arch/powerpc/lib/checksum_64.S | 482 +++++++++++++++++-------
267 arch/powerpc/lib/checksum_wrappers_64.c | 102 +++++
268 arch/powerpc/lib/copy_32.S | 2 +-
269 arch/powerpc/lib/ldstfp.S | 36 +-
270 arch/powerpc/lib/locks.c | 4 +-
271 arch/powerpc/lib/sstep.c | 8 +
272 arch/powerpc/math-emu/Makefile | 2 +-
273 arch/powerpc/mm/Makefile | 6 +-
274 arch/powerpc/mm/fault.c | 6 +
275 arch/powerpc/mm/fsl_booke_mmu.c | 15 +-
276 arch/powerpc/mm/mmu_context_nohash.c | 6 +-
277 arch/powerpc/mm/mmu_decl.h | 5 +-
278 arch/powerpc/mm/tlb_nohash.c | 56 +++-
279 arch/powerpc/mm/tlb_nohash_low.S | 2 +-
280 arch/powerpc/oprofile/Makefile | 4 +-
281 arch/powerpc/oprofile/backtrace.c | 2 +-
282 arch/powerpc/oprofile/op_model_fsl_emb.c | 15 +-
283 arch/powerpc/platforms/44x/Kconfig | 16 +
284 arch/powerpc/platforms/44x/ppc44x_simple.c | 1 +
285 arch/powerpc/platforms/83xx/Kconfig | 4 +-
286 arch/powerpc/platforms/83xx/mpc830x_rdb.c | 3 +-
287 arch/powerpc/platforms/85xx/Kconfig | 28 ++-
288 arch/powerpc/platforms/85xx/Makefile | 2 +
289 arch/powerpc/platforms/85xx/p1022_ds.c | 2 +
290 arch/powerpc/platforms/85xx/p3041_ds.c | 64 ++++
291 arch/powerpc/platforms/85xx/p5020_ds.c | 69 ++++
292 arch/powerpc/platforms/85xx/smp.c | 83 ++++-
293 arch/powerpc/platforms/Kconfig.cputype | 8 +-
294 arch/powerpc/platforms/cell/ras.c | 4 +-
295 arch/powerpc/platforms/cell/spider-pic.c | 4 +-
296 arch/powerpc/platforms/cell/spufs/file.c | 18 +
297 arch/powerpc/platforms/chrp/nvram.c | 4 +-
298 arch/powerpc/platforms/iseries/Makefile | 2 +-
299 arch/powerpc/platforms/iseries/dt.c | 4 +-
300 arch/powerpc/platforms/iseries/smp.c | 2 +-
301 arch/powerpc/platforms/maple/setup.c | 1 +
302 arch/powerpc/platforms/powermac/pfunc_core.c | 9 +-
303 arch/powerpc/platforms/pseries/Makefile | 13 +-
304 arch/powerpc/platforms/pseries/dlpar.c | 7 +-
305 arch/powerpc/platforms/pseries/dtl.c | 224 +++++++++---
306 arch/powerpc/platforms/pseries/lpar.c | 25 ++-
307 arch/powerpc/platforms/pseries/mobility.c | 362 ++++++++++++++++++
308 arch/powerpc/platforms/pseries/pseries.h | 9 +
309 arch/powerpc/platforms/pseries/setup.c | 52 +++
310 arch/powerpc/platforms/pseries/xics.c | 2 +-
311 arch/powerpc/sysdev/Makefile | 5 +-
312 arch/powerpc/sysdev/dart_iommu.c | 74 ++++-
313 arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | 101 +++++
314 arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 159 ++++++++
315 arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 231 +++++++++++
316 arch/powerpc/sysdev/fsl_msi.c | 9 +-
317 arch/powerpc/sysdev/fsl_pci.c | 60 +++-
318 arch/powerpc/sysdev/fsl_pci.h | 1 +
319 arch/powerpc/sysdev/fsl_rio.c | 65 ++--
320 arch/powerpc/sysdev/fsl_soc.c | 20 +-
321 arch/powerpc/sysdev/mpc8xxx_gpio.c | 3 +
322 arch/powerpc/sysdev/pmi.c | 2 +-
323 arch/powerpc/xmon/Makefile | 4 +-
324 drivers/i2c/busses/i2c-pasemi.c | 2 +-
325 drivers/macintosh/via-pmu-led.c | 4 +-
326 drivers/watchdog/Kconfig | 22 +-
327 drivers/watchdog/booke_wdt.c | 47 ++-
328 include/linux/pci_ids.h | 8 +
329 kernel/sys_ni.c | 1 +
330 130 files changed, 3676 insertions(+), 683 deletions(-)
331 create mode 100644 arch/powerpc/boot/dts/bluestone.dts
332 create mode 100644 arch/powerpc/boot/dts/mpc8308_p1m.dts
333 create mode 100644 arch/powerpc/configs/44x/bluestone_defconfig
334 create mode 100644 arch/powerpc/configs/e55xx_smp_defconfig
335 create mode 100644 arch/powerpc/include/asm/fsl_85xx_cache_sram.h
336 create mode 100644 arch/powerpc/lib/checksum_wrappers_64.c
337 create mode 100644 arch/powerpc/platforms/85xx/p3041_ds.c
338 create mode 100644 arch/powerpc/platforms/85xx/p5020_ds.c
339 create mode 100644 arch/powerpc/platforms/pseries/mobility.c
340 create mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h
341 create mode 100644 arch/powerpc/sysdev/fsl_85xx_cache_sram.c
342 create mode 100644 arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
345 _______________________________________________
346 Linuxppc-dev mailing list
347 Linuxppc-dev@lists.ozlabs.org
348 https://lists.ozlabs.org/listinfo/linuxppc-dev