diff mbox series

[v5,16/31] elx: libefc: Register discovery objects with hardware

Message ID 20210103171134.39878-17-jsmart2021@gmail.com
State Superseded
Headers show
Series efct: Broadcom (Emulex) FC Target driver | expand

Commit Message

James Smart Jan. 3, 2021, 5:11 p.m. UTC
This patch continues the libefc library population.

This patch adds library interface definitions for:
-Registrations for VFI, VPI and RPI.

Co-developed-by: Ram Vegesna <ram.vegesna@broadcom.com>
Signed-off-by: Ram Vegesna <ram.vegesna@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>

---
v5:
 EFC_EVT_XXX name changes.
---
 drivers/scsi/elx/libefc/efc_cmds.c | 877 +++++++++++++++++++++++++++++
 drivers/scsi/elx/libefc/efc_cmds.h |  35 ++
 2 files changed, 912 insertions(+)
 create mode 100644 drivers/scsi/elx/libefc/efc_cmds.c
 create mode 100644 drivers/scsi/elx/libefc/efc_cmds.h

Comments

Daniel Wagner Jan. 4, 2021, 4:49 p.m. UTC | #1
On Sun, Jan 03, 2021 at 09:11:19AM -0800, James Smart wrote:
> This patch continues the libefc library population.
> 
> This patch adds library interface definitions for:
> -Registrations for VFI, VPI and RPI.
> 
> Co-developed-by: Ram Vegesna <ram.vegesna@broadcom.com>
> Signed-off-by: Ram Vegesna <ram.vegesna@broadcom.com>
> Signed-off-by: James Smart <jsmart2021@gmail.com>
> 
> ---
> v5:
>  EFC_EVT_XXX name changes.
> ---
>  drivers/scsi/elx/libefc/efc_cmds.c | 877 +++++++++++++++++++++++++++++
>  drivers/scsi/elx/libefc/efc_cmds.h |  35 ++
>  2 files changed, 912 insertions(+)
>  create mode 100644 drivers/scsi/elx/libefc/efc_cmds.c
>  create mode 100644 drivers/scsi/elx/libefc/efc_cmds.h
> 
> diff --git a/drivers/scsi/elx/libefc/efc_cmds.c b/drivers/scsi/elx/libefc/efc_cmds.c
> new file mode 100644
> index 000000000000..a1cca840cf63
> --- /dev/null
> +++ b/drivers/scsi/elx/libefc/efc_cmds.c
> @@ -0,0 +1,877 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2021 Broadcom. All Rights Reserved. The term
> + * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
> + */
> +
> +#include "efclib.h"
> +#include "../libefc_sli/sli4.h"
> +#include "efc_cmds.h"
> +#include "efc_sm.h"
> +
> +static void
> +efc_nport_free_resources(struct efc_nport *nport, int evt, void *data)
> +{
> +	struct efc *efc = nport->efc;
> +
> +	/* Clear the nport attached flag */
> +	nport->attached = false;
> +
> +	/* Free the service parameters buffer */
> +	if (nport->dma.virt) {
> +		dma_free_coherent(&efc->pci->dev, nport->dma.size,
> +				  nport->dma.virt, nport->dma.phys);
> +		memset(&nport->dma, 0, sizeof(struct efc_dma));
> +	}
> +
> +	/* Free the SLI resources */
> +	sli_resource_free(efc->sli, SLI4_RSRC_VPI, nport->indicator);
> +
> +	efc_nport_cb(efc, evt, nport);
> +}
> +
> +static int
> +efc_nport_get_mbox_status(struct efc_nport *nport, u8 *mqe, int status)
> +{
> +	struct efc *efc = nport->efc;
> +	struct sli4_mbox_command_header *hdr =
> +			(struct sli4_mbox_command_header *)mqe;
> +	int rc = 0;

Is there a reason not to use the EFC_SUCCESS/FAIL defines? Anyway, this
local variable could be avoided by just using return directly.

> +
> +	if (status || le16_to_cpu(hdr->status)) {
> +		efc_log_debug(efc, "bad status vpi=%#x st=%x hdr=%x\n",
> +			nport->indicator, status, le16_to_cpu(hdr->status));
> +		rc = -1;

		return EFC_FAIL/-1;

> +	}
> +
> +	return rc;

	return EFC_SUCCESS/0;

Anyway, this pattern with 'rc = foo(); if (rc) {}' is different to the
patches I've seen so far. Usually, the local rc variable is avoided and
the function is directly called in the if condition
statement. Personally, I find the style here simpler to follow but for
consistency sake I rather have one style through out the driver.

> +static int
> +efc_nport_free_unreg_vpi_cb(struct efc *efc, int status, u8 *mqe, void *arg)
> +{
> +	struct efc_nport *nport = arg;
> +	int evt = EFC_EVT_NPORT_FREE_OK;
> +	int rc = 0;

Again the question why not EFC_SUCCESS?

Rest looks good. As the above comments are just nitpicking:

Reviewed-by: Daniel Wagner <dwagner@suse.de>
Hannes Reinecke March 5, 2021, 12:28 p.m. UTC | #2
On 1/3/21 6:11 PM, James Smart wrote:
> This patch continues the libefc library population.

> 

> This patch adds library interface definitions for:

> -Registrations for VFI, VPI and RPI.

> 

> Co-developed-by: Ram Vegesna <ram.vegesna@broadcom.com>

> Signed-off-by: Ram Vegesna <ram.vegesna@broadcom.com>

> Signed-off-by: James Smart <jsmart2021@gmail.com>

> 

> ---

> v5:

>   EFC_EVT_XXX name changes.

> ---

>   drivers/scsi/elx/libefc/efc_cmds.c | 877 +++++++++++++++++++++++++++++

>   drivers/scsi/elx/libefc/efc_cmds.h |  35 ++

>   2 files changed, 912 insertions(+)

>   create mode 100644 drivers/scsi/elx/libefc/efc_cmds.c

>   create mode 100644 drivers/scsi/elx/libefc/efc_cmds.h

> 

> diff --git a/drivers/scsi/elx/libefc/efc_cmds.c b/drivers/scsi/elx/libefc/efc_cmds.c

> new file mode 100644

> index 000000000000..a1cca840cf63

> --- /dev/null

> +++ b/drivers/scsi/elx/libefc/efc_cmds.c

> @@ -0,0 +1,877 @@

> +// SPDX-License-Identifier: GPL-2.0

> +/*

> + * Copyright (C) 2021 Broadcom. All Rights Reserved. The term

> + * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.

> + */

> +

> +#include "efclib.h"

> +#include "../libefc_sli/sli4.h"

> +#include "efc_cmds.h"

> +#include "efc_sm.h"

> +

> +static void

> +efc_nport_free_resources(struct efc_nport *nport, int evt, void *data)

> +{

> +	struct efc *efc = nport->efc;

> +

> +	/* Clear the nport attached flag */

> +	nport->attached = false;

> +

> +	/* Free the service parameters buffer */

> +	if (nport->dma.virt) {

> +		dma_free_coherent(&efc->pci->dev, nport->dma.size,

> +				  nport->dma.virt, nport->dma.phys);

> +		memset(&nport->dma, 0, sizeof(struct efc_dma));

> +	}

> +

> +	/* Free the SLI resources */

> +	sli_resource_free(efc->sli, SLI4_RSRC_VPI, nport->indicator);

> +

> +	efc_nport_cb(efc, evt, nport);

> +}

> +

> +static int

> +efc_nport_get_mbox_status(struct efc_nport *nport, u8 *mqe, int status)

> +{

> +	struct efc *efc = nport->efc;

> +	struct sli4_mbox_command_header *hdr =

> +			(struct sli4_mbox_command_header *)mqe;

> +	int rc = 0;

> +

> +	if (status || le16_to_cpu(hdr->status)) {

> +		efc_log_debug(efc, "bad status vpi=%#x st=%x hdr=%x\n",

> +			nport->indicator, status, le16_to_cpu(hdr->status));

> +		rc = -1;

> +	}

> +

> +	return rc;

> +}

> +

> +static int

> +efc_nport_free_unreg_vpi_cb(struct efc *efc, int status, u8 *mqe, void *arg)

> +{

> +	struct efc_nport *nport = arg;

> +	int evt = EFC_EVT_NPORT_FREE_OK;

> +	int rc = 0;

> +

> +	rc = efc_nport_get_mbox_status(nport, mqe, status);

> +	if (rc) {

> +		evt = EFC_EVT_NPORT_FREE_FAIL;

> +		rc = -1;

> +	}

> +

> +	efc_nport_free_resources(nport, evt, mqe);

> +	return rc;

> +}

> +

> +static void

> +efc_nport_free_unreg_vpi(struct efc_nport *nport)

> +{

> +	struct efc *efc = nport->efc;

> +	int rc;

> +	u8 data[SLI4_BMBX_SIZE];

> +

> +	rc = sli_cmd_unreg_vpi(efc->sli, data, nport->indicator,

> +			       SLI4_UNREG_TYPE_PORT);

> +	if (rc) {

> +		efc_log_err(efc, "UNREG_VPI format failure\n");

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_FREE_FAIL, data);

> +		return;

> +	}

> +

> +	rc = efc->tt.issue_mbox_rqst(efc->base, data,

> +				     efc_nport_free_unreg_vpi_cb, nport);

> +	if (rc) {

> +		efc_log_err(efc, "UNREG_VPI command failure\n");

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_FREE_FAIL, data);

> +	}

> +}

