Commit 12504216 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-6.2-2022-02-17' of git://git.infradead.org/nvme into block-6.2 

Pull NVMe fix from Christoph:

"nvme fix for Linux 6.2

 - fix visibility of the CMB sysfs attributes (Keith Busch)"

* tag 'nvme-6.2-2022-02-17' of git://git.infradead.org/nvme:
  nvme-pci: refresh visible attrs for cmb attributes
parents 9a28b92c e917a849

drivers/nvme/host/pci.c

+8 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ struct nvme_queue; 


static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown);

static void nvme_delete_io_queues(struct nvme_dev *dev);

static void nvme_update_attrs(struct nvme_dev *dev);



/*

 * Represents an NVM Express device.  Each nvme_dev is a PCI function.
@@ -1923,6 +1924,8 @@ static void nvme_map_cmb(struct nvme_dev *dev) 
	if ((dev->cmbsz & (NVME_CMBSZ_WDS | NVME_CMBSZ_RDS)) ==

			(NVME_CMBSZ_WDS | NVME_CMBSZ_RDS))

		pci_p2pmem_publish(pdev, true);



	nvme_update_attrs(dev);

}



static int nvme_set_host_mem(struct nvme_dev *dev, u32 bits)
@@ -2209,6 +2212,11 @@ static const struct attribute_group *nvme_pci_dev_attr_groups[] = { 
	NULL,

};



static void nvme_update_attrs(struct nvme_dev *dev)

{

	sysfs_update_group(&dev->ctrl.device->kobj, &nvme_pci_dev_attrs_group);

}



/*

 * nirqs is the number of interrupts available for write and read

 * queues. The core already reserved an interrupt for the admin queue.