scsi: mpi3mr: Clean up block devices post controller reset

commit c01d515687e358b22aa8414d6dac60d7defa6eb9 upstream.

After a controller reset, if the firmware changes the state of devices to
"hide", then remove those devices from the OS.

Cc: <stable@vger.kernel.org> # v6.6+
Co-developed-by: Sathya Prakash <sathya.prakash@broadcom.com>
Signed-off-by: Sathya Prakash <sathya.prakash@broadcom.com>
Signed-off-by: Chandrakanth patil <chandrakanth.patil@broadcom.com>
Link: https://lore.kernel.org/r/20231126053134.10133-3-chandrakanth.patil@broadcom.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
index 4b88a13..c7c7525 100644 (file)
--- a/drivers/scsi/mpi3mr/mpi3mr_os.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
@@ -1047,8 +1047,9 @@ void mpi3mr_rfresh_tgtdevs(struct mpi3mr_ioc *mrioc)
        list_for_each_entry_safe(tgtdev, tgtdev_next, &mrioc->tgtdev_list,
            list) {
                if ((tgtdev->dev_handle == MPI3MR_INVALID_DEV_HANDLE) &&
-                   tgtdev->host_exposed && tgtdev->starget &&
-                   tgtdev->starget->hostdata) {
+                    tgtdev->is_hidden &&
+                    tgtdev->host_exposed && tgtdev->starget &&
+                    tgtdev->starget->hostdata) {
                        tgt_priv = tgtdev->starget->hostdata;
                        tgt_priv->dev_removed = 1;
                        atomic_set(&tgt_priv->block_io, 0);
@@ -1064,6 +1065,10 @@ void mpi3mr_rfresh_tgtdevs(struct mpi3mr_ioc *mrioc)
                                mpi3mr_remove_tgtdev_from_host(mrioc, tgtdev);
                        mpi3mr_tgtdev_del_from_list(mrioc, tgtdev, true);
                        mpi3mr_tgtdev_put(tgtdev);
+               } else if (tgtdev->is_hidden & tgtdev->host_exposed) {
+                       dprint_reset(mrioc, "hiding target device with perst_id(%d)\n",
+                                    tgtdev->perst_id);
+                       mpi3mr_remove_tgtdev_from_host(mrioc, tgtdev);
                }
        }