> +

> +static void

> +efc_nport_send_evt(struct efc_nport *nport, int evt, void *data)

> +{

> +	struct efc *efc = nport->efc;

> +

> +	/* Now inform the registered callbacks */

> +	efc_nport_cb(efc, evt, nport);

> +

> +	/* Set the nport attached flag */

> +	if (evt == EFC_EVT_NPORT_ATTACH_OK)

> +		nport->attached = true;

> +

> +	/* If there is a pending free request, then handle it now */

> +	if (nport->free_req_pending)

> +		efc_nport_free_unreg_vpi(nport);

> +}

> +

> +static int

> +efc_nport_alloc_init_vpi_cb(struct efc *efc, int status, u8 *mqe, void *arg)

> +{

> +	struct efc_nport *nport = arg;

> +	int rc;

> +

> +	rc = efc_nport_get_mbox_status(nport, mqe, status);

> +	if (rc) {

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, mqe);

> +		return EFC_FAIL;

> +	}

> +

> +	efc_nport_send_evt(nport, EFC_EVT_NPORT_ALLOC_OK, mqe);

> +	return EFC_SUCCESS;

> +}

> +

> +static void

> +efc_nport_alloc_init_vpi(struct efc_nport *nport)

> +{

> +	struct efc *efc = nport->efc;

> +	u8 data[SLI4_BMBX_SIZE];

> +	int rc;

> +

> +	/* If there is a pending free request, then handle it now */

> +	if (nport->free_req_pending) {

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_FREE_OK, data);

> +		return;

> +	}

> +

> +	rc = sli_cmd_init_vpi(efc->sli, data,

> +			      nport->indicator, nport->domain->indicator);

> +	if (rc) {

> +		efc_log_err(efc, "INIT_VPI format failure\n");

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, data);

> +		return;

> +	}

> +

> +	rc = efc->tt.issue_mbox_rqst(efc->base, data,

> +			efc_nport_alloc_init_vpi_cb, nport);

> +	if (rc) {

> +		efc_log_err(efc, "INIT_VPI command failure\n");

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, data);

> +	}

> +}

> +

> +static int

> +efc_nport_alloc_read_sparm64_cb(struct efc *efc, int status, u8 *mqe, void *arg)

> +{

> +	struct efc_nport *nport = arg;

> +	u8 *payload = NULL;

> +	int rc;

> +

> +	rc = efc_nport_get_mbox_status(nport, mqe, status);

> +	if (rc) {

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, mqe);

> +		return EFC_FAIL;

> +	}

> +

> +	payload = nport->dma.virt;

> +

> +	memcpy(&nport->sli_wwpn, payload + SLI4_READ_SPARM64_WWPN_OFFSET,

> +		sizeof(nport->sli_wwpn));

> +	memcpy(&nport->sli_wwnn, payload + SLI4_READ_SPARM64_WWNN_OFFSET,

> +		sizeof(nport->sli_wwnn));

> +

> +	dma_free_coherent(&efc->pci->dev, nport->dma.size, nport->dma.virt,

> +			  nport->dma.phys);

> +	memset(&nport->dma, 0, sizeof(struct efc_dma));

> +	efc_nport_alloc_init_vpi(nport);

> +	return EFC_SUCCESS;

> +}

> +

> +static void

> +efc_nport_alloc_read_sparm64(struct efc *efc, struct efc_nport *nport)

> +{

> +	u8 data[SLI4_BMBX_SIZE];

> +	int rc;

> +

> +	/* Allocate memory for the service parameters */

> +	nport->dma.size = EFC_SPARAM_DMA_SZ;

> +	nport->dma.virt = dma_alloc_coherent(&efc->pci->dev,

> +					     nport->dma.size, &nport->dma.phys,

> +					     GFP_DMA);

> +	if (!nport->dma.virt) {

> +		efc_log_err(efc, "Failed to allocate DMA memory\n");

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, data);

> +		return;

> +	}

> +

> +	rc = sli_cmd_read_sparm64(efc->sli, data,

> +				  &nport->dma, nport->indicator);

> +	if (rc) {

> +		efc_log_err(efc, "READ_SPARM64 format failure\n");

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, data);

> +		return;

> +	}

> +

> +	rc = efc->tt.issue_mbox_rqst(efc->base, data,

> +				     efc_nport_alloc_read_sparm64_cb, nport);

> +	if (rc) {

> +		efc_log_err(efc, "READ_SPARM64 command failure\n");

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, data);

> +	}

> +}

> +

> +int

> +efc_cmd_nport_alloc(struct efc *efc, struct efc_nport *nport,

> +		    struct efc_domain *domain, u8 *wwpn)

> +{

> +	u32 rc = EFC_SUCCESS;

> +	u32 index;

> +

> +	nport->indicator = U32_MAX;

> +	nport->free_req_pending = false;

> +

> +	/*

> +	 * Check if the chip is in an error state (UE'd) before proceeding.

> +	 */

> +	if (sli_fw_error_status(efc->sli) > 0) {

> +		efc_log_crit(efc, "Chip is in an error state - reset needed\n");

> +		return EFC_FAIL;

> +	}

> +

> +	if (wwpn)

> +		memcpy(&nport->sli_wwpn, wwpn, sizeof(nport->sli_wwpn));

> +

> +	/*

> +	 * allocate a VPI object for the port and stores it in the

> +	 * indicator field of the port object.

> +	 */

> +	if (sli_resource_alloc(efc->sli, SLI4_RSRC_VPI,

> +			       &nport->indicator, &index)) {

> +		efc_log_err(efc, "VPI allocation failure\n");

> +		return EFC_FAIL;

> +	}

> +

> +	if (domain) {

> +		/*

> +		 * If the WWPN is NULL, fetch the default

> +		 * WWPN and WWNN before initializing the VPI

> +		 */

> +		if (!wwpn)

> +			efc_nport_alloc_read_sparm64(efc, nport);

> +		else

> +			efc_nport_alloc_init_vpi(nport);

> +	} else if (!wwpn) {

> +		/* This is the convention for the HW, not SLI */

> +		efc_log_err(efc, "need WWN for physical port\n");

> +		rc = EFC_FAIL;

> +	}

> +

> +	/* domain NULL and wwpn non-NULL */

> +	if (rc)

> +		sli_resource_free(efc->sli, SLI4_RSRC_VPI, nport->indicator);

> +

> +	return rc;

> +}

> +

> +static int

> +efc_nport_attach_reg_vpi_cb(struct efc *efc, int status, u8 *mqe,

> +			       void *arg)

> +{

> +	struct efc_nport *nport = arg;

> +	int rc;

> +

> +	rc = efc_nport_get_mbox_status(nport, mqe, status);

> +	if (rc) {

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_ATTACH_FAIL, mqe);

> +		return EFC_FAIL;

> +	}

> +

> +	efc_nport_send_evt(nport, EFC_EVT_NPORT_ATTACH_OK, mqe);

> +	return EFC_SUCCESS;

> +}

> +

> +int

> +efc_cmd_nport_attach(struct efc *efc, struct efc_nport *nport, u32 fc_id)

> +{

> +	u8 buf[SLI4_BMBX_SIZE];

> +	int rc = EFC_SUCCESS;

> +

> +	if (!nport) {

> +		efc_log_err(efc, "bad param(s) nport=%p\n", nport);

> +		return EFC_FAIL;

> +	}

> +

> +	/*

> +	 * Check if the chip is in an error state (UE'd) before proceeding.

> +	 */

> +	if (sli_fw_error_status(efc->sli) > 0) {

> +		efc_log_crit(efc,

> +			      "Chip is in an error state - reset needed\n");

> +		return EFC_FAIL;

> +	}

> +

> +	nport->fc_id = fc_id;

> +

> +	/* register previously-allocated VPI with the device */

> +	rc = sli_cmd_reg_vpi(efc->sli, buf, nport->fc_id,

> +			    nport->sli_wwpn, nport->indicator,

> +			    nport->domain->indicator, false);

> +	if (rc) {

> +		efc_log_err(efc, "REG_VPI format failure\n");

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_ATTACH_FAIL, buf);

> +		return rc;

> +	}

> +

> +	rc = efc->tt.issue_mbox_rqst(efc->base, buf,

> +				     efc_nport_attach_reg_vpi_cb, nport);

> +	if (rc) {

> +		efc_log_err(efc, "REG_VPI command failure\n");

> +		efc_nport_free_resources(nport, EFC_EVT_NPORT_ATTACH_FAIL, buf);

> +	}

> +

> +	return rc;

> +}

> +

> +int

> +efc_cmd_nport_free(struct efc *efc, struct efc_nport *nport)

> +{

> +	if (!nport) {

> +		efc_log_err(efc, "bad parameter(s) nport=%p\n",	nport);

> +		return EFC_FAIL;

> +	}

> +

> +	/*

> +	 * Check if the chip is in an error state (UE'd) before proceeding.

> +	 */

> +	if (sli_fw_error_status(efc->sli) > 0) {

> +		efc_log_crit(efc,

> +			      "Chip is in an error state - reset needed\n");

> +		return EFC_FAIL;

> +	}

> +

> +	/* Issue the UNREG_VPI command to free the assigned VPI context */

> +	if (nport->attached)

> +		efc_nport_free_unreg_vpi(nport);

> +	else

> +		nport->free_req_pending = true;

> +

> +	return EFC_SUCCESS;

> +}

> +

> +static int

> +efc_domain_get_mbox_status(struct efc_domain *domain, u8 *mqe, int status)

> +{

> +	struct efc *efc = domain->efc;

> +	struct sli4_mbox_command_header *hdr =

> +			(struct sli4_mbox_command_header *)mqe;

> +	int rc = 0;

> +

> +	if (status || le16_to_cpu(hdr->status)) {

> +		efc_log_debug(efc, "bad status vfi=%#x st=%x hdr=%x\n",

> +			       domain->indicator, status,

> +			       le16_to_cpu(hdr->status));

> +		rc = -1;

> +	}

> +

> +	return rc;

> +}

> +

> +static void

> +efc_domain_free_resources(struct efc_domain *domain, int evt, void *data)

> +{

> +	struct efc *efc = domain->efc;

> +

> +	/* Free the service parameters buffer */

> +	if (domain->dma.virt) {

> +		dma_free_coherent(&efc->pci->dev,

> +				  domain->dma.size, domain->dma.virt,

> +				  domain->dma.phys);

> +		memset(&domain->dma, 0, sizeof(struct efc_dma));

> +	}

> +

> +	/* Free the SLI resources */

> +	sli_resource_free(efc->sli, SLI4_RSRC_VFI, domain->indicator);

> +

> +	efc_domain_cb(efc, evt, domain);

> +}

> +

> +static void

> +efc_domain_send_nport_evt(struct efc_domain *domain,

> +			      int port_evt, int domain_evt, void *data)

> +{

> +	struct efc *efc = domain->efc;

> +

> +	/* Send alloc/attach ok to the physical nport */

> +	efc_nport_send_evt(domain->nport, port_evt, NULL);

> +

> +	/* Now inform the registered callbacks */

> +	efc_domain_cb(efc, domain_evt, domain);

> +}

> +

> +static int

> +efc_domain_alloc_read_sparm64_cb(struct efc *efc, int status, u8 *mqe,

> +				 void *arg)

> +{

> +	struct efc_domain *domain = arg;

> +	int rc;

> +

> +	rc = efc_domain_get_mbox_status(domain, mqe, status);

> +	if (rc) {

> +		efc_domain_free_resources(domain,

> +					      EFC_HW_DOMAIN_ALLOC_FAIL, mqe);

> +		return EFC_FAIL;

> +	}

> +

> +	efc_domain_send_nport_evt(domain, EFC_EVT_NPORT_ALLOC_OK,

> +				      EFC_HW_DOMAIN_ALLOC_OK, mqe);

> +	return EFC_SUCCESS;

> +}

> +

> +static void

> +efc_domain_alloc_read_sparm64(struct efc_domain *domain)

> +{

> +	struct efc *efc = domain->efc;

> +	u8 data[SLI4_BMBX_SIZE];

> +	int rc;

> +

> +	rc = sli_cmd_read_sparm64(efc->sli, data, &domain->dma, 0);

> +	if (rc) {

> +		efc_log_err(efc, "READ_SPARM64 format failure\n");

> +		efc_domain_free_resources(domain,

> +					      EFC_HW_DOMAIN_ALLOC_FAIL, data);

> +		return;

> +	}

> +

> +	rc = efc->tt.issue_mbox_rqst(efc->base, data,

> +				     efc_domain_alloc_read_sparm64_cb, domain);

> +	if (rc) {

> +		efc_log_err(efc, "READ_SPARM64 command failure\n");

> +		efc_domain_free_resources(domain,

> +					      EFC_HW_DOMAIN_ALLOC_FAIL, data);

> +	}

> +}

> +

> +static int

> +efc_domain_alloc_init_vfi_cb(struct efc *efc, int status, u8 *mqe,

> +				 void *arg)

> +{

> +	struct efc_domain *domain = arg;

> +	int rc;

> +

> +	rc = efc_domain_get_mbox_status(domain, mqe, status);

> +	if (rc) {

> +		efc_domain_free_resources(domain,

> +					      EFC_HW_DOMAIN_ALLOC_FAIL, mqe);

> +		return EFC_FAIL;

> +	}

> +

> +	efc_domain_alloc_read_sparm64(domain);

> +	return EFC_SUCCESS;

> +}

> +

> +static void

> +efc_domain_alloc_init_vfi(struct efc_domain *domain)

> +{

> +	struct efc *efc = domain->efc;

> +	struct efc_nport *nport = domain->nport;

> +	u8 data[SLI4_BMBX_SIZE];

> +	int rc;

> +

> +	/*

> +	 * For FC, the HW alread registered an FCFI.

> +	 * Copy FCF information into the domain and jump to INIT_VFI.

> +	 */

> +	domain->fcf_indicator = efc->fcfi;

> +	rc = sli_cmd_init_vfi(efc->sli, data, domain->indicator,

> +			      domain->fcf_indicator, nport->indicator);

> +	if (rc) {

> +		efc_log_err(efc, "INIT_VFI format failure\n");

> +		efc_domain_free_resources(domain,

> +					      EFC_HW_DOMAIN_ALLOC_FAIL, data);

> +		return;

> +	}

> +

> +	efc_log_err(efc, "%s issue mbox\n", __func__);

> +	rc = efc->tt.issue_mbox_rqst(efc->base, data,

> +				     efc_domain_alloc_init_vfi_cb, domain);

> +	if (rc) {

> +		efc_log_err(efc, "INIT_VFI command failure\n");

> +		efc_domain_free_resources(domain,

> +					      EFC_HW_DOMAIN_ALLOC_FAIL, data);

> +	}

> +}

> +

> +int

> +efc_cmd_domain_alloc(struct efc *efc, struct efc_domain *domain, u32 fcf)

> +{

> +	u32 index;

> +

> +	if (!domain || !domain->nport) {

> +		efc_log_err(efc, "bad parameter(s) domain=%p nport=%p\n",

> +			    domain, domain ? domain->nport : NULL);

> +		return EFC_FAIL;

> +	}

> +

> +	/*

> +	 * Check if the chip is in an error state (UE'd) before proceeding.

> +	 */

> +	if (sli_fw_error_status(efc->sli) > 0) {

> +		efc_log_crit(efc,

> +			     "Chip is in an error state - reset needed\n");

> +		return EFC_FAIL;

> +	}

> +

> +	/* allocate memory for the service parameters */

> +	domain->dma.size = EFC_SPARAM_DMA_SZ;

> +	domain->dma.virt = dma_alloc_coherent(&efc->pci->dev,

> +					      domain->dma.size,

> +					      &domain->dma.phys, GFP_DMA);

> +	if (!domain->dma.virt) {

> +		efc_log_err(efc, "Failed to allocate DMA memory\n");

> +		return EFC_FAIL;

> +	}

> +

> +	domain->fcf = fcf;

> +	domain->fcf_indicator = U32_MAX;

> +	domain->indicator = U32_MAX;

> +

> +	if (sli_resource_alloc(efc->sli, SLI4_RSRC_VFI, &domain->indicator,

> +			       &index)) {

> +		efc_log_err(efc, "VFI allocation failure\n");

> +

> +		dma_free_coherent(&efc->pci->dev,

> +				  domain->dma.size, domain->dma.virt,

> +				  domain->dma.phys);

> +		memset(&domain->dma, 0, sizeof(struct efc_dma));

> +

> +		return EFC_FAIL;

> +	}

> +

> +	efc_domain_alloc_init_vfi(domain);

> +	return EFC_SUCCESS;

> +}

> +

> +static int

> +efc_domain_attach_reg_vfi_cb(struct efc *efc, int status, u8 *mqe,

> +				 void *arg)

> +{

> +	struct efc_domain *domain = arg;

> +	int rc;

> +

> +	rc = efc_domain_get_mbox_status(domain, mqe, status);

> +	if (rc) {

> +		efc_domain_free_resources(domain,

> +					      EFC_HW_DOMAIN_ATTACH_FAIL, mqe);

> +		return EFC_FAIL;

> +	}

> +

> +	efc_domain_send_nport_evt(domain, EFC_EVT_NPORT_ATTACH_OK,

> +				      EFC_HW_DOMAIN_ATTACH_OK, mqe);

> +	return EFC_SUCCESS;

> +}

> +

> +int

> +efc_cmd_domain_attach(struct efc *efc, struct efc_domain *domain, u32 fc_id)

