From: Stewart Smith <stewart@linux.vnet.ibm.com>
To: mpe@ellerman.id.au, benh@kernel.crashing.org
Cc: Stewart Smith <stewart@linux.vnet.ibm.com>,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH 13/18] powerpc/powernv: add remaining missing enums to opal.h
Date: Tue, 10 Feb 2015 13:26:55 +1100 [thread overview]
Message-ID: <1423535220-6322-14-git-send-email-stewart@linux.vnet.ibm.com> (raw)
In-Reply-To: <1423535220-6322-1-git-send-email-stewart@linux.vnet.ibm.com>
Some enums in firmware opal.h were missing from linux opal.h, add them.
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/opal.h | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index 214a106..c09cf66 100644
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -244,8 +244,13 @@ enum OpalShpcAction {
};
enum OpalShpcLinkState {
- OPAL_SHPC_LINK_DOWN = 0,
- OPAL_SHPC_LINK_UP = 1
+ OPAL_SHPC_LINK_DOWN = 0,
+ OPAL_SHPC_LINK_UP_x1 = 1,
+ OPAL_SHPC_LINK_UP_x2 = 2,
+ OPAL_SHPC_LINK_UP_x4 = 4,
+ OPAL_SHPC_LINK_UP_x8 = 8,
+ OPAL_SHPC_LINK_UP_x16 = 16,
+ OPAL_SHPC_LINK_UP_x32 = 32
};
enum OpalMmioWindowType {
@@ -253,10 +258,15 @@ enum OpalMmioWindowType {
OPAL_M64_WINDOW_TYPE = 2,
OPAL_IO_WINDOW_TYPE = 3
};
+
enum OpalShpcSlotState {
OPAL_SHPC_DEV_NOT_PRESENT = 0,
OPAL_SHPC_DEV_PRESENT = 1
};
+enum OpalShpcPowerState {
+ OPAL_SHPC_POWER_OFF = 0,
+ OPAL_SHPC_POWER_ON = 1
+};
enum OpalExceptionHandler {
OPAL_MACHINE_CHECK_HANDLER = 1,
@@ -367,6 +377,11 @@ enum OpalEpowStatus {
OPAL_EPOW_OVER_INTERNAL_TEMP = 3
};
+enum OpalCheckTokenStatus {
+ OPAL_TOKEN_ABSENT = 0,
+ OPAL_TOKEN_PRESENT = 1
+};
+
/*
* Address cycle types for LPC accesses. These also correspond
* to the content of the first cell of the "reg" property for
@@ -536,6 +551,7 @@ enum OpalHMI_ErrType {
OpalHMI_ERROR_SCOM_FIR,
OpalHMI_ERROR_DEBUG_TRIG_FIR,
OpalHMI_ERROR_HYP_RESOURCE,
+ OpalHMI_ERROR_CAPP_RECOVERY,
};
struct OpalHMIEvent {
--
1.7.10.4
next prev parent reply other threads:[~2015-02-10 2:27 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-10 2:26 [PATCH 00/18] sync opal.h with firmware Stewart Smith
2015-02-10 2:26 ` [PATCH 01/18] powerpc/powernv: sync OPAL API tokens with skiboot Stewart Smith
2015-02-10 2:26 ` [PATCH 02/18] powerpc/powernv: synchronize OPAL calls and return codes with firmware Stewart Smith
2015-02-10 2:26 ` [PATCH 03/18] powerpc/powernv: s/OPAL_PCI_SET_PHB_CXL_MODE/OPAL_PCI_SET_PHB_CAPI_MODE/ to match firmware Stewart Smith
2015-02-10 3:39 ` Benjamin Herrenschmidt
2015-02-10 2:26 ` [PATCH 04/18] powerpc/powernv: relocate struct opal_sg_entry in opal.h to same place it is in firmware Stewart Smith
2015-02-10 2:26 ` [PATCH 05/18] powerpc/powernv: synchronize opal.h whitespace with firmware Stewart Smith
2015-02-10 2:26 ` [PATCH 06/18] powerpc/powernv: move OPAL_DUMP_REGION defines in opal.h to same place as in firmware opal.h Stewart Smith
2015-02-10 2:26 ` [PATCH 07/18] powerpc/powernv: make whitespace for OPAL_PM_* defines match firmware Stewart Smith
2015-02-10 2:26 ` [PATCH 08/18] powerpc/powernv: Move OpalSysparamPerm, OpalMessageType in opal.h to " Stewart Smith
2015-02-10 2:26 ` [PATCH 09/18] powerpc/powernv: match enum OpalMessageType with firmware Stewart Smith
2015-02-10 2:26 ` [PATCH 10/18] powerpc/powernv: move OPAL API prototypes to opal-api.h Stewart Smith
2015-02-10 2:26 ` [PATCH 11/18] powerpc/powernv: make whitespace in enum OpalSysparamPerm match firmware Stewart Smith
2015-02-10 2:26 ` [PATCH 12/18] powerpc/powernv: add CAPI and EPOW parts to opal.h Stewart Smith
2015-02-10 2:26 ` Stewart Smith [this message]
2015-02-10 2:26 ` [PATCH 14/18] powerpc/powernv: sync comments and whitespace in opal.h with firmware Stewart Smith
2015-02-10 2:26 ` [PATCH 15/18] powerpc/powernv: sync #includes " Stewart Smith
2015-02-10 2:26 ` [PATCH 16/18] powerpc/powernv: move SG_ENTRIES_PER_NODE to linux-specific opal-api.h Stewart Smith
2015-02-10 2:26 ` [PATCH 17/18] powerpc/powernv: s/u8/uint8_t/ to match firmware in opal.h Stewart Smith
2015-02-10 2:27 ` [PATCH 18/18] powerpc/powernv: s/OpalM64EnableAction/OpalM64Action/ and __be64 annotation Stewart Smith
2015-02-10 3:59 ` [PATCH 00/18] sync opal.h with firmware Michael Ellerman
2015-02-10 5:10 ` Stewart Smith
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1423535220-6322-14-git-send-email-stewart@linux.vnet.ibm.com \
--to=stewart@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).