diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2023-10-17 21:40:46 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2023-10-17 21:40:46 +0200 |
| commit | a940daa52167e9db8ecce82213813b735a9d9f23 (patch) | |
| tree | d5346c51351ccd1da7532cbec3127e6b73ec59c9 /include/linux/sed-opal.h | |
| parent | 32e4fa37fa667fdf53499b9de92737dc75199d8e (diff) | |
| parent | 58720809f52779dc0f08e53e54b014209d13eebb (diff) | |
| download | lwn-a940daa52167e9db8ecce82213813b735a9d9f23.tar.gz lwn-a940daa52167e9db8ecce82213813b735a9d9f23.zip | |
Merge branch 'linus' into smp/core
Pull in upstream to get the fixes so depending changes can be applied.
Diffstat (limited to 'include/linux/sed-opal.h')
| -rw-r--r-- | include/linux/sed-opal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/sed-opal.h b/include/linux/sed-opal.h index bbae1e52ab4f..2ac50822554e 100644 --- a/include/linux/sed-opal.h +++ b/include/linux/sed-opal.h @@ -25,6 +25,9 @@ bool opal_unlock_from_suspend(struct opal_dev *dev); struct opal_dev *init_opal_dev(void *data, sec_send_recv *send_recv); int sed_ioctl(struct opal_dev *dev, unsigned int cmd, void __user *ioctl_ptr); +#define OPAL_AUTH_KEY "opal-boot-pin" +#define OPAL_AUTH_KEY_PREV "opal-boot-pin-prev" + static inline bool is_sed_ioctl(unsigned int cmd) { switch (cmd) { @@ -47,6 +50,8 @@ static inline bool is_sed_ioctl(unsigned int cmd) case IOC_OPAL_GET_STATUS: case IOC_OPAL_GET_LR_STATUS: case IOC_OPAL_GET_GEOMETRY: + case IOC_OPAL_DISCOVERY: + case IOC_OPAL_REVERT_LSP: return true; } return false; |