Commit c9193f48 authored Jan 12, 2022 by Linus Torvalds

Merge tag 'for-5.17/drivers-2022-01-11' of git://git.kernel.dk/linux-block

Pull block driver updates from Jens Axboe:

 - mtip32xx pci cleanups (Bjorn)

 - mtip32xx conversion to generic power management (Vaibhav)

 - rsxx pci powermanagement cleanups (Bjorn)

 - Remove the rsxx driver. This hardware never saw much adoption, and
   it's been end of lifed for a while. (Christoph)

 - MD pull request from Song:
      - REQ_NOWAIT support (Vishal Verma)
      - raid6 benchmark optimization (Dirk Müller)
      - Fix for acct bioset (Xiao Ni)
      - Clean up max_queued_requests (Mariusz Tkaczyk)
      - PREEMPT_RT optimization (Davidlohr Bueso)
      - Use default_groups in kobj_type (Greg Kroah-Hartman)

 - Use attribute groups in pktcdvd and rnbd (Greg)

 - NVMe pull request from Christoph:
      - increment request genctr on completion (Keith Busch, Geliang
        Tang)
      - add a 'iopolicy' module parameter (Hannes Reinecke)
      - print out valid arguments when reading from /dev/nvme-fabrics
        (Hannes Reinecke)

 - Use struct_group() in drbd (Kees)

 - null_blk fixes (Ming)

 - Get rid of congestion logic in pktcdvd (Neil)

 - Floppy ejection hang fix (Tasos)

 - Floppy max user request size fix (Xiongwei)

 - Loop locking fix (Tetsuo)

* tag 'for-5.17/drivers-2022-01-11' of git://git.kernel.dk/linux-block: (32 commits)
  md: use default_groups in kobj_type
  md: Move alloc/free acct bioset in to personality
  lib/raid6: Use strict priority ranking for pq gen() benchmarking
  lib/raid6: skip benchmark of non-chosen xor_syndrome functions
  md: fix spelling of "its"
  md: raid456 add nowait support
  md: raid10 add nowait support
  md: raid1 add nowait support
  md: add support for REQ_NOWAIT
  md: drop queue limitation for RAID1 and RAID10
  md/raid5: play nice with PREEMPT_RT
  block/rnbd-clt-sysfs: use default_groups in kobj_type
  pktcdvd: convert to use attribute groups
  block: null_blk: only set set->nr_maps as 3 if active poll_queues is > 0
  nvme: add 'iopolicy' module parameter
  nvme: drop unused variable ctrl in nvme_setup_cmd
  nvme: increment request genctr on completion
  nvme-fabrics: print out valid arguments when reading from /dev/nvme-fabrics
  block: remove the rsxx driver
  rsxx: Drop PCI legacy power management
  ...

parents d3c81080 d85bd823

MAINTAINERS

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -7489,12 +7489,6 @@ F: Documentation/firmware_class/
	F: drivers/base/firmware_loader/		F: drivers/base/firmware_loader/
	F: include/linux/firmware.h		F: include/linux/firmware.h

	FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
	M: Joshua Morris <josh.h.morris@us.ibm.com>
	M: Philip Kelleher <pjk1939@linux.ibm.com>
	S: Maintained
	F: drivers/block/rsxx/

	FLEXTIMER FTM-QUADDEC DRIVER		FLEXTIMER FTM-QUADDEC DRIVER
	M: Patrick Havelange <patrick.havelange@essensium.com>		M: Patrick Havelange <patrick.havelange@essensium.com>
	L: linux-iio@vger.kernel.org		L: linux-iio@vger.kernel.org

drivers/block/Kconfig

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -392,17 +392,6 @@ config BLK_DEV_RBD

	If unsure, say N.		If unsure, say N.

	config BLK_DEV_RSXX
	tristate "IBM Flash Adapter 900GB Full Height PCIe Device Driver"
	depends on PCI
	select CRC32
	help
	Device driver for IBM's high speed PCIe SSD
	storage device: Flash Adapter 900GB Full Height.

	To compile this driver as a module, choose M here: the
	module will be called rsxx.

	source "drivers/block/rnbd/Kconfig"		source "drivers/block/rnbd/Kconfig"

	endif # BLK_DEV		endif # BLK_DEV

drivers/block/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,6 @@ obj-$(CONFIG_BLK_DEV_DRBD) += drbd/
	obj-$(CONFIG_BLK_DEV_RBD) += rbd.o		obj-$(CONFIG_BLK_DEV_RBD) += rbd.o
	obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX) += mtip32xx/		obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX) += mtip32xx/

	obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/
	obj-$(CONFIG_ZRAM) += zram/		obj-$(CONFIG_ZRAM) += zram/
	obj-$(CONFIG_BLK_DEV_RNBD) += rnbd/		obj-$(CONFIG_BLK_DEV_RNBD) += rnbd/

drivers/block/drbd/drbd_main.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -729,7 +729,8 @@ int drbd_send_sync_param(struct drbd_peer_device *peer_device)
	cmd = apv >= 89 ? P_SYNC_PARAM89 : P_SYNC_PARAM;		cmd = apv >= 89 ? P_SYNC_PARAM89 : P_SYNC_PARAM;

	/* initialize verify_alg and csums_alg */		/* initialize verify_alg and csums_alg */
	memset(p->verify_alg, 0, 2 * SHARED_SECRET_MAX);		BUILD_BUG_ON(sizeof(p->algs) != 2 * SHARED_SECRET_MAX);
			memset(&p->algs, 0, sizeof(p->algs));

	if (get_ldev(peer_device->device)) {		if (get_ldev(peer_device->device)) {
	dc = rcu_dereference(peer_device->device->ldev->disk_conf);		dc = rcu_dereference(peer_device->device->ldev->disk_conf);

drivers/block/drbd/drbd_protocol.h

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -283,8 +283,10 @@ struct p_rs_param_89 {

	struct p_rs_param_95 {		struct p_rs_param_95 {
	u32 resync_rate;		u32 resync_rate;
			struct_group(algs,
	char verify_alg[SHARED_SECRET_MAX];		char verify_alg[SHARED_SECRET_MAX];
	char csums_alg[SHARED_SECRET_MAX];		char csums_alg[SHARED_SECRET_MAX];
			);
	u32 c_plan_ahead;		u32 c_plan_ahead;
	u32 c_delay_target;		u32 c_delay_target;
	u32 c_fill_target;		u32 c_fill_target;