Commit 14005c96 authored by Eugen Hristev's avatar Eugen Hristev Committed by Christoph Hellwig
Browse files

nvme-pci: refresh visible attrs after being checked 



The sysfs attributes are registered early, but the driver does not know
whether they are needed or not at that moment.

For the CMB attributes, commit e917a849 ("nvme-pci: refresh visible
attrs for cmb attributes") solved this problem by
calling nvme_update_attrs after mapping the CMB.  However the issue
persists for the HMB attributes. To solve the problem, moved the call to
nvme_update_attrs after nvme_setup_host_mem, which sets up the HMB.

Fixes: e917a849 ("nvme-pci: refresh visible attrs for cmb attributes")
Fixes: 86adbf0c ("nvme: simplify transport specific device attribute handling")
Signed-off-by: default avatarEugen Hristev <eugen.hristev@collabora.com>
Signed-off-by: default avatarAndré Almeida <andrealmeid@igalia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 190f4c2c

drivers/nvme/host/pci.c

+4 −2
Original line number Diff line number Diff line
@@ -2101,8 +2101,6 @@ 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)
@@ -3010,6 +3008,8 @@ static void nvme_reset_work(struct work_struct *work) 
	if (result < 0)

		goto out;



	nvme_update_attrs(dev);



	result = nvme_setup_io_queues(dev);

	if (result)

		goto out;
@@ -3343,6 +3343,8 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (result < 0)

		goto out_disable;



	nvme_update_attrs(dev);



	result = nvme_setup_io_queues(dev);

	if (result)

		goto out_disable;