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

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

PCI: pciehp: fix unexpected power off with pciehp_force 



This patch fixes the problem that causes an occupied slot to be turned
off even if it has a working device.

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent b0b801dd

drivers/pci/hotplug/pciehp_core.c

+12 −11
Original line number Diff line number Diff line
@@ -432,19 +432,20 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ 
		goto err_out_release_ctlr;

	}



	/* Check if slot is occupied */

	t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);



	t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */

	if (value && pciehp_force) {

		rc = pciehp_enable_slot(t_slot);

		if (rc)	/* -ENODEV: shouldn't happen, but deal with it */

			value = 0;

	}

	if ((POWER_CTRL(ctrl)) && !value) {

		rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/

	t_slot->hpc_ops->get_adapter_status(t_slot, &value);

	if (value) {

		if (pciehp_force)

			pciehp_enable_slot(t_slot);

	} else {

		/* Power off slot if not occupied */

		if (POWER_CTRL(ctrl)) {

			rc = t_slot->hpc_ops->power_off_slot(t_slot);

			if (rc)

				goto err_out_free_ctrl_slot;

		}

	}



	return 0;