Skip to content

Commit 4305ca0

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: "Updates to the usual drivers (ufs, lpfc, qla2xxx, mpi3mr) plus some misc small fixes. The only core changes are to both bsg and scsi to pass in the device instead of setting it afterwards as q->queuedata, so no functional change" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (69 commits) scsi: aha152x: Use DECLARE_COMPLETION_ONSTACK for non-constant completion scsi: qla2xxx: Convert comma to semicolon scsi: qla2xxx: Update version to 10.02.09.300-k scsi: qla2xxx: Use QP lock to search for bsg scsi: qla2xxx: Reduce fabric scan duplicate code scsi: qla2xxx: Fix optrom version displayed in FDMI scsi: qla2xxx: During vport delete send async logout explicitly scsi: qla2xxx: Complete command early within lock scsi: qla2xxx: Fix flash read failure scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds scsi: qla2xxx: Fix for possible memory corruption scsi: qla2xxx: validate nvme_local_port correctly scsi: qla2xxx: Unable to act on RSCN for port online scsi: ufs: exynos: Add support for Flash Memory Protector (FMP) scsi: ufs: core: Add UFSHCD_QUIRK_KEYS_IN_PRDT scsi: ufs: core: Add fill_crypto_prdt variant op scsi: ufs: core: Add UFSHCD_QUIRK_BROKEN_CRYPTO_ENABLE scsi: ufs: core: fold ufshcd_clear_keyslot() into its caller scsi: ufs: core: Add UFSHCD_QUIRK_CUSTOM_CRYPTO_PROFILE scsi: ufs: mcq: Make .get_hba_mac() optional ...
2 parents 661fb4e + 23cef42 commit 4305ca0

Some content is hidden

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

65 files changed

+3141
-615
lines changed

‎Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -920,14 +920,16 @@ Description: This file shows whether the configuration descriptor is locked.
920920

921921
What: /sys/bus/platform/drivers/ufshcd/*/attributes/max_number_of_rtt
922922
What: /sys/bus/platform/devices/*.ufs/attributes/max_number_of_rtt
923-
Date: February 2018
924-
Contact: Stanislav Nijnikov <stanislav.nijnikov@wdc.com>
923+
Date: May 2024
924+
Contact: Avri Altman <avri.altman@wdc.com>
925925
Description: This file provides the maximum current number of
926-
outstanding RTTs in device that is allowed. The full
927-
information about the attribute could be found at
928-
UFS specifications 2.1.
926+
outstanding RTTs in device that is allowed. bMaxNumOfRTT is a
927+
read-write persistent attribute and is equal to two after device
928+
manufacturing. It shall not be set to a value greater than
929+
bDeviceRTTCap value, and it may be set only when the hw queues are
930+
empty.
929931

930-
The file is read only.
932+
The file is read write.
931933

932934
What: /sys/bus/platform/drivers/ufshcd/*/attributes/exception_event_control
933935
What: /sys/bus/platform/devices/*.ufs/attributes/exception_event_control

‎block/bsg-lib.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,13 +385,12 @@ struct request_queue *bsg_setup_queue(struct device *dev, const char *name,
385385
if (blk_mq_alloc_tag_set(set))
386386
goto out_tag_set;
387387

388-
q = blk_mq_alloc_queue(set, lim, NULL);
388+
q = blk_mq_alloc_queue(set, lim, dev);
389389
if (IS_ERR(q)) {
390390
ret = PTR_ERR(q);
391391
goto out_queue;
392392
}
393393

394-
q->queuedata = dev;
395394
blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT);
396395

397396
bset->bd = bsg_register_queue(q, dev, name, bsg_transport_sg_io_fn);

‎drivers/scsi/BusLogic.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ static struct blogic_drvr_options blogic_drvr_options[BLOGIC_MAX_ADAPTERS];
7878
BusLogic can be assigned a string by insmod.
7979
*/
8080

81+
MODULE_DESCRIPTION("BusLogic MultiMaster and FlashPoint SCSI Host Adapter driver");
8182
MODULE_LICENSE("GPL");
8283
#ifdef MODULE
8384
static char *BusLogic;

‎drivers/scsi/advansys.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11545,6 +11545,7 @@ static void __exit advansys_exit(void)
1154511545
module_init(advansys_init);
1154611546
module_exit(advansys_exit);
1154711547

11548+
MODULE_DESCRIPTION("AdvanSys SCSI Adapter driver");
1154811549
MODULE_LICENSE("GPL");
1154911550
MODULE_FIRMWARE("advansys/mcode.bin");
1155011551
MODULE_FIRMWARE("advansys/3550.bin");

