[PATCH 12/16] block: sed-opal: unify retrieval of table columns

2019-02-13 Thread David Kozub
Instead of having multiple places defining the same argument list to get
a specific column of a sed-opal table, provide a generic version and
call it from those functions.

Co-authored-by: David Kozub 
Signed-off-by: Jonas Rabenstein 
Signed-off-by: David Kozub 
Reviewed-by: Scott Bauer 
Reviewed-by: Christoph Hellwig 
Reviewed-by: Jon Derrick 
---
 block/sed-opal.c | 130 +--
 1 file changed, 47 insertions(+), 83 deletions(-)

diff --git a/block/sed-opal.c b/block/sed-opal.c
index 7f02e50e2bce..5395ab1c5248 100644
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -1075,6 +1075,37 @@ static int finalize_and_send(struct opal_dev *dev, 
cont_fn cont)
return opal_send_recv(dev, cont);
 }
 
+/*
+ * request @column from table @table on device @dev. On success, the column
+ * data will be available in dev->resp->tok[4]
+ */
+static int generic_get_column(struct opal_dev *dev, const u8 *table,
+ u64 column)
+{
+   int err;
+
+   err = cmd_start(dev, table, opalmethod[OPAL_GET]);
+
+   add_token_u8(&err, dev, OPAL_STARTLIST);
+
+   add_token_u8(&err, dev, OPAL_STARTNAME);
+   add_token_u8(&err, dev, OPAL_STARTCOLUMN);
+   add_token_u64(&err, dev, column);
+   add_token_u8(&err, dev, OPAL_ENDNAME);
+
+   add_token_u8(&err, dev, OPAL_STARTNAME);
+   add_token_u8(&err, dev, OPAL_ENDCOLUMN);
+   add_token_u64(&err, dev, column);
+   add_token_u8(&err, dev, OPAL_ENDNAME);
+
+   add_token_u8(&err, dev, OPAL_ENDLIST);
+
+   if (err)
+   return err;
+
+   return finalize_and_send(dev, parse_and_check_status);
+}
+
 static int gen_key(struct opal_dev *dev, void *data)
 {
u8 uid[OPAL_UID_LENGTH];
@@ -1129,23 +1160,11 @@ static int get_active_key(struct opal_dev *dev, void 
*data)
if (err)
return err;
 
-   err = cmd_start(dev, uid, opalmethod[OPAL_GET]);
-   add_token_u8(&err, dev, OPAL_STARTLIST);
-   add_token_u8(&err, dev, OPAL_STARTNAME);
-   add_token_u8(&err, dev, 3); /* startCloumn */
-   add_token_u8(&err, dev, 10); /* ActiveKey */
-   add_token_u8(&err, dev, OPAL_ENDNAME);
-   add_token_u8(&err, dev, OPAL_STARTNAME);
-   add_token_u8(&err, dev, 4); /* endColumn */
-   add_token_u8(&err, dev, 10); /* ActiveKey */
-   add_token_u8(&err, dev, OPAL_ENDNAME);
-   add_token_u8(&err, dev, OPAL_ENDLIST);
-   if (err) {
-   pr_debug("Error building get active key command\n");
+   err = generic_get_column(dev, uid, OPAL_ACTIVEKEY);
+   if (err)
return err;
-   }
 
-   return finalize_and_send(dev, get_active_key_cont);
+   return get_active_key_cont(dev);
 }
 
 static int generic_lr_enable_disable(struct opal_dev *dev,
@@ -1754,14 +1773,16 @@ static int activate_lsp(struct opal_dev *dev, void 
*data)
return finalize_and_send(dev, parse_and_check_status);
 }
 
-static int get_lsp_lifecycle_cont(struct opal_dev *dev)
+/* Determine if we're in the Manufactured Inactive or Active state */
+static int get_lsp_lifecycle(struct opal_dev *dev, void *data)
 {
u8 lc_status;
-   int error = 0;
+   int err;
 
-   error = parse_and_check_status(dev);
-   if (error)
-   return error;
+   err = generic_get_column(dev, opaluid[OPAL_LOCKINGSP_UID],
+OPAL_LIFECYCLE);
+   if (err)
+   return err;
 
lc_status = response_get_u64(&dev->parsed, 4);
/* 0x08 is Manufactured Inactive */
@@ -1774,49 +1795,19 @@ static int get_lsp_lifecycle_cont(struct opal_dev *dev)
return 0;
 }
 
