Skip to content

Commit b2c9a83

Browse files
torvaldstorvalds
committed
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull more SCSI updates from James Bottomley: "Mostly small bug fixes plus other trivial updates. The major change of note is moving ufs out of scsi and a minor update to lpfc vmid handling" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (24 commits) scsi: qla2xxx: Remove unused 'ql_dm_tgt_ex_pct' parameter scsi: qla2xxx: Remove setting of 'req' and 'rsp' parameters scsi: mpi3mr: Fix kernel-doc scsi: lpfc: Add support for ATTO Fibre Channel devices scsi: core: Return BLK_STS_TRANSPORT for ALUA transitioning scsi: sd_zbc: Prevent zone information memory leak scsi: sd: Fix potential NULL pointer dereference scsi: mpi3mr: Rework mrioc->bsg_device model to fix warnings scsi: myrb: Fix up null pointer access on myrb_cleanup() scsi: core: Unexport scsi_bus_type scsi: sd: Don't call blk_cleanup_disk() in sd_probe() scsi: ufs: ufshcd: Delete unnecessary NULL check scsi: isci: Fix typo in comment scsi: pmcraid: Fix typo in comment scsi: smartpqi: Fix typo in comment scsi: qedf: Fix typo in comment scsi: esas2r: Fix typo in comment scsi: storvsc: Fix typo in comment scsi: ufs: Split the drivers/scsi/ufs directory scsi: qla1280: Remove redundant variable ...
2 parents 2981436 + aa2a4de commit b2c9a83

Some content is hidden

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

80 files changed

+728
-465
lines changed

