Hi Linus,
please pull the EDAC pile for 4.2. A lot of stuff this time.
Important: Please merge this stuff *after* you have merged the tip pile
because it depends on it.
Also, there's a merge conflict with arch/x86/Kconfig but resolving it is
simple. I'm adding an exemplary resolve at the end of this mail.
Thanks.
---
The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031:
Linux 4.1-rc1 (2015-04-26 17:59:10 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git tags/edac_for_4.2
for you to fetch changes up to 0bbbe4c4da5a4698cfba5810ec9aa2c5015f5107:
EDAC: Update Documentation/edac.txt (2015-06-19 12:17:29 +0200)
----------------------------------------------------------------
* New APM X-Gene SoC EDAC driver (Loc Ho)
* AMD error injection module improvements (Aravind Gopalakrishnan)
* Altera Arria 10 support (Thor Thayer)
* misc fixes and cleanups all over the place
----------------------------------------------------------------
Alan Tull (1):
EDAC, altera: Do not allow suspend when EDAC is enabled
Aravind Gopalakrishnan (8):
EDAC, mce_amd_inj: Use MCE_INJECT_GET macro for bank node too
EDAC, mce_amd_inj: Read out number of MCE banks from the hardware
EDAC, mce_amd_inj: Modify flags attribute to use string arguments
EDAC, mce_amd_inj: Add capability to trigger APIC interrupts
EDAC, mce_amd_inj: Add individual permissions field to dfs_node
EDAC, mce_amd_inj: Add README file
EDAC, mce_amd_inj: Include irq_vectors header to fix build errors
EDAC, mce_amd_inj: Inject errors on NBC for bank 4 errors
Arnd Bergmann (1):
EDAC, xgene: Fix cpuid abuse
Borislav Petkov (7):
EDAC: Cleanup atomic_scrub mess
EDAC, edac_stub: Drop arch-specific include
EDAC, mce_amd_inj: Cleanup and simplify README
EDAC, mce_amd_inj: Move bit preparations before the injection
EDAC, mce_amd_inj: Set MISCV on injection
EDAC, mce_amd_inj: Make it depend on AMD_NB
EDAC: Update Documentation/edac.txt
Johannes Thumshirn (1):
MAINTAINERS: Change Johannes Thumshirn's email address
Loc Ho (5):
arm64: Enable EDAC on ARM64
MAINTAINERS: Add entry for APM X-Gene SoC EDAC driver
Documentation: Add documentation for the APM X-Gene SoC EDAC DTS binding
EDAC: Add APM X-Gene SoC EDAC driver
arm64: Add APM X-Gene SoC EDAC DTS entries
Rami Rosen (1):
EDAC: Fix typos in Documentation/edac.txt
Thor Thayer (5):
EDAC, altera: Do not build it as a module
EDAC, altera: Generalize driver to use DT Memory size
EDAC, altera: Refactor for Altera CycloneV SoC
EDAC, altera: Add Arria10 EDAC support
arm: socfpga: dts: Add Arria10 SDRAM EDAC DTS support
York Sun (2):
EDAC, mpc8xxx: Adapt for FSL SoC
EDAC, mpc85xx: Extend error address to 64 bit
kbuild test robot (1):
EDAC, mce_amd_inj: Make inj_type static
.../bindings/arm/altera/socfpga-sdram-edac.txt | 2 +-
.../devicetree/bindings/edac/apm-xgene-edac.txt | 79 ++
Documentation/edac.txt | 289 +++--
MAINTAINERS | 17 +-
arch/arm/Kconfig | 2 +
arch/arm/boot/dts/socfpga_arria10.dtsi | 11 +
arch/arm/include/asm/edac.h | 5 +-
arch/arm64/Kconfig | 1 +
arch/arm64/boot/dts/apm/apm-storm.dtsi | 83 ++
arch/mips/Kconfig | 1 +
arch/mips/include/asm/edac.h | 4 +-
arch/powerpc/Kconfig | 2 +
arch/powerpc/include/asm/edac.h | 4 +-
arch/tile/Kconfig | 1 +
arch/tile/include/asm/edac.h | 29 -
arch/x86/Kconfig | 2 +
arch/x86/include/asm/edac.h | 2 +-
drivers/edac/Kconfig | 24 +-
drivers/edac/Makefile | 1 +
drivers/edac/altera_edac.c | 381 +++---
drivers/edac/altera_edac.h | 201 ++++
drivers/edac/edac_mc.c | 9 +-
drivers/edac/edac_stub.c | 1 -
drivers/edac/mce_amd_inj.c | 276 ++++-
drivers/edac/mpc85xx_edac.c | 10 +-
drivers/edac/mpc85xx_edac.h | 1 +
drivers/edac/xgene_edac.c | 1215 ++++++++++++++++++++
27 files changed, 2274 insertions(+), 379 deletions(-)
create mode 100644 Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
delete mode 100644 arch/tile/include/asm/edac.h
create mode 100644 drivers/edac/altera_edac.h
create mode 100644 drivers/edac/xgene_edac.c
---
Resolved merge conflict with tip:
---
commit 8486f46ae0b614d62fdcb1a6b1c31b70be756321 (HEAD, refs/heads/test)
Merge: 5abb60333c28 0bbbe4c4da5a
Author: Borislav Petkov <[email protected]>
Date: Mon Jun 22 10:48:35 2015 +0200
Merge tag 'edac_for_4.2' into test
* New APM X-Gene SoC EDAC driver (Loc Ho)
* AMD error injection module improvements (Aravind Gopalakrishnan)
* Altera Arria 10 support (Thor Thayer)
* misc fixes and cleanups all over the place
diff --cc arch/x86/Kconfig
index c4f27a82512d,482c160a9fe9..793c3127a6ae
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -17,112 -22,61 +17,114 @@@ config X86_6
### Arch settings
config X86
def_bool y
- select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
- select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
+ select ACPI_LEGACY_TABLES_LOOKUP if ACPI
+ select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
+ select ANON_INODES
+ select ARCH_CLOCKSOURCE_DATA
+ select ARCH_DISCARD_MEMBLOCK
+ select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+ select ARCH_HAS_ELF_RANDOMIZE
select ARCH_HAS_FAST_MULTIPLIER
select ARCH_HAS_GCOV_PROFILE_ALL
+ select ARCH_HAS_PGD_INIT_LATE
+ select ARCH_HAS_SG_CHAIN
+ select ARCH_HAVE_NMI_SAFE_CMPXCHG
+ select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
select ARCH_MIGHT_HAVE_PC_PARPORT
select ARCH_MIGHT_HAVE_PC_SERIO
- select HAVE_AOUT if X86_32
- select HAVE_UNSTABLE_SCHED_CLOCK
- select ARCH_SUPPORTS_NUMA_BALANCING if X86_64
- select ARCH_SUPPORTS_INT128 if X86_64
- select HAVE_IDE
- select HAVE_OPROFILE
- select HAVE_PCSPKR_PLATFORM
- select HAVE_PERF_EVENTS
- select HAVE_IOREMAP_PROT
- select HAVE_KPROBES
- select HAVE_MEMBLOCK
- select HAVE_MEMBLOCK_NODE_MAP
- select ARCH_DISCARD_MEMBLOCK
- select ARCH_WANT_OPTIONAL_GPIOLIB
+ select ARCH_SUPPORTS_ATOMIC_RMW
+ select ARCH_SUPPORTS_INT128 if X86_64
+ select ARCH_SUPPORTS_NUMA_BALANCING if X86_64
+ select ARCH_USE_BUILTIN_BSWAP
+ select ARCH_USE_CMPXCHG_LOCKREF if X86_64
+ select ARCH_USE_QUEUED_RWLOCKS
+ select ARCH_USE_QUEUED_SPINLOCKS
select ARCH_WANT_FRAME_POINTERS
- select HAVE_DMA_ATTRS
- select HAVE_DMA_CONTIGUOUS
- select HAVE_KRETPROBES
+ select ARCH_WANT_IPC_PARSE_VERSION if X86_32
+ select ARCH_WANT_OPTIONAL_GPIOLIB
+ select BUILDTIME_EXTABLE_SORT
+ select CLKEVT_I8253
+ select CLKSRC_I8253 if X86_32
+ select CLOCKSOURCE_VALIDATE_LAST_CYCLE
+ select CLOCKSOURCE_WATCHDOG
+ select CLONE_BACKWARDS if X86_32
+ select COMPAT_OLD_SIGACTION if IA32_EMULATION
+ select DCACHE_WORD_ACCESS
++ select EDAC_SUPPORT
++ select EDAC_ATOMIC_SCRUB
+ select GENERIC_CLOCKEVENTS
+ select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 &&
X86_LOCAL_APIC)
+ select GENERIC_CLOCKEVENTS_MIN_ADJUST
+ select GENERIC_CMOS_UPDATE
+ select GENERIC_CPU_AUTOPROBE
select GENERIC_EARLY_IOREMAP
- select HAVE_OPTPROBES
- select HAVE_KPROBES_ON_FTRACE
- select HAVE_FTRACE_MCOUNT_RECORD
- select HAVE_FENTRY if X86_64
+ select GENERIC_FIND_FIRST_BIT
+ select GENERIC_IOMAP
+ select GENERIC_IRQ_PROBE
+ select GENERIC_IRQ_SHOW
+ select GENERIC_PENDING_IRQ if SMP
+ select GENERIC_SMP_IDLE_THREAD
+ select GENERIC_STRNCPY_FROM_USER
+ select GENERIC_STRNLEN_USER
+ select GENERIC_TIME_VSYSCALL
+ select HAVE_ACPI_APEI if ACPI
+ select HAVE_ACPI_APEI_NMI if ACPI
+ select HAVE_ALIGNED_STRUCT_PAGE if SLUB
+ select HAVE_AOUT if X86_32
+ select HAVE_ARCH_AUDITSYSCALL
+ select HAVE_ARCH_HUGE_VMAP if X86_64 || X86_PAE
+ select HAVE_ARCH_JUMP_LABEL
+ select HAVE_ARCH_KASAN if X86_64 && SPARSEMEM_VMEMMAP
+ select HAVE_ARCH_KGDB
+ select HAVE_ARCH_KMEMCHECK
+ select HAVE_ARCH_SECCOMP_FILTER
+ select HAVE_ARCH_SOFT_DIRTY if X86_64
+ select HAVE_ARCH_TRACEHOOK
+ select HAVE_ARCH_TRANSPARENT_HUGEPAGE
+ select HAVE_BPF_JIT if X86_64
+ select HAVE_CC_STACKPROTECTOR
+ select HAVE_CMPXCHG_DOUBLE
+ select HAVE_CMPXCHG_LOCAL
+ select HAVE_CONTEXT_TRACKING if X86_64
select HAVE_C_RECORDMCOUNT
+ select HAVE_DEBUG_KMEMLEAK
+ select HAVE_DEBUG_STACKOVERFLOW
+ select HAVE_DMA_API_DEBUG
+ select HAVE_DMA_ATTRS
+ select HAVE_DMA_CONTIGUOUS
select HAVE_DYNAMIC_FTRACE
select HAVE_DYNAMIC_FTRACE_WITH_REGS
- select HAVE_FUNCTION_TRACER
- select HAVE_FUNCTION_GRAPH_TRACER
- select HAVE_FUNCTION_GRAPH_FP_TEST
- select HAVE_SYSCALL_TRACEPOINTS
- select SYSCTL_EXCEPTION_TRACE
- select HAVE_KVM
- select HAVE_ARCH_KGDB
- select HAVE_ARCH_TRACEHOOK
- select HAVE_GENERIC_DMA_COHERENT if X86_32
select HAVE_EFFICIENT_UNALIGNED_ACCESS
- select USER_STACKTRACE_SUPPORT
- select HAVE_REGS_AND_STACK_ACCESS_API
- select HAVE_DMA_API_DEBUG
- select HAVE_KERNEL_GZIP
+ select HAVE_FENTRY if X86_64
+ select HAVE_FTRACE_MCOUNT_RECORD
+ select HAVE_FUNCTION_GRAPH_FP_TEST
+ select HAVE_FUNCTION_GRAPH_TRACER
+ select HAVE_FUNCTION_TRACER
+ select HAVE_GENERIC_DMA_COHERENT if X86_32
+ select HAVE_HW_BREAKPOINT
+ select HAVE_IDE
+ select HAVE_IOREMAP_PROT
+ select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
+ select HAVE_IRQ_TIME_ACCOUNTING
select HAVE_KERNEL_BZIP2
+ select HAVE_KERNEL_GZIP
+ select HAVE_KERNEL_LZ4
select HAVE_KERNEL_LZMA
- select HAVE_KERNEL_XZ
select HAVE_KERNEL_LZO
- select HAVE_KERNEL_LZ4
- select HAVE_HW_BREAKPOINT
+ select HAVE_KERNEL_XZ
+ select HAVE_KPROBES
+ select HAVE_KPROBES_ON_FTRACE
+ select HAVE_KRETPROBES
+ select HAVE_KVM
+ select HAVE_LIVEPATCH if X86_64
+ select HAVE_MEMBLOCK
+ select HAVE_MEMBLOCK_NODE_MAP
select HAVE_MIXED_BREAKPOINTS_REGS
- select PERF_EVENTS
+ select HAVE_OPROFILE
+ select HAVE_OPTPROBES
+ select HAVE_PCSPKR_PLATFORM
+ select HAVE_PERF_EVENTS
select HAVE_PERF_EVENTS_NMI
select HAVE_PERF_REGS
select HAVE_PERF_USER_STACK_DUMP
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at http://www.tux.org/lkml/
