~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,3 +1,4 @@
	1	+// SPDX-License-Identifier: GPL-2.0-only
1	2	/*
2	3	* sd.c Copyright (C) 1992 Drew Eckhardt
3	4	* Copyright (C) 1993, 1994, 1995, 1999 Eric Youngdale
..	..	@@ -45,6 +46,7 @@
45	46	#include <linux/init.h>
46	47	#include <linux/blkdev.h>
47	48	#include <linux/blkpg.h>
	49	+#include <linux/blk-pm.h>
48	50	#include <linux/delay.h>
49	51	#include <linux/mutex.h>
50	52	#include <linux/string_helpers.h>
..	..	@@ -113,15 +115,13 @@
113	115	static int sd_suspend_runtime(struct device *);
114	116	static int sd_resume(struct device *);
115	117	static void sd_rescan(struct device *);
116		-static int sd_init_command(struct scsi_cmnd *SCpnt);
	118	+static blk_status_t sd_init_command(struct scsi_cmnd *SCpnt);
117	119	static void sd_uninit_command(struct scsi_cmnd *SCpnt);
118	120	static int sd_done(struct scsi_cmnd *);
119	121	static void sd_eh_reset(struct scsi_cmnd *);
120	122	static int sd_eh_action(struct scsi_cmnd *, int);
121	123	static void sd_read_capacity(struct scsi_disk sdkp, unsigned char buffer);
122	124	static void scsi_disk_release(struct device *cdev);
123		-static void sd_print_sense_hdr(struct scsi_disk , struct scsi_sense_hdr );
124		-static void sd_print_result(const struct scsi_disk , const char , int);
125	125
126	126	static DEFINE_IDA(sd_index_ida);
127	127
..	..	@@ -194,7 +194,7 @@
194	194	}
195	195
196	196	if (scsi_mode_sense(sdp, 0x08, 8, buffer, sizeof(buffer), SD_TIMEOUT,
197		- SD_MAX_RETRIES, &data, NULL))
	197	+ sdkp->max_retries, &data, NULL))
198	198	return -EINVAL;
199	199	len = min_t(size_t, sizeof(buffer), data.length - data.header_length -
200	200	data.block_descriptor_length);
..	..	@@ -212,12 +212,12 @@
212	212	data.device_specific = 0;
213	213
214	214	if (scsi_mode_select(sdp, 1, sp, 8, buffer_data, len, SD_TIMEOUT,
215		- SD_MAX_RETRIES, &data, &sshdr)) {
	215	+ sdkp->max_retries, &data, &sshdr)) {
216	216	if (scsi_sense_valid(&sshdr))
217	217	sd_print_sense_hdr(sdkp, &sshdr);
218	218	return -EINVAL;
219	219	}
220		- revalidate_disk(sdkp->disk);
	220	+ sd_revalidate_disk(sdkp->disk);
221	221	return count;
222	222	}
223	223
..	..	@@ -528,6 +528,54 @@
528	528	}
529	529	static DEVICE_ATTR_RW(max_write_same_blocks);
530	530
	531	+static ssize_t
	532	+zoned_cap_show(struct device dev, struct device_attribute attr, char *buf)
	533	+{
	534	+ struct scsi_disk *sdkp = to_scsi_disk(dev);
	535	+
	536	+ if (sdkp->device->type == TYPE_ZBC)
	537	+ return sprintf(buf, "host-managed\n");
	538	+ if (sdkp->zoned == 1)
	539	+ return sprintf(buf, "host-aware\n");
	540	+ if (sdkp->zoned == 2)
	541	+ return sprintf(buf, "drive-managed\n");
	542	+ return sprintf(buf, "none\n");
	543	+}
	544	+static DEVICE_ATTR_RO(zoned_cap);
	545	+
	546	+static ssize_t
	547	+max_retries_store(struct device dev, struct device_attribute attr,
	548	+ const char *buf, size_t count)
	549	+{
	550	+ struct scsi_disk *sdkp = to_scsi_disk(dev);
	551	+ struct scsi_device *sdev = sdkp->device;
	552	+ int retries, err;
	553	+
	554	+ err = kstrtoint(buf, 10, &retries);
	555	+ if (err)
	556	+ return err;
	557	+
	558	+ if (retries == SCSI_CMD_RETRIES_NO_LIMIT \|\| retries <= SD_MAX_RETRIES) {
	559	+ sdkp->max_retries = retries;
	560	+ return count;
	561	+ }
	562	+
	563	+ sdev_printk(KERN_ERR, sdev, "max_retries must be between -1 and %d\n",
	564	+ SD_MAX_RETRIES);
	565	+ return -EINVAL;
	566	+}
	567	+
	568	+static ssize_t
	569	+max_retries_show(struct device dev, struct device_attribute attr,
	570	+ char *buf)
	571	+{
	572	+ struct scsi_disk *sdkp = to_scsi_disk(dev);
	573	+
	574	+ return sprintf(buf, "%d\n", sdkp->max_retries);
	575	+}
	576	+
	577	+static DEVICE_ATTR_RW(max_retries);
	578	+
531	579	static struct attribute *sd_disk_attrs[] = {
532	580	&dev_attr_cache_type.attr,
533	581	&dev_attr_FUA.attr,
..	..	@@ -541,6 +589,8 @@
541	589	&dev_attr_zeroing_mode.attr,
542	590	&dev_attr_max_write_same_blocks.attr,
543	591	&dev_attr_max_medium_access_timeouts.attr,
	592	+ &dev_attr_zoned_cap.attr,
	593	+ &dev_attr_max_retries.attr,
544	594	NULL,
545	595	};
546	596	ATTRIBUTE_GROUPS(sd_disk);
..	..	@@ -566,6 +616,7 @@
566	616	.name = "sd",
567	617	.owner = THIS_MODULE,
568	618	.probe = sd_probe,
	619	+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
569	620	.remove = sd_remove,
570	621	.shutdown = sd_shutdown,
571	622	.pm = &sd_pm_ops,
..	..	@@ -648,7 +699,8 @@
648	699	static int sd_sec_submit(void data, u16 spsp, u8 secp, void buffer,
649	700	size_t len, bool send)
650	701	{
651		- struct scsi_device *sdev = data;
	702	+ struct scsi_disk *sdkp = data;
	703	+ struct scsi_device *sdev = sdkp->device;
652	704	u8 cdb[12] = { 0, };
653	705	int ret;
654	706
..	..	@@ -657,12 +709,74 @@
657	709	put_unaligned_be16(spsp, &cdb[2]);
658	710	put_unaligned_be32(len, &cdb[6]);
659	711
660		- ret = scsi_execute_req(sdev, cdb,
661		- send ? DMA_TO_DEVICE : DMA_FROM_DEVICE,
662		- buffer, len, NULL, SD_TIMEOUT, SD_MAX_RETRIES, NULL);
	712	+ ret = scsi_execute(sdev, cdb, send ? DMA_TO_DEVICE : DMA_FROM_DEVICE,
	713	+ buffer, len, NULL, NULL, SD_TIMEOUT, sdkp->max_retries, 0,
	714	+ RQF_PM, NULL);
663	715	return ret <= 0 ? ret : -EIO;
664	716	}
665	717	#endif /* CONFIG_BLK_SED_OPAL */
	718	+
	719	+/*
	720	+ * Look up the DIX operation based on whether the command is read or
	721	+ * write and whether dix and dif are enabled.
	722	+ */
	723	+static unsigned int sd_prot_op(bool write, bool dix, bool dif)
	724	+{
	725	+ /* Lookup table: bit 2 (write), bit 1 (dix), bit 0 (dif) */
	726	+ static const unsigned int ops[] = { /* wrt dix dif */
	727	+ SCSI_PROT_NORMAL, /* 0 0 0 */
	728	+ SCSI_PROT_READ_STRIP, /* 0 0 1 */
	729	+ SCSI_PROT_READ_INSERT, /* 0 1 0 */
	730	+ SCSI_PROT_READ_PASS, /* 0 1 1 */
	731	+ SCSI_PROT_NORMAL, /* 1 0 0 */
	732	+ SCSI_PROT_WRITE_INSERT, /* 1 0 1 */
	733	+ SCSI_PROT_WRITE_STRIP, /* 1 1 0 */
	734	+ SCSI_PROT_WRITE_PASS, /* 1 1 1 */
	735	+ };
	736	+
	737	+ return ops[write << 2 \| dix << 1 \| dif];
	738	+}
	739	+
	740	+/*
	741	+ * Returns a mask of the protection flags that are valid for a given DIX
	742	+ * operation.
	743	+ */
	744	+static unsigned int sd_prot_flag_mask(unsigned int prot_op)
	745	+{
	746	+ static const unsigned int flag_mask[] = {
	747	+ [SCSI_PROT_NORMAL] = 0,
	748	+
	749	+ [SCSI_PROT_READ_STRIP] = SCSI_PROT_TRANSFER_PI \|
	750	+ SCSI_PROT_GUARD_CHECK \|
	751	+ SCSI_PROT_REF_CHECK \|
	752	+ SCSI_PROT_REF_INCREMENT,
	753	+
	754	+ [SCSI_PROT_READ_INSERT] = SCSI_PROT_REF_INCREMENT \|
	755	+ SCSI_PROT_IP_CHECKSUM,
	756	+
	757	+ [SCSI_PROT_READ_PASS] = SCSI_PROT_TRANSFER_PI \|
	758	+ SCSI_PROT_GUARD_CHECK \|
	759	+ SCSI_PROT_REF_CHECK \|
	760	+ SCSI_PROT_REF_INCREMENT \|
	761	+ SCSI_PROT_IP_CHECKSUM,
	762	+
	763	+ [SCSI_PROT_WRITE_INSERT] = SCSI_PROT_TRANSFER_PI \|
	764	+ SCSI_PROT_REF_INCREMENT,
	765	+
	766	+ [SCSI_PROT_WRITE_STRIP] = SCSI_PROT_GUARD_CHECK \|
	767	+ SCSI_PROT_REF_CHECK \|
	768	+ SCSI_PROT_REF_INCREMENT \|
	769	+ SCSI_PROT_IP_CHECKSUM,
	770	+
	771	+ [SCSI_PROT_WRITE_PASS] = SCSI_PROT_TRANSFER_PI \|
	772	+ SCSI_PROT_GUARD_CHECK \|
	773	+ SCSI_PROT_REF_CHECK \|
	774	+ SCSI_PROT_REF_INCREMENT \|
	775	+ SCSI_PROT_IP_CHECKSUM,
	776	+ };
	777	+
	778	+ return flag_mask[prot_op];
	779	+}
