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

Commit bed4e9cf authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: shpchp: Fix AMD POGO identification 



The fix for an AMD POGO erratum related to SHPC incorrectly identified the
device.  The workaround should be applied only for AMD POGO devices, but it
was instead applied to:

  - all AMD bridges, and
  - all devices from any vendor with device ID 0x7458

Fixes: 53044f35 ("[PATCH] PCI Hotplug: shpchp: AMD POGO errata fix")
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f2b775f5

drivers/pci/hotplug/shpchp_ctrl.c

+4 −4
Original line number Diff line number Diff line
@@ -585,13 +585,13 @@ static int shpchp_enable_slot (struct slot *p_slot) 
	ctrl_dbg(ctrl, "%s: p_slot->pwr_save %x\n", __func__, p_slot->pwr_save);

	p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);



	if (((p_slot->ctrl->pci_dev->vendor == PCI_VENDOR_ID_AMD) ||

	    (p_slot->ctrl->pci_dev->device == PCI_DEVICE_ID_AMD_POGO_7458))

	if ((p_slot->ctrl->pci_dev->vendor == PCI_VENDOR_ID_AMD &&

	     p_slot->ctrl->pci_dev->device == PCI_DEVICE_ID_AMD_POGO_7458)

	     && p_slot->ctrl->num_slots == 1) {

		/* handle amd pogo errata; this must be done before enable  */

		/* handle AMD POGO errata; this must be done before enable  */

		amd_pogo_errata_save_misc_reg(p_slot);

		retval = board_added(p_slot);

		/* handle amd pogo errata; this must be done after enable  */

		/* handle AMD POGO errata; this must be done after enable  */

		amd_pogo_errata_restore_misc_reg(p_slot);

	} else

		retval = board_added(p_slot);