| Message ID | 20180221035344.12486-1-stewart@linux.vnet.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | opal-api: Re-jig OPAL API numbers because OpenCAPI kernel merge | expand |
Stewart Smith <stewart@linux.vnet.ibm.com> writes: > 74d656d219b98ef3b96f92439337aa6392a7577d added OPAL APIs to > kernel (and this commit is now in Linus' tree) that hadn't > yet made their way to OPAL. > > Also, be slightly grumbly about it. > > Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com> Merged as of e6272787ed96c9092a5116e2b15d211521ad6e61 as the last thing that went into 5.10-rc4.
diff --git a/doc/opal-api/opal-sensor-group-enable-160.rst b/doc/opal-api/opal-sensor-group-enable-163.rst similarity index 100% rename from doc/opal-api/opal-sensor-group-enable-160.rst rename to doc/opal-api/opal-sensor-group-enable-163.rst diff --git a/doc/opal-api/opal-sensor-read-u64-158.rst b/doc/opal-api/opal-sensor-read-u64-162.rst similarity index 100% rename from doc/opal-api/opal-sensor-read-u64-158.rst rename to doc/opal-api/opal-sensor-read-u64-162.rst diff --git a/include/opal-api.h b/include/opal-api.h index b66b0d179890..bb18a8b78fdc 100644 --- a/include/opal-api.h +++ b/include/opal-api.h @@ -215,9 +215,12 @@ #define OPAL_SENSOR_GROUP_CLEAR 156 #define OPAL_PCI_SET_P2P 157 #define OPAL_QUIESCE 158 -#define OPAL_SENSOR_READ_U64 159 -#define OPAL_SENSOR_GROUP_ENABLE 160 -#define OPAL_LAST 160 +#define OPAL_RESERVED_OPENCAPI_GRUMPY_AND 159 +#define OPAL_RESERVED_OPENCAPI_DISGRUNTLED 160 +#define OPAL_RESERVED_OPENCAPI_MAINTAINER 161 +#define OPAL_SENSOR_READ_U64 162 +#define OPAL_SENSOR_GROUP_ENABLE 163 +#define OPAL_LAST 163 #define QUIESCE_HOLD 1 /* Spin all calls at entry */ #define QUIESCE_REJECT 2 /* Fail all calls with OPAL_BUSY */
74d656d219b98ef3b96f92439337aa6392a7577d added OPAL APIs to kernel (and this commit is now in Linus' tree) that hadn't yet made their way to OPAL. Also, be slightly grumbly about it. Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com> --- ...sor-group-enable-160.rst => opal-sensor-group-enable-163.rst} | 0 ...opal-sensor-read-u64-158.rst => opal-sensor-read-u64-162.rst} | 0 include/opal-api.h | 9 ++++++--- 3 files changed, 6 insertions(+), 3 deletions(-) rename doc/opal-api/{opal-sensor-group-enable-160.rst => opal-sensor-group-enable-163.rst} (100%) rename doc/opal-api/{opal-sensor-read-u64-158.rst => opal-sensor-read-u64-162.rst} (100%)