Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

28bc6fb9 · Linus Torvalds <[email protected]> · 2018-01-31 11:23:28 -08:00

Pull SCSI updates from James Bottomley:
 "This is mostly updates of the usual driver suspects: arcmsr,
  scsi_debug, mpt3sas, lpfc, cxlflash, qla2xxx, aacraid, megaraid_sas,
  hisi_sas.

  We also have a rework of the libsas hotplug handling to make it more
  robust, a slew of 32 bit time conversions and fixes, and a host of the
  usual minor updates and style changes. The biggest potential for
  regressions is the libsas hotplug changes, but so far they seem stable
  under testing"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (313 commits)
  scsi: qla2xxx: Fix logo flag for qlt_free_session_done()
  scsi: arcmsr: avoid do_gettimeofday
  scsi: core: Add VENDOR_SPECIFIC sense code definitions
  scsi: qedi: Drop cqe response during connection recovery
  scsi: fas216: fix sense buffer initialization
  scsi: ibmvfc: Remove unneeded semicolons
  scsi: hisi_sas: fix a bug in hisi_sas_dev_gone()
  scsi: hisi_sas: directly attached disk LED feature for v2 hw
  scsi: hisi_sas: devicetree: bindings: add LED feature for v2 hw
  scsi: megaraid_sas: NVMe passthrough command support
  scsi: megaraid: use ktime_get_real for firmware time
  scsi: fnic: use 64-bit timestamps
  scsi: qedf: Fix error return code in __qedf_probe()
  scsi: devinfo: fix format of the device list
  scsi: qla2xxx: Update driver version to 10.00.00.05-k
  scsi: qla2xxx: Add XCB counters to debugfs
  scsi: qla2xxx: Fix queue ID for async abort with Multiqueue
  scsi: qla2xxx: Fix warning for code intentation in __qla24xx_handle_gpdb_event()
  scsi: qla2xxx: Fix warning during port_name debug print
  scsi: qla2xxx: Fix warning in qla2x00_async_iocb_timeout()
  ...

Commit: 28bc6fb9596fe1e577d09fc17ee6e1bb051c6ba3
Parents: 0be600a5 · a2390348

Merge commit. Changes below are compared with the first parent: 0be600a5.

Changes

161 files changed · +8932 −4525

