Skip to contentSkip to conversation

mpi3mr: Few minor bug fixes

PATCH Applied Ranjan Kumar 2 participants 7 messages Jun 27, 2025 – Jul 22, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover mpi3mr: Few minor bug fixes

Few minor fixes of mpi3mr driver.

Ranjan Kumar (4):
mpi3mr: Fix race between config read submit and interrupt completion
mpi3mr: Drop unnecessary volatile from __iomem pointers
mpi3mr: Serialize admin queue BAR writes on 32-bit systems
mpi3mr: Update driver version to 8.14.0.5.50

 drivers/scsi/mpi3mr/mpi3mr.h    | 10 +++++++---
 drivers/scsi/mpi3mr/mpi3mr_fw.c | 17 ++++++++++++-----
 drivers/scsi/mpi3mr/mpi3mr_os.c |  2 ++
 3 files changed, 21 insertions(+), 8 deletions(-)
Signature · 1 line
2.31.1
#1 lore raw

PATCH 1/4 mpi3mr: Fix race between config read submit and interrupt completion

The "is_waiting" flag was updated after calling complete(), which could lead to a race where the waiting thread wakes up before the flag is cleared, may cause a missed wakeup or stale state check.

Reorder the operations to update "is_waiting" before signaling completion to ensure consistent state.

Fixes 824a156633df ("scsi: mpi3mr: Base driver code")
---
 drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mpi3mr/mpi3mr_fw.c +1 -1
index 1d7901a8f0e4..0186676698d4 100644
@@ -428,8 +428,8 @@ static void mpi3mr_process_admin_reply_desc(struct mpi3mr_ioc *mrioc,
 				       MPI3MR_SENSE_BUF_SZ);
 			}
 			if (cmdptr->is_waiting) {
-				complete(&cmdptr->done);
 				cmdptr->is_waiting = 0;
+				complete(&cmdptr->done);
 			} else if (cmdptr->callback)
 				cmdptr->callback(mrioc, cmdptr);
 		}
Signature · 1 line
2.31.1
#2 lore raw

PATCH 2/4 mpi3mr: Drop unnecessary volatile from __iomem pointers

In reply to Ranjan Kumar

The volatile qualifier is redundant for __iomem pointers.

Cleaned up usage in mpi3mr_writeq() and sysif_regs pointer as per Upstream compliance.

---
 drivers/scsi/mpi3mr/mpi3mr.h    | 2 +-
 drivers/scsi/mpi3mr/mpi3mr_fw.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/mpi3mr/mpi3mr.h +1 -1
