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

Commit b1811d24 authored by Rajat Jain's avatar Rajat Jain Committed by Bjorn Helgaas
Browse files

PCI: pciehp: Don't disable the link permanently during removal 

We need future link up events for hot-add, thus don't disable the link
permanently during device removal. Also, remove the static functions that
are now left unused.

This reverts part of 2debd928 ("PCI: pciehp: Disable/enable link during
slot power off/on").  This was discussed at the URL below, where it was
revealed that it was done for a bug in a PCIe repeater chip on that
particular platform.

Link: https://lkml.kernel.org/r/CAErSpo72KZ-a2OSQLWoK71GCgwBt676XZdGt4tEYm-6UYnLmPw@mail.gmail.com


Signed-off-by: default avatarRajat Jain <rajatxjain@gmail.com>
Signed-off-by: default avatarRajat Jain <rajatjain@juniper.net>
Signed-off-by: default avatarGuenter Roeck <groeck@juniper.net>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 4f854f2a

drivers/pci/hotplug/pciehp_hpc.c

+0 −18
Original line number Diff line number Diff line
@@ -242,11 +242,6 @@ static void pcie_wait_link_active(struct controller *ctrl) 
	__pcie_wait_link_active(ctrl, true);

}



static void pcie_wait_link_not_active(struct controller *ctrl)

{

	__pcie_wait_link_active(ctrl, false);

}



static bool pci_bus_check_dev(struct pci_bus *bus, int devfn)

{

	u32 l;
@@ -332,11 +327,6 @@ static int pciehp_link_enable(struct controller *ctrl) 
	return __pciehp_link_set(ctrl, true);

}



static int pciehp_link_disable(struct controller *ctrl)

{

	return __pciehp_link_set(ctrl, false);

}



void pciehp_get_attention_status(struct slot *slot, u8 *status)

{

	struct controller *ctrl = slot->ctrl;
@@ -508,14 +498,6 @@ void pciehp_power_off_slot(struct slot * slot) 
{

	struct controller *ctrl = slot->ctrl;



	/* Disable the link at first */

	pciehp_link_disable(ctrl);

	/* wait the link is down */

	if (ctrl->link_active_reporting)

		pcie_wait_link_not_active(ctrl);

	else

		msleep(1000);



	pcie_write_cmd(ctrl, PCI_EXP_SLTCTL_PWR_OFF, PCI_EXP_SLTCTL_PCC);

	ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,

		 pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL,