Commit 2cf816a9 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/pm' into next 

* pci/pm:
  PCI/PM: Avoid using device_may_wakeup() for runtime PM
  x86/PCI: Avoid AMD SB7xx EHCI USB wakeup defect
  PCI/PM: Restore the status of PCI devices across hibernation
  drm/radeon: make MacBook Pro d3_delay quirk more generic
  drm/amdgpu: remove unnecessary save/restore of pdev->d3_delay
  PCI/PM: Add needs_resume flag to avoid suspend complete optimization
  PCI: imx6: Fix config read timeout handling
  switchtec: Fix minor bug with partition ID register
  switchtec: Use new cdev_device_add() helper function
  PCI: endpoint: Make PCI_ENDPOINT depend on HAS_DMA
parents 6a1c1d55 666ff6f8

arch/x86/pci/fixup.c

+15 −0
Original line number Diff line number Diff line
@@ -571,3 +571,18 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2fc0, pci_invalid_bar); 
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6f60, pci_invalid_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fa0, pci_invalid_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fc0, pci_invalid_bar);



/*

 * Device [1022:7808]

 * 23. USB Wake on Connect/Disconnect with Low Speed Devices

 * https://support.amd.com/TechDocs/46837.pdf

 * Appendix A2

 * https://support.amd.com/TechDocs/42413.pdf

 */

static void pci_fixup_amd_ehci_pme(struct pci_dev *dev)

{

	dev_info(&dev->dev, "PME# does not work under D3, disabling it\n");

	dev->pme_support &= ~((PCI_PM_CAP_PME_D3 | PCI_PM_CAP_PME_D3cold)

		>> PCI_PM_CAP_PME_SHIFT);

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x7808, pci_fixup_amd_ehci_pme);

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+0 −4
Original line number Diff line number Diff line
@@ -1152,16 +1152,12 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero 
		return;



	if (state == VGA_SWITCHEROO_ON) {

		unsigned d3_delay = dev->pdev->d3_delay;



		pr_info("amdgpu: switched on\n");

		/* don't suspend or resume card normally */

		dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;



		amdgpu_device_resume(dev, true, true);



		dev->pdev->d3_delay = d3_delay;



		dev->switch_power_state = DRM_SWITCH_POWER_ON;

		drm_kms_helper_poll_enable(dev);

	} else {

drivers/gpu/drm/radeon/radeon_device.c

+0 −11
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ static inline bool radeon_is_atpx_hybrid(void) { return false; } 
#endif



#define RADEON_PX_QUIRK_DISABLE_PX  (1 << 0)

#define RADEON_PX_QUIRK_LONG_WAKEUP (1 << 1)



struct radeon_px_quirk {

	u32 chip_vendor;
@@ -136,8 +135,6 @@ static struct radeon_px_quirk radeon_px_quirk_list[] = { 
	 * https://bugzilla.kernel.org/show_bug.cgi?id=51381

	 */

	{ PCI_VENDOR_ID_ATI, 0x6840, 0x1043, 0x2122, RADEON_PX_QUIRK_DISABLE_PX },

	/* macbook pro 8.2 */

	{ PCI_VENDOR_ID_ATI, 0x6741, PCI_VENDOR_ID_APPLE, 0x00e2, RADEON_PX_QUIRK_LONG_WAKEUP },

	{ 0, 0, 0, 0, 0 },

};
@@ -1241,25 +1238,17 @@ static void radeon_check_arguments(struct radeon_device *rdev) 
static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_state state)

{

	struct drm_device *dev = pci_get_drvdata(pdev);

	struct radeon_device *rdev = dev->dev_private;



	if (radeon_is_px(dev) && state == VGA_SWITCHEROO_OFF)

		return;



	if (state == VGA_SWITCHEROO_ON) {

		unsigned d3_delay = dev->pdev->d3_delay;



		pr_info("radeon: switched on\n");

		/* don't suspend or resume card normally */

		dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;



		if (d3_delay < 20 && (rdev->px_quirk_flags & RADEON_PX_QUIRK_LONG_WAKEUP))

			dev->pdev->d3_delay = 20;



		radeon_resume_kms(dev, true, true);



		dev->pdev->d3_delay = d3_delay;



		dev->switch_power_state = DRM_SWITCH_POWER_ON;

		drm_kms_helper_poll_enable(dev);

	} else {

drivers/pci/dwc/pci-imx6.c

+30 −3
Original line number Diff line number Diff line
@@ -252,9 +252,36 @@ static void imx6_pcie_reset_phy(struct imx6_pcie *imx6_pcie) 
static int imx6q_pcie_abort_handler(unsigned long addr,

		unsigned int fsr, struct pt_regs *regs)

{

	unsigned long pc = instruction_pointer(regs);

	unsigned long instr = *(unsigned long *)pc;

	int reg = (instr >> 12) & 15;



	/*

	 * If the instruction being executed was a read,

	 * make it look like it read all-ones.

	 */

	if ((instr & 0x0c100000) == 0x04100000) {

		unsigned long val;



		if (instr & 0x00400000)

			val = 255;

		else

			val = -1;



		regs->uregs[reg] = val;

		regs->ARM_pc += 4;

		return 0;

	}



	if ((instr & 0x0e100090) == 0x00100090) {

		regs->uregs[reg] = -1;

		regs->ARM_pc += 4;

		return 0;

	}



	return 1;

}



static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)

{

	switch (imx6_pcie->variant) {
@@ -819,8 +846,8 @@ static int __init imx6_pcie_init(void) 
	 * we can install the handler here without risking it

	 * accessing some uninitialized driver state.

	 */

	hook_fault_code(16 + 6, imx6q_pcie_abort_handler, SIGBUS, 0,

			"imprecise external abort");

	hook_fault_code(8, imx6q_pcie_abort_handler, SIGBUS, 0,

			"external abort on non-linefetch");



	return platform_driver_register(&imx6_pcie_driver);

}

drivers/pci/endpoint/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ menu "PCI Endpoint" 


config PCI_ENDPOINT

	bool "PCI Endpoint Support"

	depends on HAS_DMA

	help

	   Enable this configuration option to support configurable PCI

	   endpoint. This should be enabled if the platform has a PCI

CRA Git | Maintained and supported by SUSTech CRA and CCSE