From patchwork Mon Apr 25 12:13:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 12825672 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5AADC433EF for ; Mon, 25 Apr 2022 12:13:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239642AbiDYMQw (ORCPT ); Mon, 25 Apr 2022 08:16:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231922AbiDYMQt (ORCPT ); Mon, 25 Apr 2022 08:16:49 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1CA4193D4; Mon, 25 Apr 2022 05:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650888825; x=1682424825; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+/qh612LBKatRiWstzGf4VFJepxi//hEf4y18HWsw28=; b=G78c213x5XVYJIlYGlsGvdym8Pfrt0a3uEw1EB3mGg+GEy2J2lGYcYAM F3LIr8vzVlTHPu3mlzdreRlw7PPQdhtWXiBIUYhIo8H+mQtMvj15eeoMf fhsh/Otu2JZoXI9aAgbjVF9MzJqtN2CFSOSnYpsOcyoDuWG4FIJHVinJl a8TO2qiZXCJJfK4Yx8brKCkdz1iKAo0gzmK2/LZ+3XWXGNDJbo3vmYv6T CUk2Y0GNbPmryUYRyY6UIc1Q1WPPWKqcL/qBIfR15UYxq7yJX/VjARJCT N68N6vfUaS2ErkwBibK08oljgeTaamjXE0yWsaMBvslVmhDHttw8qncR4 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10327"; a="351676968" X-IronPort-AV: E=Sophos;i="5.90,288,1643702400"; d="scan'208";a="351676968" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2022 05:13:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,288,1643702400"; d="scan'208";a="704535988" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 25 Apr 2022 05:13:43 -0700 From: Heikki Krogerus To: Greg Kroah-Hartman Cc: Felipe Balbi , "Rafael J. Wysocki" , Mathias Nyman , Andy Shevchenko , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/2] usb: core: acpi: Use the sysdev pointer instead of controller device Date: Mon, 25 Apr 2022 15:13:39 +0300 Message-Id: <20220425121340.1362-2-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425121340.1362-1-heikki.krogerus@linux.intel.com> References: <20220425121340.1362-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The controller device (hcd) does not always have the ACPI companion assigned to it at all. We can not rely on it when finding the ACPI companion for the root hub. Instead we need to use the sysdev pointer here. Signed-off-by: Heikki Krogerus --- drivers/usb/core/usb-acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c index bb1da35eb891e..fbaf5045507bb 100644 --- a/drivers/usb/core/usb-acpi.c +++ b/drivers/usb/core/usb-acpi.c @@ -206,7 +206,7 @@ usb_acpi_find_companion_for_device(struct usb_device *udev) if (!udev->parent) { /* root hub is only child (_ADR=0) under its parent, the HC */ - adev = ACPI_COMPANION(udev->dev.parent); + adev = ACPI_COMPANION(udev->bus->sysdev); return acpi_find_child_device(adev, 0, false); } From patchwork Mon Apr 25 12:13:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 12825673 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9502C433EF for ; Mon, 25 Apr 2022 12:13:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240276AbiDYMQz (ORCPT ); Mon, 25 Apr 2022 08:16:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236609AbiDYMQw (ORCPT ); Mon, 25 Apr 2022 08:16:52 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD452193D4; Mon, 25 Apr 2022 05:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650888828; x=1682424828; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RcJmmFSAKdqn8rkcY+jzES/FkuNtJTKacj4WSDA1mlk=; b=jCoGipE7TF3n3TcKDqsZRuHsclpMm4YqjI722TktxxQiEfNJwYZh+WyT NjbCENSh+I9W1mRpuBKnsWNQkGMwCPzohaXdURI92J1iom7yyL8PTqMcH jRSz7mwB5dVQ9mB7cHgIHmVWDKVYqAioB8kxW9TtJM29OgHyY+m5ixlvb WYUM2gCVQdMa3dty1wdtQT9Mzxlni07F+RZda+RAISGW866iM2ehopRHc trRVYOEFEXd047pnAph5OUJ3rM4Be/ub9YJhMUv7BP99Uoe0uFcuyKhck 0Lvm+HWDG1bZkhtEgJ5OXb3ZSnTjZRaHLC/ylKbH3VCToJ00ck0sk1QcT g==; X-IronPort-AV: E=McAfee;i="6400,9594,10327"; a="351676973" X-IronPort-AV: E=Sophos;i="5.90,288,1643702400"; d="scan'208";a="351676973" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2022 05:13:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,288,1643702400"; d="scan'208";a="704535997" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 25 Apr 2022 05:13:45 -0700 From: Heikki Krogerus To: Greg Kroah-Hartman Cc: Felipe Balbi , "Rafael J. Wysocki" , Mathias Nyman , Andy Shevchenko , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/2] usb: dwc3: host: Stop setting the ACPI companion Date: Mon, 25 Apr 2022 15:13:40 +0300 Message-Id: <20220425121340.1362-3-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220425121340.1362-1-heikki.krogerus@linux.intel.com> References: <20220425121340.1362-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org It is no longer needed. The sysdev pointer is now used when assigning the ACPI companions to the xHCI ports and USB devices. Assigning the ACPI companion here resulted in the fwnode->secondary pointer to be replaced also for the parent dwc3 device since the primary fwnode (the ACPI companion) was shared. That was unintentional and it created potential side effects like resource leaks. Signed-off-by: Heikki Krogerus --- drivers/usb/dwc3/host.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index eda871973d6cc..f56c30cf151e4 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -7,7 +7,6 @@ * Authors: Felipe Balbi , */ -#include #include #include #include @@ -83,7 +82,6 @@ int dwc3_host_init(struct dwc3 *dwc) } xhci->dev.parent = dwc->dev; - ACPI_COMPANION_SET(&xhci->dev, ACPI_COMPANION(dwc->dev)); dwc->xhci = xhci;