Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull more SCSI updates from James Bottomley:
"This is a set of minor small (and safe changes) that didn't make the
initial pull request plus some bug fixes"
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: mvsas: Remove set but not used variable 'id'
scsi: qla2xxx: Remove two arguments from qlafx00_error_entry()
scsi: qla2xxx: Make sure that qlafx00_ioctl_iosb_entry() initializes 'res'
scsi: qla2xxx: Remove a set-but-not-used variable
scsi: qla2xxx: Make qla2x00_sysfs_write_nvram() easier to analyze
scsi: qla2xxx: Declare local functions 'static'
scsi: qla2xxx: Improve several kernel-doc headers
scsi: qla2xxx: Modify fall-through annotations
scsi: 3w-sas: 3w-9xxx: Use unsigned char for cdb
scsi: mvsas: Use dma_pool_zalloc
scsi: target: Don't request modules that aren't even built
scsi: target: Set response length for REPORT TARGET PORT GROUPS
+52
-50
+8
-4
drivers/scsi/3w-9xxx.c
+8
-4
drivers/scsi/3w-9xxx.c
···
143
143
static int twa_post_command_packet(TW_Device_Extension *tw_dev, int request_id, char internal);
144
144
static int twa_reset_device_extension(TW_Device_Extension *tw_dev);
145
145
static int twa_reset_sequence(TW_Device_Extension *tw_dev, int soft_reset);
146
-
static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry *sglistarg);
146
+
static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
147
+
unsigned char *cdb, int use_sg,
148
+
TW_SG_Entry *sglistarg);
147
149
static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int request_id);
148
150
static char *twa_string_lookup(twa_message_type *table, unsigned int aen_code);
149
151
···
280
278
static int twa_aen_drain_queue(TW_Device_Extension *tw_dev, int no_check_reset)
281
279
{
282
280
int request_id = 0;
283
-
char cdb[TW_MAX_CDB_LEN];
281
+
unsigned char cdb[TW_MAX_CDB_LEN];
284
282
TW_SG_Entry sglist[1];
285
283
int finished = 0, count = 0;
286
284
TW_Command_Full *full_command_packet;
···
425
423
/* This function will read the aen queue from the isr */
426
424
static int twa_aen_read_queue(TW_Device_Extension *tw_dev, int request_id)
427
425
{
428
-
char cdb[TW_MAX_CDB_LEN];
426
+
unsigned char cdb[TW_MAX_CDB_LEN];
429
427
TW_SG_Entry sglist[1];
430
428
TW_Command_Full *full_command_packet;
431
429
int retval = 1;
···
1800
1798
static DEF_SCSI_QCMD(twa_scsi_queue)
1801
1799
1802
1800
/* This function hands scsi cdb's to the firmware */
1803
-
static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry *sglistarg)
1801
+
static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
1802
+
unsigned char *cdb, int use_sg,
1803
+
TW_SG_Entry *sglistarg)
1804
1804
{
1805
1805
TW_Command_Full *full_command_packet;
1806
1806
TW_Command_Apache *command_packet;
+5
-3
drivers/scsi/3w-sas.c
+5
-3
drivers/scsi/3w-sas.c
···
287
287
} /* End twl_post_command_packet() */
288
288
289
289
/* This function hands scsi cdb's to the firmware */
290
-
static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry_ISO *sglistarg)
290
+
static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
291
+
unsigned char *cdb, int use_sg,
292
+
TW_SG_Entry_ISO *sglistarg)
291
293
{
292
294
TW_Command_Full *full_command_packet;
293
295
TW_Command_Apache *command_packet;
···
374
372
/* This function will read the aen queue from the isr */
375
373
static int twl_aen_read_queue(TW_Device_Extension *tw_dev, int request_id)
376
374
{
377
-
char cdb[TW_MAX_CDB_LEN];
375
+
unsigned char cdb[TW_MAX_CDB_LEN];
378
376
TW_SG_Entry_ISO sglist[1];
379
377
TW_Command_Full *full_command_packet;
380
378
int retval = 1;
···
556
554
static int twl_aen_drain_queue(TW_Device_Extension *tw_dev, int no_check_reset)
557
555
{
558
556
int request_id = 0;
559
-
char cdb[TW_MAX_CDB_LEN];
557
+
unsigned char cdb[TW_MAX_CDB_LEN];
560
558
TW_SG_Entry_ISO sglist[1];
561
559
int finished = 0, count = 0;
562
560
TW_Command_Full *full_command_packet;
+2
-4
drivers/scsi/mvsas/mv_sas.c
+2
-4
drivers/scsi/mvsas/mv_sas.c
···
790
790
slot->n_elem = n_elem;
791
791
slot->slot_tag = tag;
792
792
793
-
slot->buf = dma_pool_alloc(mvi->dma_pool, GFP_ATOMIC, &slot->buf_dma);
793
+
slot->buf = dma_pool_zalloc(mvi->dma_pool, GFP_ATOMIC, &slot->buf_dma);
794
794
if (!slot->buf) {
795
795
rc = -ENOMEM;
796
796
goto err_out_tag;
797
797
}
798
-
memset(slot->buf, 0, MVS_SLOT_BUF_SZ);
799
798
800
799
tei.task = task;
801
800
tei.hdr = &mvi->slot[tag];
···
1905
1906
1906
1907
if (phy->phy_event & PHY_PLUG_OUT) {
1907
1908
u32 tmp;
1908
-
struct sas_identify_frame *id;
1909
-
id = (struct sas_identify_frame *)phy->frame_rcvd;
1909
+
1910
1910
tmp = MVS_CHIP_DISP->read_phy_ctl(mvi, phy_no);
1911
1911
phy->phy_event &= ~PHY_PLUG_OUT;
1912
1912
if (!(tmp & PHY_READY_MASK)) {
+1
-1
drivers/scsi/qla2xxx/qla_attr.c
+1
-1
drivers/scsi/qla2xxx/qla_attr.c
+4
-3
drivers/scsi/qla2xxx/qla_init.c
+4
-3
drivers/scsi/qla2xxx/qla_init.c
···
425
425
__qla24xx_handle_gpdb_event(vha, ea);
426
426
}
427
427
428
-
int qla_post_els_plogi_work(struct scsi_qla_host *vha, fc_port_t *fcport)
428
+
static int qla_post_els_plogi_work(struct scsi_qla_host *vha, fc_port_t *fcport)
429
429
{
430
430
struct qla_work_evt *e;
431
431
···
680
680
fcport);
681
681
break;
682
682
}
683
-
/* drop through */
683
+
/* fall through */
684
684
default:
685
685
if (fcport_is_smaller(fcport)) {
686
686
/* local adapter is bigger */
···
1551
1551
}
1552
1552
1553
1553
1554
-
void qla_handle_els_plogi_done(scsi_qla_host_t *vha, struct event_arg *ea)
1554
+
static void qla_handle_els_plogi_done(scsi_qla_host_t *vha,
1555
+
struct event_arg *ea)
1555
1556
{
1556
1557
ql_dbg(ql_dbg_disc, vha, 0x2118,
1557
1558
"%s %d %8phC post PRLI\n",
+2
-2
drivers/scsi/qla2xxx/qla_iocb.c
+2
-2
drivers/scsi/qla2xxx/qla_iocb.c
···
1195
1195
* @sp: SRB command to process
1196
1196
* @cmd_pkt: Command type 3 IOCB
1197
1197
* @tot_dsds: Total number of segments to transfer
1198
-
* @tot_prot_dsds:
1199
-
* @fw_prot_opts:
1198
+
* @tot_prot_dsds: Total number of segments with protection information
1199
+
* @fw_prot_opts: Protection options to be passed to firmware
1200
1200
*/
1201
1201
inline int
1202
1202
qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
+3
-3
drivers/scsi/qla2xxx/qla_isr.c
+3
-3
drivers/scsi/qla2xxx/qla_isr.c
···
25
25
26
26
/**
27
27
* qla2100_intr_handler() - Process interrupts for the ISP2100 and ISP2200.
28
-
* @irq:
28
+
* @irq: interrupt number
29
29
* @dev_id: SCSI driver HA context
30
30
*
31
31
* Called by system whenever the host adapter generates an interrupt.
···
144
144
145
145
/**
146
146
* qla2300_intr_handler() - Process interrupts for the ISP23xx and ISP63xx.
147
-
* @irq:
147
+
* @irq: interrupt number
148
148
* @dev_id: SCSI driver HA context
149
149
*
150
150
* Called by system whenever the host adapter generates an interrupt.
···
3109
3109
3110
3110
/**
3111
3111
* qla24xx_intr_handler() - Process interrupts for the ISP23xx and ISP24xx.
3112
-
* @irq:
3112
+
* @irq: interrupt number
3113
3113
* @dev_id: SCSI driver HA context
3114
3114
*
3115
3115
* Called by system whenever the host adapter generates an interrupt.
+3
-3
drivers/scsi/qla2xxx/qla_mbx.c
+3
-3
drivers/scsi/qla2xxx/qla_mbx.c
···
3478
3478
/**
3479
3479
* qla2x00_set_serdes_params() -
3480
3480
* @vha: HA context
3481
-
* @sw_em_1g:
3482
-
* @sw_em_2g:
3483
-
* @sw_em_4g:
3481
+
* @sw_em_1g: serial link options
3482
+
* @sw_em_2g: serial link options
3483
+
* @sw_em_4g: serial link options
3484
3484
*
3485
3485
* Returns
3486
3486
*/
+9
-12
drivers/scsi/qla2xxx/qla_mr.c
+9
-12
drivers/scsi/qla2xxx/qla_mr.c
···
2212
2212
struct bsg_job *bsg_job;
2213
2213
struct fc_bsg_reply *bsg_reply;
2214
2214
struct srb_iocb *iocb_job;
2215
-
int res;
2215
+
int res = 0;
2216
2216
struct qla_mt_iocb_rsp_fx00 fstatus;
2217
2217
uint8_t *fw_sts_ptr;
2218
2218
···
2624
2624
* qlafx00_multistatus_entry() - Process Multi response queue entries.
2625
2625
* @vha: SCSI driver HA context
2626
2626
* @rsp: response queue
2627
-
* @pkt:
2627
+
* @pkt: received packet
2628
2628
*/
2629
2629
static void
2630
2630
qlafx00_multistatus_entry(struct scsi_qla_host *vha,
···
2681
2681
* @vha: SCSI driver HA context
2682
2682
* @rsp: response queue
2683
2683
* @pkt: Entry pointer
2684
-
* @estatus:
2685
-
* @etype:
2686
2684
*/
2687
2685
static void
2688
2686
qlafx00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp,
2689
-
struct sts_entry_fx00 *pkt, uint8_t estatus, uint8_t etype)
2687
+
struct sts_entry_fx00 *pkt)
2690
2688
{
2691
2689
srb_t *sp;
2692
2690
struct qla_hw_data *ha = vha->hw;
···
2692
2694
uint16_t que = 0;
2693
2695
struct req_que *req = NULL;
2694
2696
int res = DID_ERROR << 16;
2695
-
2696
-
ql_dbg(ql_dbg_async, vha, 0x507f,
2697
-
"type of error status in response: 0x%x\n", estatus);
2698
2697
2699
2698
req = ha->req_q_map[que];
2700
2699
···
2740
2745
2741
2746
if (pkt->entry_status != 0 &&
2742
2747
pkt->entry_type != IOCTL_IOSB_TYPE_FX00) {
2748
+
ql_dbg(ql_dbg_async, vha, 0x507f,
2749
+
"type of error status in response: 0x%x\n",
2750
+
pkt->entry_status);
2743
2751
qlafx00_error_entry(vha, rsp,
2744
-
(struct sts_entry_fx00 *)pkt, pkt->entry_status,
2745
-
pkt->entry_type);
2752
+
(struct sts_entry_fx00 *)pkt);
2746
2753
continue;
2747
2754
}
2748
2755
···
2864
2867
/**
2865
2868
* qlafx00x_mbx_completion() - Process mailbox command completions.
2866
2869
* @vha: SCSI driver HA context
2867
-
* @mb0:
2870
+
* @mb0: value to be written into mailbox register 0
2868
2871
*/
2869
2872
static void
2870
2873
qlafx00_mbx_completion(scsi_qla_host_t *vha, uint32_t mb0)
···
2890
2893
2891
2894
/**
2892
2895
* qlafx00_intr_handler() - Process interrupts for the ISPFX00.
2893
-
* @irq:
2896
+
* @irq: interrupt number
2894
2897
* @dev_id: SCSI driver HA context
2895
2898
*
2896
2899
* Called by system whenever the host adapter generates an interrupt.
+1
-1
drivers/scsi/qla2xxx/qla_nx.c
+1
-1
drivers/scsi/qla2xxx/qla_nx.c
+1
-1
drivers/scsi/qla2xxx/qla_nx2.c
+1
-1
drivers/scsi/qla2xxx/qla_nx2.c
···
3878
3878
#define PF_BITS_MASK (0xF << 16)
3879
3879
/**
3880
3880
* qla8044_intr_handler() - Process interrupts for the ISP8044
3881
-
* @irq:
3881
+
* @irq: interrupt number
3882
3882
* @dev_id: SCSI driver HA context
3883
3883
*
3884
3884
* Called by system whenever the host adapter generates an interrupt.
+3
-3
drivers/scsi/qla2xxx/qla_os.c
+3
-3
drivers/scsi/qla2xxx/qla_os.c
···
1749
1749
static void
1750
1750
__qla2x00_abort_all_cmds(struct qla_qpair *qp, int res)
1751
1751
{
1752
-
int cnt, status;
1752
+
int cnt;
1753
1753
unsigned long flags;
1754
1754
srb_t *sp;
1755
1755
scsi_qla_host_t *vha = qp->vha;
···
1799
1799
if (!sp_get(sp)) {
1800
1800
spin_unlock_irqrestore
1801
1801
(qp->qp_lock_ptr, flags);
1802
-
status = qla2xxx_eh_abort(
1803
-
GET_CMD_SP(sp));
1802
+
qla2xxx_eh_abort(
1803
+
GET_CMD_SP(sp));
1804
1804
spin_lock_irqsave
1805
1805
(qp->qp_lock_ptr, flags);
1806
1806
}
+1
-1
drivers/scsi/qla2xxx/qla_sup.c
+1
-1
drivers/scsi/qla2xxx/qla_sup.c
+4
-4
drivers/scsi/qla2xxx/qla_target.c
+4
-4
drivers/scsi/qla2xxx/qla_target.c
···
4540
4540
case QLA_TGT_CLEAR_TS:
4541
4541
case QLA_TGT_ABORT_TS:
4542
4542
abort_cmds_for_lun(vha, lun, a->u.isp24.fcp_hdr.s_id);
4543
-
/* drop through */
4543
+
/* fall through */
4544
4544
case QLA_TGT_CLEAR_ACA:
4545
4545
h = qlt_find_qphint(vha, mcmd->unpacked_lun);
4546
4546
mcmd->qpair = h->qpair;
···
6598
6598
* qla_tgt_lport_register - register lport with external module
6599
6599
*
6600
6600
* @target_lport_ptr: pointer for tcm_qla2xxx specific lport data
6601
-
* @phys_wwpn:
6602
-
* @npiv_wwpn:
6603
-
* @npiv_wwnn:
6601
+
* @phys_wwpn: physical port WWPN
6602
+
* @npiv_wwpn: NPIV WWPN
6603
+
* @npiv_wwnn: NPIV WWNN
6604
6604
* @callback: lport initialization callback for tcm_qla2xxx code
6605
6605
*/
6606
6606
int qlt_lport_register(void *target_lport_ptr, u64 phys_wwpn,
+1
-1
drivers/target/target_core_alua.c
+1
-1
drivers/target/target_core_alua.c
+4
-4
drivers/target/target_core_transport.c
+4
-4
drivers/target/target_core_transport.c
···
205
205
if (sub_api_initialized)
206
206
return;
207
207
208
-
ret = request_module("target_core_iblock");
208
+
ret = IS_ENABLED(CONFIG_TCM_IBLOCK) && request_module("target_core_iblock");
209
209
if (ret != 0)
210
210
pr_err("Unable to load target_core_iblock\n");
211
211
212
-
ret = request_module("target_core_file");
212
+
ret = IS_ENABLED(CONFIG_TCM_FILEIO) && request_module("target_core_file");
213
213
if (ret != 0)
214
214
pr_err("Unable to load target_core_file\n");
215
215
216
-
ret = request_module("target_core_pscsi");
216
+
ret = IS_ENABLED(CONFIG_TCM_PSCSI) && request_module("target_core_pscsi");
217
217
if (ret != 0)
218
218
pr_err("Unable to load target_core_pscsi\n");
219
219
220
-
ret = request_module("target_core_user");
220
+
ret = IS_ENABLED(CONFIG_TCM_USER2) && request_module("target_core_user");
221
221
if (ret != 0)
222
222
pr_err("Unable to load target_core_user\n");
223
223