666	780
667	781	static unsigned char sd_setup_protect_cmnd(struct scsi_cmnd *scmd,
668	782	unsigned int dix, unsigned int dif)
..	..	@@ -756,18 +870,19 @@
756	870	blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
757	871	}
758	872
759		-static int sd_setup_unmap_cmnd(struct scsi_cmnd *cmd)
	873	+static blk_status_t sd_setup_unmap_cmnd(struct scsi_cmnd *cmd)
760	874	{
761	875	struct scsi_device *sdp = cmd->device;
762	876	struct request *rq = cmd->request;
763		- u64 sector = blk_rq_pos(rq) >> (ilog2(sdp->sector_size) - 9);
764		- u32 nr_sectors = blk_rq_sectors(rq) >> (ilog2(sdp->sector_size) - 9);
	877	+ struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
	878	+ u64 lba = sectors_to_logical(sdp, blk_rq_pos(rq));
	879	+ u32 nr_blocks = sectors_to_logical(sdp, blk_rq_sectors(rq));
765	880	unsigned int data_len = 24;
766	881	char *buf;
767	882
768	883	rq->special_vec.bv_page = mempool_alloc(sd_page_pool, GFP_ATOMIC);
769	884	if (!rq->special_vec.bv_page)
770		- return BLKPREP_DEFER;
	885	+ return BLK_STS_RESOURCE;
771	886	clear_highpage(rq->special_vec.bv_page);
772	887	rq->special_vec.bv_offset = 0;
773	888	rq->special_vec.bv_len = data_len;
..	..	@@ -780,28 +895,29 @@
780	895	buf = page_address(rq->special_vec.bv_page);
781	896	put_unaligned_be16(6 + 16, &buf[0]);
782	897	put_unaligned_be16(16, &buf[2]);
783		- put_unaligned_be64(sector, &buf[8]);
784		- put_unaligned_be32(nr_sectors, &buf[16]);
	898	+ put_unaligned_be64(lba, &buf[8]);
	899	+ put_unaligned_be32(nr_blocks, &buf[16]);
785	900
786		- cmd->allowed = SD_MAX_RETRIES;
	901	+ cmd->allowed = sdkp->max_retries;
787	902	cmd->transfersize = data_len;
788	903	rq->timeout = SD_TIMEOUT;
789		- scsi_req(rq)->resid_len = data_len;
790	904
791		- return scsi_init_io(cmd);
	905	+ return scsi_alloc_sgtables(cmd);
792	906	}
793	907
794		-static int sd_setup_write_same16_cmnd(struct scsi_cmnd *cmd, bool unmap)
	908	+static blk_status_t sd_setup_write_same16_cmnd(struct scsi_cmnd *cmd,
	909	+ bool unmap)
795	910	{
796	911	struct scsi_device *sdp = cmd->device;
797	912	struct request *rq = cmd->request;
798		- u64 sector = blk_rq_pos(rq) >> (ilog2(sdp->sector_size) - 9);
799		- u32 nr_sectors = blk_rq_sectors(rq) >> (ilog2(sdp->sector_size) - 9);
	913	+ struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
	914	+ u64 lba = sectors_to_logical(sdp, blk_rq_pos(rq));
	915	+ u32 nr_blocks = sectors_to_logical(sdp, blk_rq_sectors(rq));
800	916	u32 data_len = sdp->sector_size;
801	917
802	918	rq->special_vec.bv_page = mempool_alloc(sd_page_pool, GFP_ATOMIC);
803	919	if (!rq->special_vec.bv_page)
804		- return BLKPREP_DEFER;
	920	+ return BLK_STS_RESOURCE;
805	921	clear_highpage(rq->special_vec.bv_page);
806	922	rq->special_vec.bv_offset = 0;
807	923	rq->special_vec.bv_len = data_len;
..	..	@@ -811,28 +927,29 @@
811	927	cmd->cmnd[0] = WRITE_SAME_16;
812	928	if (unmap)
813	929	cmd->cmnd[1] = 0x8; /* UNMAP */
814		- put_unaligned_be64(sector, &cmd->cmnd[2]);
815		- put_unaligned_be32(nr_sectors, &cmd->cmnd[10]);
	930	+ put_unaligned_be64(lba, &cmd->cmnd[2]);
	931	+ put_unaligned_be32(nr_blocks, &cmd->cmnd[10]);
816	932
817		- cmd->allowed = SD_MAX_RETRIES;
	933	+ cmd->allowed = sdkp->max_retries;
818	934	cmd->transfersize = data_len;
819	935	rq->timeout = unmap ? SD_TIMEOUT : SD_WRITE_SAME_TIMEOUT;
820		- scsi_req(rq)->resid_len = data_len;
821	936
822		- return scsi_init_io(cmd);
	937	+ return scsi_alloc_sgtables(cmd);
823	938	}
824	939
825		-static int sd_setup_write_same10_cmnd(struct scsi_cmnd *cmd, bool unmap)
	940	+static blk_status_t sd_setup_write_same10_cmnd(struct scsi_cmnd *cmd,
	941	+ bool unmap)
826	942	{
827	943	struct scsi_device *sdp = cmd->device;
828	944	struct request *rq = cmd->request;
829		- u64 sector = blk_rq_pos(rq) >> (ilog2(sdp->sector_size) - 9);
830		- u32 nr_sectors = blk_rq_sectors(rq) >> (ilog2(sdp->sector_size) - 9);
	945	+ struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
	946	+ u64 lba = sectors_to_logical(sdp, blk_rq_pos(rq));
	947	+ u32 nr_blocks = sectors_to_logical(sdp, blk_rq_sectors(rq));
831	948	u32 data_len = sdp->sector_size;
832	949
833	950	rq->special_vec.bv_page = mempool_alloc(sd_page_pool, GFP_ATOMIC);
834	951	if (!rq->special_vec.bv_page)
835		- return BLKPREP_DEFER;
	952	+ return BLK_STS_RESOURCE;
836	953	clear_highpage(rq->special_vec.bv_page);
837	954	rq->special_vec.bv_offset = 0;
838	955	rq->special_vec.bv_len = data_len;
..	..	@@ -842,24 +959,23 @@
842	959	cmd->cmnd[0] = WRITE_SAME;
843	960	if (unmap)
844	961	cmd->cmnd[1] = 0x8; /* UNMAP */
845		- put_unaligned_be32(sector, &cmd->cmnd[2]);
846		- put_unaligned_be16(nr_sectors, &cmd->cmnd[7]);
	962	+ put_unaligned_be32(lba, &cmd->cmnd[2]);
	963	+ put_unaligned_be16(nr_blocks, &cmd->cmnd[7]);
847	964
848		- cmd->allowed = SD_MAX_RETRIES;
	965	+ cmd->allowed = sdkp->max_retries;
849	966	cmd->transfersize = data_len;
850	967	rq->timeout = unmap ? SD_TIMEOUT : SD_WRITE_SAME_TIMEOUT;
851		- scsi_req(rq)->resid_len = data_len;
852	968
853		- return scsi_init_io(cmd);
	969	+ return scsi_alloc_sgtables(cmd);
854	970	}
855	971
856		-static int sd_setup_write_zeroes_cmnd(struct scsi_cmnd *cmd)
	972	+static blk_status_t sd_setup_write_zeroes_cmnd(struct scsi_cmnd *cmd)