index 9bbc7cb98ca3..bf272dd69d23 100644
@@ -1185,7 +1185,7 @@ struct mpi3mr_ioc {
 	char name[MPI3MR_NAME_LENGTH];
 	char driver_name[MPI3MR_NAME_LENGTH];
 
-	volatile struct mpi3_sysif_registers __iomem *sysif_regs;
+	struct mpi3_sysif_registers __iomem *sysif_regs;
 	resource_size_t sysif_regs_phys;
 	int bars;
 	u64 dma_mask;
drivers/scsi/mpi3mr/mpi3mr_fw.c +2 -2
index 0186676698d4..8976582946a2 100644
@@ -23,12 +23,12 @@ module_param(poll_queues, int, 0444);
 MODULE_PARM_DESC(poll_queues, "Number of queues for io_uring poll mode. (Range 1 - 126)");
 
 #if defined(writeq) && defined(CONFIG_64BIT)
-static inline void mpi3mr_writeq(__u64 b, volatile void __iomem *addr)
+static inline void mpi3mr_writeq(__u64 b, void __iomem *addr)
 {
 	writeq(b, addr);
 }
 #else
-static inline void mpi3mr_writeq(__u64 b, volatile void __iomem *addr)
+static inline void mpi3mr_writeq(__u64 b, void __iomem *addr)
 {
 	__u64 data_out = b;
 
Signature · 1 line
2.31.1
#3 lore raw

PATCH 3/4 mpi3mr: Serialize admin queue BAR writes on 32-bit systems

In reply to Ranjan Kumar

On 32-bit systems, 64-bit BAR writes to admin queue registers are performed as two 32-bit writes. Without locking, this can cause partial writes when accessed concurrently.

Updated per-queue spinlocks is used to serialize these writes and prevent race conditions.

Fixes 824a156633df ("scsi: mpi3mr: Base driver code")
---
 drivers/scsi/mpi3mr/mpi3mr.h    |  4 ++++
 drivers/scsi/mpi3mr/mpi3mr_fw.c | 15 +++++++++++----
 drivers/scsi/mpi3mr/mpi3mr_os.c |  2 ++
 3 files changed, 17 insertions(+), 4 deletions(-)
drivers/scsi/mpi3mr/mpi3mr.h +4 -0
index bf272dd69d23..f2201108ea91 100644
@@ -1137,6 +1137,8 @@ struct scmd_priv {
  * @logdata_buf: Circular buffer to store log data entries
  * @logdata_buf_idx: Index of entry in buffer to store
  * @logdata_entry_sz: log data entry size
+ * @adm_req_q_bar_writeq_lock: Admin request queue lock
+ * @adm_reply_q_bar_writeq_lock: Admin reply queue lock
  * @pend_large_data_sz: Counter to track pending large data
  * @io_throttle_data_length: I/O size to track in 512b blocks
  * @io_throttle_high: I/O size to start throttle in 512b blocks
@@ -1339,6 +1341,8 @@ struct mpi3mr_ioc {
 	u8 *logdata_buf;
 	u16 logdata_buf_idx;
 	u16 logdata_entry_sz;
+	spinlock_t adm_req_q_bar_writeq_lock;
+	spinlock_t adm_reply_q_bar_writeq_lock;
 
 	atomic_t pend_large_data_sz;
 	u32 io_throttle_data_length;
drivers/scsi/mpi3mr/mpi3mr_fw.c +11 -4
index 8976582946a2..0152d31d430a 100644
@@ -23,17 +23,22 @@ module_param(poll_queues, int, 0444);
 MODULE_PARM_DESC(poll_queues, "Number of queues for io_uring poll mode. (Range 1 - 126)");
 
 #if defined(writeq) && defined(CONFIG_64BIT)
-static inline void mpi3mr_writeq(__u64 b, void __iomem *addr)
+static inline void mpi3mr_writeq(__u64 b, void __iomem *addr,
+	spinlock_t *write_queue_lock)
 {
 	writeq(b, addr);
 }
 #else
-static inline void mpi3mr_writeq(__u64 b, void __iomem *addr)
+static inline void mpi3mr_writeq(__u64 b, void __iomem *addr,
+	spinlock_t *write_queue_lock)
 {
 	__u64 data_out = b;
+	unsigned long flags;
 
+	spin_lock_irqsave(write_queue_lock, flags);
 	writel((u32)(data_out), addr);
 	writel((u32)(data_out >> 32), (addr + 4));
+	spin_unlock_irqrestore(write_queue_lock, flags);
 }
 #endif
 
@@ -2954,9 +2959,11 @@ static int mpi3mr_setup_admin_qpair(struct mpi3mr_ioc *mrioc)
 	    (mrioc->num_admin_req);
 	writel(num_admin_entries, &mrioc->sysif_regs->admin_queue_num_entries);
 	mpi3mr_writeq(mrioc->admin_req_dma,
-	    &mrioc->sysif_regs->admin_request_queue_address);
+		&mrioc->sysif_regs->admin_request_queue_address,
+		&mrioc->adm_req_q_bar_writeq_lock);
 	mpi3mr_writeq(mrioc->admin_reply_dma,
-	    &mrioc->sysif_regs->admin_reply_queue_address);
+		&mrioc->sysif_regs->admin_reply_queue_address,
+		&mrioc->adm_reply_q_bar_writeq_lock);
 	writel(mrioc->admin_req_pi, &mrioc->sysif_regs->admin_request_queue_pi);
 	writel(mrioc->admin_reply_ci, &mrioc->sysif_regs->admin_reply_queue_ci);
 	return retval;
drivers/scsi/mpi3mr/mpi3mr_os.c +2 -0
index ce444efd859e..0d1c9bbb13b5 100644
@@ -5365,6 +5365,8 @@ mpi3mr_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	spin_lock_init(&mrioc->tgtdev_lock);
 	spin_lock_init(&mrioc->watchdog_lock);
 	spin_lock_init(&mrioc->chain_buf_lock);
+	spin_lock_init(&mrioc->adm_req_q_bar_writeq_lock);
+	spin_lock_init(&mrioc->adm_reply_q_bar_writeq_lock);
 	spin_lock_init(&mrioc->sas_node_lock);
 	spin_lock_init(&mrioc->trigger_lock);
 
Signature · 1 line
2.31.1
#4 lore raw

PATCH 4/4 mpi3mr: Update driver version to 8.14.0.5.50

In reply to Ranjan Kumar

Updated driver version to 8.14.0.5.50

---
 drivers/scsi/mpi3mr/mpi3mr.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/mpi3mr/mpi3mr.h +2 -2
index f2201108ea91..8d4ef49e04d1 100644
@@ -56,8 +56,8 @@ extern struct list_head mrioc_list;
 extern int prot_mask;
 extern atomic64_t event_counter;
 
-#define MPI3MR_DRIVER_VERSION	"8.13.0.5.50"
-#define MPI3MR_DRIVER_RELDATE	"20-February-2025"
+#define MPI3MR_DRIVER_VERSION	"8.14.0.5.50"
+#define MPI3MR_DRIVER_RELDATE	"27-June-2025"
 
 #define MPI3MR_DRIVER_NAME	"mpi3mr"
 #define MPI3MR_DRIVER_LICENSE	"GPL"
Signature · 1 line
2.31.1
#6 lore raw
In reply to Ranjan Kumar
Quoted 9 lines · Ranjan Kumar

Few minor fixes of mpi3mr driver.

Ranjan Kumar (4):
mpi3mr: Fix race between config read submit and interrupt completion
mpi3mr: Drop unnecessary volatile from __iomem pointers
mpi3mr: Serialize admin queue BAR writes on 32-bit systems
mpi3mr: Update driver version to 8.14.0.5.50

[...]

Applied to 6.17/scsi-queue, thanks!

[1/4] mpi3mr: Fix race between config read submit and interrupt completion

      https://git.kernel.org/mkp/scsi/c/e6327c4acf92
[2/4] mpi3mr: Drop unnecessary volatile from __iomem pointers
      https://git.kernel.org/mkp/scsi/c/6853885b21cb
[3/4] mpi3mr: Serialize admin queue BAR writes on 32-bit systems
      https://git.kernel.org/mkp/scsi/c/c91e140c82eb
[4/4] mpi3mr: Update driver version to 8.14.0.5.50
      https://git.kernel.org/mkp/scsi/c/e1c9a704f2c5
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering