Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97c12223 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

nvme-pci: Add .get_address ctrl callback 



The nvme-fabrics exports the controller address to sysfs, and we'd
like to have parity with this feature for PCIe. This patch provides
the appropiate callback and returns the controller address as the pci
domain:bus:device.function.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 70da6094

drivers/nvme/host/pci.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -2414,6 +2414,13 @@ static int nvme_pci_reg_read64(struct nvme_ctrl *ctrl, u32 off, u64 *val) 
	return 0;

	return 0;

}

}





static int nvme_pci_get_address(struct nvme_ctrl *ctrl, char *buf, int size)

{

	struct pci_dev *pdev = to_pci_dev(to_nvme_dev(ctrl)->dev);



	return snprintf(buf, size, "%s", dev_name(&pdev->dev));

}



static const struct nvme_ctrl_ops nvme_pci_ctrl_ops = {

static const struct nvme_ctrl_ops nvme_pci_ctrl_ops = {

	.name			= "pcie",

	.name			= "pcie",

	.module			= THIS_MODULE,

	.module			= THIS_MODULE,
@@ -2423,6 +2430,7 @@ static const struct nvme_ctrl_ops nvme_pci_ctrl_ops = { 
	.reg_read64		= nvme_pci_reg_read64,

	.reg_read64		= nvme_pci_reg_read64,

	.free_ctrl		= nvme_pci_free_ctrl,

	.free_ctrl		= nvme_pci_free_ctrl,

	.submit_async_event	= nvme_pci_submit_async_event,

	.submit_async_event	= nvme_pci_submit_async_event,

	.get_address		= nvme_pci_get_address,

};

};





static int nvme_dev_map(struct nvme_dev *dev)

static int nvme_dev_map(struct nvme_dev *dev)