‎drivers/scsi/aha152x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ static int aha152x_abort(struct scsi_cmnd *SCpnt)
10721072
static int aha152x_device_reset(struct scsi_cmnd * SCpnt)
10731073
{
10741074
struct Scsi_Host *shpnt = SCpnt->device->host;
1075-
DECLARE_COMPLETION(done);
1075+
DECLARE_COMPLETION_ONSTACK(done);
10761076
int ret, issued, disconnected;
10771077
unsigned char old_cmd_len = SCpnt->cmd_len;
10781078
unsigned long flags;

‎drivers/scsi/aha1542.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,6 +1009,8 @@ static int aha1542_biosparam(struct scsi_device *sdev,
10091009

10101010
return 0;
10111011
}
1012+
1013+
MODULE_DESCRIPTION("Adaptec AHA-1542 SCSI host adapter driver");
10121014
MODULE_LICENSE("GPL");
10131015

10141016
static int aha1542_init_cmd_priv(struct Scsi_Host *shost, struct scsi_cmnd *cmd)

‎drivers/scsi/aha1740.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,4 +681,5 @@ static __exit void aha1740_exit (void)
681681
module_init (aha1740_init);
682682
module_exit (aha1740_exit);
683683

684+
MODULE_DESCRIPTION("Adaptec AHA1740 SCSI host adapter driver");
684685
MODULE_LICENSE("GPL");

‎drivers/scsi/arm/acornscsi.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2450,7 +2450,7 @@ static int acornscsi_queuecmd_lck(struct scsi_cmnd *SCpnt)
24502450
return 0;
24512451
}
24522452

2453-
DEF_SCSI_QCMD(acornscsi_queuecmd)
2453+
static DEF_SCSI_QCMD(acornscsi_queuecmd)
24542454

24552455
enum res_abort { res_not_running, res_success, res_success_clear, res_snooze };
24562456

@@ -2552,7 +2552,7 @@ static enum res_abort acornscsi_do_abort(AS_Host *host, struct scsi_cmnd *SCpnt)
25522552
* Params : SCpnt - command to abort
25532553
* Returns : one of SCSI_ABORT_ macros
25542554
*/
2555-
int acornscsi_abort(struct scsi_cmnd *SCpnt)
2555+
static int acornscsi_abort(struct scsi_cmnd *SCpnt)
25562556
{
25572557
AS_Host *host = (AS_Host *) SCpnt->device->host->hostdata;
25582558
int result;
@@ -2634,7 +2634,7 @@ int acornscsi_abort(struct scsi_cmnd *SCpnt)
26342634
* Params : SCpnt - command causing reset
26352635
* Returns : one of SCSI_RESET_ macros
26362636
*/
2637-
int acornscsi_host_reset(struct scsi_cmnd *SCpnt)
2637+
static int acornscsi_host_reset(struct scsi_cmnd *SCpnt)
26382638
{
26392639
AS_Host *host = (AS_Host *)SCpnt->device->host->hostdata;
26402640
struct scsi_cmnd *SCptr;
@@ -2679,8 +2679,7 @@ int acornscsi_host_reset(struct scsi_cmnd *SCpnt)
26792679
* Params : host - host to give information on
26802680
* Returns : a constant string
26812681
*/
2682-
const
2683-
char *acornscsi_info(struct Scsi_Host *host)
2682+
static const char *acornscsi_info(struct Scsi_Host *host)
26842683
{
26852684
static char string[100], *p;
26862685

‎drivers/scsi/arm/cumana_2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ cumanascsi_2_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
296296
* Params : host - driver host structure to return info for.
297297
* Returns : pointer to a static buffer containing null terminated string.
298298
*/
299-
const char *cumanascsi_2_info(struct Scsi_Host *host)
299+
static const char *cumanascsi_2_info(struct Scsi_Host *host)
300300
{
301301
struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
302302
static char string[150];

‎drivers/scsi/arm/eesox.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ eesoxscsi_dma_stop(struct Scsi_Host *host, struct scsi_pointer *SCp)
381381
* Params : host - driver host structure to return info for.
382382
* Returns : pointer to a static buffer containing null terminated string.
383383
*/
384-
const char *eesoxscsi_info(struct Scsi_Host *host)
384+
static const char *eesoxscsi_info(struct Scsi_Host *host)
385385
{
386386
struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
387387
static char string[150];

0 commit comments

Comments
 (0)