-/* Determine if we're in the Manufactured Inactive or Active state */
-static int get_lsp_lifecycle(struct opal_dev *dev, void *data)
-{
-   int err;
-
-   err = cmd_start(dev, opaluid[OPAL_LOCKINGSP_UID],
-   opalmethod[OPAL_GET]);
-
-   add_token_u8(&err, dev, OPAL_STARTLIST);
-
-   add_token_u8(&err, dev, OPAL_STARTNAME);
-   add_token_u8(&err, dev, 3); /* Start Column */
-   add_token_u8(&err, dev, OPAL_LIFECYCLE);
-   add_token_u8(&err, dev, OPAL_ENDNAME);
-
-   add_token_u8(&err, dev, OPAL_STARTNAME);
-   add_token_u8(&err, dev, 4); /* End Column */
-   add_token_u8(&err, dev, OPAL_LIFECYCLE);
-   add_token_u8(&err, dev, OPAL_ENDNAME);
-
-   add_token_u8(&err, dev, OPAL_ENDLIST);
-
-   if (err) {
-   pr_debug("Error Building GET Lifecycle Status command\n");
-   return err;
-   }
-
-   return finalize_and_send(dev, get_lsp_lifecycle_cont);
-}
-
-static int get_msid_cpin_pin_cont(struct opal_dev *dev)
+static int get_msid_cpin_pin(struct opal_dev *dev, void *data)
 {
const char *msid_pin;
size_t strlen;
-   int error = 0;
+   int err;
 
-   error = parse_and_check_status(dev);
-   if (error)
-   return error;
+   err = generic_get_co

[PATCH 12/16] block: sed-opal: unify retrieval of table columns

2019-01-16 Thread Jonas Rabenstein
Instead of having multiple places defining the same argument list to get
a specific column of a sed-opal table, provide a generic version and
call it from those functions.

Signed-off-by: Jonas Rabenstein 
---
 block/opal_proto.h |   2 +
 block/sed-opal.c   | 132 +
 2 files changed, 50 insertions(+), 84 deletions(-)

diff --git a/block/opal_proto.h b/block/opal_proto.h
index e20be8258854..b6e352cfe982 100644
--- a/block/opal_proto.h
+++ b/block/opal_proto.h
@@ -170,6 +170,8 @@ enum opal_token {
OPAL_READLOCKED = 0x07,
OPAL_WRITELOCKED = 0x08,
OPAL_ACTIVEKEY = 0x0A,
+   /* lockingsp table */
+   OPAL_LIFECYCLE = 0x06,
/* locking info table */
OPAL_MAXRANGES = 0x04,
 /* mbr control */
diff --git a/block/sed-opal.c b/block/sed-opal.c
index ee24e4e7ad6e..034cb940b34a 100644
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -1089,6 +1089,37 @@ static int finalize_and_send(struct opal_dev *dev, 
cont_fn cont)
return opal_send_recv(dev, cont);
 }
 
+/*
+ * request @column from table @table on device @dev. On success, the column
+ * data will be available in dev->resp->tok[4]
+ */
+static int generic_get_column(struct opal_dev *dev, const u8 *table,
+ u64 column)
+{
+   int err;
+
+   err = cmd_start(dev, table, opalmethod[OPAL_GET]);
+
+   add_token_u8(&err, dev, OPAL_STARTLIST);
+
+   add_token_u8(&err, dev, OPAL_STARTNAME);
+   add_token_u8(&err, dev, OPAL_STARTCOLUMN);
+   add_token_u64(&err, dev, column);
+   add_token_u8(&err, dev, OPAL_ENDNAME);
+
+   add_token_u8(&err, dev, OPAL_STARTNAME);
+   add_token_u8(&err, dev, OPAL_ENDCOLUMN);
+   add_token_u64(&err, dev, column);
+   add_token_u8(&err, dev, OPAL_ENDNAME);
+
+   add_token_u8(&err, dev, OPAL_ENDLIST);
+
+   if (err)
+   return err;
+
+   return finalize_and_send(dev, parse_and_check_status);
+}
+
 static int gen_key(struct opal_dev *dev, void *data)
 {
u8 uid[OPAL_UID_LENGTH];
@@ -1143,23 +1174,11 @@ static int get_active_key(struct opal_dev *dev, void 
*data)
if (err)
return err;
 
-   err = cmd_start(dev, uid, opalmethod[OPAL_GET]);
-   add_token_u8(&err, dev, OPAL_STARTLIST);
-   add_token_u8(&err, dev, OPAL_STARTNAME);
-   add_token_u8(&err, dev, 3); /* startCloumn */
-   add_token_u8(&err, dev, 10); /* ActiveKey */
-   add_token_u8(&err, dev, OPAL_ENDNAME);
-   add_token_u8(&err, dev, OPAL_STARTNAME);
-   add_token_u8(&err, dev, 4); /* endColumn */
-   add_token_u8(&err, dev, 10); /* ActiveKey */
-   add_token_u8(&err, dev, OPAL_ENDNAME);
-   add_token_u8(&err, dev, OPAL_ENDLIST);
-   if (err) {
-   pr_debug("Error building get active key command\n");
+   err = generic_get_column(dev, uid, OPAL_ACTIVEKEY);
+   if (err)
return err;
-   }
 
-   return finalize_and_send(dev, get_active_key_cont);
+   return get_active_key_cont(dev);
 }
 
 static int generic_lr_enable_disable(struct opal_dev *dev,
@@ -1819,17 +1838,19 @@ static int activate_lsp(struct opal_dev *dev, void 
*data)
return finalize_and_send(dev, parse_and_check_status);
 }
 
-static int get_lsp_lifecycle_cont(struct opal_dev *dev)
+/* Determine if we're in the Manufactured Inactive or Active state */
+static int get_lsp_lifecycle(struct opal_dev *dev, void *data)
 {
u8 lc_status;
-   int error = 0;
+   int err;
 
-   error = parse_and_check_status(dev);
-   if (error)
-   return error;
+   err = generic_get_column(dev, opaluid[OPAL_LOCKINGSP_UID],
+OPAL_LIFECYCLE);
+   if (err)
+   return err;
 
lc_status = response_get_u64(&dev->parsed, 4);
-   /* 0x08 is Manufacured Inactive */
+   /* 0x08 is Manufactured Inactive */
/* 0x09 is Manufactured */
if (lc_status != OPAL_MANUFACTURED_INACTIVE) {
pr_debug("Couldn't determine the status of the Lifecycle 
state\n");
@@ -1839,49 +1860,19 @@ static int get_lsp_lifecycle_cont(struct opal_dev *dev)
return 0;
 }
 
-/* Determine if we're in the Manufactured Inactive or Active state */
-static int get_lsp_lifecycle(struct opal_dev *dev, void *data)
-{
-   int err;
-
-   err = cmd_start(dev, opaluid[OPAL_LOCKINGSP_UID],
-   opalmethod[OPAL_GET]);
-
-   add_token_u8(&err, dev, OPAL_STARTLIST);
-
-   add_token_u8(&err, dev, OPAL_STARTNAME);
-   add_token_u8(&err, dev, 3); /* Start Column */
-   add_token_u8(&err, dev, 6); /* Lifecycle Column */
-   add_token_u8(&err, dev, OPAL_ENDNAME);
-
-   add_token_u8(&err, dev, OPAL_STARTNAME);
-   add_token_u8(&err, dev, 4); /* End Column */
-   add_token_u8(&err, dev, 6); /* Lifecycle Column */
-   add_token_u8(&err, dev, OPAL_ENDNAME);
-
-   add_token_u8(&err, dev, OPAL_