857	973	{
858	974	struct request *rq = cmd->request;
859	975	struct scsi_device *sdp = cmd->device;
860	976	struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
861		- u64 sector = blk_rq_pos(rq) >> (ilog2(sdp->sector_size) - 9);
862		- u32 nr_sectors = blk_rq_sectors(rq) >> (ilog2(sdp->sector_size) - 9);
	977	+ u64 lba = sectors_to_logical(sdp, blk_rq_pos(rq));
	978	+ u32 nr_blocks = sectors_to_logical(sdp, blk_rq_sectors(rq));
863	979
864	980	if (!(rq->cmd_flags & REQ_NOUNMAP)) {
865	981	switch (sdkp->zeroing_mode) {
..	..	@@ -870,10 +986,12 @@
870	986	}
871	987	}
872	988
873		- if (sdp->no_write_same)
874		- return BLKPREP_INVALID;
	989	+ if (sdp->no_write_same) {
	990	+ rq->rq_flags \|= RQF_QUIET;
	991	+ return BLK_STS_TARGET;
	992	+ }
875	993
876		- if (sdkp->ws16 \|\| sector > 0xffffffff \|\| nr_sectors > 0xffff)
	994	+ if (sdkp->ws16 \|\| lba > 0xffffffff \|\| nr_blocks > 0xffff)
877	995	return sd_setup_write_same16_cmnd(cmd, false);
878	996
879	997	return sd_setup_write_same10_cmnd(cmd, false);
..	..	@@ -948,44 +1066,38 @@
948	1066	* Will set up either WRITE SAME(10) or WRITE SAME(16) depending on
949	1067	* the preference indicated by the target device.
950	1068	**/
951		-static int sd_setup_write_same_cmnd(struct scsi_cmnd *cmd)
	1069	+static blk_status_t sd_setup_write_same_cmnd(struct scsi_cmnd *cmd)
952	1070	{
953	1071	struct request *rq = cmd->request;
954	1072	struct scsi_device *sdp = cmd->device;
955	1073	struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
956	1074	struct bio *bio = rq->bio;
957		- sector_t sector = blk_rq_pos(rq);
958		- unsigned int nr_sectors = blk_rq_sectors(rq);
	1075	+ u64 lba = sectors_to_logical(sdp, blk_rq_pos(rq));
	1076	+ u32 nr_blocks = sectors_to_logical(sdp, blk_rq_sectors(rq));
959	1077	unsigned int nr_bytes = blk_rq_bytes(rq);
960		- int ret;
	1078	+ blk_status_t ret;
961	1079
962	1080	if (sdkp->device->no_write_same)
963		- return BLKPREP_INVALID;
	1081	+ return BLK_STS_TARGET;
964	1082
965	1083	BUG_ON(bio_offset(bio) \|\| bio_iovec(bio).bv_len != sdp->sector_size);
966	1084
967		- sector >>= ilog2(sdp->sector_size) - 9;
968		- nr_sectors >>= ilog2(sdp->sector_size) - 9;
	1085	+ rq->timeout = SD_WRITE_SAME_TIMEOUT;
969	1086
970		- if (likely(!sdp->timeout_override))
971		- rq->timeout = SD_WRITE_SAME_TIMEOUT;
972		- else
973		- rq->timeout = sdp->timeout_override;
974		-
975		- if (sdkp->ws16 \|\| sector > 0xffffffff \|\| nr_sectors > 0xffff) {
	1087	+ if (sdkp->ws16 \|\| lba > 0xffffffff \|\| nr_blocks > 0xffff) {
976	1088	cmd->cmd_len = 16;
977	1089	cmd->cmnd[0] = WRITE_SAME_16;
978		- put_unaligned_be64(sector, &cmd->cmnd[2]);
979		- put_unaligned_be32(nr_sectors, &cmd->cmnd[10]);
	1090	+ put_unaligned_be64(lba, &cmd->cmnd[2]);
	1091	+ put_unaligned_be32(nr_blocks, &cmd->cmnd[10]);
980	1092	} else {
981	1093	cmd->cmd_len = 10;
982	1094	cmd->cmnd[0] = WRITE_SAME;
983		- put_unaligned_be32(sector, &cmd->cmnd[2]);
984		- put_unaligned_be16(nr_sectors, &cmd->cmnd[7]);
	1095	+ put_unaligned_be32(lba, &cmd->cmnd[2]);
	1096	+ put_unaligned_be16(nr_blocks, &cmd->cmnd[7]);
985	1097	}
986	1098
987	1099	cmd->transfersize = sdp->sector_size;
988		- cmd->allowed = SD_MAX_RETRIES;
	1100	+ cmd->allowed = sdkp->max_retries;
989	1101
990	1102	/*
991	1103	* For WRITE SAME the data transferred via the DATA OUT buffer is
..	..	@@ -998,15 +1110,16 @@
998	1110	* knows how much to actually write.
999	1111	*/
1000	1112	rq->__data_len = sdp->sector_size;
1001		- ret = scsi_init_io(cmd);
	1113	+ ret = scsi_alloc_sgtables(cmd);
1002	1114	rq->__data_len = nr_bytes;
1003	1115
1004	1116	return ret;
1005	1117	}
1006	1118
1007		-static int sd_setup_flush_cmnd(struct scsi_cmnd *cmd)
	1119	+static blk_status_t sd_setup_flush_cmnd(struct scsi_cmnd *cmd)
1008	1120	{
1009	1121	struct request *rq = cmd->request;
	1122	+ struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
1010	1123
1011	1124	/* flush requests don't perform I/O, zero the S/G table */
1012	1125	memset(&cmd->sdb, 0, sizeof(cmd->sdb));
..	..	@@ -1014,250 +1127,208 @@
1014	1127	cmd->cmnd[0] = SYNCHRONIZE_CACHE;
1015	1128	cmd->cmd_len = 10;
1016	1129	cmd->transfersize = 0;
1017		- cmd->allowed = SD_MAX_RETRIES;
	1130	+ cmd->allowed = sdkp->max_retries;
1018	1131
1019	1132	rq->timeout = rq->q->rq_timeout * SD_FLUSH_TIMEOUT_MULTIPLIER;
1020		- return BLKPREP_OK;
	1133	+ return BLK_STS_OK;
1021	1134	}
1022	1135
1023		-static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt)
	1136	+static blk_status_t sd_setup_rw32_cmnd(struct scsi_cmnd *cmd, bool write,
	1137	+ sector_t lba, unsigned int nr_blocks,
	1138	+ unsigned char flags)
1024	1139	{
1025		- struct request *rq = SCpnt->request;
1026		- struct scsi_device *sdp = SCpnt->device;
1027		- struct gendisk *disk = rq->rq_disk;
1028		- struct scsi_disk *sdkp = scsi_disk(disk);
1029		- sector_t block = blk_rq_pos(rq);
1030		- sector_t threshold;
1031		- unsigned int this_count = blk_rq_sectors(rq);
1032		- unsigned int dif, dix;
1033		- int ret;
1034		- unsigned char protect;
	1140	+ cmd->cmnd = mempool_alloc(sd_cdb_pool, GFP_ATOMIC);
	1141	+ if (unlikely(cmd->cmnd == NULL))
	1142	+ return BLK_STS_RESOURCE;
1035	1143
1036		- ret = scsi_init_io(SCpnt);
1037		- if (ret != BLKPREP_OK)
1038		- return ret;
1039		- WARN_ON_ONCE(SCpnt != rq->special);
	1144	+ cmd->cmd_len = SD_EXT_CDB_SIZE;
	1145	+ memset(cmd->cmnd, 0, cmd->cmd_len);
1040	1146
1041		- /* from here on until we're complete, any goto out
1042		- * is used for a killable error condition */
1043		- ret = BLKPREP_KILL;
	1147	+ cmd->cmnd[0] = VARIABLE_LENGTH_CMD;
	1148	+ cmd->cmnd[7] = 0x18; /* Additional CDB len */
	1149	+ cmd->cmnd[9] = write ? WRITE_32 : READ_32;
	1150	+ cmd->cmnd[10] = flags;
	1151	+ put_unaligned_be64(lba, &cmd->cmnd[12]);
	1152	+ put_unaligned_be32(lba, &cmd->cmnd[20]); /* Expected Indirect LBA */
	1153	+ put_unaligned_be32(nr_blocks, &cmd->cmnd[28]);
1044	1154
1045		- SCSI_LOG_HLQUEUE(1,
1046		- scmd_printk(KERN_INFO, SCpnt,
1047		- "%s: block=%llu, count=%d\n",
1048		- __func__, (unsigned long long)block, this_count));
	1155	+ return BLK_STS_OK;
	1156	+}
1049	1157
1050		- if (!sdp \|\| !scsi_device_online(sdp) \|\|
1051		- block + blk_rq_sectors(rq) > get_capacity(disk)) {
1052		- SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,
1053		- "Finishing %u sectors\n",
1054		- blk_rq_sectors(rq)));
1055		- SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,
1056		- "Retry with 0x%p\n", SCpnt));
1057		- goto out;
1058		- }
	1158	+static blk_status_t sd_setup_rw16_cmnd(struct scsi_cmnd *cmd, bool write,
	1159	+ sector_t lba, unsigned int nr_blocks,
	1160	+ unsigned char flags)
	1161	+{
	1162	+ cmd->cmd_len = 16;
	1163	+ cmd->cmnd[0] = write ? WRITE_16 : READ_16;
	1164	+ cmd->cmnd[1] = flags;
	1165	+ cmd->cmnd[14] = 0;
	1166	+ cmd->cmnd[15] = 0;
	1167	+ put_unaligned_be64(lba, &cmd->cmnd[2]);
	1168	+ put_unaligned_be32(nr_blocks, &cmd->cmnd[10]);
1059	1169
1060		- if (sdp->changed) {
	1170	+ return BLK_STS_OK;
	1171	+}
	1172	+
	1173	+static blk_status_t sd_setup_rw10_cmnd(struct scsi_cmnd *cmd, bool write,
	1174	+ sector_t lba, unsigned int nr_blocks,
	1175	+ unsigned char flags)
	1176	+{
	1177	+ cmd->cmd_len = 10;
	1178	+ cmd->cmnd[0] = write ? WRITE_10 : READ_10;
	1179	+ cmd->cmnd[1] = flags;
	1180	+ cmd->cmnd[6] = 0;
	1181	+ cmd->cmnd[9] = 0;
	1182	+ put_unaligned_be32(lba, &cmd->cmnd[2]);
	1183	+ put_unaligned_be16(nr_blocks, &cmd->cmnd[7]);
	1184	+
	1185	+ return BLK_STS_OK;
	1186	+}
	1187	+
	1188	+static blk_status_t sd_setup_rw6_cmnd(struct scsi_cmnd *cmd, bool write,
	1189	+ sector_t lba, unsigned int nr_blocks,
	1190	+ unsigned char flags)
	1191	+{
	1192	+ /* Avoid that 0 blocks gets translated into 256 blocks. */
	1193	+ if (WARN_ON_ONCE(nr_blocks == 0))
	1194	+ return BLK_STS_IOERR;
	1195	+
	1196	+ if (unlikely(flags & 0x8)) {
1061	1197	/*
1062		- * quietly refuse to do anything to a changed disc until
1063		- * the changed bit has been reset
	1198	+ * This happens only if this drive failed 10byte rw
	1199	+ * command with ILLEGAL_REQUEST during operation and
	1200	+ * thus turned off use_10_for_rw.
1064	1201	*/
1065		- /* printk("SCSI disk has been changed or is not present. Prohibiting further I/O.\n"); */
1066		- goto out;
	1202	+ scmd_printk(KERN_ERR, cmd, "FUA write on READ/WRITE(6) drive\n");
	1203	+ return BLK_STS_IOERR;
	1204	+ }
	1205	+
	1206	+ cmd->cmd_len = 6;
	1207	+ cmd->cmnd[0] = write ? WRITE_6 : READ_6;
	1208	+ cmd->cmnd[1] = (lba >> 16) & 0x1f;
	1209	+ cmd->cmnd[2] = (lba >> 8) & 0xff;
	1210	+ cmd->cmnd[3] = lba & 0xff;
	1211	+ cmd->cmnd[4] = nr_blocks;
	1212	+ cmd->cmnd[5] = 0;
	1213	+
	1214	+ return BLK_STS_OK;
	1215	+}
	1216	+
	1217	+static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd)
	1218	+{
	1219	+ struct request *rq = cmd->request;
	1220	+ struct scsi_device *sdp = cmd->device;
	1221	+ struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
	1222	+ sector_t lba = sectors_to_logical(sdp, blk_rq_pos(rq));
	1223	+ sector_t threshold;
	1224	+ unsigned int nr_blocks = sectors_to_logical(sdp, blk_rq_sectors(rq));
	1225	+ unsigned int mask = logical_to_sectors(sdp, 1) - 1;
	1226	+ bool write = rq_data_dir(rq) == WRITE;
	1227	+ unsigned char protect, fua;
	1228	+ blk_status_t ret;
	1229	+ unsigned int dif;
	1230	+ bool dix;
	1231	+
	1232	+ ret = scsi_alloc_sgtables(cmd);
	1233	+ if (ret != BLK_STS_OK)
	1234	+ return ret;
	1235	+
	1236	+ ret = BLK_STS_IOERR;
	1237	+ if (!scsi_device_online(sdp) \|\| sdp->changed) {
	1238	+ scmd_printk(KERN_ERR, cmd, "device offline or changed\n");
	1239	+ goto fail;
	1240	+ }
	1241	+
	1242	+ if (blk_rq_pos(rq) + blk_rq_sectors(rq) > get_capacity(rq->rq_disk)) {
	1243	+ scmd_printk(KERN_ERR, cmd, "access beyond end of device\n");
	1244	+ goto fail;
	1245	+ }
	1246	+
	1247	+ if ((blk_rq_pos(rq) & mask) \|\| (blk_rq_sectors(rq) & mask)) {
	1248	+ scmd_printk(KERN_ERR, cmd, "request not aligned to the logical block size\n");
	1249	+ goto fail;
1067	1250	}
1068	1251
1069	1252	/*
1070		- * Some SD card readers can't handle multi-sector accesses which touch
1071		- * the last one or two hardware sectors. Split accesses as needed.
	1253	+ * Some SD card readers can't handle accesses which touch the
	1254	+ * last one or two logical blocks. Split accesses as needed.
1072	1255	*/
1073		- threshold = get_capacity(disk) - SD_LAST_BUGGY_SECTORS *
1074		- (sdp->sector_size / 512);
	1256	+ threshold = sdkp->capacity - SD_LAST_BUGGY_SECTORS;
1075	1257
1076		- if (unlikely(sdp->last_sector_bug && block + this_count > threshold)) {
1077		- if (block < threshold) {
	1258	+ if (unlikely(sdp->last_sector_bug && lba + nr_blocks > threshold)) {
	1259	+ if (lba < threshold) {
1078	1260	/* Access up to the threshold but not beyond */
1079		- this_count = threshold - block;
	1261	+ nr_blocks = threshold - lba;
1080	1262	} else {
1081		- /* Access only a single hardware sector */
1082		- this_count = sdp->sector_size / 512;
	1263	+ /* Access only a single logical block */
	1264	+ nr_blocks = 1;
1083	1265	}
1084	1266	}
1085	1267
1086		- SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt, "block=%llu\n",
1087		- (unsigned long long)block));
1088		-
1089		- /*
1090		- * If we have a 1K hardware sectorsize, prevent access to single
1091		- * 512 byte sectors. In theory we could handle this - in fact
1092		- * the scsi cdrom driver must be able to handle this because
1093		- * we typically use 1K blocksizes, and cdroms typically have
1094		- * 2K hardware sectorsizes. Of course, things are simpler
1095		- * with the cdrom, since it is read-only. For performance
1096		- * reasons, the filesystems should be able to handle this
1097		- * and not force the scsi disk driver to use bounce buffers
1098		- * for this.
1099		- */
1100		- if (sdp->sector_size == 1024) {
1101		- if ((block & 1) \|\| (blk_rq_sectors(rq) & 1)) {
1102		- scmd_printk(KERN_ERR, SCpnt,
1103		- "Bad block number requested\n");
1104		- goto out;
1105		- } else {
1106		- block = block >> 1;
1107		- this_count = this_count >> 1;
1108		- }
1109		- }
1110		- if (sdp->sector_size == 2048) {
1111		- if ((block & 3) \|\| (blk_rq_sectors(rq) & 3)) {
1112		- scmd_printk(KERN_ERR, SCpnt,
1113		- "Bad block number requested\n");
1114		- goto out;
1115		- } else {
1116		- block = block >> 2;
1117		- this_count = this_count >> 2;
1118		- }
1119		- }
1120		- if (sdp->sector_size == 4096) {
1121		- if ((block & 7) \|\| (blk_rq_sectors(rq) & 7)) {
1122		- scmd_printk(KERN_ERR, SCpnt,
1123		- "Bad block number requested\n");
1124		- goto out;
1125		- } else {
1126		- block = block >> 3;
1127		- this_count = this_count >> 3;
1128		- }
1129		- }
1130		- if (rq_data_dir(rq) == WRITE) {
1131		- SCpnt->cmnd[0] = WRITE_6;
1132		-
1133		- if (blk_integrity_rq(rq))
1134		- t10_pi_prepare(SCpnt->request, sdkp->protection_type);
1135		-
1136		- } else if (rq_data_dir(rq) == READ) {
1137		- SCpnt->cmnd[0] = READ_6;
1138		- } else {
1139		- scmd_printk(KERN_ERR, SCpnt, "Unknown command %d\n", req_op(rq));
1140		- goto out;
	1268	+ if (req_op(rq) == REQ_OP_ZONE_APPEND) {
	1269	+ ret = sd_zbc_prepare_zone_append(cmd, &lba, nr_blocks);
	1270	+ if (ret)
	1271	+ goto fail;
1141	1272	}
1142	1273
1143		- SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,
1144		- "%s %d/%u 512 byte blocks.\n",
1145		- (rq_data_dir(rq) == WRITE) ?
1146		- "writing" : "reading", this_count,
1147		- blk_rq_sectors(rq)));
1148		-
1149		- dix = scsi_prot_sg_count(SCpnt);
1150		- dif = scsi_host_dif_capable(SCpnt->device->host, sdkp->protection_type);
	1274	+ fua = rq->cmd_flags & REQ_FUA ? 0x8 : 0;
	1275	+ dix = scsi_prot_sg_count(cmd);
	1276	+ dif = scsi_host_dif_capable(cmd->device->host, sdkp->protection_type);