‎MAINTAINERS

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,7 +2565,7 @@ F: drivers/pci/controller/dwc/pcie-qcom.c
25652565
F: drivers/phy/qualcomm/
25662566
F: drivers/power/*/msm*
25672567
F: drivers/reset/reset-qcom-*
2568-
F: drivers/scsi/ufs/ufs-qcom*
2568+
F: drivers/ufs/host/ufs-qcom*
25692569
F: drivers/spi/spi-geni-qcom.c
25702570
F: drivers/spi/spi-qcom-qspi.c
25712571
F: drivers/spi/spi-qup.c
@@ -17755,6 +17755,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
1775517755
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
1775617756
F: Documentation/devicetree/bindings/scsi/
1775717757
F: drivers/scsi/
17758+
F: drivers/ufs/
1775817759
F: include/scsi/
1775917760

1776017761
SCSI TAPE DRIVER
@@ -20414,24 +20415,25 @@ F: include/uapi/linux/cdrom.h
2041420415
UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
2041520416
R: Alim Akhtar <[email protected]>
2041620417
R: Avri Altman <[email protected]>
20418+
R: Bart Van Assche <[email protected]>
2041720419
L: [email protected]
2041820420
S: Supported
2041920421
F: Documentation/devicetree/bindings/ufs/
2042020422
F: Documentation/scsi/ufs.rst
20421-
F: drivers/scsi/ufs/
20423+
F: drivers/ufs/core/
2042220424

2042320425
UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
2042420426
M: Pedro Sousa <[email protected]>
2042520427
L: [email protected]
2042620428
S: Supported
20427-
F: drivers/scsi/ufs/*dwc*
20429+
F: drivers/ufs/host/*dwc*
2042820430

2042920431
UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS
2043020432
M: Stanley Chu <[email protected]>
2043120433
L: [email protected]
2043220434
L: [email protected] (moderated for non-subscribers)
2043320435
S: Maintained
20434-
F: drivers/scsi/ufs/ufs-mediatek*
20436+
F: drivers/ufs/host/ufs-mediatek*
2043520437

2043620438
UNSORTED BLOCK IMAGES (UBI)
2043720439
M: Richard Weinberger <[email protected]>

‎drivers/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ source "drivers/usb/Kconfig"
107107

108108
source "drivers/mmc/Kconfig"
109109

110+
source "drivers/ufs/Kconfig"
111+
110112
source "drivers/memstick/Kconfig"
111113

112114
source "drivers/leds/Kconfig"

‎drivers/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ obj-$(CONFIG_PM_OPP) += opp/
128128
obj-$(CONFIG_CPU_FREQ) += cpufreq/
129129
obj-$(CONFIG_CPU_IDLE) += cpuidle/
130130
obj-y += mmc/
131+
obj-y += ufs/
131132
obj-$(CONFIG_MEMSTICK) += memstick/
132133
obj-$(CONFIG_NEW_LEDS) += leds/
133134
obj-$(CONFIG_INFINIBAND) += infiniband/

‎drivers/nvme/host/fc.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1899,6 +1899,24 @@ nvme_fc_ctrl_ioerr_work(struct work_struct *work)
18991899
nvme_fc_error_recovery(ctrl, "transport detected io error");
19001900
}
19011901

1902+
/*
1903+
* nvme_fc_io_getuuid - Routine called to get the appid field
1904+
* associated with request by the lldd
1905+
* @req:IO request from nvme fc to driver
1906+
* Returns: UUID if there is an appid associated with VM or
1907+
* NULL if the user/libvirt has not set the appid to VM
1908+
*/
1909+
char *nvme_fc_io_getuuid(struct nvmefc_fcp_req *req)
1910+
{
1911+
struct nvme_fc_fcp_op *op = fcp_req_to_fcp_op(req);
1912+
struct request *rq = op->rq;
1913+
1914+
if (!IS_ENABLED(CONFIG_BLK_CGROUP_FC_APPID) || !rq->bio)
1915+
return NULL;
1916+
return blkcg_get_fc_appid(rq->bio);
1917+
}
1918+
EXPORT_SYMBOL_GPL(nvme_fc_io_getuuid);
1919+
19021920
static void
19031921
nvme_fc_fcpio_done(struct nvmefc_fcp_req *req)
19041922
{

‎drivers/scsi/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,6 @@ source "drivers/scsi/megaraid/Kconfig.megaraid"
500500
source "drivers/scsi/mpt3sas/Kconfig"
501501
source "drivers/scsi/mpi3mr/Kconfig"
502502
source "drivers/scsi/smartpqi/Kconfig"
503-
source "drivers/scsi/ufs/Kconfig"
504503

505504
config SCSI_HPTIOP
506505
tristate "HighPoint RocketRAID 3xxx/4xxx Controller support"

‎drivers/scsi/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ obj-$(CONFIG_MEGARAID_NEWGEN) += megaraid/
101101
obj-$(CONFIG_MEGARAID_SAS) += megaraid/
102102
obj-$(CONFIG_SCSI_MPT3SAS) += mpt3sas/
103103
obj-$(CONFIG_SCSI_MPI3MR) += mpi3mr/
104-
obj-$(CONFIG_SCSI_UFSHCD) += ufs/
105104
obj-$(CONFIG_SCSI_ACARD) += atp870u.o
106105
obj-$(CONFIG_SCSI_SUNESP) += esp_scsi.o sun_esp.o
107106
obj-$(CONFIG_SCSI_INITIO) += initio.o

‎drivers/scsi/esas2r/esas2r_flash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ static bool load_image(struct esas2r_adapter *a, struct esas2r_request *rq)
232232
*/
233233
rq->req_stat = RS_PENDING;
234234
if (test_bit(AF_DEGRADED_MODE, &a->flags))
235-
/* not suppported for now */;
235+
/* not supported for now */;
236236
else
237237
build_flash_msg(a, rq);
238238

‎drivers/scsi/isci/request.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2182,7 +2182,7 @@ static enum sci_status atapi_data_tc_completion_handler(struct isci_request *ire
21822182
case (SCU_TASK_DONE_UNEXP_FIS << SCU_COMPLETION_TL_STATUS_SHIFT): {
21832183
u16 len = sci_req_tx_bytes(ireq);
21842184

2185-
/* likely non-error data underrrun, workaround missing
2185+
/* likely non-error data underrun, workaround missing
21862186
* d2h frame from the controller
21872187
*/
21882188
if (d2h->fis_type != FIS_REGD2H) {

‎drivers/scsi/lpfc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ obj-$(CONFIG_SCSI_LPFC) := lpfc.o
3333
lpfc-objs := lpfc_mem.o lpfc_sli.o lpfc_ct.o lpfc_els.o \
3434
lpfc_hbadisc.o lpfc_init.o lpfc_mbox.o lpfc_nportdisc.o \
3535
lpfc_scsi.o lpfc_attr.o lpfc_vport.o lpfc_debugfs.o lpfc_bsg.o \
36-
lpfc_nvme.o lpfc_nvmet.o
36+
lpfc_nvme.o lpfc_nvmet.o lpfc_vmid.o

‎drivers/scsi/lpfc/lpfc_crtn.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,9 @@ int lpfc_vmid_cmd(struct lpfc_vport *vport,
671671
int lpfc_vmid_hash_fn(const char *vmid, int len);
672672
struct lpfc_vmid *lpfc_get_vmid_from_hashtable(struct lpfc_vport *vport,
673673
uint32_t hash, uint8_t *buf);
674+
int lpfc_vmid_get_appid(struct lpfc_vport *vport, char *uuid,
675+
enum dma_data_direction iodir,
676+
union lpfc_vmid_io_tag *tag);
674677
void lpfc_vmid_vport_cleanup(struct lpfc_vport *vport);
675678
int lpfc_issue_els_qfpa(struct lpfc_vport *vport);
676679

0 commit comments

Comments
 (0)