Re: [PATCH 09/11] acpi/nfit, libnvdimm/security: add Intel DSM 1.8 master passphrase support

With Intel DSM 1.8 [1] two new security DSMs are introduced. Enable/update master passphrase and master secure erase. The master passphrase allows a secure erase to be performed without the user passphrase that is set on the NVDIMM. The commands of master_update and master_erase are added to the sysfs knob in order to initiate the DSMs. They are similar in opeartion mechanism compare to update and erase. [1]: http://pmem.io/documents/NVDIMM_DSM_Interface-V1.8.pdf Signed-off-by: Dave Jiang <dave.jiang(a)intel.com&gt; --- Documentation/nvdimm/security.txt | 23 ++++++ drivers/acpi/nfit/core.c | 2 + drivers/acpi/nfit/intel.c | 132 ++++++++++++++++++++++++++++++++++++- drivers/acpi/nfit/intel.h | 18 +++++ drivers/acpi/nfit/nfit.h | 6 +- drivers/nvdimm/dimm_devs.c | 16 ++++ drivers/nvdimm/nd-core.h | 1 drivers/nvdimm/nd.h | 5 + drivers/nvdimm/security.c | 34 ++++++++-- include/linux/libnvdimm.h | 15 ++++ 10 files changed, 236 insertions(+), 16 deletions(-)

static int intel_dimm_security_query_overwrite(struct nvdimm *nvdimm) { int cmd_rc, rc = 0; @@ -397,7 +514,8 @@ static int intel_dimm_security_unlock(struct nvdimm *nvdimm, } static int intel_dimm_security_state(struct nvdimm *nvdimm, - enum nvdimm_security_state *state) + enum nvdimm_security_state *state, + enum nvdimm_security_extended_state *ext_state)

{ int cmd_rc, rc = 0; struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm); @@ -465,9 +583,17 @@ static int intel_dimm_security_state(struct nvdimm *nvdimm,

diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h index c3c5a1c6b1b7..3d14f73c7bca 100644 --- a/include/linux/libnvdimm.h +++ b/include/linux/libnvdimm.h @@ -167,6 +167,13 @@ enum nvdimm_security_state { NVDIMM_SECURITY_UNSUPPORTED, }; +enum nvdimm_security_extended_state { + NVDIMM_SECURITY_MASTER_INVALID = 0, + NVDIMM_SECURITY_MASTER_DISABLED, + NVDIMM_SECURITY_MASTER_ENABLED, + NVDIMM_SECURITY_MASTER_FROZEN, +};

struct nvdimm_security_ops { int (*state)(struct nvdimm *nvdimm, - enum nvdimm_security_state *state); + enum nvdimm_security_state *state, + enum nvdimm_security_extended_state *ex_state); int (*unlock)(struct nvdimm *nvdimm, const struct nvdimm_key_data *nkey); int (*change_key)(struct nvdimm *nvdimm, @@ -190,6 +198,11 @@ struct nvdimm_security_ops { int (*overwrite)(struct nvdimm *nvdimm, const struct nvdimm_key_data *nkey); int (*query_overwrite)(struct nvdimm *nvdimm); + int (*master_change_key)(struct nvdimm *nvdimm, + const struct nvdimm_key_data *old_key, + const struct nvdimm_key_data *new_key); + int (*master_erase)(struct nvdimm *nvdimm, + const struct nvdimm_key_data *nkey);