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

Commit 0711c70e authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Jesse Barnes
Browse files

pciehp: move msleep after power off 



According to the PCI Express specification, we must wait for at least
1 second after turning power off before taking any action that relies
on power having been removed from the slot/adapter. For this, current
pciehp wait for 1 second after issuing the power off command in
hpc_power_off_slot() function. But waiting for 1 second in
hpc_power_off_slot() can make pciehp probing slow-down because pciehp
probe code calls hpc_power_off_slot() if the slot is not occupied just
in case. We don't need to wait for 1 second at the pciehp probe time
because there is no action on that empty slot. So move 1 second wait
from hpc_power_off_slot() to the caller of hpc_power_off_slot().

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 6592e02a

drivers/pci/hotplug/pciehp_ctrl.c

+14 −0
Original line number Diff line number Diff line
@@ -174,6 +174,13 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot) 
		}

	}



	/*

	 * After turning power off, we must wait for at least 1 second

	 * before taking any action that relies on power having been

	 * removed from the slot/adapter.

	 */

	msleep(1000);



	if (PWR_LED(ctrl))

		pslot->hpc_ops->green_led_off(pslot);
@@ -277,6 +284,13 @@ static int remove_board(struct slot *p_slot) 
		}

	}



	/*

	 * After turning power off, we must wait for at least 1 second

	 * before taking any action that relies on power having been

	 * removed from the slot/adapter.

	 */

	msleep(1000);



	if (PWR_LED(ctrl))

		/* turn off Green LED */

		p_slot->hpc_ops->green_led_off(p_slot);

drivers/pci/hotplug/pciehp_hpc.c

+0 −7
Original line number Diff line number Diff line
@@ -754,13 +754,6 @@ static int hpc_power_off_slot(struct slot * slot) 
	}

	dbg("%s: SLOTCTRL %x write cmd %x\n",

	    __func__, ctrl->cap_base + SLOTCTRL, slot_cmd);



	/*

	 * After turning power off, we must wait for at least 1 second

	 * before taking any action that relies on power having been

	 * removed from the slot/adapter.

	 */

	msleep(1000);

 out:

	if (changed)

		pcie_unmask_bad_dllp(ctrl);