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

Commit 0ba10bc7 authored by Praveen Kalamegham's avatar Praveen Kalamegham Committed by Jesse Barnes
Browse files

PCI hotplug: shpchp: Removed check for hotplug of display devices 



Removed check to prevent hotplug of display devices within shpchp.
Originally this was thought to have been required within the PCI
Hotplug specification for some legacy devices.  However there is
no such requirement in the most recent revision. The check prevents
hotplug of not only display devices but also computational GPUs
which require serviceability.

Signed-off-by: default avatarPraveen Kalamegham <praveen@nextio.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 01b666df

drivers/pci/hotplug/shpchp_pci.c

+4 −15
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ int __ref shpchp_configure_device(struct slot *p_slot) 
		dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, fn));

		if (!dev)

			continue;

		if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {

			ctrl_err(ctrl, "Cannot hot-add display device %s\n",

				 pci_name(dev));

			pci_dev_put(dev);

			continue;

		}

		if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||

				(dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) {

			/* Find an unused bus number for the new bridge */
@@ -119,12 +113,6 @@ int shpchp_unconfigure_device(struct slot *p_slot) 
				(p_slot->device << 3) | j);

		if (!temp)

			continue;

		if ((temp->class >> 16) == PCI_BASE_CLASS_DISPLAY) {

			ctrl_err(ctrl, "Cannot remove display device %s\n",

				 pci_name(temp));

			pci_dev_put(temp);

			continue;

		}

		if (temp->hdr_type == PCI_HEADER_TYPE_BRIDGE) {

			pci_read_config_byte(temp, PCI_BRIDGE_CONTROL, &bctl);

			if (bctl & PCI_BRIDGE_CTL_VGA) {
@@ -132,7 +120,8 @@ int shpchp_unconfigure_device(struct slot *p_slot) 
					 "Cannot remove display device %s\n",

					 pci_name(temp));

				pci_dev_put(temp);

				continue;

				rc = -EINVAL;

				break;

			}

		}

		pci_remove_bus_device(temp);