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

Commit 044aceef authored by Michael Chan's avatar Michael Chan Committed by James Bottomley
Browse files

[SCSI] edd: Treat "XPRS" host bus type the same as "PCI" 



PCI Express devices will return "XPRS" host bus type during BIOS EDD
call.  "XPRS" should be treated just like "PCI" so that the proper
pci_dev symlink will be created.  Scripts such as fcoe_edd.sh will
then work correctly.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Reviewed-by: default avatarMatt Domsch <Matt_Domsch@dell.com>
Signed-off-by: default avatarYi Zou <yi.zou@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 7000f7c7

drivers/firmware/edd.c

+3 −3
Original line number Diff line number Diff line
@@ -151,7 +151,8 @@ edd_show_host_bus(struct edd_device *edev, char *buf) 
		p += scnprintf(p, left, "\tbase_address: %x\n",

			     info->params.interface_path.isa.base_address);

	} else if (!strncmp(info->params.host_bus_type, "PCIX", 4) ||

		   !strncmp(info->params.host_bus_type, "PCI", 3)) {

		   !strncmp(info->params.host_bus_type, "PCI", 3) ||

		   !strncmp(info->params.host_bus_type, "XPRS", 4)) {

		p += scnprintf(p, left,

			     "\t%02x:%02x.%d  channel: %u\n",

			     info->params.interface_path.pci.bus,
@@ -159,7 +160,6 @@ edd_show_host_bus(struct edd_device *edev, char *buf) 
			     info->params.interface_path.pci.function,

			     info->params.interface_path.pci.channel);

	} else if (!strncmp(info->params.host_bus_type, "IBND", 4) ||

		   !strncmp(info->params.host_bus_type, "XPRS", 4) ||

		   !strncmp(info->params.host_bus_type, "HTPT", 4)) {

		p += scnprintf(p, left,

			     "\tTBD: %llx\n",
@@ -668,7 +668,7 @@ edd_get_pci_dev(struct edd_device *edev) 
{

	struct edd_info *info = edd_dev_get_info(edev);



	if (edd_dev_is_type(edev, "PCI")) {

	if (edd_dev_is_type(edev, "PCI") || edd_dev_is_type(edev, "XPRS")) {

		return pci_get_bus_and_slot(info->params.interface_path.pci.bus,

				     PCI_DEVFN(info->params.interface_path.pci.slot,

					       info->params.interface_path.pci.