Skip to content

Commit e1a7aa2

Browse files
torvaldstorvalds
committed
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI updates from James Bottomley: "This series consists of the usual driver updates (ufs, pm80xx, lpfc, mpi3mr, mpt3sas, hisi_sas, libsas) and minor updates and bug fixes. The most impactful change is likely the switch from GFP_DMA to GFP_KERNEL in a bunch of drivers, but even that shouldn't affect too many people" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (121 commits) scsi: mpi3mr: Bump driver version to 8.0.0.61.0 scsi: mpi3mr: Fixes around reply request queues scsi: mpi3mr: Enhanced Task Management Support Reply handling scsi: mpi3mr: Use TM response codes from MPI3 headers scsi: mpi3mr: Add io_uring interface support in I/O-polled mode scsi: mpi3mr: Print cable mngnt and temp threshold events scsi: mpi3mr: Support Prepare for Reset event scsi: mpi3mr: Add Event acknowledgment logic scsi: mpi3mr: Gracefully handle online FW update operation scsi: mpi3mr: Detect async reset that occurred in firmware scsi: mpi3mr: Add IOC reinit function scsi: mpi3mr: Handle offline FW activation in graceful manner scsi: mpi3mr: Code refactor of IOC init - part2 scsi: mpi3mr: Code refactor of IOC init - part1 scsi: mpi3mr: Fault IOC when internal command gets timeout scsi: mpi3mr: Display IOC firmware package version scsi: mpi3mr: Handle unaligned PLL in unmap cmnds scsi: mpi3mr: Increase internal cmnds timeout to 60s scsi: mpi3mr: Do access status validation before adding devices scsi: mpi3mr: Add support for PCIe Managed Switch SES device ...
2 parents fb3b067 + c77b1f8 commit e1a7aa2

92 files changed

Lines changed: 3714 additions & 1628 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MAINTAINERS‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7081,9 +7081,7 @@ S: Maintained
70817081
F: drivers/mmc/host/cqhci*
70827082

70837083
EMULEX 10Gbps iSCSI - OneConnect DRIVER
7084-
M: Subbu Seetharaman <subbu.seetharaman@broadcom.com>
70857084
M: Ketan Mukadam <ketan.mukadam@broadcom.com>
7086-
M: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
70877085
L: linux-scsi@vger.kernel.org
70887086
S: Supported
70897087
W: http://www.broadcom.com

‎block/blk-pm.c‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -163,27 +163,19 @@ EXPORT_SYMBOL(blk_pre_runtime_resume);
163163
/**
164164
* blk_post_runtime_resume - Post runtime resume processing
165165
* @q: the queue of the device
166-
* @err: return value of the device's runtime_resume function
167166
*
168167
* Description:
169-
* Update the queue's runtime status according to the return value of the
170-
* device's runtime_resume function. If the resume was successful, call
171-
* blk_set_runtime_active() to do the real work of restarting the queue.
168+
* For historical reasons, this routine merely calls blk_set_runtime_active()
169+
* to do the real work of restarting the queue. It does this regardless of
170+
* whether the device's runtime-resume succeeded; even if it failed the
171+
* driver or error handler will need to communicate with the device.
172172
*
173173
* This function should be called near the end of the device's
174174
* runtime_resume callback.
175175
*/
176-
void blk_post_runtime_resume(struct request_queue *q, int err)
176+
void blk_post_runtime_resume(struct request_queue *q)
177177
{
178-
if (!q->dev)
179-
return;
180-
if (!err) {
181-
blk_set_runtime_active(q);
182-
} else {
183-
spin_lock_irq(&q->queue_lock);
184-
q->rpm_status = RPM_SUSPENDED;
185-
spin_unlock_irq(&q->queue_lock);
186-
}
178+
blk_set_runtime_active(q);
187179
}
188180
EXPORT_SYMBOL(blk_post_runtime_resume);
189181

