diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-02-21 14:33:40 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-02-21 14:41:21 +1100 |
| commit | e6272787ed96c9092a5116e2b15d211521ad6e61 (patch) | |
| tree | 188529a8e0528a1b90994b799cd876020e96b3af | |
| parent | 237cd0c50a669af3aff4e804d19b785f7515179d (diff) | |
| download | blackbird-skiboot-e6272787ed96c9092a5116e2b15d211521ad6e61.tar.gz blackbird-skiboot-e6272787ed96c9092a5116e2b15d211521ad6e61.zip | |
opal-api: Re-jig OPAL API numbers because OpenCAPI kernel merge
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>
| -rw-r--r-- | doc/opal-api/opal-sensor-group-enable-163.rst (renamed from doc/opal-api/opal-sensor-group-enable-160.rst) | 0 | ||||
| -rw-r--r-- | doc/opal-api/opal-sensor-read-u64-162.rst (renamed from doc/opal-api/opal-sensor-read-u64-158.rst) | 0 | ||||
| -rw-r--r-- | include/opal-api.h | 9 |
3 files changed, 6 insertions, 3 deletions
diff --git a/doc/opal-api/opal-sensor-group-enable-160.rst b/doc/opal-api/opal-sensor-group-enable-163.rst index b702dd5f..b702dd5f 100644 --- a/doc/opal-api/opal-sensor-group-enable-160.rst +++ b/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 index b75bcbc2..b75bcbc2 100644 --- a/doc/opal-api/opal-sensor-read-u64-158.rst +++ b/doc/opal-api/opal-sensor-read-u64-162.rst diff --git a/include/opal-api.h b/include/opal-api.h index b66b0d17..bb18a8b7 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 */ |
