From patchwork Thu Sep 5 04:24:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 13791724 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F3691152166; Thu, 5 Sep 2024 04:35:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.121 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725510906; cv=none; b=AC4jQcdIZyFuTeW6kFn3uTUUET12E8fo9sqHo6mWsp7ons5pikRj9umEj4KCApSBy5WZ6EPXG30b4GC1ZMSuuz4OzJ/qdz11/dMFn++Tl1WnrKPl+POsjfqrVIXCPXKU74Y/O5DM/nsI0YZaU4RD2S+AYmgz2tnbPSKCr/T9RWY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725510906; c=relaxed/simple; bh=aXaVE+s/SnDKQ47vWdxiCRhxJM4RxuS7CvFpS24RYkE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=G2y9S1KwsKfyO8mZiDu//EirbA/VFMWLq7RR1+V1C07dNErUsiQkfHr0QgumoF4LeeR5FZumnDBjR84ipSlIyYzHukZYL5lmE4vxZZfxrdcQ7USojK8ry4/cU5PGiR1nAZR+Irq1xEF//N9qFIQebKE1nYPiHVHKCJPdRxaqOQ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=evF528ZE; arc=none smtp.client-ip=185.125.188.121 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="evF528ZE" Received: from localhost.localdomain (unknown [10.101.196.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 4FF773F383; Thu, 5 Sep 2024 04:25:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1725510331; bh=RRQ5XZs9l1MpHcXSCY9xoJFCag9Jqr471zYJz9s+Q1Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=evF528ZEZiUSFHTTfBzH5lM0QATz6OdM1u/QyyREzjTYURSoBFyTsqkWeU5Eb0wuv HiRf4sDl4SoXlkU+6GsRAqYdGIdkDFjyEtTtni0J2tVsHhRHT3DAoSJhqk6XNBb2d+ imQO85avByHdWFdAyJMnzc/Unk1l5VrJYVYn/vnTuxOVJlFz7pPwJdhl77CxJkgsoi 0WeVbFK8oSngAXJLYpsh1nvDTUZ+BzFuwqjUVvV/PNbwRuD2EV9Ge7XaXMHHmGjNyW n0fbaTYY8Te0aRxfZyNjwteO+RYQEBINWhbotVIbHzIC3SOeMKnbFnmk47mNJ/tWWK zbZxNLoo9A2qw== From: Kai-Heng Feng To: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, gregkh@linuxfoundation.org, jorge.lopez2@hp.com Cc: acelan.kao@canonical.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Kai-Heng Feng Subject: [PATCH 1/2] usb: linux/usb.h: Move USB port definition to usb.h Date: Thu, 5 Sep 2024 12:24:46 +0800 Message-ID: <20240905042447.418662-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Move struct usb_port to linux/usb.h so other subsystems can use it too. The user will be introduced in next patch. Signed-off-by: Kai-Heng Feng --- drivers/usb/core/hub.h | 45 ------------------------------------- drivers/usb/core/usb.h | 6 ----- include/linux/usb.h | 51 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h index e6ae73f8a95d..8b488c247a1e 100644 --- a/drivers/usb/core/hub.h +++ b/drivers/usb/core/hub.h @@ -77,51 +77,6 @@ struct usb_hub { struct list_head onboard_devs; }; -/** - * struct usb port - kernel's representation of a usb port - * @child: usb device attached to the port - * @dev: generic device interface - * @port_owner: port's owner - * @peer: related usb2 and usb3 ports (share the same connector) - * @connector: USB Type-C connector - * @req: default pm qos request for hubs without port power control - * @connect_type: port's connect type - * @state: device state of the usb device attached to the port - * @state_kn: kernfs_node of the sysfs attribute that accesses @state - * @location: opaque representation of platform connector location - * @status_lock: synchronize port_event() vs usb_port_{suspend|resume} - * @portnum: port index num based one - * @is_superspeed cache super-speed status - * @usb3_lpm_u1_permit: whether USB3 U1 LPM is permitted. - * @usb3_lpm_u2_permit: whether USB3 U2 LPM is permitted. - * @early_stop: whether port initialization will be stopped earlier. - * @ignore_event: whether events of the port are ignored. - */ -struct usb_port { - struct usb_device *child; - struct device dev; - struct usb_dev_state *port_owner; - struct usb_port *peer; - struct typec_connector *connector; - struct dev_pm_qos_request *req; - enum usb_port_connect_type connect_type; - enum usb_device_state state; - struct kernfs_node *state_kn; - usb_port_location_t location; - struct mutex status_lock; - u32 over_current_count; - u8 portnum; - u32 quirks; - unsigned int early_stop:1; - unsigned int ignore_event:1; - unsigned int is_superspeed:1; - unsigned int usb3_lpm_u1_permit:1; - unsigned int usb3_lpm_u2_permit:1; -}; - -#define to_usb_port(_dev) \ - container_of(_dev, struct usb_port, dev) - extern int usb_hub_create_port_device(struct usb_hub *hub, int port1); extern void usb_hub_remove_port_device(struct usb_hub *hub, diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index b8324ea05b20..3f45b6978660 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -192,12 +192,6 @@ extern const struct file_operations usbdev_file_operations; extern int usb_devio_init(void); extern void usb_devio_cleanup(void); -/* - * Firmware specific cookie identifying a port's location. '0' == no location - * data available - */ -typedef u32 usb_port_location_t; - /* internal notify stuff */ extern void usb_notify_add_device(struct usb_device *udev); extern void usb_notify_remove_device(struct usb_device *udev); diff --git a/include/linux/usb.h b/include/linux/usb.h index 832997a9da0a..1a8f94cc2bc1 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -772,6 +772,57 @@ extern void usb_queue_reset_device(struct usb_interface *dev); extern struct device *usb_intf_get_dma_device(struct usb_interface *intf); +/* + * Firmware specific cookie identifying a port's location. '0' == no location + * data available + */ +typedef u32 usb_port_location_t; + +/** + * struct usb port - kernel's representation of a usb port + * @child: usb device attached to the port + * @dev: generic device interface + * @port_owner: port's owner + * @peer: related usb2 and usb3 ports (share the same connector) + * @connector: USB Type-C connector + * @req: default pm qos request for hubs without port power control + * @connect_type: port's connect type + * @state: device state of the usb device attached to the port + * @state_kn: kernfs_node of the sysfs attribute that accesses @state + * @location: opaque representation of platform connector location + * @status_lock: synchronize port_event() vs usb_port_{suspend|resume} + * @portnum: port index num based one + * @is_superspeed cache super-speed status + * @usb3_lpm_u1_permit: whether USB3 U1 LPM is permitted. + * @usb3_lpm_u2_permit: whether USB3 U2 LPM is permitted. + * @early_stop: whether port initialization will be stopped earlier. + * @ignore_event: whether events of the port are ignored. + */ +struct usb_port { + struct usb_device *child; + struct device dev; + struct usb_dev_state *port_owner; + struct usb_port *peer; + struct typec_connector *connector; + struct dev_pm_qos_request *req; + enum usb_port_connect_type connect_type; + enum usb_device_state state; + struct kernfs_node *state_kn; + usb_port_location_t location; + struct mutex status_lock; + u32 over_current_count; + u8 portnum; + u32 quirks; + unsigned int early_stop:1; + unsigned int ignore_event:1; + unsigned int is_superspeed:1; + unsigned int usb3_lpm_u1_permit:1; + unsigned int usb3_lpm_u2_permit:1; +}; + +#define to_usb_port(_dev) \ + container_of(_dev, struct usb_port, dev) + #ifdef CONFIG_ACPI extern int usb_acpi_set_power_state(struct usb_device *hdev, int index, bool enable); From patchwork Thu Sep 5 04:24:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 13791725 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F361B149E16; Thu, 5 Sep 2024 04:35:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.121 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725510909; cv=none; b=XlvB/Fz/5yFA6Z1NEcKzxNGshGAg8l7pq+ip14DjiHav7F3w2b0NLEtrrE7m53JgX+Swd9e+NBlJ56H2zOwsY/RAauqls/0breF/MC0f5IFyKdjGAYox8ZWzWn5C42eT5xn3k2DelmegqfSDv60D3oAoDGEyL3nivzI/zeo6NHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725510909; c=relaxed/simple; bh=C2hGsloktDrW6qeedTlD98Vt+7uUUABL98LuaJmqbFw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lGylF4SB1fWQdi5Y2BGKKU2YAhG97TWSofMdbi86VTHbkvheo7HGbBsZrN77led6bsq6ZOTuG5xMhDcJaER+4p0tTYrt0+NlssR4ejCanx4mH2/bgSDIU05xa1+0GCeFErv9B+pquX23M9v59pMd+q0Rkms53UfuvJn1KpuLVN0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=CXEntX1M; arc=none smtp.client-ip=185.125.188.121 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="CXEntX1M" Received: from localhost.localdomain (unknown [10.101.196.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 2789C40277; Thu, 5 Sep 2024 04:25:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1725510338; bh=FlrVU5ggFN3bVKP4cC7T9JINJbAIVK9NIuV92g/t9BE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CXEntX1M5EVINkGgSEtLjkTshThQjHcWpcHyZozlFdFbHo3xjdi9kvDbvQgnioCHr gd5JIPw5M0SNuie4kQOIt0foPc9npLvIRJkv9Ed8VU+P2U4WtZS8h5LWEO3Yb9C/tS muntYj6cDGm0MaDgNtg34bLnU8mDU9JrpM0JbZTNiKxUghQ3eqJh2D1jsHawab+xZc b6A/a/b7QE6Sv7OHCD9SOxGDP+V5CZxM3M+oQ18NUOQYVreccJ12JPIc9Dx5vZek/e tlVUUjbqN5iOGRr+2aRPM82V78vvgScS2xuWC1AsnqKk1Wwy34uXJdM6GR5PIVenq0 my3YFtM9YcpYA== From: Kai-Heng Feng To: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, gregkh@linuxfoundation.org, jorge.lopez2@hp.com Cc: acelan.kao@canonical.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Kai-Heng Feng Subject: [PATCH 2/2] platform/x86/hp: Avoid spurious wakeup on HP ProOne 440 Date: Thu, 5 Sep 2024 12:24:47 +0800 Message-ID: <20240905042447.418662-2-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240905042447.418662-1-kai.heng.feng@canonical.com> References: <20240905042447.418662-1-kai.heng.feng@canonical.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The HP ProOne 440 has a power saving design that when the display is off, it also cuts the USB touchscreen device's power off. This can cause system early wakeup because cutting the power off the touchscreen device creates a disconnect event and prevent the system from suspending: [ 445.814574] hub 2-0:1.0: hub_suspend [ 445.814652] usb usb2: bus suspend, wakeup 0 [ 445.824629] xhci_hcd 0000:00:14.0: Port change event, 1-11, id 11, portsc: 0x202a0 [ 445.824639] xhci_hcd 0000:00:14.0: resume root hub [ 445.824651] xhci_hcd 0000:00:14.0: handle_port_status: starting usb1 port polling. [ 445.844039] xhci_hcd 0000:00:14.0: PM: pci_pm_suspend(): hcd_pci_suspend+0x0/0x20 returns -16 [ 445.844058] xhci_hcd 0000:00:14.0: PM: dpm_run_callback(): pci_pm_suspend+0x0/0x1c0 returns -16 [ 445.844072] xhci_hcd 0000:00:14.0: PM: failed to suspend async: error -16 [ 446.276101] PM: Some devices failed to suspend, or early wake event detected So add a quirk to make sure the following is happening: 1. Let the i915 driver suspend first, to ensure the display is off so system also cuts the USB touchscreen's power. 2. If the touchscreen is present, wait a while to let the USB disconnect event fire. 3. Since the disconnect event already happened, the xhci's suspend routine won't be interrupted anymore. Signed-off-by: Kai-Heng Feng --- drivers/platform/x86/hp/hp-wmi.c | 104 ++++++++++++++++++++++++++++++- 1 file changed, 103 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c index 876e0a97cee1..80fc3ee4deaf 100644 --- a/drivers/platform/x86/hp/hp-wmi.c +++ b/drivers/platform/x86/hp/hp-wmi.c @@ -30,6 +30,9 @@ #include #include #include +#include +#include +#include MODULE_AUTHOR("Matthew Garrett "); MODULE_DESCRIPTION("HP laptop WMI driver"); @@ -1708,6 +1711,52 @@ static void __exit hp_wmi_bios_remove(struct platform_device *device) platform_profile_remove(); } +static int hp_wmi_suspend_handler(struct device *device) +{ + acpi_handle handle; + struct acpi_device *adev; + struct device *physdev; + struct usb_port *port_dev; + struct usb_device *udev; + acpi_status status; + bool found = false; + + /* The USB touchscreen device always connects to HS11 */ + status = acpi_get_handle(NULL, "\\_SB.PC00.XHCI.RHUB.HS11", &handle); + if (ACPI_FAILURE(status)) + return 0; + + adev = acpi_fetch_acpi_dev(handle); + if (!adev) + return 0; + + physdev = get_device(acpi_get_first_physical_node(adev)); + if (!physdev) + return 0; + + port_dev = to_usb_port(physdev); + if (port_dev->state == USB_STATE_NOTATTACHED) + return 0; + + udev = port_dev->child; + + if (udev) { + usb_get_dev(udev); + if (le16_to_cpu(udev->descriptor.idVendor) == 0x1fd2 && + le16_to_cpu(udev->descriptor.idProduct) == 0x8102) { + dev_dbg(&hp_wmi_platform_dev->dev, "LG Melfas touchscreen found\n"); + found = true; + } + usb_put_dev(udev); + + /* Let the xhci have time to handle disconnect event */ + if (found) + msleep(200); + } + + return 0; +} + static int hp_wmi_resume_handler(struct device *device) { /* @@ -1745,7 +1794,7 @@ static int hp_wmi_resume_handler(struct device *device) return 0; } -static const struct dev_pm_ops hp_wmi_pm_ops = { +static struct dev_pm_ops hp_wmi_pm_ops = { .resume = hp_wmi_resume_handler, .restore = hp_wmi_resume_handler, }; @@ -1871,6 +1920,57 @@ static int hp_wmi_hwmon_init(void) return 0; } +static int lg_usb_touchscreen_quirk(const struct dmi_system_id *id) +{ + struct pci_dev *vga, *xhci; + struct device_link *vga_link, *xhci_link; + + vga = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, NULL); + + xhci = pci_get_class(PCI_CLASS_SERIAL_USB_XHCI, NULL); + + if (vga && xhci) { + xhci_link = device_link_add(&hp_wmi_platform_dev->dev, &xhci->dev, + DL_FLAG_STATELESS); + if (xhci_link) + dev_info(&hp_wmi_platform_dev->dev, "Suspend before %s\n", + pci_name(xhci)); + else + return 1; + + vga_link = device_link_add(&vga->dev, &hp_wmi_platform_dev->dev, + DL_FLAG_STATELESS); + if (vga_link) + dev_info(&hp_wmi_platform_dev->dev, "Suspend after %s\n", + pci_name(vga)); + else { + device_link_del(xhci_link); + return 1; + } + } + + + /* During system bootup, the display and the USB touchscreen device can + * be on and off several times, so the device may not be present during + * hp-wmi's probe routine. Try to find the device in suspend routine + * instead. + */ + hp_wmi_pm_ops.suspend = hp_wmi_suspend_handler; + + return 1; +} + +static const struct dmi_system_id hp_wmi_quirk_table[] = { + { + .callback = lg_usb_touchscreen_quirk, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "HP"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP ProOne 440 23.8 inch G9 All-in-One Desktop PC"), + }, + }, + {} +}; + static int __init hp_wmi_init(void) { int event_capable = wmi_has_guid(HPWMI_EVENT_GUID); @@ -1909,6 +2009,8 @@ static int __init hp_wmi_init(void) goto err_unregister_device; } + dmi_check_system(hp_wmi_quirk_table); + return 0; err_unregister_device: