diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-07-30 21:48:00 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-07-30 21:48:00 +0400 |
| commit | c3107e3c504d3187ed8eac8179494946faff1481 (patch) | |
| tree | e7615968a55fc9176ee02926ae442e9d8890d5bd /include/dt-bindings/clock/stih416-clks.h | |
| parent | 5ccb8225abf2ac51cd023a99f28366ac9823bd0d (diff) | |
| parent | 594c7255dce7a13cac50cf2470cc56e2c3b0494e (diff) | |
| download | linux-c3107e3c504d3187ed8eac8179494946faff1481.tar.xz | |
Merge tag 'please-pull-apei' into x86/ras
APEI is currently implemented so that it depends on x86 hardware.
The primary dependency is that GHES uses the x86 NMI for hardware
error notification and MCE for memory error handling. These patches
remove that dependency.
Other APEI features such as error reporting via external IRQ, error
serialization, or error injection, do not require changes to use them
on non-x86 architectures.
The following patch set eliminates the APEI Kconfig x86 dependency
by making these changes:
- treat NMI notification as GHES architecture - HAVE_ACPI_APEI_NMI
- group and wrap around #ifdef CONFIG_HAVE_ACPI_APEI_NMI code which
is used only for NMI path
- identify architectural boxes and abstract it accordingly (tlb flush and MCE)
- rework ioremap for both IRQ and NMI context
NMI code is kept in ghes.c file since NMI and IRQ context are tightly coupled.
Note, these patches introduce no functional changes for x86. The NMI notification
feature is hard selected for x86. Architectures that want to use this
feature should also provide NMI code infrastructure.
Diffstat (limited to 'include/dt-bindings/clock/stih416-clks.h')
| -rw-r--r-- | include/dt-bindings/clock/stih416-clks.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/stih416-clks.h b/include/dt-bindings/clock/stih416-clks.h index 552c779eb6af..f9bdbd13568d 100644 --- a/include/dt-bindings/clock/stih416-clks.h +++ b/include/dt-bindings/clock/stih416-clks.h @@ -10,6 +10,7 @@ #define CLK_ETH1_PHY 4 /* CLOCKGEN A1 */ +#define CLK_ICN_IF_2 0 #define CLK_GMAC0_PHY 3 #endif |