1151	1277
1152	1278	if (dif \|\| dix)
1153		- protect = sd_setup_protect_cmnd(SCpnt, dix, dif);
	1279	+ protect = sd_setup_protect_cmnd(cmd, dix, dif);
1154	1280	else
1155	1281	protect = 0;
1156	1282
1157	1283	if (protect && sdkp->protection_type == T10_PI_TYPE2_PROTECTION) {
1158		- SCpnt->cmnd = mempool_alloc(sd_cdb_pool, GFP_ATOMIC);
1159		-
1160		- if (unlikely(SCpnt->cmnd == NULL)) {
1161		- ret = BLKPREP_DEFER;
1162		- goto out;
1163		- }
1164		-
1165		- SCpnt->cmd_len = SD_EXT_CDB_SIZE;
1166		- memset(SCpnt->cmnd, 0, SCpnt->cmd_len);
1167		- SCpnt->cmnd[0] = VARIABLE_LENGTH_CMD;
1168		- SCpnt->cmnd[7] = 0x18;
1169		- SCpnt->cmnd[9] = (rq_data_dir(rq) == READ) ? READ_32 : WRITE_32;
1170		- SCpnt->cmnd[10] = protect \| ((rq->cmd_flags & REQ_FUA) ? 0x8 : 0);
1171		-
1172		- /* LBA */
1173		- SCpnt->cmnd[12] = sizeof(block) > 4 ? (unsigned char) (block >> 56) & 0xff : 0;
1174		- SCpnt->cmnd[13] = sizeof(block) > 4 ? (unsigned char) (block >> 48) & 0xff : 0;
1175		- SCpnt->cmnd[14] = sizeof(block) > 4 ? (unsigned char) (block >> 40) & 0xff : 0;
1176		- SCpnt->cmnd[15] = sizeof(block) > 4 ? (unsigned char) (block >> 32) & 0xff : 0;
1177		- SCpnt->cmnd[16] = (unsigned char) (block >> 24) & 0xff;
1178		- SCpnt->cmnd[17] = (unsigned char) (block >> 16) & 0xff;
1179		- SCpnt->cmnd[18] = (unsigned char) (block >> 8) & 0xff;
1180		- SCpnt->cmnd[19] = (unsigned char) block & 0xff;
1181		-
1182		- /* Expected Indirect LBA */
1183		- SCpnt->cmnd[20] = (unsigned char) (block >> 24) & 0xff;
1184		- SCpnt->cmnd[21] = (unsigned char) (block >> 16) & 0xff;
1185		- SCpnt->cmnd[22] = (unsigned char) (block >> 8) & 0xff;
1186		- SCpnt->cmnd[23] = (unsigned char) block & 0xff;
1187		-
1188		- /* Transfer length */
1189		- SCpnt->cmnd[28] = (unsigned char) (this_count >> 24) & 0xff;
1190		- SCpnt->cmnd[29] = (unsigned char) (this_count >> 16) & 0xff;
1191		- SCpnt->cmnd[30] = (unsigned char) (this_count >> 8) & 0xff;
1192		- SCpnt->cmnd[31] = (unsigned char) this_count & 0xff;
1193		- } else if (sdp->use_16_for_rw \|\| (this_count > 0xffff)) {
1194		- SCpnt->cmnd[0] += READ_16 - READ_6;
1195		- SCpnt->cmnd[1] = protect \| ((rq->cmd_flags & REQ_FUA) ? 0x8 : 0);
1196		- SCpnt->cmnd[2] = sizeof(block) > 4 ? (unsigned char) (block >> 56) & 0xff : 0;
1197		- SCpnt->cmnd[3] = sizeof(block) > 4 ? (unsigned char) (block >> 48) & 0xff : 0;
1198		- SCpnt->cmnd[4] = sizeof(block) > 4 ? (unsigned char) (block >> 40) & 0xff : 0;
1199		- SCpnt->cmnd[5] = sizeof(block) > 4 ? (unsigned char) (block >> 32) & 0xff : 0;
1200		- SCpnt->cmnd[6] = (unsigned char) (block >> 24) & 0xff;
1201		- SCpnt->cmnd[7] = (unsigned char) (block >> 16) & 0xff;
1202		- SCpnt->cmnd[8] = (unsigned char) (block >> 8) & 0xff;
1203		- SCpnt->cmnd[9] = (unsigned char) block & 0xff;
1204		- SCpnt->cmnd[10] = (unsigned char) (this_count >> 24) & 0xff;
1205		- SCpnt->cmnd[11] = (unsigned char) (this_count >> 16) & 0xff;
1206		- SCpnt->cmnd[12] = (unsigned char) (this_count >> 8) & 0xff;
1207		- SCpnt->cmnd[13] = (unsigned char) this_count & 0xff;
1208		- SCpnt->cmnd[14] = SCpnt->cmnd[15] = 0;
1209		- } else if ((this_count > 0xff) \|\| (block > 0x1fffff) \|\|
1210		- scsi_device_protection(SCpnt->device) \|\|
1211		- SCpnt->device->use_10_for_rw) {
1212		- SCpnt->cmnd[0] += READ_10 - READ_6;
1213		- SCpnt->cmnd[1] = protect \| ((rq->cmd_flags & REQ_FUA) ? 0x8 : 0);
1214		- SCpnt->cmnd[2] = (unsigned char) (block >> 24) & 0xff;
1215		- SCpnt->cmnd[3] = (unsigned char) (block >> 16) & 0xff;
1216		- SCpnt->cmnd[4] = (unsigned char) (block >> 8) & 0xff;
1217		- SCpnt->cmnd[5] = (unsigned char) block & 0xff;
1218		- SCpnt->cmnd[6] = SCpnt->cmnd[9] = 0;
1219		- SCpnt->cmnd[7] = (unsigned char) (this_count >> 8) & 0xff;
1220		- SCpnt->cmnd[8] = (unsigned char) this_count & 0xff;
	1284	+ ret = sd_setup_rw32_cmnd(cmd, write, lba, nr_blocks,
	1285	+ protect \| fua);
	1286	+ } else if (sdp->use_16_for_rw \|\| (nr_blocks > 0xffff)) {
	1287	+ ret = sd_setup_rw16_cmnd(cmd, write, lba, nr_blocks,
	1288	+ protect \| fua);
	1289	+ } else if ((nr_blocks > 0xff) \|\| (lba > 0x1fffff) \|\|
	1290	+ sdp->use_10_for_rw \|\| protect) {
	1291	+ ret = sd_setup_rw10_cmnd(cmd, write, lba, nr_blocks,
	1292	+ protect \| fua);
1221	1293	} else {
1222		- if (unlikely(rq->cmd_flags & REQ_FUA)) {
1223		- /*
1224		- * This happens only if this drive failed
1225		- * 10byte rw command with ILLEGAL_REQUEST
1226		- * during operation and thus turned off
1227		- * use_10_for_rw.
1228		- */
1229		- scmd_printk(KERN_ERR, SCpnt,
1230		- "FUA write on READ/WRITE(6) drive\n");
1231		- goto out;
1232		- }
1233		-
1234		- SCpnt->cmnd[1] \|= (unsigned char) ((block >> 16) & 0x1f);
1235		- SCpnt->cmnd[2] = (unsigned char) ((block >> 8) & 0xff);
1236		- SCpnt->cmnd[3] = (unsigned char) block & 0xff;
1237		- SCpnt->cmnd[4] = (unsigned char) this_count;
1238		- SCpnt->cmnd[5] = 0;
	1294	+ ret = sd_setup_rw6_cmnd(cmd, write, lba, nr_blocks,
	1295	+ protect \| fua);
1239	1296	}
1240		- SCpnt->sdb.length = this_count * sdp->sector_size;
	1297	+
	1298	+ if (unlikely(ret != BLK_STS_OK))
	1299	+ goto fail;