@@ -201,7 +193,7 @@ EXPORT_SYMBOL(blk_post_runtime_resume);
201193
* runtime PM status and re-enable peeking requests from the queue. It
202194
* should be called before first request is added to the queue.
203195
*
204-
* This function is also called by blk_post_runtime_resume() for successful
196+
* This function is also called by blk_post_runtime_resume() for
205197
* runtime resumes. It does everything necessary to restart the queue.
206198
*/
207199
void blk_set_runtime_active(struct request_queue *q)

‎drivers/message/fusion/mptbase.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,8 +1274,6 @@ mpt_send_handshake_request(u8 cb_idx, MPT_ADAPTER *ioc, int reqBytes, u32 *req,
12741274
static int
12751275
mpt_host_page_access_control(MPT_ADAPTER *ioc, u8 access_control_value, int sleepFlag)
12761276
{
1277-
int r = 0;
1278-
12791277
/* return if in use */
12801278
if (CHIPREG_READ32(&ioc->chip->Doorbell)
12811279
& MPI_DOORBELL_ACTIVE)
@@ -1289,9 +1287,9 @@ mpt_host_page_access_control(MPT_ADAPTER *ioc, u8 access_control_value, int slee
12891287
(access_control_value<<12)));
12901288

12911289
/* Wait for IOC to clear Doorbell Status bit */
1292-
if ((r = WaitForDoorbellAck(ioc, 5, sleepFlag)) < 0) {
1290+
if (WaitForDoorbellAck(ioc, 5, sleepFlag) < 0)
12931291
return -2;
1294-
}else
1292+
else
12951293
return 0;
12961294
}
12971295

