Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2da7b403 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

skd: Introduce the symbolic constant SKD_MAX_REQ_PER_MSG 



This patch does not change any functionality.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 760b48ca

drivers/block/skd_main.c

+8 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/aer.h>

#include <linux/wait.h>

#include <linux/uio.h>

#include <linux/stringify.h>

#include <scsi/scsi.h>

#include <scsi/sg.h>

#include <linux/io.h>
@@ -86,6 +87,7 @@ MODULE_VERSION(DRV_VERSION "-" DRV_BUILD_ID); 
#define SKD_PAUSE_TIMEOUT       (5 * 1000)



#define SKD_N_FITMSG_BYTES      (512u)

#define SKD_MAX_REQ_PER_MSG	14



#define SKD_N_SPECIAL_CONTEXT   32u

#define SKD_N_SPECIAL_FITMSG_BYTES      (128u)
@@ -377,7 +379,7 @@ static int skd_max_req_per_msg = SKD_MAX_REQ_PER_MSG_DEFAULT; 
module_param(skd_max_req_per_msg, int, 0444);

MODULE_PARM_DESC(skd_max_req_per_msg,

		 "Maximum SCSI requests packed in a single message."

		 " (1-14, default==1)");

		 " (1-" __stringify(SKD_MAX_REQ_PER_MSG) ", default==1)");



#define SKD_MAX_QUEUE_DEPTH_DEFAULT 64

#define SKD_MAX_QUEUE_DEPTH_DEFAULT_STR "64"
@@ -5016,6 +5018,9 @@ static void skd_log_skreq(struct skd_device *skdev, 


static int __init skd_init(void)

{

	BUILD_BUG_ON(sizeof(struct fit_msg_hdr) + SKD_MAX_REQ_PER_MSG *

		     sizeof(struct skd_scsi_request) != SKD_N_FITMSG_BYTES);



	pr_info(PFX " v%s-b%s loaded\n", DRV_VERSION, DRV_BUILD_ID);



	switch (skd_isr_type) {
@@ -5036,7 +5041,8 @@ static int __init skd_init(void) 
		skd_max_queue_depth = SKD_MAX_QUEUE_DEPTH_DEFAULT;

	}



	if (skd_max_req_per_msg < 1 || skd_max_req_per_msg > 14) {

	if (skd_max_req_per_msg < 1 ||

	    skd_max_req_per_msg > SKD_MAX_REQ_PER_MSG) {

		pr_err(PFX "skd_max_req_per_msg %d invalid, re-set to %d\n",

		       skd_max_req_per_msg, SKD_MAX_REQ_PER_MSG_DEFAULT);

		skd_max_req_per_msg = SKD_MAX_REQ_PER_MSG_DEFAULT;