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

Commit e788787e authored by Sandeep Singh's avatar Sandeep Singh Committed by Greg Kroah-Hartman
Browse files

usb:xhci:Add quirk for Certain failing HP keyboard on reset after resume 



Certain HP keyboards would keep inputting a character automatically which
is the wake-up key after S3 resume

On some AMD platforms USB host fails to respond (by holding resume-K) to
USB device (an HP keyboard) resume request within 1ms (TURSM) and ensures
that resume is signaled for at least 20 ms (TDRSMDN), which is defined in
USB 2.0 spec. The result is that the keyboard is out of function.

In SNPS USB design, the host responds to the resume request only after
system gets back to S0 and the host gets to functional after the internal
HW restore operation that is more than 1 second after the initial resume
request from the USB device.

As a workaround for specific keyboard ID(HP Keyboards), applying port reset
after resume when the keyboard is plugged in.

Signed-off-by: default avatarSandeep Singh <Sandeep.Singh@amd.com>
Signed-off-by: default avatarShyam Sundar S K <Shyam-sundar.S-k@amd.com>
cc: Nehal Shah <Nehal-bakulchandra.Shah@amd.com>
Reviewed-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8cc34c8d

drivers/usb/core/quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ static const struct usb_device_id usb_amd_resume_quirk_list[] = { 
	{ USB_DEVICE(0x093a, 0x2500), .driver_info = USB_QUIRK_RESET_RESUME },

	{ USB_DEVICE(0x093a, 0x2510), .driver_info = USB_QUIRK_RESET_RESUME },

	{ USB_DEVICE(0x093a, 0x2521), .driver_info = USB_QUIRK_RESET_RESUME },

	{ USB_DEVICE(0x03f0, 0x2b4a), .driver_info = USB_QUIRK_RESET_RESUME },



	/* Logitech Optical Mouse M90/M100 */

	{ USB_DEVICE(0x046d, 0xc05a), .driver_info = USB_QUIRK_RESET_RESUME },

drivers/usb/host/pci-quirks.c

+12 −5
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ enum amd_chipset_gen { 
	AMD_CHIPSET_HUDSON2,

	AMD_CHIPSET_BOLTON,

	AMD_CHIPSET_YANGTZE,

	AMD_CHIPSET_TAISHAN,

	AMD_CHIPSET_UNKNOWN,

};
@@ -141,6 +142,11 @@ static int amd_chipset_sb_type_init(struct amd_chipset_info *pinfo) 
			pinfo->sb_type.gen = AMD_CHIPSET_SB700;

		else if (rev >= 0x40 && rev <= 0x4f)

			pinfo->sb_type.gen = AMD_CHIPSET_SB800;

	}

	pinfo->smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD,

					  0x145c, NULL);

	if (pinfo->smbus_dev) {

		pinfo->sb_type.gen = AMD_CHIPSET_TAISHAN;

	} else {

		pinfo->smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD,

				PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, NULL);
@@ -260,12 +266,13 @@ int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *pdev) 
{

	/* Make sure amd chipset type has already been initialized */

	usb_amd_find_chipset_info();

	if (amd_chipset.sb_type.gen != AMD_CHIPSET_YANGTZE)

		return 0;



	if (amd_chipset.sb_type.gen == AMD_CHIPSET_YANGTZE ||

	    amd_chipset.sb_type.gen == AMD_CHIPSET_TAISHAN) {

		dev_dbg(&pdev->dev, "QUIRK: Enable AMD remote wakeup fix\n");

		return 1;

	}

	return 0;

}

EXPORT_SYMBOL_GPL(usb_hcd_amd_remote_wakeup_quirk);



bool usb_amd_hang_symptom_quirk(void)