Merge tag 'powerpc-4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc updates from Michael Ellerman:
- support "hybrid" iommu/direct DMA ops for coherent_mask < dma_mask
from Benjamin Herrenschmidt
- EEH fixes for SRIOV from Gavin
- introduce rtas_get_sensor_fast() for IRQ handlers from Thomas Huth
- use hardware RNG for arch_get_random_seed_* not arch_get_random_*
from Paul Mackerras
- seccomp filter support from Michael Ellerman
- opal_cec_reboot2() handling for HMIs & machine checks from Mahesh
Salgaonkar
- add powerpc timebase as a trace clock source from Naveen N. Rao
- misc cleanups in the xmon, signal & SLB code from Anshuman Khandual
- add an inline function to update POWER8 HID0 from Gautham R. Shenoy
- fix pte_pagesize_index() crash on 4K w/64K hash from Michael Ellerman
- drop support for 64K local store on 4K kernels from Michael Ellerman
- move dma_get_required_mask() from pnv_phb to pci_controller_ops from
Andrew Donnellan
- initialize distance lookup table from drconf path from Nikunj A
Dadhania
- enable RTC class support from Vaibhav Jain
- disable automatically blocked PCI config from Gavin Shan
- add LEDs driver for PowerNV platform from Vasant Hegde
- fix endianness issues in the HVSI driver from Laurent Dufour
- kexec endian fixes from Samuel Mendoza-Jonas
- fix corrupted pdn list from Gavin Shan
- fix fenced PHB caused by eeh_slot_error_detail() from Gavin Shan
- Freescale updates from Scott: Highlights include 32-bit memcpy/memset
optimizations, checksum optimizations, 85xx config fragments and
updates, device tree updates, e6500 fixes for non-SMP, and misc
cleanup and minor fixes.
- a ton of cxl updates & fixes:
- add explicit precision specifiers from Rasmus Villemoes
- use more common format specifier from Rasmus Villemoes
- destroy cxl_adapter_idr on module_exit from Johannes Thumshirn
- destroy afu->contexts_idr on release of an afu from Johannes
Thumshirn
- compile with -Werror from Daniel Axtens
- EEH support from Daniel Axtens
- plug irq_bitmap getting leaked in cxl_context from Vaibhav Jain
- add alternate MMIO error handling from Ian Munsie
- allow release of contexts which have been OPENED but not STARTED
from Andrew Donnellan
- remove use of macro DEFINE_PCI_DEVICE_TABLE from Vaishali Thakkar
- release irqs if memory allocation fails from Vaibhav Jain
- remove racy attempt to force EEH invocation in reset from Daniel
Axtens
- fix + cleanup error paths in cxl_dev_context_init from Ian Munsie
- fix force unmapping mmaps of contexts allocated through the kernel
api from Ian Munsie
- set up and enable PSL Timebase from Philippe Bergheaud
* tag 'powerpc-4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (140 commits)
cxl: Set up and enable PSL Timebase
cxl: Fix force unmapping mmaps of contexts allocated through the kernel api
cxl: Fix + cleanup error paths in cxl_dev_context_init
powerpc/eeh: Fix fenced PHB caused by eeh_slot_error_detail()
powerpc/pseries: Cleanup on pci_dn_reconfig_notifier()
powerpc/pseries: Fix corrupted pdn list
powerpc/powernv: Enable LEDS support
powerpc/iommu: Set default DMA offset in dma_dev_setup
cxl: Remove racy attempt to force EEH invocation in reset
cxl: Release irqs if memory allocation fails
cxl: Remove use of macro DEFINE_PCI_DEVICE_TABLE
powerpc/powernv: Fix mis-merge of OPAL support for LEDS driver
powerpc/powernv: Reset HILE before kexec_sequence()
powerpc/kexec: Reset secondary cpu endianness before kexec
powerpc/hvsi: Fix endianness issues in the HVSI driver
leds/powernv: Add driver for PowerNV platform
powerpc/powernv: Create LED platform device
powerpc/powernv: Add OPAL interfaces for accessing and modifying system LED states
powerpc/powernv: Fix the log message when disabling VF
cxl: Allow release of contexts which have been OPENED but not STARTED
...
This commit is contained in:
Linus Torvalds
@@ -154,7 +154,10 @@
|
||||
#define OPAL_FLASH_WRITE 111
|
||||
#define OPAL_FLASH_ERASE 112
|
||||
#define OPAL_PRD_MSG 113
|
||||
#define OPAL_LAST 113
|
||||
#define OPAL_LEDS_GET_INDICATOR 114
|
||||
#define OPAL_LEDS_SET_INDICATOR 115
|
||||
#define OPAL_CEC_REBOOT2 116
|
||||
#define OPAL_LAST 116
|
||||
|
||||
/* Device tree flags */
|
||||
|
||||
@@ -340,6 +343,18 @@ enum OpalPciResetState {
|
||||
OPAL_ASSERT_RESET = 1
|
||||
};
|
||||
|
||||
enum OpalSlotLedType {
|
||||
OPAL_SLOT_LED_TYPE_ID = 0, /* IDENTIFY LED */
|
||||
OPAL_SLOT_LED_TYPE_FAULT = 1, /* FAULT LED */
|
||||
OPAL_SLOT_LED_TYPE_ATTN = 2, /* System Attention LED */
|
||||
OPAL_SLOT_LED_TYPE_MAX = 3
|
||||
};
|
||||
|
||||
enum OpalSlotLedState {
|
||||
OPAL_SLOT_LED_STATE_OFF = 0, /* LED is OFF */
|
||||
OPAL_SLOT_LED_STATE_ON = 1 /* LED is ON */
|
||||
};
|
||||
|
||||
/*
|
||||
* Address cycle types for LPC accesses. These also correspond
|
||||
* to the content of the first cell of the "reg" property for
|
||||
@@ -438,6 +453,7 @@ struct OpalMemoryErrorData {
|
||||
/* HMI interrupt event */
|
||||
enum OpalHMI_Version {
|
||||
OpalHMIEvt_V1 = 1,
|
||||
OpalHMIEvt_V2 = 2,
|
||||
};
|
||||
|
||||
enum OpalHMI_Severity {
|
||||
@@ -468,6 +484,49 @@ enum OpalHMI_ErrType {
|
||||
OpalHMI_ERROR_CAPP_RECOVERY,
|
||||
};
|
||||
|
||||
enum OpalHMI_XstopType {
|
||||
CHECKSTOP_TYPE_UNKNOWN = 0,
|
||||
CHECKSTOP_TYPE_CORE = 1,
|
||||
CHECKSTOP_TYPE_NX = 2,
|
||||
};
|
||||
|
||||
enum OpalHMI_CoreXstopReason {
|
||||
CORE_CHECKSTOP_IFU_REGFILE = 0x00000001,
|
||||
CORE_CHECKSTOP_IFU_LOGIC = 0x00000002,
|
||||
CORE_CHECKSTOP_PC_DURING_RECOV = 0x00000004,
|
||||
CORE_CHECKSTOP_ISU_REGFILE = 0x00000008,
|
||||
CORE_CHECKSTOP_ISU_LOGIC = 0x00000010,
|
||||
CORE_CHECKSTOP_FXU_LOGIC = 0x00000020,
|
||||
CORE_CHECKSTOP_VSU_LOGIC = 0x00000040,
|
||||
CORE_CHECKSTOP_PC_RECOV_IN_MAINT_MODE = 0x00000080,
|
||||
CORE_CHECKSTOP_LSU_REGFILE = 0x00000100,
|
||||
CORE_CHECKSTOP_PC_FWD_PROGRESS = 0x00000200,
|
||||
CORE_CHECKSTOP_LSU_LOGIC = 0x00000400,
|
||||
CORE_CHECKSTOP_PC_LOGIC = 0x00000800,
|
||||
CORE_CHECKSTOP_PC_HYP_RESOURCE = 0x00001000,
|
||||
CORE_CHECKSTOP_PC_HANG_RECOV_FAILED = 0x00002000,
|
||||
CORE_CHECKSTOP_PC_AMBI_HANG_DETECTED = 0x00004000,
|
||||
CORE_CHECKSTOP_PC_DEBUG_TRIG_ERR_INJ = 0x00008000,
|
||||
CORE_CHECKSTOP_PC_SPRD_HYP_ERR_INJ = 0x00010000,
|
||||
};
|
||||
|
||||
enum OpalHMI_NestAccelXstopReason {
|
||||
NX_CHECKSTOP_SHM_INVAL_STATE_ERR = 0x00000001,
|
||||
NX_CHECKSTOP_DMA_INVAL_STATE_ERR_1 = 0x00000002,
|
||||
NX_CHECKSTOP_DMA_INVAL_STATE_ERR_2 = 0x00000004,
|
||||
NX_CHECKSTOP_DMA_CH0_INVAL_STATE_ERR = 0x00000008,
|
||||
NX_CHECKSTOP_DMA_CH1_INVAL_STATE_ERR = 0x00000010,
|
||||
NX_CHECKSTOP_DMA_CH2_INVAL_STATE_ERR = 0x00000020,
|
||||
NX_CHECKSTOP_DMA_CH3_INVAL_STATE_ERR = 0x00000040,
|
||||
NX_CHECKSTOP_DMA_CH4_INVAL_STATE_ERR = 0x00000080,
|
||||
NX_CHECKSTOP_DMA_CH5_INVAL_STATE_ERR = 0x00000100,
|
||||
NX_CHECKSTOP_DMA_CH6_INVAL_STATE_ERR = 0x00000200,
|
||||
NX_CHECKSTOP_DMA_CH7_INVAL_STATE_ERR = 0x00000400,
|
||||
NX_CHECKSTOP_DMA_CRB_UE = 0x00000800,
|
||||
NX_CHECKSTOP_DMA_CRB_SUE = 0x00001000,
|
||||
NX_CHECKSTOP_PBI_ISN_UE = 0x00002000,
|
||||
};
|
||||
|
||||
struct OpalHMIEvent {
|
||||
uint8_t version; /* 0x00 */
|
||||
uint8_t severity; /* 0x01 */
|
||||
@@ -478,6 +537,23 @@ struct OpalHMIEvent {
|
||||
__be64 hmer;
|
||||
/* TFMR register. Valid only for TFAC and TFMR_PARITY error type. */
|
||||
__be64 tfmr;
|
||||
|
||||
/* version 2 and later */
|
||||
union {
|
||||
/*
|
||||
* checkstop info (Core/NX).
|
||||
* Valid for OpalHMI_ERROR_MALFUNC_ALERT.
|
||||
*/
|
||||
struct {
|
||||
uint8_t xstop_type; /* enum OpalHMI_XstopType */
|
||||
uint8_t reserved_1[3];
|
||||
__be32 xstop_reason;
|
||||
union {
|
||||
__be32 pir; /* for CHECKSTOP_TYPE_CORE */
|
||||
__be32 chip_id; /* for CHECKSTOP_TYPE_NX */
|
||||
} u;
|
||||
} xstop_error;
|
||||
} u;
|
||||
};
|
||||
|
||||
enum {
|
||||
@@ -768,6 +844,52 @@ struct opal_i2c_request {
|
||||
__be64 buffer_ra; /* Buffer real address */
|
||||
};
|
||||
|
||||
/*
|
||||
* EPOW status sharing (OPAL and the host)
|
||||
*
|
||||
* The host will pass on OPAL, a buffer of length OPAL_SYSEPOW_MAX
|
||||
* with individual elements being 16 bits wide to fetch the system
|
||||
* wide EPOW status. Each element in the buffer will contain the
|
||||
* EPOW status in it's bit representation for a particular EPOW sub
|
||||
* class as defiend here. So multiple detailed EPOW status bits
|
||||
* specific for any sub class can be represented in a single buffer
|
||||
* element as it's bit representation.
|
||||
*/
|
||||
|
||||
/* System EPOW type */
|
||||
enum OpalSysEpow {
|
||||
OPAL_SYSEPOW_POWER = 0, /* Power EPOW */
|
||||
OPAL_SYSEPOW_TEMP = 1, /* Temperature EPOW */
|
||||
OPAL_SYSEPOW_COOLING = 2, /* Cooling EPOW */
|
||||
OPAL_SYSEPOW_MAX = 3, /* Max EPOW categories */
|
||||
};
|
||||
|
||||
/* Power EPOW */
|
||||
enum OpalSysPower {
|
||||
OPAL_SYSPOWER_UPS = 0x0001, /* System on UPS power */
|
||||
OPAL_SYSPOWER_CHNG = 0x0002, /* System power config change */
|
||||
OPAL_SYSPOWER_FAIL = 0x0004, /* System impending power failure */
|
||||
OPAL_SYSPOWER_INCL = 0x0008, /* System incomplete power */
|
||||
};
|
||||
|
||||
/* Temperature EPOW */
|
||||
enum OpalSysTemp {
|
||||
OPAL_SYSTEMP_AMB = 0x0001, /* System over ambient temperature */
|
||||
OPAL_SYSTEMP_INT = 0x0002, /* System over internal temperature */
|
||||
OPAL_SYSTEMP_HMD = 0x0004, /* System over ambient humidity */
|
||||
};
|
||||
|
||||
/* Cooling EPOW */
|
||||
enum OpalSysCooling {
|
||||
OPAL_SYSCOOL_INSF = 0x0001, /* System insufficient cooling */
|
||||
};
|
||||
|
||||
/* Argument to OPAL_CEC_REBOOT2() */
|
||||
enum {
|
||||
OPAL_REBOOT_NORMAL = 0,
|
||||
OPAL_REBOOT_PLATFORM_ERROR = 1,
|
||||
};
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#endif /* __OPAL_API_H */
|
||||
|
||||
Reference in New Issue
Block a user