Commit 2668e3ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI fixes from James Bottomley:
 "Two minor fixes: one in the core to improve the handling of warnings
  and unconditionally clear the command flags when ending a request and
  the other to add missing table values needed for bandwidth scaling in
  qualcomm ufs"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING
  scsi: ufs: qcom: Add missing interconnect bandwidth values for Gear 5
parents 7586c850 ca91259b

drivers/scsi/scsi_lib.c

+3 −4
Original line number Diff line number Diff line
@@ -635,10 +635,9 @@ static bool scsi_end_request(struct request *req, blk_status_t error, 
	if (blk_queue_add_random(q))

		add_disk_randomness(req->q->disk);



	if (!blk_rq_is_passthrough(req)) {

		WARN_ON_ONCE(!(cmd->flags & SCMD_INITIALIZED));

		cmd->flags &= ~SCMD_INITIALIZED;

	}

	WARN_ON_ONCE(!blk_rq_is_passthrough(req) &&

		     !(cmd->flags & SCMD_INITIALIZED));

	cmd->flags = 0;



	/*

	 * Calling rcu_barrier() is not necessary here because the

drivers/ufs/host/ufs-qcom.c

+7 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ enum { 
	TSTBUS_MAX,

};



#define QCOM_UFS_MAX_GEAR 4

#define QCOM_UFS_MAX_GEAR 5

#define QCOM_UFS_MAX_LANE 2



enum {
@@ -67,26 +67,32 @@ static const struct __ufs_qcom_bw_table { 
	[MODE_PWM][UFS_PWM_G2][UFS_LANE_1] = { 1844,		1000 },

	[MODE_PWM][UFS_PWM_G3][UFS_LANE_1] = { 3688,		1000 },

	[MODE_PWM][UFS_PWM_G4][UFS_LANE_1] = { 7376,		1000 },

	[MODE_PWM][UFS_PWM_G5][UFS_LANE_1] = { 14752,		1000 },

	[MODE_PWM][UFS_PWM_G1][UFS_LANE_2] = { 1844,		1000 },

	[MODE_PWM][UFS_PWM_G2][UFS_LANE_2] = { 3688,		1000 },

	[MODE_PWM][UFS_PWM_G3][UFS_LANE_2] = { 7376,		1000 },

	[MODE_PWM][UFS_PWM_G4][UFS_LANE_2] = { 14752,		1000 },

	[MODE_PWM][UFS_PWM_G5][UFS_LANE_2] = { 29504,		1000 },

	[MODE_HS_RA][UFS_HS_G1][UFS_LANE_1] = { 127796,		1000 },

	[MODE_HS_RA][UFS_HS_G2][UFS_LANE_1] = { 255591,		1000 },

	[MODE_HS_RA][UFS_HS_G3][UFS_LANE_1] = { 1492582,	102400 },

	[MODE_HS_RA][UFS_HS_G4][UFS_LANE_1] = { 2915200,	204800 },

	[MODE_HS_RA][UFS_HS_G5][UFS_LANE_1] = { 5836800,	409600 },

	[MODE_HS_RA][UFS_HS_G1][UFS_LANE_2] = { 255591,		1000 },

	[MODE_HS_RA][UFS_HS_G2][UFS_LANE_2] = { 511181,		1000 },

	[MODE_HS_RA][UFS_HS_G3][UFS_LANE_2] = { 1492582,	204800 },

	[MODE_HS_RA][UFS_HS_G4][UFS_LANE_2] = { 2915200,	409600 },

	[MODE_HS_RA][UFS_HS_G5][UFS_LANE_2] = { 5836800,	819200 },

	[MODE_HS_RB][UFS_HS_G1][UFS_LANE_1] = { 149422,		1000 },

	[MODE_HS_RB][UFS_HS_G2][UFS_LANE_1] = { 298189,		1000 },

	[MODE_HS_RB][UFS_HS_G3][UFS_LANE_1] = { 1492582,	102400 },

	[MODE_HS_RB][UFS_HS_G4][UFS_LANE_1] = { 2915200,	204800 },

	[MODE_HS_RB][UFS_HS_G5][UFS_LANE_1] = { 5836800,	409600 },

	[MODE_HS_RB][UFS_HS_G1][UFS_LANE_2] = { 298189,		1000 },

	[MODE_HS_RB][UFS_HS_G2][UFS_LANE_2] = { 596378,		1000 },

	[MODE_HS_RB][UFS_HS_G3][UFS_LANE_2] = { 1492582,	204800 },

	[MODE_HS_RB][UFS_HS_G4][UFS_LANE_2] = { 2915200,	409600 },

	[MODE_HS_RB][UFS_HS_G5][UFS_LANE_2] = { 5836800,	819200 },

	[MODE_MAX][0][0]		    = { 7643136,	307200 },

};