block: sed-opal: Introduce SUM_SET_LIST parameter and append it using 'add_token_u64'

In function 'activate_lsp', rather than hard-coding the short atom
header(0x83), we need to let the function 'add_short_atom_header' append
the header based on the parameter being appended.

The parameter has been defined in Section 3.1.2.1 of
https://trustedcomputinggroup.org/wp-content/uploads/TCG_Storage-Opal_Feature_Set_Single_User_Mode_v1-00_r1-00-Final.pdf

Reviewed-by: Jon Derrick <jonathan.derrick@intel.com>
Signed-off-by: Revanth Rajashekar <revanth.rajashekar@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/opal_proto.h b/block/opal_proto.h
index 736e67c3e7c53bf7bf667436f5b3c2b55a9a30ef..325cbba2465fd13096b5f000709c8c588cdcc6e5 100644 (file)
--- a/block/opal_proto.h
+++ b/block/opal_proto.h
@@ -205,6 +205,10 @@ enum opal_lockingstate {
        OPAL_LOCKING_LOCKED = 0x03,
 };
 
+enum opal_parameter {
+       OPAL_SUM_SET_LIST = 0x060000,
+};
+
 /* Packets derived from:
  * TCG_Storage_Architecture_Core_Spec_v2.01_r1.00
  * Secion: 3.2.3 ComPackets, Packets & Subpackets

diff --git a/block/sed-opal.c b/block/sed-opal.c
index b2cacc9ddd114d85292cd1b6c97d79bf2529d16a..880cc57a5f6bd34ed26bc25df6ac091316bc117c 100644 (file)
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -1886,7 +1886,6 @@ static int activate_lsp(struct opal_dev *dev, void *data)
 {
        struct opal_lr_act *opal_act = data;
        u8 user_lr[OPAL_UID_LENGTH];
-       u8 uint_3 = 0x83;
        int err, i;
 
        err = cmd_start(dev, opaluid[OPAL_LOCKINGSP_UID],
@@ -1899,10 +1898,7 @@ static int activate_lsp(struct opal_dev *dev, void *data)
                        return err;
 
                add_token_u8(&err, dev, OPAL_STARTNAME);
-               add_token_u8(&err, dev, uint_3);
-               add_token_u8(&err, dev, 6);
-               add_token_u8(&err, dev, 0);
-               add_token_u8(&err, dev, 0);
+               add_token_u64(&err, dev, OPAL_SUM_SET_LIST);
 
                add_token_u8(&err, dev, OPAL_STARTLIST);
                add_token_bytestring(&err, dev, user_lr, OPAL_UID_LENGTH);