Merge branch '6.8/scsi-staging' into 6.8/scsi-fixes

martinkpetersen · martinkpetersen · commit 52998cdd8d34 · 2024-01-22T15:49:29.000-05:00
Pull in staged fixes for 6.8.

Signed-off-by: Martin K. Petersen &lt;martin.petersen@oracle.com&gt;
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -10282,7 +10282,7 @@ F:	drivers/scsi/ibmvscsi/ibmvscsi*
 F:	include/scsi/viosrp.h
 
 IBM Power Virtual SCSI Device Target Driver
-M:	Michael Cyr <mikecyr@linux.ibm.com>
+M:	Tyrel Datwyler <tyreld@linux.ibm.com>
 L:	linux-scsi@vger.kernel.org
 L:	target-devel@vger.kernel.org
 S:	Supported
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
@@ -371,7 +371,6 @@ static u16 initio_se2_rd(unsigned long base, u8 addr)
  */
 static void initio_se2_wr(unsigned long base, u8 addr, u16 val)
 {
-	u8 rb;
 	u8 instr;
 	int i;
 
@@ -400,7 +399,7 @@ static void initio_se2_wr(unsigned long base, u8 addr, u16 val)
 		udelay(30);
 		outb(SE2CS, base + TUL_NVRAM);			/* -CLK */
 		udelay(30);
-		if ((rb = inb(base + TUL_NVRAM)) & SE2DI)
+		if (inb(base + TUL_NVRAM) & SE2DI)
 			break;	/* write complete */
 	}
 	outb(0, base + TUL_NVRAM);				/* -CS */
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
@@ -3387,7 +3387,7 @@ static enum sci_status isci_io_request_build(struct isci_host *ihost,
 		return SCI_FAILURE;
 	}
 
-	return SCI_SUCCESS;
+	return status;
 }
 
 static struct isci_request *isci_request_from_tag(struct isci_host *ihost, u16 tag)
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
@@ -188,8 +188,6 @@ static void virtscsi_vq_done(struct virtio_scsi *vscsi,
 		while ((buf = virtqueue_get_buf(vq, &len)) != NULL)
 			fn(vscsi, buf);
 
-		if (unlikely(virtqueue_is_broken(vq)))
-			break;
 	} while (!virtqueue_enable_cb(vq));
 	spin_unlock_irqrestore(&virtscsi_vq->vq_lock, flags);
 }

Original file line number	Diff line number	Diff line change
`@@ -3387,7 +3387,7 @@ static enum sci_status isci_io_request_build(struct isci_host *ihost,`
`3387`	`3387`	`return SCI_FAILURE;`
`3388`	`3388`	`}`
`3389`	`3389`
`3390`		`- return SCI_SUCCESS;`
	`3390`	`+ return status;`
`3391`	`3391`	`}`
`3392`	`3392`
`3393`	`3393`	`static struct isci_request isci_request_from_tag(struct isci_host ihost, u16 tag)`
Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,6 @@ static void virtscsi_vq_done(struct virtio_scsi *vscsi,`
`188`	`188`	`while ((buf = virtqueue_get_buf(vq, &len)) != NULL)`
`189`	`189`	`fn(vscsi, buf);`
`190`	`190`
`191`		`- if (unlikely(virtqueue_is_broken(vq)))`
`192`		`- break;`
`193`	`191`	`} while (!virtqueue_enable_cb(vq));`
`194`	`192`	`spin_unlock_irqrestore(&virtscsi_vq->vq_lock, flags);`
`195`	`193`	`}`