> +{

> +	u8 buf[SLI4_BMBX_SIZE];

> +	int rc = EFC_SUCCESS;

> +

> +	if (!domain) {

> +		efc_log_err(efc, "bad param(s) domain=%p\n", domain);

> +		return EFC_FAIL;

> +	}

> +

> +	/*

> +	 * Check if the chip is in an error state (UE'd) before proceeding.

> +	 */

> +	if (sli_fw_error_status(efc->sli) > 0) {

> +		efc_log_crit(efc,

> +			      "Chip is in an error state - reset needed\n");

> +		return EFC_FAIL;

> +	}

> +

> +	domain->nport->fc_id = fc_id;

> +

> +	rc = sli_cmd_reg_vfi(efc->sli, buf, SLI4_BMBX_SIZE, domain->indicator,

> +			     domain->fcf_indicator, domain->dma,

> +			     domain->nport->indicator, domain->nport->sli_wwpn,

> +			     domain->nport->fc_id);

> +	if (rc) {

> +		efc_log_err(efc, "REG_VFI format failure\n");

> +		goto cleanup;

> +	}

> +

> +	rc = efc->tt.issue_mbox_rqst(efc->base, buf,

> +				     efc_domain_attach_reg_vfi_cb, domain);

> +	if (rc) {

> +		efc_log_err(efc, "REG_VFI command failure\n");

> +		goto cleanup;

> +	}

> +

> +	return rc;

> +

> +cleanup:

> +	efc_domain_free_resources(domain, EFC_HW_DOMAIN_ATTACH_FAIL, buf);

> +

> +	return rc;

> +}

> +

> +static int

> +efc_domain_free_unreg_vfi_cb(struct efc *efc, int status, u8 *mqe, void *arg)

> +{

> +	struct efc_domain *domain = arg;

> +	int evt = EFC_HW_DOMAIN_FREE_OK;

> +	int rc = 0;

> +

> +	rc = efc_domain_get_mbox_status(domain, mqe, status);

> +	if (rc) {

> +		evt = EFC_HW_DOMAIN_FREE_FAIL;

> +		rc = EFC_FAIL;

> +	}

> +

> +	efc_domain_free_resources(domain, evt, mqe);

> +	return rc;

> +}

> +

> +static void

> +efc_domain_free_unreg_vfi(struct efc_domain *domain)

> +{

> +	struct efc *efc = domain->efc;

> +	int rc;

> +	u8 data[SLI4_BMBX_SIZE];

> +

> +	rc = sli_cmd_unreg_vfi(efc->sli, data, domain->indicator,

> +			       SLI4_UNREG_TYPE_DOMAIN);

> +	if (rc) {

> +		efc_log_err(efc, "UNREG_VFI format failure\n");

> +		goto cleanup;

> +	}

> +

> +	rc = efc->tt.issue_mbox_rqst(efc->base, data,

> +				     efc_domain_free_unreg_vfi_cb, domain);

> +	if (rc) {

> +		efc_log_err(efc, "UNREG_VFI command failure\n");

> +		goto cleanup;

> +	}

> +

> +	return;

> +

> +cleanup:

> +	efc_domain_free_resources(domain, EFC_HW_DOMAIN_FREE_FAIL, data);

> +}

> +

> +int

> +efc_cmd_domain_free(struct efc *efc, struct efc_domain *domain)

> +{

> +	int rc = EFC_SUCCESS;

> +

> +	if (!domain) {

> +		efc_log_err(efc, "bad parameter(s) domain=%p\n", domain);

> +		return EFC_FAIL;

> +	}

> +

> +	/*

> +	 * Check if the chip is in an error state (UE'd) before proceeding.

> +	 */

> +	if (sli_fw_error_status(efc->sli) > 0) {

> +		efc_log_crit(efc,

> +			      "Chip is in an error state - reset needed\n");

> +		return EFC_FAIL;

> +	}

> +

> +	efc_domain_free_unreg_vfi(domain);

> +	return rc;

> +}

> +

> +int

> +efc_cmd_node_alloc(struct efc *efc, struct efc_remote_node *rnode, u32 fc_addr,

> +		   struct efc_nport *nport)

> +{

> +	/* Check for invalid indicator */

> +	if (rnode->indicator != U32_MAX) {

> +		efc_log_err(efc,

> +			     "RPI allocation failure addr=%#x rpi=%#x\n",

> +			    fc_addr, rnode->indicator);

> +		return EFC_FAIL;

> +	}

> +

> +	/*

> +	 * Check if the chip is in an error state (UE'd) before proceeding.

> +	 */

> +	if (sli_fw_error_status(efc->sli) > 0) {

> +		efc_log_crit(efc,

> +			      "Chip is in an error state - reset needed\n");

> +		return EFC_FAIL;

> +	}

> +

> +	/* NULL SLI port indicates an unallocated remote node */

> +	rnode->nport = NULL;

> +

> +	if (sli_resource_alloc(efc->sli, SLI4_RSRC_RPI,

> +			       &rnode->indicator, &rnode->index)) {

> +		efc_log_err(efc, "RPI allocation failure addr=%#x\n",

> +			     fc_addr);

> +		return EFC_FAIL;

> +	}

> +

> +	rnode->fc_id = fc_addr;

> +	rnode->nport = nport;

> +

> +	return EFC_SUCCESS;

> +}

> +

> +static int

> +efc_cmd_node_attach_cb(struct efc *efc, int status, u8 *mqe, void *arg)

> +{

> +	struct efc_remote_node *rnode = arg;

> +	struct sli4_mbox_command_header *hdr =

> +				(struct sli4_mbox_command_header *)mqe;

> +	int evt = 0;

> +

> +	if (status || le16_to_cpu(hdr->status)) {

> +		efc_log_debug(efc, "bad status cqe=%#x mqe=%#x\n", status,

> +			       le16_to_cpu(hdr->status));

> +		rnode->attached = false;

> +		evt = EFC_EVT_NODE_ATTACH_FAIL;

> +	} else {

> +		rnode->attached = true;

> +		evt = EFC_EVT_NODE_ATTACH_OK;

> +	}

> +

> +	efc_remote_node_cb(efc, evt, rnode);

> +

> +	return EFC_SUCCESS;

> +}

> +

> +int

> +efc_cmd_node_attach(struct efc *efc, struct efc_remote_node *rnode,

> +		    struct efc_dma *sparms)

> +{

> +	int rc = EFC_FAIL;

> +	u8 buf[SLI4_BMBX_SIZE];

> +

> +	if (!rnode || !sparms) {

> +		efc_log_err(efc, "bad parameter(s) rnode=%p sparms=%p\n",

> +			    rnode, sparms);

> +		return EFC_FAIL;

> +	}

> +

> +	/*

> +	 * Check if the chip is in an error state (UE'd) before proceeding.

> +	 */

> +	if (sli_fw_error_status(efc->sli) > 0) {

> +		efc_log_crit(efc, "Chip is in an error state - reset needed\n");

> +		return EFC_FAIL;

> +	}

> +

> +	/*

> +	 * If the attach count is non-zero, this RPI has already been reg'd.

> +	 * Otherwise, register the RPI

> +	 */

> +	if (rnode->index == U32_MAX) {

> +		efc_log_err(efc, "bad parameter rnode->index invalid\n");

> +		return EFC_FAIL;

> +	}

> +

> +	/* Update a remote node object with the remote port's service params */

> +	if (!sli_cmd_reg_rpi(efc->sli, buf, rnode->indicator,

> +			rnode->nport->indicator, rnode->fc_id, sparms, 0, 0))

> +		rc = efc->tt.issue_mbox_rqst(efc->base, buf,

> +					     efc_cmd_node_attach_cb, rnode);

> +

> +	return rc;

> +}

> +

> +int

> +efc_node_free_resources(struct efc *efc, struct efc_remote_node *rnode)

> +{

> +	int rc = EFC_SUCCESS;

> +

> +	if (!rnode) {

> +		efc_log_err(efc, "bad parameter rnode=%p\n", rnode);

> +		return EFC_FAIL;

> +	}

> +

> +	if (rnode->nport) {

> +		if (rnode->attached) {

> +			efc_log_err(efc, "Err: rnode is still attached\n");

> +			return EFC_FAIL;

> +		}

> +		if (rnode->indicator != U32_MAX) {

> +			if (sli_resource_free(efc->sli, SLI4_RSRC_RPI,

> +					      rnode->indicator)) {

> +				efc_log_err(efc,

> +					    "RPI free fail RPI %d addr=%#x\n",

> +					    rnode->indicator, rnode->fc_id);

> +				rc = EFC_FAIL;

> +			} else {

> +				rnode->indicator = U32_MAX;

> +				rnode->index = U32_MAX;

> +			}

> +		}

> +	}

> +

> +	return rc;

> +}

> +

> +static int

> +efc_cmd_node_free_cb(struct efc *efc, int status, u8 *mqe, void *arg)

