Commit d5de4af2 authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

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



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

Change-Id: Icdeb7f15849a9d1aacf5936c5954bb39875f4cd9
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1651


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 3add68e3

lib/nvme/nvme_opal.c

+11 −23
Original line number Diff line number Diff line
@@ -38,21 +38,14 @@ 
#include "nvme_opal_internal.h"



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,

					     0, sess->cmd, IO_BUFFER_LENGTH);

}



static int

opal_recv_cmd(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)

opal_security_recv(struct spdk_opal_dev *dev, struct opal_session *sess)

{

	void *response = sess->resp;

	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;



	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",

			      header->outstanding_data,

			      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);



	return ret;
@@ -93,17 +86,12 @@ opal_send_recv(struct spdk_opal_dev *dev, struct opal_session *sess) 
{

	int ret;



	ret = opal_send_cmd(dev, sess);

	if (ret) {

		return ret;

	}



	ret = opal_recv_cmd(dev, sess);

	ret = opal_security_send(dev, sess);

	if (ret) {

		return ret;

	}



	return opal_recv_check(dev, sess);

	return opal_security_recv(dev, sess);

}



static void