scsi: lpfc: Kill lpfc_bus_reset_handler()

lpfc_bus_reset_handler() is really just a loop calling
lpfc_target_reset_handler() over all targets, which is what the error
handler will be doing anyway.

Link: https://lore.kernel.org/r/20220301143718.40913-2-hare@suse.de
Cc: James Smart <james.smart@broadcom.com>
Reviewed-by: James Smart <jsmart2021@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 5a3da38..a061b4e 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -6529,95 +6529,6 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd)
 }
 
 /**
- * lpfc_bus_reset_handler - scsi_host_template eh_bus_reset_handler entry point
- * @cmnd: Pointer to scsi_cmnd data structure.
- *
- * This routine does target reset to all targets on @cmnd->device->host.
- * This emulates Parallel SCSI Bus Reset Semantics.
- *
- * Return code :
- *  0x2003 - Error
- *  0x2002 - Success
- **/
-static int
-lpfc_bus_reset_handler(struct scsi_cmnd *cmnd)
-{
-       struct Scsi_Host  *shost = cmnd->device->host;
-       struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
-       struct lpfc_nodelist *ndlp = NULL;
-       struct lpfc_scsi_event_header scsi_event;
-       int match;
-       int ret = SUCCESS, status, i;
-       u32 logit = LOG_FCP;
-
-       scsi_event.event_type = FC_REG_SCSI_EVENT;
-       scsi_event.subcategory = LPFC_EVENT_BUSRESET;
-       scsi_event.lun = 0;
-       memcpy(scsi_event.wwpn, &vport->fc_portname, sizeof(struct lpfc_name));
-       memcpy(scsi_event.wwnn, &vport->fc_nodename, sizeof(struct lpfc_name));
-
-       fc_host_post_vendor_event(shost, fc_get_event_number(),
-               sizeof(scsi_event), (char *)&scsi_event, LPFC_NL_VENDOR_ID);
-
-       status = fc_block_scsi_eh(cmnd);
-       if (status != 0 && status != SUCCESS)
-               return status;
-
-       /*
-        * Since the driver manages a single bus device, reset all
-        * targets known to the driver.  Should any target reset
-        * fail, this routine returns failure to the midlayer.
-        */
-       for (i = 0; i < LPFC_MAX_TARGET; i++) {
-               /* Search for mapped node by target ID */
-               match = 0;
-               spin_lock_irq(shost->host_lock);
-               list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {
-
-                       if (vport->phba->cfg_fcp2_no_tgt_reset &&
-                           (ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE))
-                               continue;
-                       if (ndlp->nlp_state == NLP_STE_MAPPED_NODE &&
-                           ndlp->nlp_sid == i &&
-                           ndlp->rport &&
-                           ndlp->nlp_type & NLP_FCP_TARGET) {
-                               match = 1;
-                               break;
-                       }
-               }
-               spin_unlock_irq(shost->host_lock);
-               if (!match)
-                       continue;
-
-               status = lpfc_send_taskmgmt(vport, cmnd,
-                                       i, 0, FCP_TARGET_RESET);
-
-               if (status != SUCCESS) {
-                       lpfc_printf_vlog(vport, KERN_ERR, LOG_TRACE_EVENT,
-                                        "0700 Bus Reset on target %d failed\n",
-                                        i);
-                       ret = FAILED;
-               }
-       }
-       /*
-        * We have to clean up i/o as : they may be orphaned by the TMFs
-        * above; or if any of the TMFs failed, they may be in an
-        * indeterminate state.
-        * We will report success if all the i/o aborts successfully.
-        */
-
-       status = lpfc_reset_flush_io_context(vport, 0, 0, LPFC_CTX_HOST);
-       if (status != SUCCESS)
-               ret = FAILED;
-       if (ret == FAILED)
-               logit =  LOG_TRACE_EVENT;
-
-       lpfc_printf_vlog(vport, KERN_ERR, logit,
-                        "0714 SCSI layer issued Bus Reset Data: x%x\n", ret);
-       return ret;
-}
-
-/**
  * lpfc_host_reset_handler - scsi_host_template eh_host_reset_handler entry pt
  * @cmnd: Pointer to scsi_cmnd data structure.
  *
@@ -7203,7 +7114,6 @@ struct scsi_host_template lpfc_template_nvme = {
        .eh_abort_handler       = lpfc_no_handler,
        .eh_device_reset_handler = lpfc_no_handler,
        .eh_target_reset_handler = lpfc_no_handler,
-       .eh_bus_reset_handler   = lpfc_no_handler,
        .eh_host_reset_handler  = lpfc_no_handler,
        .slave_alloc            = lpfc_no_slave,
        .slave_configure        = lpfc_no_slave,
@@ -7228,7 +7138,6 @@ struct scsi_host_template lpfc_template = {
        .eh_abort_handler       = lpfc_abort_handler,
        .eh_device_reset_handler = lpfc_device_reset_handler,
        .eh_target_reset_handler = lpfc_target_reset_handler,
-       .eh_bus_reset_handler   = lpfc_bus_reset_handler,
        .eh_host_reset_handler  = lpfc_host_reset_handler,
        .slave_alloc            = lpfc_slave_alloc,
        .slave_configure        = lpfc_slave_configure,