1241	1300
1242	1301	/*
1243	1302	* We shouldn't disconnect in the middle of a sector, so with a dumb
1244	1303	* host adapter, it's safe to assume that we can at least transfer
1245	1304	* this many bytes between each connect / disconnect.
1246	1305	*/
1247		- SCpnt->transfersize = sdp->sector_size;
1248		- SCpnt->underflow = this_count << 9;
1249		- SCpnt->allowed = SD_MAX_RETRIES;
	1306	+ cmd->transfersize = sdp->sector_size;
	1307	+ cmd->underflow = nr_blocks << 9;
	1308	+ cmd->allowed = sdkp->max_retries;
	1309	+ cmd->sdb.length = nr_blocks * sdp->sector_size;
	1310	+
	1311	+ SCSI_LOG_HLQUEUE(1,
	1312	+ scmd_printk(KERN_INFO, cmd,
	1313	+ "%s: block=%llu, count=%d\n", __func__,
	1314	+ (unsigned long long)blk_rq_pos(rq),
	1315	+ blk_rq_sectors(rq)));
	1316	+ SCSI_LOG_HLQUEUE(2,
	1317	+ scmd_printk(KERN_INFO, cmd,
	1318	+ "%s %d/%u 512 byte blocks.\n",
	1319	+ write ? "writing" : "reading", nr_blocks,
	1320	+ blk_rq_sectors(rq)));
1250	1321
1251	1322	/*
1252		- * This indicates that the command is ready from our end to be
1253		- * queued.
	1323	+ * This indicates that the command is ready from our end to be queued.
1254	1324	*/
1255		- ret = BLKPREP_OK;
1256		- out:
	1325	+ return BLK_STS_OK;
	1326	+fail:
	1327	+ scsi_free_sgtables(cmd);
1257	1328	return ret;
1258	1329	}
1259	1330
1260		-static int sd_init_command(struct scsi_cmnd *cmd)
	1331	+static blk_status_t sd_init_command(struct scsi_cmnd *cmd)
1261	1332	{
1262	1333	struct request *rq = cmd->request;
1263	1334
..	..	@@ -1273,7 +1344,7 @@
1273	1344	case SD_LBP_ZERO:
1274	1345	return sd_setup_write_same10_cmnd(cmd, false);
1275	1346	default:
1276		- return BLKPREP_INVALID;
	1347	+ return BLK_STS_TARGET;
1277	1348	}
1278	1349	case REQ_OP_WRITE_ZEROES:
1279	1350	return sd_setup_write_zeroes_cmnd(cmd);
..	..	@@ -1283,14 +1354,23 @@
1283	1354	return sd_setup_flush_cmnd(cmd);
1284	1355	case REQ_OP_READ:
1285	1356	case REQ_OP_WRITE:
	1357	+ case REQ_OP_ZONE_APPEND:
1286	1358	return sd_setup_read_write_cmnd(cmd);
1287		- case REQ_OP_ZONE_REPORT:
1288		- return sd_zbc_setup_report_cmnd(cmd);
1289	1359	case REQ_OP_ZONE_RESET:
1290		- return sd_zbc_setup_reset_cmnd(cmd);
	1360	+ return sd_zbc_setup_zone_mgmt_cmnd(cmd, ZO_RESET_WRITE_POINTER,
	1361	+ false);
	1362	+ case REQ_OP_ZONE_RESET_ALL:
	1363	+ return sd_zbc_setup_zone_mgmt_cmnd(cmd, ZO_RESET_WRITE_POINTER,
	1364	+ true);
	1365	+ case REQ_OP_ZONE_OPEN:
	1366	+ return sd_zbc_setup_zone_mgmt_cmnd(cmd, ZO_OPEN_ZONE, false);
	1367	+ case REQ_OP_ZONE_CLOSE:
	1368	+ return sd_zbc_setup_zone_mgmt_cmnd(cmd, ZO_CLOSE_ZONE, false);
	1369	+ case REQ_OP_ZONE_FINISH:
	1370	+ return sd_zbc_setup_zone_mgmt_cmnd(cmd, ZO_FINISH_ZONE, false);
1291	1371	default:
1292	1372	WARN_ON_ONCE(1);
1293		- return BLKPREP_KILL;
	1373	+ return BLK_STS_NOTSUPP;
1294	1374	}
1295	1375	}
1296	1376
..	..	@@ -1308,6 +1388,22 @@
1308	1388	SCpnt->cmd_len = 0;
1309	1389	mempool_free(cmnd, sd_cdb_pool);
1310	1390	}
	1391	+}
	1392	+
	1393	+static bool sd_need_revalidate(struct block_device *bdev,
	1394	+ struct scsi_disk *sdkp)
	1395	+{
	1396	+ if (sdkp->device->removable \|\| sdkp->write_prot) {
	1397	+ if (bdev_check_media_change(bdev))
	1398	+ return true;
	1399	+ }
	1400	+
	1401	+ /*
	1402	+ * Force a full rescan after ioctl(BLKRRPART). While the disk state has
	1403	+ * nothing to do with partitions, BLKRRPART is used to force a full
	1404	+ * revalidate after things like a format for historical reasons.
	1405	+ */
	1406	+ return test_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
1311	1407	}
1312	1408
1313	1409	/**
..	..	@@ -1346,8 +1442,8 @@
1346	1442	if (!scsi_block_when_processing_errors(sdev))
1347	1443	goto error_out;
1348	1444
1349		- if (sdev->removable \|\| sdkp->write_prot)
1350		- check_disk_change(bdev);
	1445	+ if (sd_need_revalidate(bdev, sdkp))
	1446	+ sd_revalidate_disk(bdev->bd_disk);
1351	1447
1352	1448	/*
1353	1449	* If the drive is empty, just let the open fail.
..	..	@@ -1444,7 +1540,7 @@
1444	1540	* @bdev: target block device
1445	1541	* @mode: FMODE_* mask
1446	1542	* @cmd: ioctl command number
1447		- * @arg: this is third argument given to ioctl(2) system call.
	1543	+ * @p: this is third argument given to ioctl(2) system call.
1448	1544	* Often contains a pointer.
1449	1545	*
1450	1546	* Returns 0 if successful (some ioctls return positive numbers on
..	..	@@ -1453,13 +1549,12 @@
1453	1549	* Note: most ioctls are forward onto the block subsystem or further
1454	1550	* down in the scsi subsystem.
1455	1551	**/
1456		-static int sd_ioctl(struct block_device *bdev, fmode_t mode,
1457		- unsigned int cmd, unsigned long arg)
	1552	+static int sd_ioctl_common(struct block_device *bdev, fmode_t mode,
	1553	+ unsigned int cmd, void __user *p)
