tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

scsi: mpi3mr: Prevent duplicate SAS/SATA device entries in channel 1

Avoid scanning SAS/SATA devices in channel 1 when SAS transport is
enabled, as the SAS/SATA devices are exposed through channel 0.

Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
Signed-off-by: Ranjan Kumar <ranjan.kumar@broadcom.com>
Link: https://lore.kernel.org/stable/20251120071955.463475-1-suganath-prabu.subramani%40broadcom.com
Link: https://patch.msgid.link/20251120071955.463475-1-suganath-prabu.subramani@broadcom.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Suganath Prabu S and committed by
Martin K. Petersen 4588e65c 5053eab3

+5 -3
+2 -2
drivers/scsi/mpi3mr/mpi3mr.h
··· 56 56 extern int prot_mask; 57 57 extern atomic64_t event_counter; 58 58 59 - #define MPI3MR_DRIVER_VERSION "8.15.0.5.50" 60 - #define MPI3MR_DRIVER_RELDATE "12-August-2025" 59 + #define MPI3MR_DRIVER_VERSION "8.15.0.5.51" 60 + #define MPI3MR_DRIVER_RELDATE "18-November-2025" 61 61 62 62 #define MPI3MR_DRIVER_NAME "mpi3mr" 63 63 #define MPI3MR_DRIVER_LICENSE "GPL"
+3 -1
drivers/scsi/mpi3mr/mpi3mr_os.c
··· 1184 1184 if (is_added == true) 1185 1185 tgtdev->io_throttle_enabled = 1186 1186 (flags & MPI3_DEVICE0_FLAGS_IO_THROTTLING_REQUIRED) ? 1 : 0; 1187 + if (!mrioc->sas_transport_enabled) 1188 + tgtdev->non_stl = 1; 1187 1189 1188 1190 switch (flags & MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_MASK) { 1189 1191 case MPI3_DEVICE0_FLAGS_MAX_WRITE_SAME_256_LB: ··· 4846 4844 spin_lock_irqsave(&mrioc->tgtdev_lock, flags); 4847 4845 if (starget->channel == mrioc->scsi_device_channel) { 4848 4846 tgt_dev = __mpi3mr_get_tgtdev_by_perst_id(mrioc, starget->id); 4849 - if (tgt_dev && !tgt_dev->is_hidden) { 4847 + if (tgt_dev && !tgt_dev->is_hidden && tgt_dev->non_stl) { 4850 4848 scsi_tgt_priv_data->starget = starget; 4851 4849 scsi_tgt_priv_data->dev_handle = tgt_dev->dev_handle; 4852 4850 scsi_tgt_priv_data->perst_id = tgt_dev->perst_id;