From patchwork Tue Jun 18 16:41:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13702719 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 C9F6EC2BA18 for ; Tue, 18 Jun 2024 16:41:59 +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=LHUFmztTI9qm4Piwy/s9eRbA8n6sW2WSmJm5HMabzYA=; b=WFGU+MkgwgKWUP /82/gGbfP5HgQpwq3sjUELBO0CenllJL2wL2HGOpP8iGbEMhF4tlh+dHtFWTE/ThNGDEm2NiSM7PZ c2ukjqG/vSokMGnNiH7QVbUAjNui97+9Bcw2gOSrQyoZJXDQr7uHGM3AnhZfm0ZmJAJM/sI3m+JbF +TQZabfl2Ir8bX5O/i99Foqs3NKQlYCy4xIp8zgp3gjcO2nIqJrcLs0JYrGjZmJtbydMAcAdxk3mz NDXe79BZ3YDNznvbO/13rzHydIShpGoNWK7BOTsje3LWj3Jsm3t3/x4DAe2R2FE8GkZPXpqOeABqM xFUPDOJqk4jEK9W5lW6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJbu8-0000000FtTN-2Bhf; Tue, 18 Jun 2024 16:41:56 +0000 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJbu5-0000000FtSm-3kBz; Tue, 18 Jun 2024 16:41:55 +0000 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1f47f07acd3so50279765ad.0; Tue, 18 Jun 2024 09:41:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718728913; x=1719333713; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lEKJAviaww/opy5uOYiRNCbAr4C1pq+2z0zEGSrd6PU=; b=S3aAyyD/HUXbzuE3siEit4LP+xXGLP1UVcvbyLYcVM63T8XeHb1BUUluXT/FQuluBE POA33atN9PiZR4AFAVPvUkEISds/VZLOHY725/vw+JlLD7lSF+Bz7+uAcdKMNDaSCl+m hFq7w7w8ypZsmorR6rhjX+cuIRouHuCkDAVZJ6UzFCp8+1edIN6ceGjSnHB//nzmj3RV K5Hc1bVFR4+g/7lkiyXrs+dMmAUrylZuMvfGVChTzcSzq4UsV1HCrhR5EkXqjuVKceiQ kTxm7Pjb8gYpRhDXznLtU9c6EkdrU2bMkFsnp6t5edQt0gTiOrZxDhxo1guSxYfzl+Iq jVlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718728913; x=1719333713; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lEKJAviaww/opy5uOYiRNCbAr4C1pq+2z0zEGSrd6PU=; b=JukYX52l0ajAnbxxljnMyVnYW30F9x3kAt4dFWhhBpKWIrofS1PwgYVbbdUBAyL8rP 3JcNbuojKZaMBSDumjYgeLNgfImHEH9HYn980mYPstaULoOr5coagP2qpOPbVQ3wBYjE sIV+hbcbYjFG9xA0DAut7CHkD7cGcWw+PWn8rpaeeYaVDu+rh7Z2BtYEvq7C6jiAEB6e 2Jej84mp23U5L6fs/wKg0fz2otfU7Vv3+lQLaT7LLZQNvpeu9Rg0r4nnrRDnVq2YaMVb qhDnn9KzW2seyzAqxKb18js/KVNkpIaSr9eg0zz0exm6zpT/rQZ5QHCLb9V7y9SRwcgl M0ig== X-Forwarded-Encrypted: i=1; AJvYcCUZZgGZLfXVmxu6GND6Eax6DSYYpnKBd0/pYSmIVd9InZKrS7cXvmEU1MD4JxQ7ujWTZcPzyZWHT3De/8Sn71UWMKSSLa3lWsZ2UzRHcD/WzrkxuxDWZtn/C5sg5+1quVvbGYJZXpRX/WiCP8+lfiFRH9ICLc2V5t8= X-Gm-Message-State: AOJu0Yycq/hSV27H4WyRFpHpaQbKDf8UzH8qHHion/FkLYQuR+nETCxP 1Tprbhohr6zBI1y+npu8oU9wg+WlIfJdcKfzHWGj/ZgqR+QZP+OA X-Google-Smtp-Source: AGHT+IE6ycMy8brzP3yQKsR/MLnmyODjfStahN/qCbSdYEUO+jsOWW626LyTQvb+AEorPSXcDg0QYg== X-Received: by 2002:a17:903:11c7:b0:1f6:7212:75f0 with SMTP id d9443c01a7336-1f9aa3ceb87mr1916655ad.17.1718728912991; Tue, 18 Jun 2024 09:41:52 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.222]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855f0175csm99081835ad.191.2024.06.18.09.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jun 2024 09:41:52 -0700 (PDT) From: Anand Moon To: Shawn Lin , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Bjorn Helgaas , Heiko Stuebner Cc: Anand Moon , linux-pci@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/3] PCI: rockchip: Simplify clock handling by using clk_bulk*() function Date: Tue, 18 Jun 2024 22:11:26 +0530 Message-ID: <20240618164133.223194-2-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240618164133.223194-1-linux.amoon@gmail.com> References: <20240618164133.223194-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240618_094153_961117_ED83FFF5 X-CRM114-Status: GOOD ( 18.62 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Refactors the clock handling in the Rockchip PCIe driver, introducing a more robust and efficient method for enabling and disabling clocks using clk_bulk*() API. Using the clk_bulk APIs, the clock handling for the core clocks becomes much simpler. Signed-off-by: Anand Moon --- drivers/pci/controller/pcie-rockchip.c | 64 ++++---------------------- drivers/pci/controller/pcie-rockchip.h | 14 ++++-- 2 files changed, 20 insertions(+), 58 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c index 0ef2e622d36e..166dad666a35 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c @@ -30,7 +30,7 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) struct platform_device *pdev = to_platform_device(dev); struct device_node *node = dev->of_node; struct resource *regs; - int err; + int err, i; if (rockchip->is_rc) { regs = platform_get_resource_byname(pdev, @@ -127,28 +127,13 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) "failed to get ep GPIO\n"); } - rockchip->aclk_pcie = devm_clk_get(dev, "aclk"); - if (IS_ERR(rockchip->aclk_pcie)) { - dev_err(dev, "aclk clock not found\n"); - return PTR_ERR(rockchip->aclk_pcie); - } - - rockchip->aclk_perf_pcie = devm_clk_get(dev, "aclk-perf"); - if (IS_ERR(rockchip->aclk_perf_pcie)) { - dev_err(dev, "aclk_perf clock not found\n"); - return PTR_ERR(rockchip->aclk_perf_pcie); - } - - rockchip->hclk_pcie = devm_clk_get(dev, "hclk"); - if (IS_ERR(rockchip->hclk_pcie)) { - dev_err(dev, "hclk clock not found\n"); - return PTR_ERR(rockchip->hclk_pcie); - } + for (i = 0; i < ROCKCHIP_NUM_CLKS; i++) + rockchip->clks[i].id = rockchip_pci_clks[i]; - rockchip->clk_pcie_pm = devm_clk_get(dev, "pm"); - if (IS_ERR(rockchip->clk_pcie_pm)) { - dev_err(dev, "pm clock not found\n"); - return PTR_ERR(rockchip->clk_pcie_pm); + err = devm_clk_bulk_get(dev, ROCKCHIP_NUM_CLKS, rockchip->clks); + if (err) { + dev_err(dev, "rockchip clk bulk get failed\n"); + return err; } return 0; @@ -372,39 +357,13 @@ int rockchip_pcie_enable_clocks(struct rockchip_pcie *rockchip) struct device *dev = rockchip->dev; int err; - err = clk_prepare_enable(rockchip->aclk_pcie); + err = clk_bulk_prepare_enable(ROCKCHIP_NUM_CLKS, rockchip->clks); if (err) { - dev_err(dev, "unable to enable aclk_pcie clock\n"); + dev_err(dev, "rockchip clk bulk prepare enable failed\n"); return err; } - err = clk_prepare_enable(rockchip->aclk_perf_pcie); - if (err) { - dev_err(dev, "unable to enable aclk_perf_pcie clock\n"); - goto err_aclk_perf_pcie; - } - - err = clk_prepare_enable(rockchip->hclk_pcie); - if (err) { - dev_err(dev, "unable to enable hclk_pcie clock\n"); - goto err_hclk_pcie; - } - - err = clk_prepare_enable(rockchip->clk_pcie_pm); - if (err) { - dev_err(dev, "unable to enable clk_pcie_pm clock\n"); - goto err_clk_pcie_pm; - } - return 0; - -err_clk_pcie_pm: - clk_disable_unprepare(rockchip->hclk_pcie); -err_hclk_pcie: - clk_disable_unprepare(rockchip->aclk_perf_pcie); -err_aclk_perf_pcie: - clk_disable_unprepare(rockchip->aclk_pcie); - return err; } EXPORT_SYMBOL_GPL(rockchip_pcie_enable_clocks); @@ -412,10 +371,7 @@ void rockchip_pcie_disable_clocks(void *data) { struct rockchip_pcie *rockchip = data; - clk_disable_unprepare(rockchip->clk_pcie_pm); - clk_disable_unprepare(rockchip->hclk_pcie); - clk_disable_unprepare(rockchip->aclk_perf_pcie); - clk_disable_unprepare(rockchip->aclk_pcie); + clk_bulk_disable_unprepare(ROCKCHIP_NUM_CLKS, rockchip->clks); } EXPORT_SYMBOL_GPL(rockchip_pcie_disable_clocks); diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h index 6111de35f84c..f256cdf4fa49 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -287,6 +287,15 @@ (((c) << ((b) * 8 + 5)) & \ ROCKCHIP_PCIE_CORE_EP_FUNC_BAR_CFG_BAR_CTRL_MASK(b)) +#define ROCKCHIP_NUM_CLKS ARRAY_SIZE(rockchip_pci_clks) + +static const char * const rockchip_pci_clks[] = { + "aclk", + "aclk-perf", + "hclk", + "pm", +}; + struct rockchip_pcie { void __iomem *reg_base; /* DT axi-base */ void __iomem *apb_base; /* DT apb-base */ @@ -299,10 +308,7 @@ struct rockchip_pcie { struct reset_control *pm_rst; struct reset_control *aclk_rst; struct reset_control *pclk_rst; - struct clk *aclk_pcie; - struct clk *aclk_perf_pcie; - struct clk *hclk_pcie; - struct clk *clk_pcie_pm; + struct clk_bulk_data clks[ROCKCHIP_NUM_CLKS]; struct regulator *vpcie12v; /* 12V power supply */ struct regulator *vpcie3v3; /* 3.3V power supply */ struct regulator *vpcie1v8; /* 1.8V power supply */ From patchwork Tue Jun 18 16:41:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13702720 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 48671C27C4F for ; Tue, 18 Jun 2024 16:42:05 +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=T4Daj+CvHnHRfi7HmR08wLqEiuz3MHgX5LPNlmg0Ufk=; b=ypQ6fMufKY8w9Q YczrvwC5uQwHNU+/OuNfKIf8i8dVZQD96V02YkE/y1V06xNWLWVP43AGrfRlPRLfUSYFBr2hFVedq cQw/VidmwAxCjZMlFfZ5D0NARV4LoGEg8WFuVgVYlsD7zN876bAAlRc9TnwKgTxHXXQ2HXTPrfBYu XTC017AlPfEndQGlFo56FxAfwLRtMtCSp2530RmzaPxBhFC6KMDGRQ9IyTqnKf76oltEUdJC2C+rE La9urdEtZrBJ3P7hD25bYfr5EoR2VyjSC0hJ9QLG66+EgG6adB/v9WZBr3Y/pIZRtB33Grkz9hT2V rZu0Spguj0qBVOJmEkxw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJbuD-0000000FtVF-3hmu; Tue, 18 Jun 2024 16:42:01 +0000 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJbuB-0000000FtUB-2Web; Tue, 18 Jun 2024 16:42:01 +0000 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1f717608231so43199515ad.2; Tue, 18 Jun 2024 09:41:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718728919; x=1719333719; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ESixGGC9u5ovZQ6bWKTTIZp88BSFjHh98tzqZjNcDpA=; b=S9Wyzet5opH5YDTVZyQoUIpagY/VHPqXD+W7bhwEJsM91VVXmk6ovtuj4AzUNxaHzx 57543OjgpgMO5A7vEuwHEIost6cqnZyWvPXVirJSTBqA1ZIjwcUMbWKfy0vBsMH2ENWh i+3rdAirwUKMd/x3SLw5qL5SjQD3t+MPZX6s6QfzuAtb1MKboVdmHowoz6VcZUn6dPX0 nPFqkQ9K2tx6FG5vpYFRJ/iC+c316dyJlp5PsSP0f6jY5Glm2Ez7INquyGkJUgAHBdR8 y1kHBF6INm5mhKA6BjOa/cu+DcqvUkwIc6Hj5CnvkQydB1+2yU3wovv9OhJ/jLx7EHhH Uk3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718728919; x=1719333719; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ESixGGC9u5ovZQ6bWKTTIZp88BSFjHh98tzqZjNcDpA=; b=JfhTWO6Hf+r/FnZ5Zr2iFxu5wdp1Z6u7QqArj8DHRiZk6V1cEqgZtU4apyhlXxavsz mRNiw6YeTP8CSb1tilD4f1KeFTbejs8PjCPgjXL+ENfdLu0HMk9iuG2DGfdIcVvWei8/ Mvfsjan7WLpp8AZz/4wDlrY7hXtcspS5gloAFI4y6g5o4EuWXiidhsvPnYVe2I5KgCI0 D+gUk/8NFQk5G0ddMOOCGqca+OecyZvWGTTKfS7W8wZvARB7JukL2sKFn42HubEEPEJG IqsVgq4/YjiZ6UnVZxzwT2tq0w/AZ4i1ogZrGY/5OBma4T+mz3WtHa5PBX1I0faAnBqC pj5A== X-Forwarded-Encrypted: i=1; AJvYcCVPjTY8+4cZ9DXcmx2gi6sjgCoKNYNKl8SflPpIgZPAdbT/0lpogg1TZgf99BetUqae+qNL0EEUzGCKaOL2R3rmjX0ajEz6xyefEw14Yiz4ST9QgIqWY72bGPhPyBRfNjfQmXlSoedIzByMTh5W9+FUVqYMhuJAwKM= X-Gm-Message-State: AOJu0YzTukCJVJwYvlx5JDRjYtre2GtzLdn3JcbEfIr2whjZsHG80tqS oBAblKpUW0o+hlOELrNegS/KDOl3b+06hUdTiljpkGqZX4dM3iGl X-Google-Smtp-Source: AGHT+IFg4ssYvnK3V3MlBPc+TJw7hIS0CzI9EisxKeWciJMuK5xzpw7EkR0LYYrUHnpvSR2nd0UgwQ== X-Received: by 2002:a17:902:6b4a:b0:1f6:e4ab:a1f2 with SMTP id d9443c01a7336-1f9aa3d3cddmr1315805ad.25.1718728918640; Tue, 18 Jun 2024 09:41:58 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.222]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855f0175csm99081835ad.191.2024.06.18.09.41.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jun 2024 09:41:58 -0700 (PDT) From: Anand Moon To: Shawn Lin , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Bjorn Helgaas , Heiko Stuebner , Philipp Zabel Cc: Anand Moon , linux-pci@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/3] PCI: rockchip: Simplify reset control handling by using reset_control_bulk*() function Date: Tue, 18 Jun 2024 22:11:27 +0530 Message-ID: <20240618164133.223194-3-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240618164133.223194-1-linux.amoon@gmail.com> References: <20240618164133.223194-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240618_094159_709668_2E40FAC5 X-CRM114-Status: GOOD ( 18.42 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Refactors the reset control clock handling in the Rockchip PCIe driver, introducing a more robust and efficient method for assert and deassert reset controller using reset_control_bulk*() API. Using the reset_control_bulk APIs, the reset handling for the core clocks reset unit becomes much simpler. As per rockchip rk3399 TRM SOFTRST_CON8 soft reset controller have clock reset unit value set to 0x1 for example "pcie_pipe", "pcie_mgmt_sticky", "pcie_mgmt" and "pci_core", hence group then under one reset bulk controller. Where as "pcie_pm", "presetn_pcie", "aresetn_pcie" have reset value set to 0x0 ,hence group them under reset control bulk controller. Signed-off-by: Anand Moon --- drivers/pci/controller/pcie-rockchip.c | 139 +++++-------------------- drivers/pci/controller/pcie-rockchip.h | 24 +++-- 2 files changed, 44 insertions(+), 119 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c index 166dad666a35..5154dfb1311b 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c @@ -69,54 +69,24 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) if (rockchip->link_gen < 0 || rockchip->link_gen > 2) rockchip->link_gen = 2; - rockchip->core_rst = devm_reset_control_get_exclusive(dev, "core"); - if (IS_ERR(rockchip->core_rst)) { - if (PTR_ERR(rockchip->core_rst) != -EPROBE_DEFER) - dev_err(dev, "missing core reset property in node\n"); - return PTR_ERR(rockchip->core_rst); - } - - rockchip->mgmt_rst = devm_reset_control_get_exclusive(dev, "mgmt"); - if (IS_ERR(rockchip->mgmt_rst)) { - if (PTR_ERR(rockchip->mgmt_rst) != -EPROBE_DEFER) - dev_err(dev, "missing mgmt reset property in node\n"); - return PTR_ERR(rockchip->mgmt_rst); - } - - rockchip->mgmt_sticky_rst = devm_reset_control_get_exclusive(dev, - "mgmt-sticky"); - if (IS_ERR(rockchip->mgmt_sticky_rst)) { - if (PTR_ERR(rockchip->mgmt_sticky_rst) != -EPROBE_DEFER) - dev_err(dev, "missing mgmt-sticky reset property in node\n"); - return PTR_ERR(rockchip->mgmt_sticky_rst); - } - - rockchip->pipe_rst = devm_reset_control_get_exclusive(dev, "pipe"); - if (IS_ERR(rockchip->pipe_rst)) { - if (PTR_ERR(rockchip->pipe_rst) != -EPROBE_DEFER) - dev_err(dev, "missing pipe reset property in node\n"); - return PTR_ERR(rockchip->pipe_rst); - } + for (i = 0; i < ROCKCHIP_NUM_PM_RSTS; i++) + rockchip->pm_rsts[i].id = rockchip_pci_pm_rsts[i]; - rockchip->pm_rst = devm_reset_control_get_exclusive(dev, "pm"); - if (IS_ERR(rockchip->pm_rst)) { - if (PTR_ERR(rockchip->pm_rst) != -EPROBE_DEFER) - dev_err(dev, "missing pm reset property in node\n"); - return PTR_ERR(rockchip->pm_rst); + err = devm_reset_control_bulk_get_optional_exclusive(dev, + ROCKCHIP_NUM_PM_RSTS, rockchip->pm_rsts); + if (err) { + dev_err(dev, "cannot get the devm_reset_control err %d\n", err); + return err; } - rockchip->pclk_rst = devm_reset_control_get_exclusive(dev, "pclk"); - if (IS_ERR(rockchip->pclk_rst)) { - if (PTR_ERR(rockchip->pclk_rst) != -EPROBE_DEFER) - dev_err(dev, "missing pclk reset property in node\n"); - return PTR_ERR(rockchip->pclk_rst); - } + for (i = 0; i < ROCKCHIP_NUM_CORE_RSTS; i++) + rockchip->core_rsts[i].id = rockchip_pci_core_rsts[i]; - rockchip->aclk_rst = devm_reset_control_get_exclusive(dev, "aclk"); - if (IS_ERR(rockchip->aclk_rst)) { - if (PTR_ERR(rockchip->aclk_rst) != -EPROBE_DEFER) - dev_err(dev, "missing aclk reset property in node\n"); - return PTR_ERR(rockchip->aclk_rst); + err = devm_reset_control_bulk_get_optional_exclusive(dev, + ROCKCHIP_NUM_CORE_RSTS, rockchip->core_rsts); + if (err) { + dev_err(dev, "cannot get the devm_reset_control err %d\n", err); + return err; } if (rockchip->is_rc) { @@ -152,21 +122,10 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) int err, i; u32 regs; - err = reset_control_assert(rockchip->aclk_rst); + err = reset_control_bulk_assert(ROCKCHIP_NUM_PM_RSTS, + rockchip->pm_rsts); if (err) { - dev_err(dev, "assert aclk_rst err %d\n", err); - return err; - } - - err = reset_control_assert(rockchip->pclk_rst); - if (err) { - dev_err(dev, "assert pclk_rst err %d\n", err); - return err; - } - - err = reset_control_assert(rockchip->pm_rst); - if (err) { - dev_err(dev, "assert pm_rst err %d\n", err); + dev_err(dev, "reset bulk assert pm_rsts err %d\n", err); return err; } @@ -178,47 +137,19 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) } } - err = reset_control_assert(rockchip->core_rst); + err = reset_control_bulk_assert(ROCKCHIP_NUM_CORE_RSTS, + rockchip->core_rsts); if (err) { - dev_err(dev, "assert core_rst err %d\n", err); - goto err_exit_phy; - } - - err = reset_control_assert(rockchip->mgmt_rst); - if (err) { - dev_err(dev, "assert mgmt_rst err %d\n", err); - goto err_exit_phy; - } - - err = reset_control_assert(rockchip->mgmt_sticky_rst); - if (err) { - dev_err(dev, "assert mgmt_sticky_rst err %d\n", err); - goto err_exit_phy; - } - - err = reset_control_assert(rockchip->pipe_rst); - if (err) { - dev_err(dev, "assert pipe_rst err %d\n", err); + dev_err(dev, "reset bulk assert core_rsts err %d\n", err); goto err_exit_phy; } udelay(10); - err = reset_control_deassert(rockchip->pm_rst); - if (err) { - dev_err(dev, "deassert pm_rst err %d\n", err); - goto err_exit_phy; - } - - err = reset_control_deassert(rockchip->aclk_rst); - if (err) { - dev_err(dev, "deassert aclk_rst err %d\n", err); - goto err_exit_phy; - } - - err = reset_control_deassert(rockchip->pclk_rst); + err = reset_control_bulk_deassert(ROCKCHIP_NUM_PM_RSTS, + rockchip->pm_rsts); if (err) { - dev_err(dev, "deassert pclk_rst err %d\n", err); + dev_err(dev, "reset bulk deassert pm_rsts err %d\n", err); goto err_exit_phy; } @@ -261,31 +192,15 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) * Please don't reorder the deassert sequence of the following * four reset pins. */ - err = reset_control_deassert(rockchip->mgmt_sticky_rst); + err = reset_control_bulk_deassert(ROCKCHIP_NUM_CORE_RSTS, + rockchip->core_rsts); if (err) { - dev_err(dev, "deassert mgmt_sticky_rst err %d\n", err); - goto err_power_off_phy; - } - - err = reset_control_deassert(rockchip->core_rst); - if (err) { - dev_err(dev, "deassert core_rst err %d\n", err); - goto err_power_off_phy; - } - - err = reset_control_deassert(rockchip->mgmt_rst); - if (err) { - dev_err(dev, "deassert mgmt_rst err %d\n", err); - goto err_power_off_phy; - } - - err = reset_control_deassert(rockchip->pipe_rst); - if (err) { - dev_err(dev, "deassert pipe_rst err %d\n", err); + dev_err(dev, "reset bulk deassert core_rsts err %d\n", err); goto err_power_off_phy; } return 0; + err_power_off_phy: while (i--) phy_power_off(rockchip->phys[i]); diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h index f256cdf4fa49..fceb6f526b72 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -288,6 +288,8 @@ ROCKCHIP_PCIE_CORE_EP_FUNC_BAR_CFG_BAR_CTRL_MASK(b)) #define ROCKCHIP_NUM_CLKS ARRAY_SIZE(rockchip_pci_clks) +#define ROCKCHIP_NUM_PM_RSTS ARRAY_SIZE(rockchip_pci_pm_rsts) +#define ROCKCHIP_NUM_CORE_RSTS ARRAY_SIZE(rockchip_pci_core_rsts) static const char * const rockchip_pci_clks[] = { "aclk", @@ -296,18 +298,26 @@ static const char * const rockchip_pci_clks[] = { "pm", }; +static const char * const rockchip_pci_pm_rsts[] = { + "pm", + "pclk", + "aclk", +}; + +static const char * const rockchip_pci_core_rsts[] = { + "core", + "mgmt", + "mgmt-sticky", + "pipe", +}; + struct rockchip_pcie { void __iomem *reg_base; /* DT axi-base */ void __iomem *apb_base; /* DT apb-base */ bool legacy_phy; struct phy *phys[MAX_LANE_NUM]; - struct reset_control *core_rst; - struct reset_control *mgmt_rst; - struct reset_control *mgmt_sticky_rst; - struct reset_control *pipe_rst; - struct reset_control *pm_rst; - struct reset_control *aclk_rst; - struct reset_control *pclk_rst; + struct reset_control_bulk_data pm_rsts[ROCKCHIP_NUM_PM_RSTS]; + struct reset_control_bulk_data core_rsts[ROCKCHIP_NUM_CORE_RSTS]; struct clk_bulk_data clks[ROCKCHIP_NUM_CLKS]; struct regulator *vpcie12v; /* 12V power supply */ struct regulator *vpcie3v3; /* 3.3V power supply */ From patchwork Tue Jun 18 16:41:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13702721 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 626FAC2BA18 for ; Tue, 18 Jun 2024 16:42:13 +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=jiG5BoUUOSuz+d6seARUBRqyFah6NJARQGHOVPDiYPc=; b=x5+GpI0m0paYQ7 g8YRsejQ3iP9W8V8j0unxNen08YoWnMNykhGJx9mO3IuF63zt2TBGS4pSUgy3n/L8SuWJVi+Wd9gT XP9dhTUz/mlJuzu9zpcMuQiqIzO4J+yn18dubGE6iyRd4voTXo7+uLXZBQs/Hh17/ZJiRpSs6zvgS 6+fDo/SBVePQDMO7As7VBPthEBX3hSBr6kAYjURqO0BVBVVadq+aclkFGi2KNUh8sT/7StfrH7XZA XIacUncgGAPIg52eg3dQvDNjGL6I7ss75iKIbzTr5t7Ky0JHEvNh1fI+Si+K+1nyjJ1bfHLWAggV1 AVLylWau6h0rKwDCD4fg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJbuM-0000000FtZr-1E5O; Tue, 18 Jun 2024 16:42:10 +0000 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJbuG-0000000FtWN-05wO; Tue, 18 Jun 2024 16:42:06 +0000 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1f480624d0fso41012355ad.1; Tue, 18 Jun 2024 09:42:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718728923; x=1719333723; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iixnqsqkMZEErBkM0858HsMj9TA2R4apkp/+SZw2++E=; b=movS8ZyYWt5Ke/yYBW3G7sSnGTahnQBiflXINtOgA4ZStC7ElXZi2u/eXsiOxfsUhC wkt49m2ypLoLG6Mg8xU44OG1vZBycPVa+LhWm5Iq7ppzglHFh4soKee2skrRHtrpQFg/ hg265XIasXjdvnh+3a9MJfOfK1pmhODOtG5iZay16OZwdCO5PZX3ax1s77C3JwY17VOG v9MD31DQxCy0E9MWg3c55rS3k0apv3fVp94I25TdYAg1vEsj5/C40OAX3+9pY0OR+m7i HcyyorrdZsoAsy0Z8oFnzdxleiI4SenSNAYkw0VKdHDy5PjtjARUEeIgn8BYfq1ajqnH 1ZVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718728923; x=1719333723; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iixnqsqkMZEErBkM0858HsMj9TA2R4apkp/+SZw2++E=; b=okwNBTnofPIeTSWZ8mWBkusotKLXLoot7FbY20wc6Txf7vvDkfp79Vrt8PujsYe23M vBURzJ82pevzU9D0oWtCwV0F43vBS4M3JiWtpbq+dqnppOtTSHczgYdks9kein2Brxny N5x16/zNmPz/YZ8N/mEKv2KGFhEqnGPv4yddlk4Izgr873J16COTttokLOnW5VOq1sxu rPlounaen6GG68/+lztPSeh1pkRavGRzmxTZnUEjOrlvc9iDWyh70zfA7S3agXz4pnE/ Cgb4qJ08ZJyw8mJwlPPRmR7gMPaFghLIhhrQD6mWg5OXmyxIfTKZs8Rdzm6t9KT6NQhx 8AAQ== X-Forwarded-Encrypted: i=1; AJvYcCWuugjGyMkUv6BnuCJl2bPGA9OQRYHOXdTQIRy1Q8wXByFMLKaYQjEi3SMectj14lnWejCRXSQgxvUJOND4Q4bu9pbFq9feKNKQDVtj69D2Epk/tfcmr1eoq3EJzO0LEgYupLCZLc3CRLaWW4QkFup3WVFtGO64tqI= X-Gm-Message-State: AOJu0YzMeqMg7QW9ofpLEfepMGAAMY2voXO0clICi56DDMeoHfmOtqpl LNn3Z9aLTIYaRVRFmql+RyM+bgRdVw6Zrzboa6J74iK7Ec/KK/Dc X-Google-Smtp-Source: AGHT+IHsT0VQzYxsZ9Jo6zIgcHs26CdlPuekBEpH3qo+y0uEIlpZiMjRBVcq7ZtZJ90pAsTC67dVlQ== X-Received: by 2002:a17:903:41c6:b0:1f8:44f8:a384 with SMTP id d9443c01a7336-1f9aa42f5c2mr1651995ad.30.1718728923292; Tue, 18 Jun 2024 09:42:03 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.222]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855f0175csm99081835ad.191.2024.06.18.09.42.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jun 2024 09:42:03 -0700 (PDT) From: Anand Moon To: Shawn Lin , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Bjorn Helgaas , Heiko Stuebner Cc: Anand Moon , linux-pci@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 3/3] PCI: rockchip: refactor rockchip_pcie_disable_clocks function signature Date: Tue, 18 Jun 2024 22:11:28 +0530 Message-ID: <20240618164133.223194-4-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240618164133.223194-1-linux.amoon@gmail.com> References: <20240618164133.223194-1-linux.amoon@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240618_094204_205081_C263C312 X-CRM114-Status: GOOD ( 12.69 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Updated rockchip_pcie_disable_clocks function to accept a struct rockchip pointer instead of a void pointer. Signed-off-by: Anand Moon --- drivers/pci/controller/pcie-rockchip.c | 4 +--- drivers/pci/controller/pcie-rockchip.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c index 5154dfb1311b..79f625cba11c 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c @@ -282,10 +282,8 @@ int rockchip_pcie_enable_clocks(struct rockchip_pcie *rockchip) } EXPORT_SYMBOL_GPL(rockchip_pcie_enable_clocks); -void rockchip_pcie_disable_clocks(void *data) +void rockchip_pcie_disable_clocks(struct rockchip_pcie *rockchip) { - struct rockchip_pcie *rockchip = data; - clk_bulk_disable_unprepare(ROCKCHIP_NUM_CLKS, rockchip->clks); } EXPORT_SYMBOL_GPL(rockchip_pcie_disable_clocks); diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h index fceb6f526b72..6fe5c32af0ee 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -352,7 +352,7 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip); int rockchip_pcie_get_phys(struct rockchip_pcie *rockchip); void rockchip_pcie_deinit_phys(struct rockchip_pcie *rockchip); int rockchip_pcie_enable_clocks(struct rockchip_pcie *rockchip); -void rockchip_pcie_disable_clocks(void *data); +void rockchip_pcie_disable_clocks(struct rockchip_pcie *rockchip); void rockchip_pcie_cfg_configuration_accesses( struct rockchip_pcie *rockchip, u32 type);