1458	1554	{
1459	1555	struct gendisk *disk = bdev->bd_disk;
1460	1556	struct scsi_disk *sdkp = scsi_disk(disk);
1461	1557	struct scsi_device *sdp = sdkp->device;
1462		- void __user p = (void __user )arg;
1463	1558	int error;
1464	1559
1465	1560	SCSI_LOG_IOCTL(1, sd_printk(KERN_INFO, sdkp, "sd_ioctl: disk=%s, "
..	..	@@ -1495,9 +1590,6 @@
1495	1590	break;
1496	1591	default:
1497	1592	error = scsi_cmd_blk_ioctl(bdev, mode, cmd, p);
1498		- if (error != -ENOTTY)
1499		- break;
1500		- error = scsi_ioctl(sdp, cmd, p);
1501	1593	break;
1502	1594	}
1503	1595	out:
..	..	@@ -1578,7 +1670,7 @@
1578	1670	if (scsi_block_when_processing_errors(sdp)) {
1579	1671	struct scsi_sense_hdr sshdr = { 0, };
1580	1672
1581		- retval = scsi_test_unit_ready(sdp, SD_TIMEOUT, SD_MAX_RETRIES,
	1673	+ retval = scsi_test_unit_ready(sdp, SD_TIMEOUT, sdkp->max_retries,
1582	1674	&sshdr);
1583	1675
1584	1676	/* failed to execute TUR, assume media not present */
..	..	@@ -1635,7 +1727,7 @@
1635	1727	* flush everything.
1636	1728	*/
1637	1729	res = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, sshdr,
1638		- timeout, SD_MAX_RETRIES, 0, RQF_PM, NULL);
	1730	+ timeout, sdkp->max_retries, 0, RQF_PM, NULL);
1639	1731	if (res == 0)
1640	1732	break;
1641	1733	}
..	..	@@ -1675,43 +1767,37 @@
1675	1767	static void sd_rescan(struct device *dev)
1676	1768	{
1677	1769	struct scsi_disk *sdkp = dev_get_drvdata(dev);
	1770	+ int ret;
1678	1771
1679		- revalidate_disk(sdkp->disk);
	1772	+ ret = sd_revalidate_disk(sdkp->disk);
	1773	+ revalidate_disk_size(sdkp->disk, ret == 0);
1680	1774	}
1681	1775
	1776	+static int sd_ioctl(struct block_device *bdev, fmode_t mode,
	1777	+ unsigned int cmd, unsigned long arg)
	1778	+{
	1779	+ void __user p = (void __user )arg;
	1780	+ int ret;
	1781	+
	1782	+ ret = sd_ioctl_common(bdev, mode, cmd, p);
	1783	+ if (ret != -ENOTTY)
	1784	+ return ret;
	1785	+
	1786	+ return scsi_ioctl(scsi_disk(bdev->bd_disk)->device, cmd, p);
	1787	+}
1682	1788
1683	1789	#ifdef CONFIG_COMPAT
1684		-/*
1685		- * This gets directly called from VFS. When the ioctl
1686		- * is not recognized we go back to the other translation paths.
1687		- */
1688	1790	static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,
1689	1791	unsigned int cmd, unsigned long arg)
1690	1792	{
1691		- struct gendisk *disk = bdev->bd_disk;
1692		- struct scsi_disk *sdkp = scsi_disk(disk);
1693		- struct scsi_device *sdev = sdkp->device;
1694	1793	void __user *p = compat_ptr(arg);
1695		- int error;
	1794	+ int ret;
1696	1795
1697		- error = scsi_verify_blk_ioctl(bdev, cmd);
1698		- if (error < 0)
1699		- return error;
	1796	+ ret = sd_ioctl_common(bdev, mode, cmd, p);
	1797	+ if (ret != -ENOTTY)
	1798	+ return ret;
1700	1799
1701		- error = scsi_ioctl_block_when_processing_errors(sdev, cmd,
1702		- (mode & FMODE_NDELAY) != 0);
1703		- if (error)
1704		- return error;
1705		-
1706		- if (is_sed_ioctl(cmd))
1707		- return sed_ioctl(sdkp->opal_dev, cmd, p);
1708		-
1709		- /*
1710		- * Let the static ioctl translation table take care of it.
1711		- */
1712		- if (!sdev->host->hostt->compat_ioctl)
1713		- return -ENOIOCTLCMD;
1714		- return sdev->host->hostt->compat_ioctl(sdev, cmd, p);
	1800	+ return scsi_compat_ioctl(scsi_disk(bdev->bd_disk)->device, cmd, p);
1715	1801	}
1716	1802	#endif
1717	1803
..	..	@@ -1738,7 +1824,8 @@
1738	1824	static int sd_pr_command(struct block_device *bdev, u8 sa,
1739	1825	u64 key, u64 sa_key, u8 type, u8 flags)
1740	1826	{
1741		- struct scsi_device *sdev = scsi_disk(bdev->bd_disk)->device;
	1827	+ struct scsi_disk *sdkp = scsi_disk(bdev->bd_disk);
	1828	+ struct scsi_device *sdev = sdkp->device;
1742	1829	struct scsi_sense_hdr sshdr;
1743	1830	int result;
1744	1831	u8 cmd[16] = { 0, };
..	..	@@ -1754,7 +1841,7 @@
1754	1841	data[20] = flags;
1755	1842
1756	1843	result = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE, &data, sizeof(data),
1757		- &sshdr, SD_TIMEOUT, SD_MAX_RETRIES, NULL);
	1844	+ &sshdr, SD_TIMEOUT, sdkp->max_retries, NULL);
1758	1845
1759	1846	if (driver_byte(result) == DRIVER_SENSE &&
1760	1847	scsi_sense_valid(&sshdr)) {
..	..	@@ -1818,8 +1905,8 @@
1818	1905	.compat_ioctl = sd_compat_ioctl,
1819	1906	#endif
1820	1907	.check_events = sd_check_events,
1821		- .revalidate_disk = sd_revalidate_disk,
1822	1908	.unlock_native_capacity = sd_unlock_native_capacity,
	1909	+ .report_zones = sd_zbc_report_zones,
1823	1910	.pr_ops = &sd_pr_ops,
1824	1911	};
1825	1912
..	..	@@ -1963,22 +2050,12 @@
1963	2050	case REQ_OP_WRITE_ZEROES:
1964	2051	case REQ_OP_WRITE_SAME:
1965	2052	case REQ_OP_ZONE_RESET:
	2053	+ case REQ_OP_ZONE_RESET_ALL:
	2054	+ case REQ_OP_ZONE_OPEN:
	2055	+ case REQ_OP_ZONE_CLOSE:
	2056	+ case REQ_OP_ZONE_FINISH:
1966	2057	if (!result) {
1967	2058	good_bytes = blk_rq_bytes(req);
1968		- scsi_set_resid(SCpnt, 0);
1969		- } else {
1970		- good_bytes = 0;
1971		- scsi_set_resid(SCpnt, blk_rq_bytes(req));
1972		- }
1973		- break;
1974		- case REQ_OP_ZONE_REPORT:
1975		- /* To avoid that the block layer performs an incorrect
1976		- * bio_advance() call and restart of the remainder of
1977		- * incomplete report zone BIOs, always indicate a full
1978		- * completion of REQ_OP_ZONE_REPORT.
1979		- */
1980		- if (!result) {
1981		- good_bytes = scsi_bufflen(SCpnt);
1982	2059	scsi_set_resid(SCpnt, 0);
1983	2060	} else {
1984	2061	good_bytes = 0;
..	..	@@ -1996,6 +2073,7 @@
1996	2073	sd_printk(KERN_INFO, sdkp,
1997	2074	"Unaligned partial completion (resid=%u, sector_sz=%u)\n",
1998	2075	resid, sector_size);
	2076	+ scsi_print_command(SCpnt);
1999	2077	resid = min(scsi_bufflen(SCpnt),
2000	2078	round_up(resid, sector_size));
2001	2079	scsi_set_resid(SCpnt, resid);
..	..	@@ -2063,16 +2141,11 @@
2063	2141
2064	2142	out:
2065	2143	if (sd_is_zoned(sdkp))
2066		- sd_zbc_complete(SCpnt, good_bytes, &sshdr);
	2144	+ good_bytes = sd_zbc_complete(SCpnt, good_bytes, &sshdr);
2067	2145
2068	2146	SCSI_LOG_HLCOMPLETE(1, scmd_printk(KERN_INFO, SCpnt,
2069	2147	"sd_done: completed %d of %d bytes\n",
2070	2148	good_bytes, scsi_bufflen(SCpnt)));
2071		-
2072		- if (rq_data_dir(SCpnt->request) == READ && scsi_prot_sg_count(SCpnt) &&
2073		- good_bytes)
2074		- t10_pi_complete(SCpnt->request, sdkp->protection_type,
2075		- good_bytes / scsi_prot_interval(SCpnt));
2076	2149
2077	2150	return good_bytes;
2078	2151	}
..	..	@@ -2104,7 +2177,7 @@
2104	2177	the_result = scsi_execute_req(sdkp->device, cmd,
2105	2178	DMA_NONE, NULL, 0,
2106	2179	&sshdr, SD_TIMEOUT,
2107		- SD_MAX_RETRIES, NULL);
	2180	+ sdkp->max_retries, NULL);
2108	2181
2109	2182	/*
2110	2183	* If the drive has indicated to us that it
..	..	@@ -2160,7 +2233,7 @@
2160	2233	cmd[4] \|= 1 << 4;
2161	2234	scsi_execute_req(sdkp->device, cmd, DMA_NONE,
2162	2235	NULL, 0, &sshdr,
2163		- SD_TIMEOUT, SD_MAX_RETRIES,
	2236	+ SD_TIMEOUT, sdkp->max_retries,
2164	2237	NULL);
2165	2238	spintime_expire = jiffies + 100 * HZ;
2166	2239	spintime = 1;
..	..	@@ -2278,22 +2351,6 @@
2278	2351
2279	2352	#define READ_CAPACITY_RETRIES_ON_RESET 10
2280	2353
2281		-/*
2282		- * Ensure that we don't overflow sector_t when CONFIG_LBDAF is not set
2283		- * and the reported logical block size is bigger than 512 bytes. Note
2284		- * that last_sector is a u64 and therefore logical_to_sectors() is not
2285		- * applicable.
2286		- */
2287		-static bool sd_addressable_capacity(u64 lba, unsigned int sector_size)
2288		-{
2289		- u64 last_sector = (lba + 1ULL) << (ilog2(sector_size) - 9);
2290		-
2291		- if (sizeof(sector_t) == 4 && last_sector > U32_MAX)
2292		- return false;
2293		-
2294		- return true;
2295		-}
2296		-
2297	2354	static int read_capacity_16(struct scsi_disk sdkp, struct scsi_device sdp,
2298	2355	unsigned char *buffer)
2299	2356	{
..	..	@@ -2318,7 +2375,7 @@
2318	2375
2319	2376	the_result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE,
2320	2377	buffer, RC16_LEN, &sshdr,
2321		- SD_TIMEOUT, SD_MAX_RETRIES, NULL);
	2378	+ SD_TIMEOUT, sdkp->max_retries, NULL);
2322	2379
2323	2380	if (media_not_present(sdkp, &sshdr))
2324	2381	return -ENODEV;
..	..	@@ -2357,14 +2414,6 @@
2357	2414	if (sd_read_protection_type(sdkp, buffer) < 0) {
2358	2415	sdkp->capacity = 0;
2359	2416	return -ENODEV;
2360		- }
2361		-
2362		- if (!sd_addressable_capacity(lba, sector_size)) {
2363		- sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a "
2364		- "kernel compiled with support for large block "
2365		- "devices.\n");
2366		- sdkp->capacity = 0;
2367		- return -EOVERFLOW;
2368	2417	}
2369	2418
2370	2419	/* Logical blocks per physical block exponent */
..	..	@@ -2411,7 +2460,7 @@
2411	2460
2412	2461	the_result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE,
2413	2462	buffer, 8, &sshdr,
2414		- SD_TIMEOUT, SD_MAX_RETRIES, NULL);
	2463	+ SD_TIMEOUT, sdkp->max_retries, NULL);