File	Status	Add	Del	Content
Documentation/devicetree/bindings/scsi/hisilicon-sas.txt	modified	+4	−1	View file
Documentation/driver-api/scsi.rst	modified	+9	−1	View file
drivers/message/fusion/mptbase.c	modified	+30	−29	View file
drivers/message/fusion/mptctl.c	modified	+7	−18	View file
drivers/message/fusion/mptsas.c	modified	+0	−1	View file
drivers/scsi/3w-9xxx.c	modified	+11	−15	View file
drivers/scsi/3w-9xxx.h	modified	+1	−1	View file
drivers/scsi/3w-sas.c	modified	+6	−9	View file
drivers/scsi/aacraid/aachba.c	modified	+317	−156	View file
drivers/scsi/aacraid/aacraid.h	modified	+47	−7	View file
drivers/scsi/aacraid/commctrl.c	modified	+5	−1	View file
drivers/scsi/aacraid/comminit.c	modified	+44	−5	View file
drivers/scsi/aacraid/commsup.c	modified	+120	−100	View file
drivers/scsi/aacraid/linit.c	modified	+15	−11	View file
drivers/scsi/aacraid/sa.c	modified	+16	−16	View file
drivers/scsi/arcmsr/arcmsr.h	modified	+346	−221	View file
drivers/scsi/arcmsr/arcmsr_hba.c	modified	+813	−505	View file
drivers/scsi/arm/fas216.c	modified	+1	−1	View file
drivers/scsi/bfa/bfa_core.c	modified	+1	−1	View file
drivers/scsi/bfa/bfa_cs.h	modified	+3	−3	View file
drivers/scsi/bfa/bfa_defs_svc.h	modified	+2	−1	View file
drivers/scsi/bfa/bfa_fcbuild.c	modified	+4	−4	View file
drivers/scsi/bfa/bfa_fcpim.c	modified	+2	−1	View file
drivers/scsi/bfa/bfa_fcpim.h	modified	+2	−2	View file
drivers/scsi/bfa/bfa_fcs.c	modified	+39	−39	View file
drivers/scsi/bfa/bfa_fcs_lport.c	modified	+24	−38	View file
drivers/scsi/bfa/bfa_ioc.c	modified	+6	−4	View file
drivers/scsi/bfa/bfa_port.c	modified	+3	−12	View file
drivers/scsi/bfa/bfa_port.h	modified	+1	−1	View file
drivers/scsi/bfa/bfa_svc.c	modified	+16	−35	View file
drivers/scsi/bfa/bfa_svc.h	modified	+1	−1	View file
drivers/scsi/bfa/bfad.c	modified	+11	−12	View file
drivers/scsi/bfa/bfad_attr.c	modified	+1	−4	View file
drivers/scsi/bfa/bfad_bsg.c	modified	+4	−6	View file
drivers/scsi/bfa/bfad_debugfs.c	modified	+2	−6	View file
drivers/scsi/bfa/bfad_im.h	modified	+22	−10	View file
drivers/scsi/bnx2fc/bnx2fc_fcoe.c	modified	+2	−2	View file
drivers/scsi/bnx2fc/bnx2fc_hwi.c	modified	+25	−35	View file
drivers/scsi/bnx2fc/bnx2fc_tgt.c	modified	+22	−29	View file
drivers/scsi/bnx2i/bnx2i_hwi.c	modified	+7	−12	View file
drivers/scsi/csiostor/csio_init.c	modified	+1	−1	View file
drivers/scsi/csiostor/csio_init.h	modified	+0	−1	View file
drivers/scsi/csiostor/csio_mb.c	modified	+3	−3	View file
drivers/scsi/cxgbi/libcxgbi.c	modified	+1	−1	View file
drivers/scsi/cxlflash/Makefile	modified	+1	−1	View file
drivers/scsi/cxlflash/backend.h	added	+41	−0	View file
drivers/scsi/cxlflash/common.h	modified	+5	−3	View file
drivers/scsi/cxlflash/cxl_hw.c	added	+168	−0	View file
drivers/scsi/cxlflash/main.c	modified	+40	−60	View file
drivers/scsi/cxlflash/superpipe.c	modified	+31	−33	View file
drivers/scsi/cxlflash/superpipe.h	modified	+2	−2	View file
drivers/scsi/device_handler/scsi_dh_alua.c	modified	+28	−9	View file
drivers/scsi/fnic/fnic_debugfs.c	modified	+2	−20	View file
drivers/scsi/fnic/fnic_fcs.c	modified	+1	−3	View file
drivers/scsi/fnic/fnic_scsi.c	modified	+1	−1	View file
drivers/scsi/fnic/fnic_stats.h	modified	+2	−2	View file
drivers/scsi/fnic/fnic_trace.c	modified	+29	−29	View file
drivers/scsi/hisi_sas/hisi_sas.h	modified	+43	−3	View file
drivers/scsi/hisi_sas/hisi_sas_main.c	modified	+216	−51	View file
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c	modified	+3	−3	View file
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c	modified	+150	−44	View file
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c	modified	+287	−45	View file
drivers/scsi/hosts.c	modified	+6	−0	View file
drivers/scsi/hpsa.c	modified	+4	−14	View file
drivers/scsi/ibmvscsi/ibmvfc.c	modified	+17	−17	View file
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c	modified	+170	−150	View file
drivers/scsi/ipr.c	modified	+2	−2	View file
drivers/scsi/iscsi_tcp.c	modified	+2	−0	View file
drivers/scsi/libiscsi.c	modified	+26	−2	View file
drivers/scsi/libiscsi_tcp.c	modified	+5	−4	View file
drivers/scsi/libsas/sas_ata.c	modified	+0	−1	View file
drivers/scsi/libsas/sas_discover.c	modified	+19	−15	View file
drivers/scsi/libsas/sas_event.c	modified	+66	−20	View file
drivers/scsi/libsas/sas_expander.c	modified	+6	−6	View file
drivers/scsi/libsas/sas_init.c	modified	+104	−3	View file
drivers/scsi/libsas/sas_internal.h	modified	+7	−0	View file
drivers/scsi/libsas/sas_phy.c	modified	+34	−35	View file
drivers/scsi/libsas/sas_port.c	modified	+15	−10	View file
drivers/scsi/libsas/sas_scsi_host.c	modified	+4	−16	View file
drivers/scsi/lpfc/lpfc.h	modified	+4	−2	View file
drivers/scsi/lpfc/lpfc_attr.c	modified	+50	−9	View file
drivers/scsi/lpfc/lpfc_crtn.h	modified	+2	−0	View file
drivers/scsi/lpfc/lpfc_ct.c	modified	+20	−0	View file
drivers/scsi/lpfc/lpfc_debugfs.c	modified	+54	−11	View file
drivers/scsi/lpfc/lpfc_disc.h	modified	+2	−0	View file
drivers/scsi/lpfc/lpfc_els.c	modified	+61	−55	View file
drivers/scsi/lpfc/lpfc_hbadisc.c	modified	+17	−12	View file
drivers/scsi/lpfc/lpfc_hw4.h	modified	+5	−1	View file
drivers/scsi/lpfc/lpfc_init.c	modified	+198	−96	View file
drivers/scsi/lpfc/lpfc_nportdisc.c	modified	+62	−26	View file
drivers/scsi/lpfc/lpfc_nvme.c	modified	+288	−68	View file
drivers/scsi/lpfc/lpfc_nvme.h	modified	+15	−2	View file
drivers/scsi/lpfc/lpfc_nvmet.c	modified	+63	−8	View file
drivers/scsi/lpfc/lpfc_nvmet.h	modified	+10	−0	View file
drivers/scsi/lpfc/lpfc_sli.c	modified	+104	−89	View file
drivers/scsi/lpfc/lpfc_sli4.h	modified	+8	−6	View file
drivers/scsi/lpfc/lpfc_version.h	modified	+1	−1	View file
drivers/scsi/megaraid/megaraid_sas.h	modified	+29	−8	View file
drivers/scsi/megaraid/megaraid_sas_base.c	modified	+83	−88	View file
drivers/scsi/megaraid/megaraid_sas_fp.c	modified	+18	−10	View file
drivers/scsi/megaraid/megaraid_sas_fusion.c	modified	+65	−34	View file
drivers/scsi/megaraid/megaraid_sas_fusion.h	modified	+6	−0	View file
drivers/scsi/mpt3sas/mpt3sas_base.c	modified	+103	−104	View file
drivers/scsi/mpt3sas/mpt3sas_base.h	modified	+11	−18	View file
drivers/scsi/mpt3sas/mpt3sas_ctl.c	modified	+12	−19	View file
drivers/scsi/mpt3sas/mpt3sas_scsih.c	modified	+86	−246	View file
drivers/scsi/mpt3sas/mpt3sas_warpdrive.c	modified	+3	−30	View file
drivers/scsi/pmcraid.c	modified	+1	−1	View file
drivers/scsi/ppa.c	modified	+4	−0	View file
drivers/scsi/qedf/qedf_main.c	modified	+3	−0	View file
drivers/scsi/qedi/qedi_fw.c	modified	+1	−1	View file
drivers/scsi/qedi/qedi_main.c	modified	+18	−28	View file
drivers/scsi/qla2xxx/qla_attr.c	modified	+4	−3	View file
drivers/scsi/qla2xxx/qla_bsg.c	modified	+3	−6	View file
drivers/scsi/qla2xxx/qla_def.h	modified	+142	−31	View file
drivers/scsi/qla2xxx/qla_dfs.c	modified	+25	−14	View file
drivers/scsi/qla2xxx/qla_fw.h	modified	+1	−1	View file
drivers/scsi/qla2xxx/qla_gbl.h	modified	+27	−5	View file
drivers/scsi/qla2xxx/qla_gs.c	modified	+1301	−196	View file
drivers/scsi/qla2xxx/qla_init.c	modified	+691	−365	View file
drivers/scsi/qla2xxx/qla_inline.h	modified	+1	−0	View file
drivers/scsi/qla2xxx/qla_iocb.c	modified	+48	−17	View file
drivers/scsi/qla2xxx/qla_isr.c	modified	+43	−13	View file
drivers/scsi/qla2xxx/qla_mbx.c	modified	+71	−80	View file
drivers/scsi/qla2xxx/qla_mid.c	modified	+115	−25	View file
drivers/scsi/qla2xxx/qla_nx2.c	modified	+0	−2	View file
drivers/scsi/qla2xxx/qla_os.c	modified	+362	−166	View file
drivers/scsi/qla2xxx/qla_sup.c	modified	+1	−0	View file
drivers/scsi/qla2xxx/qla_target.c	modified	+429	−332	View file
drivers/scsi/qla2xxx/qla_target.h	modified	+2	−2	View file
drivers/scsi/qla2xxx/qla_tmpl.c	modified	+37	−3	View file
drivers/scsi/qla2xxx/qla_version.h	modified	+1	−1	View file
drivers/scsi/qla2xxx/tcm_qla2xxx.c	modified	+1	−4	View file
drivers/scsi/qla4xxx/ql4_init.c	modified	+2	−3	View file
drivers/scsi/qla4xxx/ql4_mbx.c	modified	+9	−12	View file
drivers/scsi/qla4xxx/ql4_nx.c	modified	+2	−3	View file
drivers/scsi/qla4xxx/ql4_os.c	modified	+5	−7	View file
drivers/scsi/scsi_common.c	modified	+7	−7	View file
drivers/scsi/scsi_debug.c	modified	+513	−211	View file
drivers/scsi/scsi_devinfo.c	modified	+17	−22	View file
drivers/scsi/scsi_dh.c	modified	+4	−1	View file
drivers/scsi/scsi_error.c	modified	+18	−3	View file
drivers/scsi/scsi_lib.c	modified	+33	−17	View file
drivers/scsi/scsi_priv.h	modified	+8	−7	View file
drivers/scsi/scsi_sysfs.c	modified	+0	−3	View file
drivers/scsi/scsi_transport_fc.c	modified	+2	−2	View file
drivers/scsi/sd.c	modified	+3	−3	View file
drivers/scsi/ses.c	modified	+7	−4	View file
drivers/scsi/smartpqi/Makefile	modified	+1	−1	View file
drivers/scsi/st.c	modified	+1	−1	View file
drivers/scsi/storvsc_drv.c	modified	+3	−1	View file
drivers/scsi/ufs/ufshci.h	modified	+16	−0	View file
drivers/scsi/wd719x.c	modified	+3	−1	View file
include/linux/ata.h	modified	+2	−0	View file
include/scsi/libsas.h	modified	+22	−8	View file
include/scsi/scsi_cmnd.h	modified	+0	−1	View file
include/scsi/scsi_host.h	modified	+2	−0	View file
include/scsi/scsi_proto.h	modified	+1	−0	View file
include/scsi/scsi_transport_fc.h	modified	+2	−2	View file
include/scsi/scsi_transport_sas.h	modified	+1	−0	View file
kernel/rcu/update.c	modified	+2	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/scsi/hisilicon-sas.txt

