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

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

PCI: pciehp: remove wrong workaround for bad DLLP 



Remove wrong workaround for BAD DLLP error, which confused surprise
down error with DLL errors.

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

drivers/pci/hotplug/pciehp_hpc.c

+3 −50
Original line number Diff line number Diff line
@@ -535,54 +535,12 @@ int pciehp_power_on_slot(struct slot * slot) 
	return retval;

}



static inline int pcie_mask_bad_dllp(struct controller *ctrl)

{

	struct pci_dev *dev = ctrl->pcie->port;

	int pos;

	u32 reg;



	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);

	if (!pos)

		return 0;

	pci_read_config_dword(dev, pos + PCI_ERR_COR_MASK, &reg);

	if (reg & PCI_ERR_COR_BAD_DLLP)

		return 0;

	reg |= PCI_ERR_COR_BAD_DLLP;

	pci_write_config_dword(dev, pos + PCI_ERR_COR_MASK, reg);

	return 1;

}



static inline void pcie_unmask_bad_dllp(struct controller *ctrl)

{

	struct pci_dev *dev = ctrl->pcie->port;

	u32 reg;

	int pos;



	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);

	if (!pos)

		return;

	pci_read_config_dword(dev, pos + PCI_ERR_COR_MASK, &reg);

	if (!(reg & PCI_ERR_COR_BAD_DLLP))

		return;

	reg &= ~PCI_ERR_COR_BAD_DLLP;

	pci_write_config_dword(dev, pos + PCI_ERR_COR_MASK, reg);

}



int pciehp_power_off_slot(struct slot * slot)

{

	struct controller *ctrl = slot->ctrl;

	u16 slot_cmd;

	u16 cmd_mask;

	int retval = 0;

	int changed;



	/*

	 * Set Bad DLLP Mask bit in Correctable Error Mask

	 * Register. This is the workaround against Bad DLLP error

	 * that sometimes happens during turning power off the slot

	 * which conforms to PCI Express 1.0a spec.

	 */

	changed = pcie_mask_bad_dllp(ctrl);

	int retval;



	slot_cmd = POWER_OFF;

	cmd_mask = PCI_EXP_SLTCTL_PCC;
@@ -595,16 +553,11 @@ int pciehp_power_off_slot(struct slot * slot) 
	retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask);

	if (retval) {

		ctrl_err(ctrl, "Write command failed!\n");

		retval = -1;

		goto out;

		return retval;

	}

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

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

 out:

	if (changed)

		pcie_unmask_bad_dllp(ctrl);



	return retval;

	return 0;

}



static irqreturn_t pcie_isr(int irq, void *dev_id)