> +{

> +	struct efc_remote_node *rnode = arg;

> +	struct sli4_mbox_command_header *hdr =

> +				(struct sli4_mbox_command_header *)mqe;

> +	int evt = EFC_EVT_NODE_FREE_FAIL;

> +	int rc = 0;

> +

> +	if (status || le16_to_cpu(hdr->status)) {

> +		efc_log_debug(efc, "bad status cqe=%#x mqe=%#x\n", status,

> +			       le16_to_cpu(hdr->status));

> +

> +		/*

> +		 * In certain cases, a non-zero MQE status is OK (all must be

> +		 * true):

> +		 *   - node is attached

> +		 *   - status is 0x1400

> +		 */

> +		if (!rnode->attached ||

> +		    (le16_to_cpu(hdr->status) != SLI4_MBX_STATUS_RPI_NOT_REG))

> +			rc = EFC_FAIL;

> +	}

> +

> +	if (!rc) {

> +		rnode->attached = false;

> +		evt = EFC_EVT_NODE_FREE_OK;

> +	}

> +

> +	efc_remote_node_cb(efc, evt, rnode);

> +

> +	return rc;

> +}

> +

> +int

> +efc_cmd_node_detach(struct efc *efc, struct efc_remote_node *rnode)

> +{

> +	u8 buf[SLI4_BMBX_SIZE];

> +	int rc = EFC_FAIL;

> +

> +	if (!rnode) {

> +		efc_log_err(efc, "bad parameter rnode=%p\n", rnode);

> +		return EFC_FAIL;

> +	}

> +

> +	/*

> +	 * Check if the chip is in an error state (UE'd) before proceeding.

> +	 */

> +	if (sli_fw_error_status(efc->sli) > 0) {

> +		efc_log_crit(efc, "Chip is in an error state - reset needed\n");

> +		return EFC_FAIL;

> +	}

> +

> +	if (rnode->nport) {

> +		if (!rnode->attached)

> +			return EFC_FAIL;

> +

> +		rc = EFC_FAIL;

> +

> +		if (!sli_cmd_unreg_rpi(efc->sli, buf, rnode->indicator,

> +				      SLI4_RSRC_RPI, U32_MAX))

> +			rc = efc->tt.issue_mbox_rqst(efc->base, buf,

> +					efc_cmd_node_free_cb, rnode);

> +

> +		if (rc != EFC_SUCCESS) {

> +			efc_log_err(efc, "UNREG_RPI failed\n");

> +			rc = EFC_FAIL;

> +		}

> +	}

> +

> +	return rc;

> +}

> diff --git a/drivers/scsi/elx/libefc/efc_cmds.h b/drivers/scsi/elx/libefc/efc_cmds.h

> new file mode 100644

> index 000000000000..9c0287799e9e

> --- /dev/null

> +++ b/drivers/scsi/elx/libefc/efc_cmds.h

> @@ -0,0 +1,35 @@

> +/* SPDX-License-Identifier: GPL-2.0 */

> +/*

> + * Copyright (C) 2021 Broadcom. All Rights Reserved. The term

> + * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.

> + */

> +

> +#ifndef __EFC_CMDS_H__

> +#define __EFC_CMDS_H__

> +

> +#define EFC_SPARAM_DMA_SZ	112

> +int

> +efc_cmd_nport_alloc(struct efc *efc, struct efc_nport *nport,

> +		   struct efc_domain *domain, u8 *wwpn);

> +int

> +efc_cmd_nport_attach(struct efc *efc, struct efc_nport *nport, u32 fc_id);

> +int

> +efc_cmd_nport_free(struct efc *efc, struct efc_nport *nport);

> +int

> +efc_cmd_domain_alloc(struct efc *efc, struct efc_domain *domain, u32 fcf);

> +int

> +efc_cmd_domain_attach(struct efc *efc, struct efc_domain *domain, u32 fc_id);

> +int

> +efc_cmd_domain_free(struct efc *efc, struct efc_domain *domain);

> +int

> +efc_cmd_node_detach(struct efc *efc, struct efc_remote_node *rnode);

> +int

> +efc_node_free_resources(struct efc *efc, struct efc_remote_node *rnode);

> +int

> +efc_cmd_node_attach(struct efc *efc, struct efc_remote_node *rnode,

> +		    struct efc_dma *sparms);

> +int

> +efc_cmd_node_alloc(struct efc *efc, struct efc_remote_node *rnode, u32 fc_addr,

> +		   struct efc_nport *nport);

> +

> +#endif /* __EFC_CMDS_H */

> 

What I'm not happy with is this 'reset needed' thingie.
The check for unavailable/wedged hardware is splattered all over the 
code, making it really hard to figure out why it should be there or if a 
check should be missing.
Can't this check be moved into the function doing the actual hardware 
access, and having them returned an appropriate error code?

Plus the statement 'reset needed' really should be followed by the 
actual action (ie a device reset); where would be the point of that 
message otherwise?

Cheers,

Hannes
-- 
Dr. Hannes Reinecke                Kernel Storage Architect
hare@suse.de                              +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
diff mbox series

Patch