View file

diff --git a/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt b/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
index b6a869f..df3bef7 100644
--- a/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
+++ b/Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
@@ -8,7 +8,10 @@ Main node required properties:
 	(b) "hisilicon,hip06-sas-v2" for v2 hw in hip06 chipset
 	(c) "hisilicon,hip07-sas-v2" for v2 hw in hip07 chipset
   - sas-addr : array of 8 bytes for host SAS address
-  - reg : Address and length of the SAS register
+  - reg : Contains two regions. The first is the address and length of the SAS
+          register. The second is the address and length of CPLD register for
+          SGPIO control. The second is optional, and should be set only when
+          we use a CPLD for directly attached disk LED control.
   - hisilicon,sas-syscon: phandle of syscon used for sas control
   - ctrl-reset-reg : offset to controller reset register in ctrl reg
   - ctrl-reset-sts-reg : offset to controller reset status register in ctrl reg

Documentation/driver-api/scsi.rst

View file

diff --git a/Documentation/driver-api/scsi.rst b/Documentation/driver-api/scsi.rst
index 9ae0317..3ae3379 100644
--- a/Documentation/driver-api/scsi.rst
+++ b/Documentation/driver-api/scsi.rst
@@ -224,6 +224,14 @@ mid to lowlevel SCSI driver interface
 .. kernel-doc:: drivers/scsi/hosts.c
    :export:
 