2415	2464
2416	2465	if (media_not_present(sdkp, &sshdr))
2417	2466	return -ENODEV;
..	..	@@ -2446,14 +2495,6 @@
2446	2495	sdkp->capacity = 0;
2447	2496	sdkp->physical_block_size = sector_size;
2448	2497	return sector_size;
2449		- }
2450		-
2451		- if (!sd_addressable_capacity(lba, sector_size)) {
2452		- sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a "
2453		- "kernel compiled with support for large block "
2454		- "devices.\n");
2455		- sdkp->capacity = 0;
2456		- return -EOVERFLOW;
2457	2498	}
2458	2499
2459	2500	sdkp->capacity = lba + 1;
..	..	@@ -2583,35 +2624,33 @@
2583	2624	int sector_size = sdkp->device->sector_size;
2584	2625	char cap_str_2[10], cap_str_10[10];
2585	2626
	2627	+ if (!sdkp->first_scan && old_capacity == sdkp->capacity)
	2628	+ return;
	2629	+
2586	2630	string_get_size(sdkp->capacity, sector_size,
2587	2631	STRING_UNITS_2, cap_str_2, sizeof(cap_str_2));
2588	2632	string_get_size(sdkp->capacity, sector_size,
2589		- STRING_UNITS_10, cap_str_10,
2590		- sizeof(cap_str_10));
	2633	+ STRING_UNITS_10, cap_str_10, sizeof(cap_str_10));
2591	2634
2592		- if (sdkp->first_scan \|\| old_capacity != sdkp->capacity) {
	2635	+ sd_printk(KERN_NOTICE, sdkp,
	2636	+ "%llu %d-byte logical blocks: (%s/%s)\n",
	2637	+ (unsigned long long)sdkp->capacity,
	2638	+ sector_size, cap_str_10, cap_str_2);
	2639	+
	2640	+ if (sdkp->physical_block_size != sector_size)
2593	2641	sd_printk(KERN_NOTICE, sdkp,
2594		- "%llu %d-byte logical blocks: (%s/%s)\n",
2595		- (unsigned long long)sdkp->capacity,
2596		- sector_size, cap_str_10, cap_str_2);
2597		-
2598		- if (sdkp->physical_block_size != sector_size)
2599		- sd_printk(KERN_NOTICE, sdkp,
2600		- "%u-byte physical blocks\n",
2601		- sdkp->physical_block_size);
2602		-
2603		- sd_zbc_print_zones(sdkp);
2604		- }
	2642	+ "%u-byte physical blocks\n",
	2643	+ sdkp->physical_block_size);