diff --git a/drivers/scsi/elx/libefc/efc_cmds.c b/drivers/scsi/elx/libefc/efc_cmds.c
new file mode 100644
index 000000000000..a1cca840cf63
--- /dev/null
+++ b/drivers/scsi/elx/libefc/efc_cmds.c
@@ -0,0 +1,877 @@ 
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2021 Broadcom. All Rights Reserved. The term
+ * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
+ */
+
+#include "efclib.h"
+#include "../libefc_sli/sli4.h"
+#include "efc_cmds.h"
+#include "efc_sm.h"
+
+static void
+efc_nport_free_resources(struct efc_nport *nport, int evt, void *data)
+{
+	struct efc *efc = nport->efc;
+
+	/* Clear the nport attached flag */
+	nport->attached = false;
+
+	/* Free the service parameters buffer */
+	if (nport->dma.virt) {
+		dma_free_coherent(&efc->pci->dev, nport->dma.size,
+				  nport->dma.virt, nport->dma.phys);
+		memset(&nport->dma, 0, sizeof(struct efc_dma));
+	}
+
+	/* Free the SLI resources */
+	sli_resource_free(efc->sli, SLI4_RSRC_VPI, nport->indicator);
+
+	efc_nport_cb(efc, evt, nport);
+}
+
+static int
+efc_nport_get_mbox_status(struct efc_nport *nport, u8 *mqe, int status)
+{
+	struct efc *efc = nport->efc;
+	struct sli4_mbox_command_header *hdr =
+			(struct sli4_mbox_command_header *)mqe;
+	int rc = 0;
+
+	if (status || le16_to_cpu(hdr->status)) {
+		efc_log_debug(efc, "bad status vpi=%#x st=%x hdr=%x\n",
+			nport->indicator, status, le16_to_cpu(hdr->status));
+		rc = -1;
+	}
+
+	return rc;
+}
+
+static int
+efc_nport_free_unreg_vpi_cb(struct efc *efc, int status, u8 *mqe, void *arg)
+{
+	struct efc_nport *nport = arg;
+	int evt = EFC_EVT_NPORT_FREE_OK;
+	int rc = 0;
+
+	rc = efc_nport_get_mbox_status(nport, mqe, status);
+	if (rc) {
+		evt = EFC_EVT_NPORT_FREE_FAIL;
+		rc = -1;
+	}
+
+	efc_nport_free_resources(nport, evt, mqe);
+	return rc;
+}
+
+static void
+efc_nport_free_unreg_vpi(struct efc_nport *nport)
+{
+	struct efc *efc = nport->efc;
+	int rc;
+	u8 data[SLI4_BMBX_SIZE];
+
+	rc = sli_cmd_unreg_vpi(efc->sli, data, nport->indicator,
+			       SLI4_UNREG_TYPE_PORT);
+	if (rc) {
+		efc_log_err(efc, "UNREG_VPI format failure\n");
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_FREE_FAIL, data);
+		return;
+	}
+
+	rc = efc->tt.issue_mbox_rqst(efc->base, data,
+				     efc_nport_free_unreg_vpi_cb, nport);
+	if (rc) {
+		efc_log_err(efc, "UNREG_VPI command failure\n");
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_FREE_FAIL, data);
+	}
+}
+
+static void
+efc_nport_send_evt(struct efc_nport *nport, int evt, void *data)
+{
+	struct efc *efc = nport->efc;
+
+	/* Now inform the registered callbacks */
+	efc_nport_cb(efc, evt, nport);
+
+	/* Set the nport attached flag */
+	if (evt == EFC_EVT_NPORT_ATTACH_OK)
+		nport->attached = true;
+
+	/* If there is a pending free request, then handle it now */
+	if (nport->free_req_pending)
+		efc_nport_free_unreg_vpi(nport);
+}
+
+static int
+efc_nport_alloc_init_vpi_cb(struct efc *efc, int status, u8 *mqe, void *arg)
+{
+	struct efc_nport *nport = arg;
+	int rc;
+
+	rc = efc_nport_get_mbox_status(nport, mqe, status);
+	if (rc) {
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, mqe);
+		return EFC_FAIL;
+	}
+
+	efc_nport_send_evt(nport, EFC_EVT_NPORT_ALLOC_OK, mqe);
+	return EFC_SUCCESS;
+}
+
+static void
+efc_nport_alloc_init_vpi(struct efc_nport *nport)
+{
+	struct efc *efc = nport->efc;
+	u8 data[SLI4_BMBX_SIZE];
+	int rc;
+
+	/* If there is a pending free request, then handle it now */
+	if (nport->free_req_pending) {
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_FREE_OK, data);
+		return;
+	}
+
+	rc = sli_cmd_init_vpi(efc->sli, data,
+			      nport->indicator, nport->domain->indicator);
+	if (rc) {
+		efc_log_err(efc, "INIT_VPI format failure\n");
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, data);
+		return;
+	}
+
+	rc = efc->tt.issue_mbox_rqst(efc->base, data,
+			efc_nport_alloc_init_vpi_cb, nport);
+	if (rc) {
+		efc_log_err(efc, "INIT_VPI command failure\n");
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, data);
+	}
+}
+
+static int
+efc_nport_alloc_read_sparm64_cb(struct efc *efc, int status, u8 *mqe, void *arg)
+{
+	struct efc_nport *nport = arg;
+	u8 *payload = NULL;
+	int rc;
+
+	rc = efc_nport_get_mbox_status(nport, mqe, status);
+	if (rc) {
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, mqe);
+		return EFC_FAIL;
+	}
+
+	payload = nport->dma.virt;
+
+	memcpy(&nport->sli_wwpn, payload + SLI4_READ_SPARM64_WWPN_OFFSET,
+		sizeof(nport->sli_wwpn));
+	memcpy(&nport->sli_wwnn, payload + SLI4_READ_SPARM64_WWNN_OFFSET,
+		sizeof(nport->sli_wwnn));
+
+	dma_free_coherent(&efc->pci->dev, nport->dma.size, nport->dma.virt,
+			  nport->dma.phys);
+	memset(&nport->dma, 0, sizeof(struct efc_dma));
+	efc_nport_alloc_init_vpi(nport);
+	return EFC_SUCCESS;
+}
+
+static void
+efc_nport_alloc_read_sparm64(struct efc *efc, struct efc_nport *nport)
+{
+	u8 data[SLI4_BMBX_SIZE];
+	int rc;
+
+	/* Allocate memory for the service parameters */
+	nport->dma.size = EFC_SPARAM_DMA_SZ;
+	nport->dma.virt = dma_alloc_coherent(&efc->pci->dev,
+					     nport->dma.size, &nport->dma.phys,
+					     GFP_DMA);
+	if (!nport->dma.virt) {
+		efc_log_err(efc, "Failed to allocate DMA memory\n");
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, data);
+		return;
+	}
+
+	rc = sli_cmd_read_sparm64(efc->sli, data,
+				  &nport->dma, nport->indicator);
+	if (rc) {
+		efc_log_err(efc, "READ_SPARM64 format failure\n");
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, data);
+		return;
+	}
+
+	rc = efc->tt.issue_mbox_rqst(efc->base, data,
+				     efc_nport_alloc_read_sparm64_cb, nport);
+	if (rc) {
+		efc_log_err(efc, "READ_SPARM64 command failure\n");
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_ALLOC_FAIL, data);
+	}
+}
+
+int
+efc_cmd_nport_alloc(struct efc *efc, struct efc_nport *nport,
+		    struct efc_domain *domain, u8 *wwpn)
+{
+	u32 rc = EFC_SUCCESS;
+	u32 index;
+
+	nport->indicator = U32_MAX;
+	nport->free_req_pending = false;
+
+	/*
+	 * Check if the chip is in an error state (UE'd) before proceeding.
+	 */
+	if (sli_fw_error_status(efc->sli) > 0) {
+		efc_log_crit(efc, "Chip is in an error state - reset needed\n");
+		return EFC_FAIL;
+	}
+
+	if (wwpn)
+		memcpy(&nport->sli_wwpn, wwpn, sizeof(nport->sli_wwpn));
+
+	/*
+	 * allocate a VPI object for the port and stores it in the
+	 * indicator field of the port object.
+	 */
+	if (sli_resource_alloc(efc->sli, SLI4_RSRC_VPI,
+			       &nport->indicator, &index)) {
+		efc_log_err(efc, "VPI allocation failure\n");
+		return EFC_FAIL;
+	}
+
+	if (domain) {
+		/*
+		 * If the WWPN is NULL, fetch the default
+		 * WWPN and WWNN before initializing the VPI
+		 */
+		if (!wwpn)
+			efc_nport_alloc_read_sparm64(efc, nport);
+		else
+			efc_nport_alloc_init_vpi(nport);
+	} else if (!wwpn) {
+		/* This is the convention for the HW, not SLI */
+		efc_log_err(efc, "need WWN for physical port\n");
+		rc = EFC_FAIL;
+	}
+
+	/* domain NULL and wwpn non-NULL */
+	if (rc)
+		sli_resource_free(efc->sli, SLI4_RSRC_VPI, nport->indicator);
+
+	return rc;
+}
+
+static int
+efc_nport_attach_reg_vpi_cb(struct efc *efc, int status, u8 *mqe,
+			       void *arg)
+{
+	struct efc_nport *nport = arg;
+	int rc;
+
+	rc = efc_nport_get_mbox_status(nport, mqe, status);
+	if (rc) {
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_ATTACH_FAIL, mqe);
+		return EFC_FAIL;
+	}
+
+	efc_nport_send_evt(nport, EFC_EVT_NPORT_ATTACH_OK, mqe);
+	return EFC_SUCCESS;
+}
+
+int
+efc_cmd_nport_attach(struct efc *efc, struct efc_nport *nport, u32 fc_id)
+{
+	u8 buf[SLI4_BMBX_SIZE];
+	int rc = EFC_SUCCESS;
+
+	if (!nport) {
+		efc_log_err(efc, "bad param(s) nport=%p\n", nport);
+		return EFC_FAIL;
+	}
+
+	/*
+	 * Check if the chip is in an error state (UE'd) before proceeding.
+	 */
+	if (sli_fw_error_status(efc->sli) > 0) {
+		efc_log_crit(efc,
+			      "Chip is in an error state - reset needed\n");
+		return EFC_FAIL;
+	}
+
+	nport->fc_id = fc_id;
+
+	/* register previously-allocated VPI with the device */
+	rc = sli_cmd_reg_vpi(efc->sli, buf, nport->fc_id,
+			    nport->sli_wwpn, nport->indicator,
+			    nport->domain->indicator, false);
+	if (rc) {
+		efc_log_err(efc, "REG_VPI format failure\n");
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_ATTACH_FAIL, buf);
+		return rc;
+	}
+
+	rc = efc->tt.issue_mbox_rqst(efc->base, buf,
+				     efc_nport_attach_reg_vpi_cb, nport);
+	if (rc) {
+		efc_log_err(efc, "REG_VPI command failure\n");
+		efc_nport_free_resources(nport, EFC_EVT_NPORT_ATTACH_FAIL, buf);
+	}
+
+	return rc;
+}
+
+int
+efc_cmd_nport_free(struct efc *efc, struct efc_nport *nport)
+{
+	if (!nport) {
+		efc_log_err(efc, "bad parameter(s) nport=%p\n",	nport);
+		return EFC_FAIL;
+	}
+
+	/*
+	 * Check if the chip is in an error state (UE'd) before proceeding.
+	 */
+	if (sli_fw_error_status(efc->sli) > 0) {
+		efc_log_crit(efc,
+			      "Chip is in an error state - reset needed\n");
+		return EFC_FAIL;
+	}
+
+	/* Issue the UNREG_VPI command to free the assigned VPI context */
+	if (nport->attached)
+		efc_nport_free_unreg_vpi(nport);
+	else
+		nport->free_req_pending = true;
+
+	return EFC_SUCCESS;
+}
+
+static int
+efc_domain_get_mbox_status(struct efc_domain *domain, u8 *mqe, int status)
+{
+	struct efc *efc = domain->efc;
+	struct sli4_mbox_command_header *hdr =
+			(struct sli4_mbox_command_header *)mqe;
+	int rc = 0;
+
+	if (status || le16_to_cpu(hdr->status)) {
+		efc_log_debug(efc, "bad status vfi=%#x st=%x hdr=%x\n",
+			       domain->indicator, status,
+			       le16_to_cpu(hdr->status));
+		rc = -1;
+	}
+
+	return rc;
+}
+
+static void
+efc_domain_free_resources(struct efc_domain *domain, int evt, void *data)
+{
+	struct efc *efc = domain->efc;
+
+	/* Free the service parameters buffer */
+	if (domain->dma.virt) {
+		dma_free_coherent(&efc->pci->dev,
+				  domain->dma.size, domain->dma.virt,
+				  domain->dma.phys);
+		memset(&domain->dma, 0, sizeof(struct efc_dma));
+	}
+
+	/* Free the SLI resources */
+	sli_resource_free(efc->sli, SLI4_RSRC_VFI, domain->indicator);
+
+	efc_domain_cb(efc, evt, domain);
+}
+
+static void
+efc_domain_send_nport_evt(struct efc_domain *domain,
+			      int port_evt, int domain_evt, void *data)
+{
+	struct efc *efc = domain->efc;
+
+	/* Send alloc/attach ok to the physical nport */
+	efc_nport_send_evt(domain->nport, port_evt, NULL);
+
+	/* Now inform the registered callbacks */
+	efc_domain_cb(efc, domain_evt, domain);
+}
+
+static int
+efc_domain_alloc_read_sparm64_cb(struct efc *efc, int status, u8 *mqe,
+				 void *arg)
+{
+	struct efc_domain *domain = arg;
+	int rc;
+
+	rc = efc_domain_get_mbox_status(domain, mqe, status);
+	if (rc) {
+		efc_domain_free_resources(domain,
+					      EFC_HW_DOMAIN_ALLOC_FAIL, mqe);
+		return EFC_FAIL;
+	}
+
+	efc_domain_send_nport_evt(domain, EFC_EVT_NPORT_ALLOC_OK,
+				      EFC_HW_DOMAIN_ALLOC_OK, mqe);
+	return EFC_SUCCESS;
+}
+
+static void
+efc_domain_alloc_read_sparm64(struct efc_domain *domain)
+{
+	struct efc *efc = domain->efc;
+	u8 data[SLI4_BMBX_SIZE];
+	int rc;
+
+	rc = sli_cmd_read_sparm64(efc->sli, data, &domain->dma, 0);
+	if (rc) {
+		efc_log_err(efc, "READ_SPARM64 format failure\n");
+		efc_domain_free_resources(domain,
+					      EFC_HW_DOMAIN_ALLOC_FAIL, data);
+		return;
+	}
+
+	rc = efc->tt.issue_mbox_rqst(efc->base, data,
+				     efc_domain_alloc_read_sparm64_cb, domain);
+	if (rc) {
+		efc_log_err(efc, "READ_SPARM64 command failure\n");
+		efc_domain_free_resources(domain,
+					      EFC_HW_DOMAIN_ALLOC_FAIL, data);
+	}
+}
+
+static int
+efc_domain_alloc_init_vfi_cb(struct efc *efc, int status, u8 *mqe,
+				 void *arg)
+{
+	struct efc_domain *domain = arg;
+	int rc;
+
+	rc = efc_domain_get_mbox_status(domain, mqe, status);
+	if (rc) {
+		efc_domain_free_resources(domain,
+					      EFC_HW_DOMAIN_ALLOC_FAIL, mqe);
+		return EFC_FAIL;
+	}
+
+	efc_domain_alloc_read_sparm64(domain);
+	return EFC_SUCCESS;
+}
+
+static void
+efc_domain_alloc_init_vfi(struct efc_domain *domain)
+{
+	struct efc *efc = domain->efc;
+	struct efc_nport *nport = domain->nport;
+	u8 data[SLI4_BMBX_SIZE];
+	int rc;
+
+	/*
+	 * For FC, the HW alread registered an FCFI.
+	 * Copy FCF information into the domain and jump to INIT_VFI.
+	 */
+	domain->fcf_indicator = efc->fcfi;
+	rc = sli_cmd_init_vfi(efc->sli, data, domain->indicator,
+			      domain->fcf_indicator, nport->indicator);
+	if (rc) {
+		efc_log_err(efc, "INIT_VFI format failure\n");
+		efc_domain_free_resources(domain,
+					      EFC_HW_DOMAIN_ALLOC_FAIL, data);
+		return;
+	}
+
+	efc_log_err(efc, "%s issue mbox\n", __func__);
+	rc = efc->tt.issue_mbox_rqst(efc->base, data,
+				     efc_domain_alloc_init_vfi_cb, domain);
+	if (rc) {
+		efc_log_err(efc, "INIT_VFI command failure\n");
+		efc_domain_free_resources(domain,
+					      EFC_HW_DOMAIN_ALLOC_FAIL, data);
+	}
+}
+
+int
+efc_cmd_domain_alloc(struct efc *efc, struct efc_domain *domain, u32 fcf)
+{
+	u32 index;
+
+	if (!domain || !domain->nport) {
+		efc_log_err(efc, "bad parameter(s) domain=%p nport=%p\n",
+			    domain, domain ? domain->nport : NULL);
+		return EFC_FAIL;
+	}
+
+	/*
+	 * Check if the chip is in an error state (UE'd) before proceeding.
+	 */
+	if (sli_fw_error_status(efc->sli) > 0) {
+		efc_log_crit(efc,
+			     "Chip is in an error state - reset needed\n");
+		return EFC_FAIL;
+	}
+
+	/* allocate memory for the service parameters */
+	domain->dma.size = EFC_SPARAM_DMA_SZ;
+	domain->dma.virt = dma_alloc_coherent(&efc->pci->dev,
+					      domain->dma.size,
+					      &domain->dma.phys, GFP_DMA);
+	if (!domain->dma.virt) {
+		efc_log_err(efc, "Failed to allocate DMA memory\n");
+		return EFC_FAIL;
+	}
+
+	domain->fcf = fcf;
+	domain->fcf_indicator = U32_MAX;
+	domain->indicator = U32_MAX;
+
+	if (sli_resource_alloc(efc->sli, SLI4_RSRC_VFI, &domain->indicator,
+			       &index)) {
+		efc_log_err(efc, "VFI allocation failure\n");
+
+		dma_free_coherent(&efc->pci->dev,
+				  domain->dma.size, domain->dma.virt,
+				  domain->dma.phys);
+		memset(&domain->dma, 0, sizeof(struct efc_dma));
+
+		return EFC_FAIL;
+	}
+
+	efc_domain_alloc_init_vfi(domain);
+	return EFC_SUCCESS;
+}
+
+static int
+efc_domain_attach_reg_vfi_cb(struct efc *efc, int status, u8 *mqe,
+				 void *arg)
+{
+	struct efc_domain *domain = arg;
+	int rc;
+
+	rc = efc_domain_get_mbox_status(domain, mqe, status);
+	if (rc) {
+		efc_domain_free_resources(domain,
+					      EFC_HW_DOMAIN_ATTACH_FAIL, mqe);
+		return EFC_FAIL;
+	}
+
+	efc_domain_send_nport_evt(domain, EFC_EVT_NPORT_ATTACH_OK,
+				      EFC_HW_DOMAIN_ATTACH_OK, mqe);
+	return EFC_SUCCESS;
+}
+
+int
+efc_cmd_domain_attach(struct efc *efc, struct efc_domain *domain, u32 fc_id)
+{
+	u8 buf[SLI4_BMBX_SIZE];
+	int rc = EFC_SUCCESS;
+
+	if (!domain) {
+		efc_log_err(efc, "bad param(s) domain=%p\n", domain);
+		return EFC_FAIL;
+	}
+
+	/*
+	 * Check if the chip is in an error state (UE'd) before proceeding.
+	 */
+	if (sli_fw_error_status(efc->sli) > 0) {
+		efc_log_crit(efc,
+			      "Chip is in an error state - reset needed\n");
+		return EFC_FAIL;
+	}
+
+	domain->nport->fc_id = fc_id;
+
+	rc = sli_cmd_reg_vfi(efc->sli, buf, SLI4_BMBX_SIZE, domain->indicator,
+			     domain->fcf_indicator, domain->dma,
+			     domain->nport->indicator, domain->nport->sli_wwpn,
+			     domain->nport->fc_id);
+	if (rc) {
+		efc_log_err(efc, "REG_VFI format failure\n");
+		goto cleanup;
+	}
+
+	rc = efc->tt.issue_mbox_rqst(efc->base, buf,
+				     efc_domain_attach_reg_vfi_cb, domain);
+	if (rc) {
+		efc_log_err(efc, "REG_VFI command failure\n");
+		goto cleanup;
+	}
+
+	return rc;
+
+cleanup:
+	efc_domain_free_resources(domain, EFC_HW_DOMAIN_ATTACH_FAIL, buf);
+
+	return rc;
+}
+
+static int
+efc_domain_free_unreg_vfi_cb(struct efc *efc, int status, u8 *mqe, void *arg)
+{
+	struct efc_domain *domain = arg;
+	int evt = EFC_HW_DOMAIN_FREE_OK;
+	int rc = 0;
+
+	rc = efc_domain_get_mbox_status(domain, mqe, status);
+	if (rc) {
+		evt = EFC_HW_DOMAIN_FREE_FAIL;
+		rc = EFC_FAIL;
+	}
+
+	efc_domain_free_resources(domain, evt, mqe);
+	return rc;
+}
+
+static void
+efc_domain_free_unreg_vfi(struct efc_domain *domain)
+{
+	struct efc *efc = domain->efc;
+	int rc;
+	u8 data[SLI4_BMBX_SIZE];
+
+	rc = sli_cmd_unreg_vfi(efc->sli, data, domain->indicator,
+			       SLI4_UNREG_TYPE_DOMAIN);
+	if (rc) {
+		efc_log_err(efc, "UNREG_VFI format failure\n");
+		goto cleanup;
+	}
+
+	rc = efc->tt.issue_mbox_rqst(efc->base, data,
+				     efc_domain_free_unreg_vfi_cb, domain);
+	if (rc) {
+		efc_log_err(efc, "UNREG_VFI command failure\n");
+		goto cleanup;
+	}
+
+	return;
+
+cleanup:
+	efc_domain_free_resources(domain, EFC_HW_DOMAIN_FREE_FAIL, data);
+}
+
+int
+efc_cmd_domain_free(struct efc *efc, struct efc_domain *domain)
+{
+	int rc = EFC_SUCCESS;
+
+	if (!domain) {
+		efc_log_err(efc, "bad parameter(s) domain=%p\n", domain);
+		return EFC_FAIL;
+	}
+
+	/*
+	 * Check if the chip is in an error state (UE'd) before proceeding.
+	 */
+	if (sli_fw_error_status(efc->sli) > 0) {
+		efc_log_crit(efc,
+			      "Chip is in an error state - reset needed\n");
+		return EFC_FAIL;
+	}
+
+	efc_domain_free_unreg_vfi(domain);
+	return rc;
+}
+
+int
+efc_cmd_node_alloc(struct efc *efc, struct efc_remote_node *rnode, u32 fc_addr,
+		   struct efc_nport *nport)
+{
+	/* Check for invalid indicator */
+	if (rnode->indicator != U32_MAX) {
+		efc_log_err(efc,
+			     "RPI allocation failure addr=%#x rpi=%#x\n",
+			    fc_addr, rnode->indicator);
+		return EFC_FAIL;
+	}
+
+	/*
+	 * Check if the chip is in an error state (UE'd) before proceeding.
+	 */
+	if (sli_fw_error_status(efc->sli) > 0) {
+		efc_log_crit(efc,
+			      "Chip is in an error state - reset needed\n");
+		return EFC_FAIL;
+	}
+
+	/* NULL SLI port indicates an unallocated remote node */
+	rnode->nport = NULL;
+
+	if (sli_resource_alloc(efc->sli, SLI4_RSRC_RPI,
+			       &rnode->indicator, &rnode->index)) {
+		efc_log_err(efc, "RPI allocation failure addr=%#x\n",
+			     fc_addr);
+		return EFC_FAIL;
+	}
+
+	rnode->fc_id = fc_addr;
+	rnode->nport = nport;
+
+	return EFC_SUCCESS;
+}
+
+static int
+efc_cmd_node_attach_cb(struct efc *efc, int status, u8 *mqe, void *arg)
+{
+	struct efc_remote_node *rnode = arg;
+	struct sli4_mbox_command_header *hdr =
+				(struct sli4_mbox_command_header *)mqe;
+	int evt = 0;
+
+	if (status || le16_to_cpu(hdr->status)) {
+		efc_log_debug(efc, "bad status cqe=%#x mqe=%#x\n", status,
+			       le16_to_cpu(hdr->status));
+		rnode->attached = false;
+		evt = EFC_EVT_NODE_ATTACH_FAIL;
+	} else {
+		rnode->attached = true;
+		evt = EFC_EVT_NODE_ATTACH_OK;
+	}
+
+	efc_remote_node_cb(efc, evt, rnode);
+
+	return EFC_SUCCESS;
+}
+
+int
+efc_cmd_node_attach(struct efc *efc, struct efc_remote_node *rnode,
+		    struct efc_dma *sparms)
+{
+	int rc = EFC_FAIL;
+	u8 buf[SLI4_BMBX_SIZE];
+
+	if (!rnode || !sparms) {
+		efc_log_err(efc, "bad parameter(s) rnode=%p sparms=%p\n",
+			    rnode, sparms);
+		return EFC_FAIL;
+	}
+
+	/*
+	 * Check if the chip is in an error state (UE'd) before proceeding.
+	 */
+	if (sli_fw_error_status(efc->sli) > 0) {
+		efc_log_crit(efc, "Chip is in an error state - reset needed\n");
+		return EFC_FAIL;
+	}
+
+	/*
+	 * If the attach count is non-zero, this RPI has already been reg'd.
+	 * Otherwise, register the RPI
+	 */
+	if (rnode->index == U32_MAX) {
+		efc_log_err(efc, "bad parameter rnode->index invalid\n");
+		return EFC_FAIL;
+	}
+
+	/* Update a remote node object with the remote port's service params */
+	if (!sli_cmd_reg_rpi(efc->sli, buf, rnode->indicator,
+			rnode->nport->indicator, rnode->fc_id, sparms, 0, 0))
+		rc = efc->tt.issue_mbox_rqst(efc->base, buf,
+					     efc_cmd_node_attach_cb, rnode);
+
+	return rc;
+}
+
+int
+efc_node_free_resources(struct efc *efc, struct efc_remote_node *rnode)
+{
+	int rc = EFC_SUCCESS;
+
+	if (!rnode) {
+		efc_log_err(efc, "bad parameter rnode=%p\n", rnode);
+		return EFC_FAIL;
+	}
+
+	if (rnode->nport) {
+		if (rnode->attached) {
+			efc_log_err(efc, "Err: rnode is still attached\n");
+			return EFC_FAIL;
+		}
+		if (rnode->indicator != U32_MAX) {
+			if (sli_resource_free(efc->sli, SLI4_RSRC_RPI,
+					      rnode->indicator)) {
+				efc_log_err(efc,
+					    "RPI free fail RPI %d addr=%#x\n",
+					    rnode->indicator, rnode->fc_id);
+				rc = EFC_FAIL;
+			} else {
+				rnode->indicator = U32_MAX;
+				rnode->index = U32_MAX;
+			}
+		}
+	}
+
+	return rc;
+}
+
+static int
+efc_cmd_node_free_cb(struct efc *efc, int status, u8 *mqe, void *arg)
+{
+	struct efc_remote_node *rnode = arg;
+	struct sli4_mbox_command_header *hdr =
+				(struct sli4_mbox_command_header *)mqe;
+	int evt = EFC_EVT_NODE_FREE_FAIL;
+	int rc = 0;
+
+	if (status || le16_to_cpu(hdr->status)) {
+		efc_log_debug(efc, "bad status cqe=%#x mqe=%#x\n", status,
+			       le16_to_cpu(hdr->status));
+
+		/*
+		 * In certain cases, a non-zero MQE status is OK (all must be
+		 * true):
+		 *   - node is attached
+		 *   - status is 0x1400
+		 */
+		if (!rnode->attached ||
+		    (le16_to_cpu(hdr->status) != SLI4_MBX_STATUS_RPI_NOT_REG))
+			rc = EFC_FAIL;
+	}
+
+	if (!rc) {
+		rnode->attached = false;
+		evt = EFC_EVT_NODE_FREE_OK;
+	}
+
+	efc_remote_node_cb(efc, evt, rnode);
+
+	return rc;
+}
+
+int
+efc_cmd_node_detach(struct efc *efc, struct efc_remote_node *rnode)
+{
+	u8 buf[SLI4_BMBX_SIZE];
+	int rc = EFC_FAIL;
+
+	if (!rnode) {
+		efc_log_err(efc, "bad parameter rnode=%p\n", rnode);
+		return EFC_FAIL;
+	}
+
+	/*
+	 * Check if the chip is in an error state (UE'd) before proceeding.
+	 */
+	if (sli_fw_error_status(efc->sli) > 0) {
+		efc_log_crit(efc, "Chip is in an error state - reset needed\n");
+		return EFC_FAIL;
+	}
+
+	if (rnode->nport) {
+		if (!rnode->attached)
+			return EFC_FAIL;
+
+		rc = EFC_FAIL;
+
+		if (!sli_cmd_unreg_rpi(efc->sli, buf, rnode->indicator,
+				      SLI4_RSRC_RPI, U32_MAX))
+			rc = efc->tt.issue_mbox_rqst(efc->base, buf,
+					efc_cmd_node_free_cb, rnode);
+
+		if (rc != EFC_SUCCESS) {
+			efc_log_err(efc, "UNREG_RPI failed\n");
+			rc = EFC_FAIL;
+		}
+	}
+
+	return rc;
+}
diff --git a/drivers/scsi/elx/libefc/efc_cmds.h b/drivers/scsi/elx/libefc/efc_cmds.h
new file mode 100644
index 000000000000..9c0287799e9e
--- /dev/null
+++ b/drivers/scsi/elx/libefc/efc_cmds.h
@@ -0,0 +1,35 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2021 Broadcom. All Rights Reserved. The term
+ * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
+ */
+
+#ifndef __EFC_CMDS_H__
+#define __EFC_CMDS_H__
+
+#define EFC_SPARAM_DMA_SZ	112
+int
+efc_cmd_nport_alloc(struct efc *efc, struct efc_nport *nport,
+		   struct efc_domain *domain, u8 *wwpn);
+int
+efc_cmd_nport_attach(struct efc *efc, struct efc_nport *nport, u32 fc_id);
+int
+efc_cmd_nport_free(struct efc *efc, struct efc_nport *nport);
+int
+efc_cmd_domain_alloc(struct efc *efc, struct efc_domain *domain, u32 fcf);
+int
+efc_cmd_domain_attach(struct efc *efc, struct efc_domain *domain, u32 fc_id);
+int
+efc_cmd_domain_free(struct efc *efc, struct efc_domain *domain);
+int
+efc_cmd_node_detach(struct efc *efc, struct efc_remote_node *rnode);
+int
+efc_node_free_resources(struct efc *efc, struct efc_remote_node *rnode);
+int
+efc_cmd_node_attach(struct efc *efc, struct efc_remote_node *rnode,
+		    struct efc_dma *sparms);
+int
+efc_cmd_node_alloc(struct efc *efc, struct efc_remote_node *rnode, u32 fc_addr,
+		   struct efc_nport *nport);
+
+#endif /* __EFC_CMDS_H */