+drivers/scsi/scsi_common.c
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+general support functions
+
+.. kernel-doc:: drivers/scsi/scsi_common.c
+   :export:
+
 Transport classes
 -----------------
 
@@ -332,5 +340,5 @@ todo
 ~~~~
 
 Parallel (fast/wide/ultra) SCSI, USB, SATA, SAS, Fibre Channel,
-FireWire, ATAPI devices, Infiniband, I20, iSCSI, Parallel ports,
+FireWire, ATAPI devices, Infiniband, I2O, iSCSI, Parallel ports,
 netlink...

drivers/message/fusion/mptbase.c

View file

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 7a93400..51eb1b0 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -958,7 +958,7 @@ mpt_put_msg_frame(u8 cb_idx, MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf)
 {
 	u32 mf_dma_addr;
 	int req_offset;
-	u16	 req_idx;	/* Request index */
+	u16 req_idx;	/* Request index */
 
 	/* ensure values are reset properly! */
 	mf->u.frame.hwhdr.msgctxu.fld.cb_idx = cb_idx;		/* byte */
@@ -994,7 +994,7 @@ mpt_put_msg_frame_hi_pri(u8 cb_idx, MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf)
 {
 	u32 mf_dma_addr;
 	int req_offset;
-	u16	 req_idx;	/* Request index */
+	u16 req_idx;	/* Request index */
 
 	/* ensure values are reset properly! */
 	mf->u.frame.hwhdr.msgctxu.fld.cb_idx = cb_idx;
@@ -1128,11 +1128,12 @@ mpt_add_sge_64bit_1078(void *pAddr, u32 flagslength, dma_addr_t dma_addr)
 static void
 mpt_add_chain(void *pAddr, u8 next, u16 length, dma_addr_t dma_addr)
 {
-		SGEChain32_t *pChain = (SGEChain32_t *) pAddr;
-		pChain->Length = cpu_to_le16(length);
-		pChain->Flags = MPI_SGE_FLAGS_CHAIN_ELEMENT;
-		pChain->NextChainOffset = next;
-		pChain->Address = cpu_to_le32(dma_addr);
+	SGEChain32_t *pChain = (SGEChain32_t *) pAddr;
+
+	pChain->Length = cpu_to_le16(length);
+	pChain->Flags = MPI_SGE_FLAGS_CHAIN_ELEMENT;
+	pChain->NextChainOffset = next;
+	pChain->Address = cpu_to_le32(dma_addr);
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -1147,18 +1148,18 @@ mpt_add_chain(void *pAddr, u8 next, u16 length, dma_addr_t dma_addr)
 static void
 mpt_add_chain_64bit(void *pAddr, u8 next, u16 length, dma_addr_t dma_addr)
 {
-		SGEChain64_t *pChain = (SGEChain64_t *) pAddr;
-		u32 tmp = dma_addr & 0xFFFFFFFF;
+	SGEChain64_t *pChain = (SGEChain64_t *) pAddr;
+	u32 tmp = dma_addr & 0xFFFFFFFF;
 
-		pChain->Length = cpu_to_le16(length);
-		pChain->Flags = (MPI_SGE_FLAGS_CHAIN_ELEMENT |
-				 MPI_SGE_FLAGS_64_BIT_ADDRESSING);
+	pChain->Length = cpu_to_le16(length);
+	pChain->Flags = (MPI_SGE_FLAGS_CHAIN_ELEMENT |
+			 MPI_SGE_FLAGS_64_BIT_ADDRESSING);
 
-		pChain->NextChainOffset = next;
+	pChain->NextChainOffset = next;
 
-		pChain->Address.Low = cpu_to_le32(tmp);
-		tmp = (u32)(upper_32_bits(dma_addr));
-		pChain->Address.High = cpu_to_le32(tmp);
+	pChain->Address.Low = cpu_to_le32(tmp);
+	tmp = (u32)(upper_32_bits(dma_addr));
+	pChain->Address.High = cpu_to_le32(tmp);
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -1360,7 +1361,7 @@ mpt_host_page_alloc(MPT_ADAPTER *ioc, pIOCInit_t ioc_init)
 	ioc->add_sge(psge, flags_length, ioc->HostPageBuffer_dma);
 	ioc->facts.HostPageBufferSGE = ioc_init->HostPageBufferSGE;
 
-return 0;
+	return 0;
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -2152,7 +2153,7 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state)
 	    device_state);
 
 	/* put ioc into READY_STATE */
-	if(SendIocReset(ioc, MPI_FUNCTION_IOC_MESSAGE_UNIT_RESET, CAN_SLEEP)) {
+	if (SendIocReset(ioc, MPI_FUNCTION_IOC_MESSAGE_UNIT_RESET, CAN_SLEEP)) {
 		printk(MYIOC_s_ERR_FMT
 		"pci-suspend:  IOC msg unit reset failed!\n", ioc->name);
 	}
@@ -6348,7 +6349,7 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
 	u8		 page_type = 0, extend_page;
 	unsigned long 	 timeleft;
 	unsigned long	 flags;
-    int		 in_isr;
+	int		 in_isr;
 	u8		 issue_hard_reset = 0;
 	u8		 retry_count = 0;
 
@@ -7697,7 +7698,7 @@ mpt_display_event_info(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply)
 		break;
 	}
 	if (ds)
-		strncpy(evStr, ds, EVENT_DESCR_STR_SZ);
+		strlcpy(evStr, ds, EVENT_DESCR_STR_SZ);
 
 
 	devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT
@@ -8092,15 +8093,15 @@ mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info)
 static void
 mpt_sas_log_info(MPT_ADAPTER *ioc, u32 log_info, u8 cb_idx)
 {
-union loginfo_type {
-	u32	loginfo;
-	struct {
-		u32	subcode:16;
-		u32	code:8;
-		u32	originator:4;
-		u32	bus_type:4;
-	}dw;
-};
+	union loginfo_type {
+		u32	loginfo;
+		struct {
+			u32	subcode:16;
+			u32	code:8;
+			u32	originator:4;
+			u32	bus_type:4;
+		} dw;
+	};
 	union loginfo_type sas_loginfo;
 	char *originator_desc = NULL;
 	char *code_desc = NULL;

drivers/message/fusion/mptctl.c

View file

diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 7b3b413..8d12017 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -2481,24 +2481,13 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
 	else
 		karg.host_no =  -1;
 
-	/* Reformat the fw_version into a string
-	 */
-	karg.fw_version[0] = ioc->facts.FWVersion.Struct.Major >= 10 ?
-		((ioc->facts.FWVersion.Struct.Major / 10) + '0') : '0';
-	karg.fw_version[1] = (ioc->facts.FWVersion.Struct.Major % 10 ) + '0';
-	karg.fw_version[2] = '.';
-	karg.fw_version[3] = ioc->facts.FWVersion.Struct.Minor >= 10 ?
-		((ioc->facts.FWVersion.Struct.Minor / 10) + '0') : '0';
-	karg.fw_version[4] = (ioc->facts.FWVersion.Struct.Minor % 10 ) + '0';
-	karg.fw_version[5] = '.';
-	karg.fw_version[6] = ioc->facts.FWVersion.Struct.Unit >= 10 ?
-		((ioc->facts.FWVersion.Struct.Unit / 10) + '0') : '0';
-	karg.fw_version[7] = (ioc->facts.FWVersion.Struct.Unit % 10 ) + '0';
-	karg.fw_version[8] = '.';
-	karg.fw_version[9] = ioc->facts.FWVersion.Struct.Dev >= 10 ?
-		((ioc->facts.FWVersion.Struct.Dev / 10) + '0') : '0';
-	karg.fw_version[10] = (ioc->facts.FWVersion.Struct.Dev % 10 ) + '0';
-	karg.fw_version[11] = '\0';
+	/* Reformat the fw_version into a string */
+	snprintf(karg.fw_version, sizeof(karg.fw_version),
+		 "%.2hhu.%.2hhu.%.2hhu.%.2hhu",
+		 ioc->facts.FWVersion.Struct.Major,
+		 ioc->facts.FWVersion.Struct.Minor,
+		 ioc->facts.FWVersion.Struct.Unit,
+		 ioc->facts.FWVersion.Struct.Dev);
 
 	/* Issue a config request to get the device serial number
 	 */

drivers/message/fusion/mptsas.c

View file

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 345f603..439ee9c 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -1165,7 +1165,6 @@ mptsas_schedule_target_reset(void *iocp)
 	 * issue target reset to next device in the queue
 	 */
 
-	head = &hd->target_reset_list;
 	if (list_empty(head))
 		return;
 

drivers/scsi/3w-9xxx.c

View file

diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 00e7968..b42c9c4 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -369,7 +369,6 @@ out:
 static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header)
 {
 	u32 local_time;
-	struct timeval time;
 	TW_Event *event;
 	unsigned short aen;
 	char host[16];
@@ -392,8 +391,8 @@ static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
 	memset(event, 0, sizeof(TW_Event));
 
 	event->severity = TW_SEV_OUT(header->status_block.severity__reserved);
-	do_gettimeofday(&time);
-	local_time = (u32)(time.tv_sec - (sys_tz.tz_minuteswest * 60));
+	/* event->time_stamp_sec overflows in y2106 */
+	local_time = (u32)(ktime_get_real_seconds() - (sys_tz.tz_minuteswest * 60));
 	event->time_stamp_sec = local_time;
 	event->aen_code = aen;
 	event->retrieved = TW_AEN_NOT_RETRIEVED;
@@ -473,11 +472,10 @@ out:
 static void twa_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
 {
 	u32 schedulertime;
-	struct timeval utc;
 	TW_Command_Full *full_command_packet;
 	TW_Command *command_packet;
 	TW_Param_Apache *param;
-	u32 local_time;
+	time64_t local_time;
 
 	/* Fill out the command packet */
 	full_command_packet = tw_dev->command_packet_virt[request_id];
@@ -499,9 +497,8 @@ static void twa_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
 
 	/* Convert system time in UTC to local time seconds since last 
            Sunday 12:00AM */
-	do_gettimeofday(&utc);
-	local_time = (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
-	schedulertime = local_time - (3 * 86400);
+	local_time = (ktime_get_real_seconds() - (sys_tz.tz_minuteswest * 60));
+	div_u64_rem(local_time - (3 * 86400), 604800, &schedulertime);
 	schedulertime = cpu_to_le32(schedulertime % 604800);
 
 	memcpy(param->data, &schedulertime, sizeof(u32));
@@ -648,8 +645,7 @@ static long twa_chrdev_ioctl(struct file *file, unsigned int cmd, unsigned long 
 	TW_Command_Full *full_command_packet;
 	TW_Compatibility_Info *tw_compat_info;
 	TW_Event *event;
-	struct timeval current_time;
-	u32 current_time_ms;
+	ktime_t current_time;
 	TW_Device_Extension *tw_dev = twa_device_extension_list[iminor(inode)];
 	int retval = TW_IOCTL_ERROR_OS_EFAULT;
 	void __user *argp = (void __user *)arg;
@@ -840,17 +836,17 @@ static long twa_chrdev_ioctl(struct file *file, unsigned int cmd, unsigned long 
 		break;
 	case TW_IOCTL_GET_LOCK:
 		tw_lock = (TW_Lock *)tw_ioctl->data_buffer;
-		do_gettimeofday(&current_time);
-		current_time_ms = (current_time.tv_sec * 1000) + (current_time.tv_usec / 1000);
+		current_time = ktime_get();
 
-		if ((tw_lock->force_flag == 1) || (tw_dev->ioctl_sem_lock == 0) || (current_time_ms >= tw_dev->ioctl_msec)) {
+		if ((tw_lock->force_flag == 1) || (tw_dev->ioctl_sem_lock == 0) ||
+		    ktime_after(current_time, tw_dev->ioctl_time)) {
 			tw_dev->ioctl_sem_lock = 1;
-			tw_dev->ioctl_msec = current_time_ms + tw_lock->timeout_msec;
+			tw_dev->ioctl_time = ktime_add_ms(current_time, tw_lock->timeout_msec);
 			tw_ioctl->driver_command.status = 0;
 			tw_lock->time_remaining_msec = tw_lock->timeout_msec;
 		} else {
 			tw_ioctl->driver_command.status = TW_IOCTL_ERROR_STATUS_LOCKED;
-			tw_lock->time_remaining_msec = tw_dev->ioctl_msec - current_time_ms;
+			tw_lock->time_remaining_msec = ktime_ms_delta(tw_dev->ioctl_time, current_time);
 		}
 		break;
 	case TW_IOCTL_RELEASE_LOCK:

drivers/scsi/3w-9xxx.h

View file

diff --git a/drivers/scsi/3w-9xxx.h b/drivers/scsi/3w-9xxx.h
index b6c208c..d88cd34 100644
--- a/drivers/scsi/3w-9xxx.h
+++ b/drivers/scsi/3w-9xxx.h
@@ -666,7 +666,7 @@ typedef struct TAG_TW_Device_Extension {
 	unsigned char		event_queue_wrapped;
 	unsigned int            error_sequence_id;
 	int                     ioctl_sem_lock;
-	u32                     ioctl_msec;
+	ktime_t                 ioctl_time;
 	int			chrdev_request_id;
 	wait_queue_head_t	ioctl_wqueue;
 	struct mutex		ioctl_lock;

drivers/scsi/3w-sas.c

View file

diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
index b150e13..cf9f2a0 100644
--- a/drivers/scsi/3w-sas.c
+++ b/drivers/scsi/3w-sas.c
@@ -221,7 +221,6 @@ out:
 static void twl_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header)
 {
 	u32 local_time;
-	struct timeval time;
 	TW_Event *event;
 	unsigned short aen;
 	char host[16];
@@ -240,8 +239,8 @@ static void twl_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
 	memset(event, 0, sizeof(TW_Event));
 
 	event->severity = TW_SEV_OUT(header->status_block.severity__reserved);
-	do_gettimeofday(&time);
-	local_time = (u32)(time.tv_sec - (sys_tz.tz_minuteswest * 60));
+	/* event->time_stamp_sec overflows in y2106 */
+	local_time = (u32)(ktime_get_real_seconds() - (sys_tz.tz_minuteswest * 60));
 	event->time_stamp_sec = local_time;
 	event->aen_code = aen;
 	event->retrieved = TW_AEN_NOT_RETRIEVED;
@@ -408,11 +407,10 @@ out:
 static void twl_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
 {
 	u32 schedulertime;
-	struct timeval utc;
 	TW_Command_Full *full_command_packet;
 	TW_Command *command_packet;
 	TW_Param_Apache *param;
-	u32 local_time;
+	time64_t local_time;
 
 	/* Fill out the command packet */
 	full_command_packet = tw_dev->command_packet_virt[request_id];
@@ -434,10 +432,9 @@ static void twl_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
 
 	/* Convert system time in UTC to local time seconds since last 
            Sunday 12:00AM */
-	do_gettimeofday(&utc);
-	local_time = (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
-	schedulertime = local_time - (3 * 86400);
-	schedulertime = cpu_to_le32(schedulertime % 604800);
+	local_time = (ktime_get_real_seconds() - (sys_tz.tz_minuteswest * 60));
+	div_u64_rem(local_time - (3 * 86400), 604800, &schedulertime);
+	schedulertime = cpu_to_le32(schedulertime);
 
 	memcpy(param->data, &schedulertime, sizeof(u32));
 

drivers/scsi/aacraid/aachba.c

View file

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index af3e4d3..e7961cb 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -42,6 +42,8 @@
 #include <linux/highmem.h> /* For flush_kernel_dcache_page */
 #include <linux/module.h>
 
+#include <asm/unaligned.h>
+
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
@@ -913,8 +915,15 @@ static void setinqstr(struct aac_dev *dev, void *data, int tindex)
 	memset(str, ' ', sizeof(*str));
 
 	if (sup_adap_info->adapter_type_text[0]) {
-		char *cp = sup_adap_info->adapter_type_text;
 		int c;
+		char *cp;
+		char *cname = kmemdup(sup_adap_info->adapter_type_text,
+				sizeof(sup_adap_info->adapter_type_text),
+								GFP_ATOMIC);
+		if (!cname)
+			return;
+
+		cp = cname;
 		if ((cp[0] == 'A') && (cp[1] == 'O') && (cp[2] == 'C'))
 			inqstrcpy("SMC", str->vid);
 		else {
@@ -923,7 +932,7 @@ static void setinqstr(struct aac_dev *dev, void *data, int tindex)
 				++cp;
 			c = *cp;
 			*cp = '\0';
-			inqstrcpy(sup_adap_info->adapter_type_text, str->vid);
+			inqstrcpy(cname, str->vid);
 			*cp = c;
 			while (*cp && *cp != ' ')
 				++cp;
@@ -931,14 +940,11 @@ static void setinqstr(struct aac_dev *dev, void *data, int tindex)
 		while (*cp == ' ')
 			++cp;
 		/* last six chars reserved for vol type */
-		c = 0;
-		if (strlen(cp) > sizeof(str->pid)) {
-			c = cp[sizeof(str->pid)];
+		if (strlen(cp) > sizeof(str->pid))
 			cp[sizeof(str->pid)] = '\0';
-		}
 		inqstrcpy (cp, str->pid);
-		if (c)
-			cp[sizeof(str->pid)] = c;
+
+		kfree(cname);
 	} else {
 		struct aac_driver_ident *mp = aac_get_driver_ident(dev->cardtype);
 
@@ -1660,87 +1666,309 @@ static int aac_adapter_hba(struct fib *fib, struct scsi_cmnd *cmd)
 				  (void *) cmd);
 }
 
-int aac_issue_bmic_identify(struct aac_dev *dev, u32 bus, u32 target)
+static int aac_send_safw_bmic_cmd(struct aac_dev *dev,
+	struct aac_srb_unit *srbu, void *xfer_buf, int xfer_len)
 {
-	struct fib *fibptr;
-	struct aac_srb *srbcmd;
-	struct sgmap64 *sg64;
-	struct aac_ciss_identify_pd *identify_resp;
-	dma_addr_t addr;
-	u32 vbus, vid;
-	u16 fibsize, datasize;
-	int rcode = -ENOMEM;
-
+	struct fib	*fibptr;
+	dma_addr_t	addr;
+	int		rcode;
+	int		fibsize;
+	struct aac_srb	*srb;
+	struct aac_srb_reply *srb_reply;
+	struct sgmap64	*sg64;
+	u32 vbus;
+	u32 vid;
+
+	if (!dev->sa_firmware)
+		return 0;
 
+	/* allocate FIB */
 	fibptr = aac_fib_alloc(dev);
 	if (!fibptr)
-		goto out;
+		return -ENOMEM;
 
-	fibsize = sizeof(struct aac_srb) -
-			sizeof(struct sgentry) + sizeof(struct sgentry64);
-	datasize = sizeof(struct aac_ciss_identify_pd);
+	aac_fib_init(fibptr);
+	fibptr->hw_fib_va->header.XferState &=
+		~cpu_to_le32(FastResponseCapable);
 
-	identify_resp = dma_alloc_coherent(&dev->pdev->dev, datasize, &addr,
-					   GFP_KERNEL);
-	if (!identify_resp)
-		goto fib_free_ptr;
+	fibsize  = sizeof(struct aac_srb) - sizeof(struct sgentry) +
+						sizeof(struct sgentry64);
 
-	vbus = (u32)le16_to_cpu(dev->supplement_adapter_info.virt_device_bus);
-	vid = (u32)le16_to_cpu(dev->supplement_adapter_info.virt_device_target);
+	/* allocate DMA buffer for response */
+	addr = dma_map_single(&dev->pdev->dev, xfer_buf, xfer_len,
+							DMA_BIDIRECTIONAL);
+	if (dma_mapping_error(&dev->pdev->dev, addr)) {
+		rcode = -ENOMEM;
+		goto fib_error;
+	}
 
-	aac_fib_init(fibptr);
+	srb = fib_data(fibptr);
+	memcpy(srb, &srbu->srb, sizeof(struct aac_srb));
 
-	srbcmd = (struct aac_srb *) fib_data(fibptr);
-	srbcmd->function = cpu_to_le32(SRBF_ExecuteScsi);
-	srbcmd->channel  = cpu_to_le32(vbus);
-	srbcmd->id       = cpu_to_le32(vid);
-	srbcmd->lun      = 0;
-	srbcmd->flags    = cpu_to_le32(SRB_DataIn);
-	srbcmd->timeout  = cpu_to_le32(10);
-	srbcmd->retry_limit = 0;
-	srbcmd->cdb_size = cpu_to_le32(12);
-	srbcmd->count = cpu_to_le32(datasize);
+	vbus = (u32)le16_to_cpu(
+			dev->supplement_adapter_info.virt_device_bus);
+	vid  = (u32)le16_to_cpu(
+			dev->supplement_adapter_info.virt_device_target);
 
-	memset(srbcmd->cdb, 0, sizeof(srbcmd->cdb));
-	srbcmd->cdb[0] = 0x26;
-	srbcmd->cdb[2] = (u8)((AAC_MAX_LUN + target) & 0x00FF);
-	srbcmd->cdb[6] = CISS_IDENTIFY_PHYSICAL_DEVICE;
+	/* set the common request fields */
+	srb->channel		= cpu_to_le32(vbus);
+	srb->id			= cpu_to_le32(vid);
+	srb->lun		= 0;
+	srb->function		= cpu_to_le32(SRBF_ExecuteScsi);
+	srb->timeout		= 0;
+	srb->retry_limit	= 0;
+	srb->cdb_size		= cpu_to_le32(16);
+	srb->count		= cpu_to_le32(xfer_len);
+
+	sg64 = (struct sgmap64 *)&srb->sg;
+	sg64->count		= cpu_to_le32(1);
+	sg64->sg[0].addr[1]	= cpu_to_le32(upper_32_bits(addr));
+	sg64->sg[0].addr[0]	= cpu_to_le32(lower_32_bits(addr));
+	sg64->sg[0].count	= cpu_to_le32(xfer_len);
 
-	sg64 = (struct sgmap64 *)&srbcmd->sg;
-	sg64->count = cpu_to_le32(1);
-	sg64->sg[0].addr[1] = cpu_to_le32((u32)(((addr) >> 16) >> 16));
-	sg64->sg[0].addr[0] = cpu_to_le32((u32)(addr & 0xffffffff));
-	sg64->sg[0].count = cpu_to_le32(datasize);
+	/*
+	 * Copy the updated data for other dumping or other usage if needed
+	 */
+	memcpy(&srbu->srb, srb, sizeof(struct aac_srb));
+
+	/* issue request to the controller */
+	rcode = aac_fib_send(ScsiPortCommand64, fibptr, fibsize, FsaNormal,
+					1, 1, NULL, NULL);
+
+	if (rcode == -ERESTARTSYS)
+		rcode = -ERESTART;
+
+	if (unlikely(rcode < 0))
+		goto bmic_error;
+
+	srb_reply = (struct aac_srb_reply *)fib_data(fibptr);
+	memcpy(&srbu->srb_reply, srb_reply, sizeof(struct aac_srb_reply));
+
+bmic_error:
+	dma_unmap_single(&dev->pdev->dev, addr, xfer_len, DMA_BIDIRECTIONAL);
+fib_error:
+	aac_fib_complete(fibptr);
+	aac_fib_free(fibptr);
+	return rcode;
+}
+
+static void aac_set_safw_target_qd(struct aac_dev *dev, int bus, int target)
+{
+
+	struct aac_ciss_identify_pd *identify_resp;
 
-	rcode = aac_fib_send(ScsiPortCommand64,
-		fibptr, fibsize, FsaNormal, 1, 1, NULL, NULL);
+	if (dev->hba_map[bus][target].devtype != AAC_DEVTYPE_NATIVE_RAW)
+		return;
+
+	identify_resp = dev->hba_map[bus][target].safw_identify_resp;
+	if (identify_resp == NULL) {
+		dev->hba_map[bus][target].qd_limit = 32;
+		return;
+	}
 
 	if (identify_resp->current_queue_depth_limit <= 0 ||
-		identify_resp->current_queue_depth_limit > 32)
+		identify_resp->current_queue_depth_limit > 255)
 		dev->hba_map[bus][target].qd_limit = 32;
 	else
 		dev->hba_map[bus][target].qd_limit =
 			identify_resp->current_queue_depth_limit;
+}
 
-	dma_free_coherent(&dev->pdev->dev, datasize, identify_resp, addr);
+static int aac_issue_safw_bmic_identify(struct aac_dev *dev,
+	struct aac_ciss_identify_pd **identify_resp, u32 bus, u32 target)
+{
+	int rcode = -ENOMEM;
+	int datasize;
+	struct aac_srb_unit srbu;
+	struct aac_srb *srbcmd;
+	struct aac_ciss_identify_pd *identify_reply;
 
-	aac_fib_complete(fibptr);
+	datasize = sizeof(struct aac_ciss_identify_pd);
+	identify_reply = kmalloc(datasize, GFP_KERNEL);
+	if (!identify_reply)
+		goto out;
+
+	memset(&srbu, 0, sizeof(struct aac_srb_unit));
+
+	srbcmd = &srbu.srb;
+	srbcmd->flags	= cpu_to_le32(SRB_DataIn);
+	srbcmd->cdb[0]	= 0x26;
+	srbcmd->cdb[2]	= (u8)((AAC_MAX_LUN + target) & 0x00FF);
+	srbcmd->cdb[6]	= CISS_IDENTIFY_PHYSICAL_DEVICE;
+
+	rcode = aac_send_safw_bmic_cmd(dev, &srbu, identify_reply, datasize);