diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-30 21:01:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-30 21:01:36 -0700 |
commit | bad60e6f259a01cf9f29a1ef8d435ab6c60b2de9 (patch) | |
tree | c9aaa8166735659761239c117af2b11b022bc6cb | |
parent | dd0f0cf58af70dc9267409f113bea772d57f675c (diff) | |
parent | 719dbb2df78fc9a40e28392b07cd715bfc5a665c (diff) |
Merge tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc updates from Michael Ellerman:
"Highlights:
- PowerNV PCI hotplug support.
- Lots more Power9 support.
- eBPF JIT support on ppc64le.
- Lots of cxl updates.
- Boot code consolidation.
Bug fixes:
- Fix spin_unlock_wait() from Boqun Feng
- Fix stack pointer corruption in __tm_recheckpoint() from Michael
Neuling
- Fix multiple bugs in memory_hotplug_max() from Bharata B Rao
- mm: Ensure "special" zones are empty from Oliver O'Halloran
- ftrace: Separate the heuristics for checking call sites from
Michael Ellerman
- modules: Never restore r2 for a mprofile-kernel style mcount() call
from Michael Ellerman
- Fix endianness when reading TCEs from Alexey Kardashevskiy
- start rtasd before PCI probing from Greg Kurz
- PCI: rpaphp: Fix slot registration for multiple slots under a PHB
from Tyrel Datwyler
- powerpc/mm: Add memory barrier in __hugepte_alloc() from Sukadev
Bhattiprolu
Cleanups & fixes:
- Drop support for MPIC in pseries from Rashmica Gupta
- Define and use PPC64_ELF_ABI_v2/v1 from Michael Ellerman
- Remove unused symbols in asm-offsets.c from Rashmica Gupta
- Fix SRIOV not building without EEH enabled from Russell Currey
- Remove kretprobe_trampoline_holder from Thiago Jung Bauermann
- Reduce log level of PCI I/O space warning from Benjamin
Herrenschmidt
- Add array bounds checking to crash_shutdown_handlers from Suraj
Jitindar Singh
- Avoid -maltivec when using clang integrated assembler from Anton
Blanchard
- Fix array overrun in ppc_rtas() syscall from Andrew Donnellan
- Fix error return value in cmm_mem_going_offline() from Rasmus
Villemoes
- export cpu_to_core_id() from Mauricio Faria de Oliveira
- Remove old symbols from defconfigs from Andrew Donnellan
- Update obsolete comments in setup_32.c about entry conditions from
Benjamin Herrenschmidt
- Add comment explaining the purpose of setup_kdump_trampoline() from
Benjamin Herrenschmidt
- Merge the RELOCATABLE config entries for ppc32 and ppc64 from Kevin
Hao
- Remove RELOCATABLE_PPC32 from Kevin Hao
- Fix .long's in tlb-radix.c to more meaningful from Balbir Singh
Minor cleanups & fixes:
- Andrew Donnellan, Anna-Maria Gleixner, Anton Blanchard, Benjamin
Herrenschmidt, Bharata B Rao, Christophe Leroy, Colin Ian King,
Geliang Tang, Greg Kurz, Madhavan Srinivasan, Michael Ellerman,
Michael Ellerman, Stephen Rothwell, Stewart Smith.
Freescale updates from Scott:
- "Highlights include more 8xx optimizations, device tree updates,
and MVME7100 support."
PowerNV PCI hotplug from Gavin Shan:
- PCI: Add pcibios_setup_bridge()
- Override pcibios_setup_bridge()
- Remove PCI_RESET_DELAY_US
- Move pnv_pci_ioda_setup_opal_tce_kill() around
- Increase PE# capacity
- Allocate PE# in reverse order
- Create PEs in pcibios_setup_bridge()
- Setup PE for root bus
- Extend PCI bridge resources
- Make pnv_ioda_deconfigure_pe() visible
- Dynamically release PE
- Update bridge windows on PCI plug
- Delay populating pdn
- Support PCI slot ID
- Use PCI slot reset infrastructure
- Introduce pnv_pci_get_slot_id()
- Functions to get/set PCI slot state
- PCI/hotplug: PowerPC PowerNV PCI hotplug driver
- Print correct PHB type names
Power9 idle support from Shreyas B. Prabhu:
- set power_save func after the idle states are initialized
- Use PNV_THREAD_WINKLE macro while requesting for winkle
- make hypervisor state restore a function
- Rename idle_power7.S to idle_book3s.S
- Rename reusable idle functions to hardware agnostic names
- Make pnv_powersave_common more generic
- abstraction for saving SPRs before entering deep idle states
- Add platform support for stop instruction
- cpuidle/powernv: Use CPUIDLE_STATE_MAX instead of MAX_POWERNV_IDLE_STATES
- cpuidle/powernv: cleanup cpuidle-powernv.c
- cpuidle/powernv: Add support for POWER ISA v3 idle states
- Use deepest stop state when cpu is offlined
Power9 PMU from Madhavan Srinivasan:
- factor out power8 pmu macros and defines
- factor out power8 pmu functions
- factor out power8 __init_pmu code
- Add power9 event list macros for generic and cache events
- Power9 PMU support
- Export Power9 generic and cache events to sysfs
Power9 preliminary interrupt & PCI support from Benjamin Herrenschmidt:
- Add XICS emulation APIs
- Move a few exception common handlers to make room
- Add support for HV virtualization interrupts
- Add mechanism to force a replay of interrupts
- Add ICP OPAL backend
- Discover IODA3 PHBs
- pci: Remove obsolete SW invalidate
- opal: Add real mode call wrappers
- Rename TCE invalidation calls
- Remove SWINV constants and obsolete TCE code
- Rework accessing the TCE invalidate register
- Fallback to OPAL for TCE invalidations
- Use the device-tree to get available range of M64's
- Check status of a PHB before using it
- pci: Don't try to allocate resources that will be reassigned
Other Power9:
- Send SIGBUS on unaligned copy and paste from Chris Smart
- Large Decrementer support from Oliver O'Halloran
- Load Monitor Register Support from Jack Miller
Performance improvements from Anton Blanchard:
- Avoid load hit store in __giveup_fpu() and __giveup_altivec()
- Avoid load hit store in setup_sigcontext()
- Remove assembly versions of strcpy, strcat, str
/*
* linux/fs/proc/net.c
*
* Copyright (C) 2007
*
* Author: Eric Biederman <ebiederm@xmission.com>
*
* proc net directory handling functions
*/
#include <asm/uaccess.h>
#include <linux/errno.h>
#include <linux/time.h>
#include <linux/proc_fs.h>
#include <linux/stat.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/bitops.h>
#include <linux/mount.h>
#include <linux/nsproxy.h>
#include <net/net_namespace.h>
#include <linux/seq_file.h>
#include "internal.h"
static inline struct net *PDE_NET(struct proc_dir_entry *pde)
{
return pde->parent->data;
}
static struct net *get_proc_net(const struct i-rw-r--r-- Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt 43
-rw-r--r-- Documentation/devicetree/bindings/powerpc/opal/oppanel-opal.txt 14
-rw-r--r-- Documentation/devicetree/bindings/rtc/rtc-opal.txt 2
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm.txt) 0
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/brg.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/brg.txt) 0
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/i2c.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/i2c.txt) 0
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/pic.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/pic.txt) 0
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/usb.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/usb.txt) 0
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/gpio.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/gpio.txt) 0
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/network.txt 124
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt) 52
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/firmware.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/firmware.txt) 0
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/par_io.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/par_io.txt) 0
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/pincfg.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/pincfg.txt) 0
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/ucc.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/ucc.txt) 0
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/usb.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/usb.txt) 0
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/serial.txt (renamed from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/serial.txt) 0
-rw-r--r-- Documentation/devicetree/bindings/soc/fsl/cpm_qe/uqe_serial.txt 17
-rw-r--r-- Documentation/kernel-parameters.txt 9
-rw-r--r-- MAINTAINERS 7
-rw-r--r-- arch/powerpc/Kconfig 71
-rw-r--r-- arch/powerpc/Kconfig.debug 5
-rw-r--r-- arch/powerpc/Makefile 7
-rw-r--r-- arch/powerpc/boot/Makefile 8
-rw-r--r-- arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi 1
-rw-r--r-- arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi 1
-rw-r--r-- arch/powerpc/boot/dts/fsl/kmcoge4.dts 37
-rw-r--r-- arch/powerpc/boot/dts/fsl/mvme7100.dts 153
-rw-r--r-- arch/powerpc/boot/dts/fsl/qonverge-usb2-dr-0.dtsi 2
-rw-r--r-- arch/powerpc/boot/dts/fsl/t1040si-post.dtsi 49
-rw-r--r-- arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi 38
-rw-r--r-- arch/powerpc/boot/dts/fsl/t104xqds.dtsi 38
-rw-r--r-- arch/powerpc/boot/dts/fsl/t104xrdb.dtsi 38
-rw-r--r-- arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi 2
-rw-r--r-- arch/powerpc/boot/motload-head.S 11
-rw-r--r-- arch/powerpc/boot/mvme7100.c 59
-rw-r--r-- arch/powerpc/boot/opal-calls.S 58
-rw-r--r-- arch/powerpc/boot/opal.c 98
-rw-r--r-- arch/powerpc/boot/ops.h 1
-rw-r--r-- arch/powerpc/boot/ppc_asm.h 4
-rw-r--r-- arch/powerpc/boot/ppcboot.h 2
-rw-r--r-- arch/powerpc/boot/serial.c 2
-rw-r--r-- arch/powerpc/boot/types.h 10
-rwxr-xr-x arch/powerpc/boot/wrapper 5
-rw-r--r-- arch/powerpc/configs/40x/acadia_defconfig 1
-rw-r--r-- arch/powerpc/configs/40x/ep405_defconfig 1
-rw-r--r-- arch/powerpc/configs/40x/kilauea_defconfig 1
-rw-r--r-- arch/powerpc/configs/40x/klondike_defconfig 3
-rw-r--r-- arch/powerpc/configs/40x/makalu_defconfig 1
-rw-r--r-- arch/powerpc/configs/40x/obs600_defconfig 1
-rw-r--r-- arch/powerpc/configs/40x/virtex_defconfig 1
-rw-r--r-- arch/powerpc/configs/40x/walnut_defconfig 1
-rw-r--r-- arch/powerpc/configs/44x/akebono_defconfig 8
-rw-r--r-- arch/powerpc/configs/44x/arches_defconfig 1
-rw-r--r-- arch/powerpc/configs/44x/bamboo_defconfig 1
-rw-r--r-- arch/powerpc/configs/44x/bluestone_defconfig 2
-rw-r--r-- arch/powerpc/configs/44x/canyonlands_defconfig 1
-rw-r--r-- arch/powerpc/configs/44x/currituck_defconfig 8
-rw-r--r-- arch/powerpc/configs/44x/ebony_defconfig 1
-rw-r--r-- arch/powerpc/configs/44x/eiger_defconfig 2
-rw-r--r-- arch/powerpc/configs/44x/icon_defconfig 4
-rw-r--r-- arch/powerpc/configs/44x/iss476-smp_defconfig 8
-rw-r--r-- arch/powerpc/configs/44x/katmai_defconfig 1
-rw-r--r-- arch/powerpc/configs/44x/rainier_defconfig 1
-rw-r--r-- arch/powerpc/configs/44x/redwood_defconfig 2
-rw-r--r-- arch/powerpc/configs/44x/sam440ep_defconfig 6
-rw-r--r-- arch/powerpc/configs/44x/sequoia_defconfig 1
-rw-r--r-- arch/powerpc/configs/44x/taishan_defconfig 1
-rw-r--r-- arch/powerpc/configs/44x/virtex5_defconfig 1
-rw-r--r-- arch/powerpc/configs/44x/warp_defconfig 5