2605	2644	}
2606	2645
2607	2646	/* called with buffer of length 512 */
2608	2647	static inline int
2609		-sd_do_mode_sense(struct scsi_device *sdp, int dbd, int modepage,
	2648	+sd_do_mode_sense(struct scsi_disk *sdkp, int dbd, int modepage,
2610	2649	unsigned char buffer, int len, struct scsi_mode_data data,
2611	2650	struct scsi_sense_hdr *sshdr)
2612	2651	{
2613		- return scsi_mode_sense(sdp, dbd, modepage, buffer, len,
2614		- SD_TIMEOUT, SD_MAX_RETRIES, data,
	2652	+ return scsi_mode_sense(sdkp->device, dbd, modepage, buffer, len,
	2653	+ SD_TIMEOUT, sdkp->max_retries, data,
2615	2654	sshdr);
2616	2655	}
2617	2656
..	..	@@ -2634,14 +2673,14 @@
2634	2673	}
2635	2674
2636	2675	if (sdp->use_192_bytes_for_3f) {
2637		- res = sd_do_mode_sense(sdp, 0, 0x3F, buffer, 192, &data, NULL);
	2676	+ res = sd_do_mode_sense(sdkp, 0, 0x3F, buffer, 192, &data, NULL);
2638	2677	} else {
2639	2678	/*
2640	2679	* First attempt: ask for all pages (0x3F), but only 4 bytes.
2641	2680	* We have to start carefully: some devices hang if we ask
2642	2681	* for more than is available.
2643	2682	*/
2644		- res = sd_do_mode_sense(sdp, 0, 0x3F, buffer, 4, &data, NULL);
	2683	+ res = sd_do_mode_sense(sdkp, 0, 0x3F, buffer, 4, &data, NULL);
2645	2684
2646	2685	/*
2647	2686	* Second attempt: ask for page 0 When only page 0 is
..	..	@@ -2649,18 +2688,18 @@
2649	2688	* 5: Illegal Request, Sense Code 24: Invalid field in
2650	2689	* CDB.
2651	2690	*/
2652		- if (!scsi_status_is_good(res))
2653		- res = sd_do_mode_sense(sdp, 0, 0, buffer, 4, &data, NULL);
	2691	+ if (res < 0)
	2692	+ res = sd_do_mode_sense(sdkp, 0, 0, buffer, 4, &data, NULL);
2654	2693
2655	2694	/*
2656	2695	* Third attempt: ask 255 bytes, as we did earlier.
2657	2696	*/
2658		- if (!scsi_status_is_good(res))
2659		- res = sd_do_mode_sense(sdp, 0, 0x3F, buffer, 255,
	2697	+ if (res < 0)
	2698	+ res = sd_do_mode_sense(sdkp, 0, 0x3F, buffer, 255,
2660	2699	&data, NULL);
2661	2700	}
2662	2701
2663		- if (!scsi_status_is_good(res)) {
	2702	+ if (res < 0) {
2664	2703	sd_first_printk(KERN_WARNING, sdkp,
2665	2704	"Test WP failed, assume Write Enabled\n");
2666	2705	} else {
..	..	@@ -2683,7 +2722,6 @@
2683	2722	{
2684	2723	int len = 0, res;
2685	2724	struct scsi_device *sdp = sdkp->device;
2686		- struct Scsi_Host *host = sdp->host;
2687	2725
2688	2726	int dbd;
2689	2727	int modepage;
..	..	@@ -2715,17 +2753,14 @@
2715	2753	dbd = 8;
2716	2754	} else {
2717	2755	modepage = 8;
2718		- if (host->set_dbd_for_caching)
2719		- dbd = 8;
2720		- else
2721		- dbd = 0;
	2756	+ dbd = 0;
2722	2757	}
2723	2758
2724	2759	/* cautiously ask */
2725		- res = sd_do_mode_sense(sdp, dbd, modepage, buffer, first_len,
	2760	+ res = sd_do_mode_sense(sdkp, dbd, modepage, buffer, first_len,
2726	2761	&data, &sshdr);
2727	2762
2728		- if (!scsi_status_is_good(res))
	2763	+ if (res < 0)
2729	2764	goto bad_sense;
2730	2765
2731	2766	if (!data.header_length) {
..	..	@@ -2754,10 +2789,10 @@
2754	2789
2755	2790	/* Get the data */
2756	2791	if (len > first_len)
2757		- res = sd_do_mode_sense(sdp, dbd, modepage, buffer, len,
	2792	+ res = sd_do_mode_sense(sdkp, dbd, modepage, buffer, len,
2758	2793	&data, &sshdr);
2759	2794
2760		- if (scsi_status_is_good(res)) {
	2795	+ if (!res) {
2761	2796	int offset = data.header_length + data.block_descriptor_length;
2762	2797
2763	2798	while (offset < len) {
..	..	@@ -2873,9 +2908,9 @@
2873	2908	return;
2874	2909
2875	2910	res = scsi_mode_sense(sdp, 1, 0x0a, buffer, 36, SD_TIMEOUT,
2876		- SD_MAX_RETRIES, &data, &sshdr);
	2911	+ sdkp->max_retries, &data, &sshdr);
2877	2912
2878		- if (!scsi_status_is_good(res) \|\| !data.header_length \|\|
	2913	+ if (res < 0 \|\| !data.header_length \|\|
2879	2914	data.length < 6) {
2880	2915	sd_first_printk(KERN_WARNING, sdkp,
2881	2916	"getting Control mode page failed, assume no ATO\n");
..	..	@@ -2992,22 +3027,32 @@
2992	3027
2993	3028	if (sdkp->device->type == TYPE_ZBC) {
2994	3029	/* Host-managed */
2995		- q->limits.zoned = BLK_ZONED_HM;
	3030	+ blk_queue_set_zoned(sdkp->disk, BLK_ZONED_HM);
2996	3031	} else {
2997	3032	sdkp->zoned = (buffer[8] >> 4) & 3;
2998		- if (sdkp->zoned == 1)
	3033	+ if (sdkp->zoned == 1) {
2999	3034	/* Host-aware */
3000		- q->limits.zoned = BLK_ZONED_HA;
3001		- else
3002		- /*
3003		- * Treat drive-managed devices as
3004		- * regular block devices.
3005		- */
3006		- q->limits.zoned = BLK_ZONED_NONE;
	3035	+ blk_queue_set_zoned(sdkp->disk, BLK_ZONED_HA);
	3036	+ } else {
	3037	+ /* Regular disk or drive managed disk */
	3038	+ blk_queue_set_zoned(sdkp->disk, BLK_ZONED_NONE);
	3039	+ }
3007	3040	}
3008		- if (blk_queue_is_zoned(q) && sdkp->first_scan)
	3041	+
	3042	+ if (!sdkp->first_scan)
	3043	+ goto out;
	3044	+
	3045	+ if (blk_queue_is_zoned(q)) {
3009	3046	sd_printk(KERN_NOTICE, sdkp, "Host-%s zoned block device\n",
3010	3047	q->limits.zoned == BLK_ZONED_HM ? "managed" : "aware");
	3048	+ } else {
	3049	+ if (sdkp->zoned == 1)
	3050	+ sd_printk(KERN_NOTICE, sdkp,
	3051	+ "Host-aware SMR disk used as regular disk\n");
	3052	+ else if (sdkp->zoned == 2)
	3053	+ sd_printk(KERN_NOTICE, sdkp,
	3054	+ "Drive-managed SMR disk\n");
	3055	+ }
3011	3056
3012	3057	out:
3013	3058	kfree(buffer);
..	..	@@ -3237,9 +3282,18 @@
3237	3282
3238	3283	sdkp->first_scan = 0;
3239	3284
3240		- set_capacity(disk, logical_to_sectors(sdp, sdkp->capacity));
	3285	+ set_capacity_revalidate_and_notify(disk,
	3286	+ logical_to_sectors(sdp, sdkp->capacity), false);
3241	3287	sd_config_write_same(sdkp);
3242	3288	kfree(buffer);
	3289	+
	3290	+ /*
	3291	+ * For a zoned drive, revalidating the zones can be done only once
	3292	+ * the gendisk capacity is set. So if this fails, set back the gendisk
	3293	+ * capacity to 0.
	3294	+ */
	3295	+ if (sd_zbc_revalidate_zones(sdkp))
	3296	+ set_capacity_revalidate_and_notify(disk, 0, false);
3243	3297
3244	3298	out:
3245	3299	return 0;
..	..	@@ -3311,72 +3365,6 @@
3311	3365	return 0;
3312	3366	}
3313	3367
3314		-/*
3315		- * The asynchronous part of sd_probe
3316		- */
3317		-static void sd_probe_async(void *data, async_cookie_t cookie)
3318		-{
3319		- struct scsi_disk *sdkp = data;
3320		- struct scsi_device *sdp;
3321		- struct gendisk *gd;
3322		- u32 index;
3323		- struct device *dev;
3324		-
3325		- sdp = sdkp->device;
3326		- gd = sdkp->disk;
3327		- index = sdkp->index;
3328		- dev = &sdp->sdev_gendev;
3329		-
3330		- gd->major = sd_major((index & 0xf0) >> 4);
3331		- gd->first_minor = ((index & 0xf) << 4) \| (index & 0xfff00);
3332		-
3333		- gd->fops = &sd_fops;
3334		- gd->private_data = &sdkp->driver;
3335		- gd->queue = sdkp->device->request_queue;
3336		-
3337		- /* defaults, until the device tells us otherwise */
3338		- sdp->sector_size = 512;
3339		- sdkp->capacity = 0;
3340		- sdkp->media_present = 1;
3341		- sdkp->write_prot = 0;
3342		- sdkp->cache_override = 0;
3343		- sdkp->WCE = 0;
3344		- sdkp->RCD = 0;
3345		- sdkp->ATO = 0;
3346		- sdkp->first_scan = 1;
3347		- sdkp->max_medium_access_timeouts = SD_MAX_MEDIUM_TIMEOUTS;
3348		-
3349		- sd_revalidate_disk(gd);
3350		-
3351		- gd->flags = GENHD_FL_EXT_DEVT;
3352		- if (sdp->removable) {
3353		- gd->flags \|= GENHD_FL_REMOVABLE;
3354		- gd->events \|= DISK_EVENT_MEDIA_CHANGE;
3355		- }
3356		-
3357		- blk_pm_runtime_init(sdp->request_queue, dev);
3358		- if (sdp->rpm_autosuspend) {
3359		- pm_runtime_set_autosuspend_delay(dev,
3360		- sdp->host->hostt->rpm_autosuspend_delay);
3361		- }
3362		- device_add_disk(dev, gd);
3363		- if (sdkp->capacity)
3364		- sd_dif_config_host(sdkp);
3365		-
3366		- sd_revalidate_disk(gd);
3367		-
3368		- if (sdkp->security) {
3369		- sdkp->opal_dev = init_opal_dev(sdp, &sd_sec_submit);
3370		- if (sdkp->opal_dev)
3371		- sd_printk(KERN_NOTICE, sdkp, "supports TCG Opal\n");
3372		- }
3373		-
3374		- sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
3375		- sdp->removable ? "removable " : "");
3376		- scsi_autopm_put_device(sdp);
3377		- put_device(&sdkp->dev);
3378		-}
3379		-
3380	3368	/**
3381	3369	* sd_probe - called during driver initialization and whenever a
3382	3370	* new scsi device is attached to the system. It is called once
..	..	@@ -3443,6 +3431,7 @@
3443	3431	sdkp->driver = &sd_template;
3444	3432	sdkp->disk = gd;
3445	3433	sdkp->index = index;
	3434	+ sdkp->max_retries = SD_MAX_RETRIES;
3446	3435	atomic_set(&sdkp->openers, 0);
3447	3436	atomic_set(&sdkp->device->ioerr_cnt, 0);
3448	3437
..	..	@@ -3466,9 +3455,56 @@
3466	3455	}
3467	3456
3468	3457	dev_set_drvdata(dev, sdkp);
	3458	+ device_init_wakeup(dev, true);
3469	3459
3470		- get_device(&sdkp->dev); /* prevent release before async_schedule */
3471		- async_schedule_domain(sd_probe_async, sdkp, &scsi_sd_probe_domain);
	3460	+ gd->major = sd_major((index & 0xf0) >> 4);
	3461	+ gd->first_minor = ((index & 0xf) << 4) \| (index & 0xfff00);
	3462	+
	3463	+ gd->fops = &sd_fops;
	3464	+ gd->private_data = &sdkp->driver;
	3465	+ gd->queue = sdkp->device->request_queue;
	3466	+
	3467	+ /* defaults, until the device tells us otherwise */
	3468	+ sdp->sector_size = 512;
	3469	+ sdkp->capacity = 0;
	3470	+ sdkp->media_present = 1;
	3471	+ sdkp->write_prot = 0;
	3472	+ sdkp->cache_override = 0;
	3473	+ sdkp->WCE = 0;
	3474	+ sdkp->RCD = 0;
	3475	+ sdkp->ATO = 0;
	3476	+ sdkp->first_scan = 1;
	3477	+ sdkp->max_medium_access_timeouts = SD_MAX_MEDIUM_TIMEOUTS;
	3478	+
	3479	+ sd_revalidate_disk(gd);
	3480	+
	3481	+ gd->flags = GENHD_FL_EXT_DEVT;
	3482	+ if (sdp->removable) {
	3483	+ gd->flags \|= GENHD_FL_REMOVABLE;
	3484	+ gd->events \|= DISK_EVENT_MEDIA_CHANGE;
	3485	+ gd->event_flags = DISK_EVENT_FLAG_POLL \| DISK_EVENT_FLAG_UEVENT;
	3486	+ }
	3487	+
	3488	+ blk_pm_runtime_init(sdp->request_queue, dev);
	3489	+ if (sdp->rpm_autosuspend) {
	3490	+ pm_runtime_set_autosuspend_delay(dev,
	3491	+ sdp->host->hostt->rpm_autosuspend_delay);
	3492	+ }
	3493	+ device_add_disk(dev, gd, NULL);
	3494	+ if (sdkp->capacity)
	3495	+ sd_dif_config_host(sdkp);
	3496	+
	3497	+ sd_revalidate_disk(gd);
	3498	+
	3499	+ if (sdkp->security) {
	3500	+ sdkp->opal_dev = init_opal_dev(sdkp, &sd_sec_submit);
	3501	+ if (sdkp->opal_dev)
	3502	+ sd_printk(KERN_NOTICE, sdkp, "supports TCG Opal\n");
	3503	+ }
	3504	+
	3505	+ sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
	3506	+ sdp->removable ? "removable " : "");
	3507	+ scsi_autopm_put_device(sdp);
3472	3508
3473	3509	return 0;
3474	3510
..	..	@@ -3504,12 +3540,9 @@
3504	3540	scsi_autopm_get_device(sdkp->device);
3505	3541
3506	3542	async_synchronize_full_domain(&scsi_sd_pm_domain);
3507		- async_synchronize_full_domain(&scsi_sd_probe_domain);
3508	3543	device_del(&sdkp->dev);
3509	3544	del_gendisk(sdkp->disk);
3510	3545	sd_shutdown(dev);
3511		-
3512		- sd_zbc_remove(sdkp);
3513	3546
3514	3547	free_opal_dev(sdkp->opal_dev);
3515	3548
..	..	@@ -3556,6 +3589,8 @@
3556	3589	put_disk(disk);
3557	3590	put_device(&sdkp->device->sdev_gendev);
3558	3591
	3592	+ sd_zbc_release_disk(sdkp);
	3593	+
3559	3594	kfree(sdkp);
3560	3595	}
3561	3596
..	..	@@ -3576,7 +3611,7 @@
3576	3611	return -ENODEV;
3577	3612
3578	3613	res = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, &sshdr,
3579		- SD_TIMEOUT, SD_MAX_RETRIES, 0, RQF_PM, NULL);
	3614	+ SD_TIMEOUT, sdkp->max_retries, 0, RQF_PM, NULL);
3580	3615	if (res) {
3581	3616	sd_print_result(sdkp, "Start/Stop Unit failed", res);
3582	3617	if (driver_byte(res) == DRIVER_SENSE)
..	..	@@ -3683,10 +3718,16 @@
3683	3718	if (!sdkp->device->manage_start_stop)
3684	3719	return 0;
3685	3720
	3721	+ /* The wake-up process cannot allow the PM to enter sleep */
	3722	+ pm_stay_awake(dev);
	3723	+
3686	3724	sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
3687	3725	ret = sd_start_stop_device(sdkp, 1);
3688	3726	if (!ret)
3689	3727	opal_unlock_from_suspend(sdkp->opal_dev);
	3728	+
	3729	+ pm_relax(dev);
	3730	+
3690	3731	return ret;
3691	3732	}
3692	3733
..	..	@@ -3789,15 +3830,13 @@
3789	3830	module_init(init_sd);
3790	3831	module_exit(exit_sd);
3791	3832
3792		-static void sd_print_sense_hdr(struct scsi_disk *sdkp,
3793		- struct scsi_sense_hdr *sshdr)
	3833	+void sd_print_sense_hdr(struct scsi_disk sdkp, struct scsi_sense_hdr sshdr)
3794	3834	{
3795	3835	scsi_print_sense_hdr(sdkp->device,
3796	3836	sdkp->disk ? sdkp->disk->disk_name : NULL, sshdr);
3797	3837	}
3798	3838
3799		-static void sd_print_result(const struct scsi_disk sdkp, const char msg,
3800		- int result)
	3839	+void sd_print_result(const struct scsi_disk sdkp, const char msg, int result)
3801	3840	{
3802	3841	const char *hb_string = scsi_hostbyte_string(result);
3803	3842	const char *db_string = scsi_driverbyte_string(result);
..	..	@@ -3812,4 +3851,3 @@
3812	3851	"%s: Result: hostbyte=0x%02x driverbyte=0x%02x\n",
3813	3852	msg, host_byte(result), driver_byte(result));
3814	3853	}
3815		-