‎drivers/scsi/a100u2w.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -904,13 +904,11 @@ static int inia100_build_scb(struct orc_host * host, struct orc_scb * scb, struc
904904
/**
905905
* inia100_queue_lck - queue command with host
906906
* @cmd: Command block
907-
* @done: Completion function
908907
*
909908
* Called by the mid layer to queue a command. Process the command
910909
* block, build the host specific scb structures and if there is room
911910
* queue the command down to the controller
912911
*/
913-
914912
static int inia100_queue_lck(struct scsi_cmnd *cmd)
915913
{
916914
struct orc_scb *scb;

‎drivers/scsi/atp870u.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,6 @@ static irqreturn_t atp870u_intr_handle(int irq, void *dev_id)
614614
/**
615615
* atp870u_queuecommand_lck - Queue SCSI command
616616
* @req_p: request block
617-
* @done: completion function
618617
*
619618
* Queue a command to the ATP queue. Called with the host lock held.
620619
*/

‎drivers/scsi/bfa/bfad_attr.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ const struct attribute_group *bfad_im_host_groups[] = {
981981
NULL
982982
};
983983

984-
struct attribute *bfad_im_vport_attrs[] = {
984+
static struct attribute *bfad_im_vport_attrs[] = {
985985
&dev_attr_serial_number.attr,
986986
&dev_attr_model.attr,
987987
&dev_attr_model_description.attr,

‎drivers/scsi/ch.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ ch_read_element_status(scsi_changer *ch, u_int elem, char *data)
239239
u_char *buffer;
240240
int result;
241241

242-
buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
242+
buffer = kmalloc(512, GFP_KERNEL);
243243
if(!buffer)
244244
return -ENOMEM;
245245

@@ -297,7 +297,7 @@ ch_readconfig(scsi_changer *ch)
297297
int result,id,lun,i;
298298
u_int elem;
299299

300-
buffer = kzalloc(512, GFP_KERNEL | GFP_DMA);
300+
buffer = kzalloc(512, GFP_KERNEL);
301301
if (!buffer)
302302
return -ENOMEM;
303303

@@ -783,7 +783,7 @@ static long ch_ioctl(struct file *file,
783783
return -EINVAL;
784784
elem = ch->firsts[cge.cge_type] + cge.cge_unit;
785785

786-
buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
786+
buffer = kmalloc(512, GFP_KERNEL);
787787
if (!buffer)
788788
return -ENOMEM;
789789
mutex_lock(&ch->lock);

‎drivers/scsi/dc395x.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,6 @@ static void build_srb(struct scsi_cmnd *cmd, struct DeviceCtlBlk *dcb,
946946
* layer, invoke 'done' on completion
947947
*
948948
* @cmd: pointer to scsi command object
949-
* @done: function pointer to be invoked on completion
950949
*
951950
* Returns 1 if the adapter (host) is busy, else returns 0. One
952951
* reason for an adapter to be busy is that the number
@@ -959,7 +958,7 @@ static void build_srb(struct scsi_cmnd *cmd, struct DeviceCtlBlk *dcb,
959958
* Locks: struct Scsi_Host::host_lock held on entry (with "irqsave")
960959
* and is expected to be held on return.
961960
*
962-
**/
961+
*/
963962
static int dc395x_queue_command_lck(struct scsi_cmnd *cmd)
964963
{
965964
void (*done)(struct scsi_cmnd *) = scsi_done;

‎drivers/scsi/elx/efct/efct_driver.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ efct_firmware_write(struct efct *efct, const u8 *buf, size_t buf_len,
261261

262262
dma.size = FW_WRITE_BUFSIZE;
263263
dma.virt = dma_alloc_coherent(&efct->pci->dev,
264-
dma.size, &dma.phys, GFP_DMA);
264+
dma.size, &dma.phys, GFP_KERNEL);
265265
if (!dma.virt)
266266
return -ENOMEM;
267267

‎drivers/scsi/elx/efct/efct_hw.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ efct_hw_setup_io(struct efct_hw *hw)
516516
dma = &hw->xfer_rdy;
517517
dma->size = sizeof(struct fcp_txrdy) * hw->config.n_io;
518518
dma->virt = dma_alloc_coherent(&efct->pci->dev,
519-
dma->size, &dma->phys, GFP_DMA);
519+
dma->size, &dma->phys, GFP_KERNEL);
520520
if (!dma->virt)
521521
return -ENOMEM;
522522
}
@@ -562,7 +562,7 @@ efct_hw_setup_io(struct efct_hw *hw)
562562
sizeof(struct sli4_sge);
563563
dma->virt = dma_alloc_coherent(&efct->pci->dev,
564564
dma->size, &dma->phys,
565-
GFP_DMA);
565+
GFP_KERNEL);
566566
if (!dma->virt) {
567567
efc_log_err(hw->os, "dma_alloc fail %d\n", i);
568568
memset(&io->def_sgl, 0,
@@ -618,7 +618,7 @@ efct_hw_init_prereg_io(struct efct_hw *hw)
618618
memset(&req, 0, sizeof(struct efc_dma));
619619
req.size = 32 + sgls_per_request * 16;
620620
req.virt = dma_alloc_coherent(&efct->pci->dev, req.size, &req.phys,
621-
GFP_DMA);
621+
GFP_KERNEL);
622622
if (!req.virt) {
623623
kfree(sgls);
624624
return -ENOMEM;
@@ -1063,7 +1063,7 @@ efct_hw_init(struct efct_hw *hw)
10631063
dma = &hw->loop_map;
10641064
dma->size = SLI4_MIN_LOOP_MAP_BYTES;
10651065
dma->virt = dma_alloc_coherent(&hw->os->pci->dev, dma->size, &dma->phys,
1066-
GFP_DMA);
1066+
GFP_KERNEL);
10671067
if (!dma->virt)
10681068
return -EIO;
10691069

@@ -1192,7 +1192,7 @@ efct_hw_rx_buffer_alloc(struct efct_hw *hw, u32 rqindex, u32 count,
11921192
prq->dma.virt = dma_alloc_coherent(&efct->pci->dev,
11931193
prq->dma.size,
11941194
&prq->dma.phys,
1195-
GFP_DMA);
1195+
GFP_KERNEL);
11961196
if (!prq->dma.virt) {
11971197
efc_log_err(hw->os, "DMA allocation failed\n");
11981198
kfree(rq_buf);

0 commit comments

Comments
 (0)