Commit 308ad58a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

sd: move zone limits setup out of sd_read_block_characteristics 



Move a bit of code that sets up the zone flag and the write granularity
into sd_zbc_read_zones to be with the rest of the zoned limits.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20240617060532.127975-4-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent be60e770

drivers/scsi/sd.c

+1 −20
Original line number Diff line number Diff line
@@ -3312,29 +3312,10 @@ static void sd_read_block_characteristics(struct scsi_disk *sdkp, 
		blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, q);

	}





#ifdef CONFIG_BLK_DEV_ZONED /* sd_probe rejects ZBD devices early otherwise */

	if (sdkp->device->type == TYPE_ZBC) {

		lim->zoned = true;



		/*

		 * Per ZBC and ZAC specifications, writes in sequential write

		 * required zones of host-managed devices must be aligned to

		 * the device physical block size.

		 */

		lim->zone_write_granularity = sdkp->physical_block_size;

	} else {

		/*

		 * Host-aware devices are treated as conventional.

		 */

		lim->zoned = false;

	}

#endif /* CONFIG_BLK_DEV_ZONED */



	if (!sdkp->first_scan)

		return;



	if (lim->zoned)

	if (sdkp->device->type == TYPE_ZBC)

		sd_printk(KERN_NOTICE, sdkp, "Host-managed zoned block device\n");

	else if (sdkp->zoned == 1)

		sd_printk(KERN_NOTICE, sdkp, "Host-aware SMR disk used as regular disk\n");

drivers/scsi/sd_zbc.c

+9 −0
Original line number Diff line number Diff line
@@ -601,6 +601,15 @@ int sd_zbc_read_zones(struct scsi_disk *sdkp, struct queue_limits *lim, 
	if (sdkp->device->type != TYPE_ZBC)

		return 0;



	lim->zoned = true;



	/*

	 * Per ZBC and ZAC specifications, writes in sequential write required

	 * zones of host-managed devices must be aligned to the device physical

	 * block size.

	 */

	lim->zone_write_granularity = sdkp->physical_block_size;



	/* READ16/WRITE16/SYNC16 is mandatory for ZBC devices */

	sdkp->device->use_16_for_rw = 1;

	sdkp->device->use_10_for_rw = 0;