ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme/opal: concentrate security receive and status check in one function

Browse Source 
Also rename them to security send/recv to reflect the fact.

Change-Id: Icdeb7f15849a9d1aacf5936c5954bb39875f4cd9
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1651
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Changpeng Liu 2020-04-02 23:41:35 +08:00 committed by Tomasz Zawadzki
parent 3add68e3d6
commit d5de4af2bc
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/nvme/nvme_opal.c
View File

@ -38,21 +38,14 @@
#include "nvme_opal_internal.h" #include "nvme_opal_internal.h"
static int static int
opal_send_cmd(struct spdk_opal_dev *dev, struct opal_session *sess) opal_security_send(struct spdk_opal_dev *dev, struct opal_session *sess)
{ {
return spdk_nvme_ctrlr_security_send(dev->ctrlr, SPDK_SCSI_SECP_TCG, dev->comid, return spdk_nvme_ctrlr_security_send(dev->ctrlr, SPDK_SCSI_SECP_TCG, dev->comid,
0, sess->cmd, IO_BUFFER_LENGTH); 0, sess->cmd, IO_BUFFER_LENGTH);
} }
static int static int
opal_recv_cmd(struct spdk_opal_dev *dev, struct opal_session *sess) opal_security_recv(struct spdk_opal_dev *dev, struct opal_session *sess)
{
return spdk_nvme_ctrlr_security_receive(dev->ctrlr, SPDK_SCSI_SECP_TCG, dev->comid,
0, sess->resp, IO_BUFFER_LENGTH);
}
static int
opal_recv_check(struct spdk_opal_dev *dev, struct opal_session *sess)
{ {
void *response = sess->resp; void *response = sess->resp;
struct spdk_opal_compacket *header = response; struct spdk_opal_compacket *header = response;
@ -61,6 +54,13 @@ opal_recv_check(struct spdk_opal_dev *dev, struct opal_session *sess)
uint64_t now; uint64_t now;
do { do {
memset(response, 0, IO_BUFFER_LENGTH);
ret = spdk_nvme_ctrlr_security_receive(dev->ctrlr, SPDK_SCSI_SECP_TCG, dev->comid,
0, sess->resp, IO_BUFFER_LENGTH);
if (ret) {
SPDK_ERRLOG("Security Receive Error on dev = %p\n", dev);
return ret;
}
SPDK_DEBUGLOG(SPDK_LOG_OPAL, "outstanding_data=%d, minTransfer=%d\n", SPDK_DEBUGLOG(SPDK_LOG_OPAL, "outstanding_data=%d, minTransfer=%d\n",
header->outstanding_data, header->outstanding_data,
header->min_transfer); header->min_transfer);
@ -76,13 +76,6 @@ opal_recv_check(struct spdk_opal_dev *dev, struct opal_session *sess)
} }
} }
memset(response, 0, IO_BUFFER_LENGTH);
ret = spdk_nvme_ctrlr_security_receive(dev->ctrlr, SPDK_SCSI_SECP_TCG, dev->comid,
0, sess->resp, IO_BUFFER_LENGTH);
if (ret) {
SPDK_ERRLOG("Security Receive Error on dev = %p\n", dev);
return ret;
}
} while (!ret); } while (!ret);
return ret; return ret;
@ -93,17 +86,12 @@ opal_send_recv(struct spdk_opal_dev *dev, struct opal_session *sess)
{ {
int ret; int ret;
ret = opal_send_cmd(dev, sess); ret = opal_security_send(dev, sess);
if (ret) { if (ret) {
return ret; return ret;
} }
ret = opal_recv_cmd(dev, sess); return opal_security_recv(dev, sess);
if (ret) {
return ret;
}
return opal_recv_check(dev, sess);
} }
static void static void