From patchwork Mon Oct 2 13:26:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13406244 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E7492E784AC for ; Mon, 2 Oct 2023 13:33:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=RtFkdhRfXI2qSl//uKYSO6rFTjJwS/gXEM2U0+fmC5E=; b=YsacRnviFLXb8P vhEY1EBmcMsfTCEKWq4UObQDrlgI7HEU88L8aCx30hXeiEYgVgowP5LiusPZjlnNDPPT2JpFbCYlk TCdWyE4SKiTK31fxxI8YuInKNS23KhRGHb/VivBkv73WIrvxafOheVtGqzPvfxQUU0ttVAEKWx7Rw lYreXPwHG85+T1fHXgv1ubeBiN4nlSyadmx6ub3R3yciMR0MMDUWuBjWXxb17xmwMZDwRgG/Rv2LA +rk7YtQBW9ns9MZB3/tKuvOCUpDRD7QnfsbTVWC7qxf6yBKc3B43AMyk9f1oC0+zFAl+CCVjOSEHd SyAGLupjVmtJdzZ+P/ww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qnJ2K-00Cn02-2Y; Mon, 02 Oct 2023 13:32:36 +0000 Received: from mgamail.intel.com ([192.55.52.93]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qnJ2H-00CmzQ-3C for linux-arm-kernel@lists.infradead.org; Mon, 02 Oct 2023 13:32:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696253553; x=1727789553; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=IAF3ppOCz/aKQLdQ1DG/jiVmbimLG/74kbOGxZWwpS8=; b=JbhMa85JLfTKUbnBkegAt91KAyBCW7SYAHX4/QjGeElPRgVCT4C5xhvg JOe2mv6Yl4Rh5Z30/67AQzrVb8YeVW4U2IGmJ6eZferMwGt8Q+hK4n368 krHRLFp90cNLuzuVGs62xRshSURGz5mWDTXAcSvzEFjFHXe/ODzzDJrFa Ls5Fr6HS5AlEF2mhcdd+DYI+5z6zbiTHBAUnrnQxnlDyrYpnt/o+37IcS IYtqoUcpZo8kq86DxgB3dpgvlUiuELcvrZZWiQNnd1HZ99JvpRJv0pd1B C7FUcwgmGj+XoxrQJ6TrI5HlgT9vXh/KEjiR8pizmUOsL2l+GwH5QuxBk Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="379923419" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="379923419" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 06:26:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="754048987" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="754048987" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 02 Oct 2023 06:26:42 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 216472FF; Mon, 2 Oct 2023 16:26:41 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Rob Herring , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , "Rafael J. Wysocki" , Len Brown , Russell King , Rob Herring , Frank Rowand , Peng Fan Subject: [PATCH v2 1/2] amba: bus: balance firmware node reference counting Date: Mon, 2 Oct 2023 16:26:34 +0300 Message-Id: <20231002132635.2595382-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231002_063234_099447_001BFB0F X-CRM114-Status: GOOD ( 18.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Currently the ACPI code doesn't bump the reference count of the firmware node, while OF counter part does. Not that it's a problem right now, since ACPI doesn't really use the reference counting for firmware nodes, it still makes sense to make code robust against any changes done there. For this, - switch ACPI case to use device_set_node() to be unified with OF - move reference counting to amba_device_add() - switch to use firmware nodes instead of OF ones In the result we will have reference counting done in the same module for all callers independently on the nature of firmware node behind. Signed-off-by: Andy Shevchenko --- v2: fixed compilation error (LKP), all dependencies are in v6.6-rcX (Rob) drivers/acpi/arm64/amba.c | 2 +- drivers/amba/bus.c | 5 ++++- drivers/of/platform.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c index 60be8ee1dbdc..171b5c2c7edd 100644 --- a/drivers/acpi/arm64/amba.c +++ b/drivers/acpi/arm64/amba.c @@ -101,7 +101,7 @@ static int amba_handler_attach(struct acpi_device *adev, if (parent) dev->dev.parent = acpi_get_first_physical_node(parent); - ACPI_COMPANION_SET(&dev->dev, adev); + device_set_node(&dev->dev, acpi_fwnode_handle(adev)); ret = amba_device_add(dev, &iomem_resource); if (ret) { diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 09e72967b8ab..a24c152bfaac 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -528,7 +529,7 @@ static void amba_device_release(struct device *dev) { struct amba_device *d = to_amba_device(dev); - of_node_put(d->dev.of_node); + fwnode_handle_put(dev_fwnode(&d->dev)); if (d->res.parent) release_resource(&d->res); mutex_destroy(&d->periphid_lock); @@ -548,6 +549,8 @@ int amba_device_add(struct amba_device *dev, struct resource *parent) { int ret; + fwnode_handle_get(dev_fwnode(&dev->dev)); + ret = request_resource(parent, &dev->res); if (ret) return ret; diff --git a/drivers/of/platform.c b/drivers/of/platform.c index f235ab55b91e..126d265aa7d8 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -273,7 +273,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node, dev->dev.dma_mask = &dev->dev.coherent_dma_mask; /* setup generic device info */ - device_set_node(&dev->dev, of_fwnode_handle(of_node_get(node))); + device_set_node(&dev->dev, of_fwnode_handle(node)); dev->dev.parent = parent ? : &platform_bus; dev->dev.platform_data = platform_data; if (bus_id) From patchwork Mon Oct 2 13:26:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13406245 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 26EAEE784AC for ; Mon, 2 Oct 2023 13:33:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Lv05zwPiPhmDXQ+vj6dXLAl2x6Ezdv6fHeYVrfz8BCI=; b=lLR22z6DDMzlDV CGg2VuBZtIDdLZzGuBSGd9Dpk5MNeunpICLmO8Jup1TQrLwiCZUbIfCWfZa+Dc/6lGs8aMubXEj7D o8kb2phJyFFKLADkZ+x/BPHYQVBWLg5u9xyu0jZybR/6D2daSM8xV4IrzWl5SiO8/tU81YEj3DSsj B5LsSNWSaMsUysNCmi+EYQQVZdy4c/RyW8Iw6db4vq4kuKdLXj6wLAxtIB4oj+4krzWBMts052sxD eO7XkL88D1fhpbH6iMl4ulysQSOFFMIYEo2nEXN1yyY31DINbvElgH2MbacZF5ZPiZCBY3pA4xqHd Gqf+sOx74kWeD1A7kk7g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qnJ2M-00Cn0Q-14; Mon, 02 Oct 2023 13:32:38 +0000 Received: from mgamail.intel.com ([192.55.52.93]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qnJ2J-00CmzQ-1l for linux-arm-kernel@lists.infradead.org; Mon, 02 Oct 2023 13:32:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696253555; x=1727789555; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lDAqfAvJkp0xhbjXWLoPesIG5pkXB+BnJ5EhDi7GpC0=; b=RRG9RJ9VBEs+cYtTcoSRoW9sKY+mL4X3sGVqPfYd/zvzNA62rQgkPKMs Bv6S7V/Kb8y33D/qb/L9BS5XcvupKpFfonasthUbXsVxZS3V3lbKbSTce g2gl3vJ/Ug/SYJejQslEMHdBRe658iop4DnaA3Xi2aNoboFYysNd3gB52 xBTLbsSAKEPV91+sW6E/wPkFLXkAy1AR7QZrOL1avffe8N7qbMCPNSnb7 yL79gEbVcRSa4IEGl9QMx/9hRO9PZ0i23Tk+Ny3Rjxzk/1CbvrwfvYTtS UW0LMJSAi/b14mN9drB+36PeLvuifKFUGfCqXXKtbdOuvvtSq7+0KZhb7 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="379923411" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="379923411" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 06:26:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="754048986" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="754048986" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 02 Oct 2023 06:26:42 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2F42B1A7; Mon, 2 Oct 2023 16:26:41 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Rob Herring , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , "Rafael J. Wysocki" , Len Brown , Russell King , Rob Herring , Frank Rowand , Peng Fan Subject: [PATCH v2 2/2] amba: bus: Enable compile testing Date: Mon, 2 Oct 2023 16:26:35 +0300 Message-Id: <20231002132635.2595382-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231002132635.2595382-1-andriy.shevchenko@linux.intel.com> References: <20231002132635.2595382-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231002_063235_617850_479CEE28 X-CRM114-Status: GOOD ( 12.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There is no architecture specific code in the implementation of AMBA bus, let's enable compile testing for it. Signed-off-by: Andy Shevchenko --- v2: new patch to make it easier to compile test on non-ARM drivers/amba/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/amba/Kconfig b/drivers/amba/Kconfig index fb6c7e0b4cce..9ff4638550c8 100644 --- a/drivers/amba/Kconfig +++ b/drivers/amba/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 config ARM_AMBA - bool + bool "AMBA bus support" || if COMPILE_TEST if ARM_AMBA