From nobody Wed Nov 27 04:35:49 2024 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51C791AAE2B; Mon, 14 Oct 2024 13:52:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728913961; cv=none; b=AaF7+PfXM97+w6rMX/ZkVuauglw6J64+lewfZYN+TiOgUpKPn16HESj30uDgy7G72pEE3WVbPVfEYj59t3zLsaVmpeV3BXcDYAZUsumtP/EDSI0WwHSdZob74DnU1cLCbcvuvblh5+/YGFensGH7S6E/zXI4Y3+aOy0MlFl0MsM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728913961; c=relaxed/simple; bh=ZXtNVb4r6KeelVZyuDByibEMH/8juWQ5/I2U8TVhyS8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xy9tHYmYiHFggP+RJm4yK9lnO6pPqKgEInhXDKGbS62BSTbDNbKkmljTDxl+3plO8bl44Ljl7AzT33iqyC6zdKN0r588Ws6HHgvGzrOLIP8wlNfTG8+SYhgLIBFZodt1ZkIQlh28u/Lce8pYXpJ05AeRGM0MqlpkkR0Eyu0+w0w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aoctezxO; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aoctezxO" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-20cb89a4e4cso15056065ad.3; Mon, 14 Oct 2024 06:52:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728913959; x=1729518759; darn=vger.kernel.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=h8PSw+1wYNacjTtPYA5fd7bTOnk8W60YwefujtypIrw=; b=aoctezxOU50SlfYR3AP2SJMMp4TEu0aegr3lTdyZu3Ns4lTf/GMKbrHKAy2DhLLvJL YLgDyADhYL8yiNGHHI6vDVtGvfVOgmEhokORzx3gcfSP07ilaVGD81+Qq4Hd3uWKjSEq eXYWxYLSDOiL2+toGbyz0xPazQWtIeXUZCnO3vHiZLIpZJ/EU+IG8Nen0n4Q3KIVsCns MK+l06vFS/2/sVyfqaYovk01R5g5AaVtqc1Xks2KWPplYCWc1D1or0VFsxeStEiwzCh5 b26lh99FvDjQD/FPJ4PqNgr+apJpoB0FFpLXeHhe1epGnemWquz3P5VrukKqiwBoZM4A 5pOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728913959; x=1729518759; 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=h8PSw+1wYNacjTtPYA5fd7bTOnk8W60YwefujtypIrw=; b=CbxVJqLNaF2ifYVmMOAozYTntQRH1a4Kc5kT+BKj/hfBVTNAvz4qvJG8D6WElkEi92 gTsdS5gdMuMrr9mRDAqCkee+mg6L9BjECpVdKGFdRdEMWPf3yDuu5Wjb2b67EBo/ZhX5 3vx/TEnmO3TDA86657oKiU1gJWMimxwgfujWcD2dHhEkBy4TEBf+Oe2mhUicP9yUuPTq 7QJTWLNUJ1donbk+uTwaNZwB0dmniZIAS2l90zKHMQOfjE/NUsp2FkQffC+oh+lXGVfL x968n45DToHzdjXPK0k1CowkswF28+rUTivsnE31yp0E7dvG9/0b4o4K4Cm0B6wIqnZG NDcA== X-Forwarded-Encrypted: i=1; AJvYcCXUb/vN7Sk02/VRHlxOMnka0zvLLFAghmQdhlpU110IjtVjg9aWnZnU7q68PolpyjNPPT/hpD0xVp/r@vger.kernel.org, AJvYcCXtTKdrH9M9shayanBecuvBnL9bEvz7mdRSyrBvtrzwdpOaOVYRVa2C4X0L9kqAnbaRfdorSG9FCZ43uUs=@vger.kernel.org X-Gm-Message-State: AOJu0YyeFVA216YB90/rvyqhVETqQ6OPqpD4Wsl6UHPV4+lYLJtqOpfQ u+qaFeZyuevDA1Su2QNK1sAYrlyOTFp5dAqq1vo9tPGMf5RvNKvX X-Google-Smtp-Source: AGHT+IGF1YNMv+PE/lepuTiYhGTd9u9bZizREZBcJvGvx+r2KpJFyHv4F97G08nvfRmL48fmJemr5w== X-Received: by 2002:a17:902:e812:b0:20c:769b:f042 with SMTP id d9443c01a7336-20ca14821dcmr170098865ad.31.1728913958710; Mon, 14 Oct 2024 06:52:38 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.221]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20c8c0e74d6sm66469135ad.166.2024.10.14.06.52.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 06:52:38 -0700 (PDT) From: Anand Moon To: Shawn Lin , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas , Heiko Stuebner , Philipp Zabel , linux-pci@vger.kernel.org (open list:PCIE DRIVER FOR ROCKCHIP), linux-rockchip@lists.infradead.org (open list:PCIE DRIVER FOR ROCKCHIP), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-kernel@vger.kernel.org (open list) Cc: Anand Moon Subject: [PATCH v8 2/3] PCI: rockchip: Simplify reset control handling by using reset_control_bulk*() function Date: Mon, 14 Oct 2024 19:22:03 +0530 Message-ID: <20241014135210.224913-3-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241014135210.224913-1-linux.amoon@gmail.com> References: <20241014135210.224913-1-linux.amoon@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Refactor the reset control handling in the Rockchip PCIe driver, introduce 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. Spilt the reset controller in two groups as per the RK3399 TM 17.5.8.1 PCIe Initialization Sequence 17.5.8.1.1 PCIe as Root Complex. 6. De-assert the PIPE_RESET_N/MGMT_STICKY_RESET_N/MGMT_RESET_N/RESET_N simultaneously. - devm_reset_control_bulk_get_exclusive(): Allows the driver to get all resets defined in the DT thereby removing the hardcoded reset names in the driver. - reset_control_bulk_assert(): Allows the driver to assert the resets defined in the driver. - reset_control_bulk_deassert(): Allows the driver to deassert the resets defined in the driver. Signed-off-by: Anand Moon --- v8: I tried to address reviews and comments from Mani. Follow the sequence of De-assert as per the driver code. Drop the comment in the driver. Improve the commit message with the description of the TMP section. Improve the reason for the core functional changes in the commit description. Improve the error handling messages of the code. v7: replace devm_reset_control_bulk_get_optional_exclusive() with devm_reset_control_bulk_get_exclusive() update the functional changes. V6: Add reason for the split of the RESET pins. v5: Fix the De-assert reset core as per the TRM De-assert the PIPE_RESET_N/MGMT_STICKY_RESET_N/MGMT_RESET_N/RESET_N simultaneously. v4: use dev_err_probe in error path. v3: Fix typo in commit message, dropped reported by. v2: Fix compilation error reported by Intel test robot fixed checkpatch warning. --- drivers/pci/controller/pcie-rockchip.c | 155 +++++-------------------- drivers/pci/controller/pcie-rockchip.h | 26 +++-- 2 files changed, 49 insertions(+), 132 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controlle= r/pcie-rockchip.c index 2777ef0cb599..43d83c1f3196 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 =3D to_platform_device(dev); struct device_node *node =3D dev->of_node; struct resource *regs; - int err; + int err, i; =20 if (rockchip->is_rc) { regs =3D platform_get_resource_byname(pdev, @@ -69,55 +69,23 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockch= ip) if (rockchip->link_gen < 0 || rockchip->link_gen > 2) rockchip->link_gen =3D 2; =20 - rockchip->core_rst =3D devm_reset_control_get_exclusive(dev, "core"); - if (IS_ERR(rockchip->core_rst)) { - if (PTR_ERR(rockchip->core_rst) !=3D -EPROBE_DEFER) - dev_err(dev, "missing core reset property in node\n"); - return PTR_ERR(rockchip->core_rst); - } - - rockchip->mgmt_rst =3D devm_reset_control_get_exclusive(dev, "mgmt"); - if (IS_ERR(rockchip->mgmt_rst)) { - if (PTR_ERR(rockchip->mgmt_rst) !=3D -EPROBE_DEFER) - dev_err(dev, "missing mgmt reset property in node\n"); - return PTR_ERR(rockchip->mgmt_rst); - } - - rockchip->mgmt_sticky_rst =3D devm_reset_control_get_exclusive(dev, - "mgmt-sticky"); - if (IS_ERR(rockchip->mgmt_sticky_rst)) { - if (PTR_ERR(rockchip->mgmt_sticky_rst) !=3D -EPROBE_DEFER) - dev_err(dev, "missing mgmt-sticky reset property in node\n"); - return PTR_ERR(rockchip->mgmt_sticky_rst); - } - - rockchip->pipe_rst =3D devm_reset_control_get_exclusive(dev, "pipe"); - if (IS_ERR(rockchip->pipe_rst)) { - if (PTR_ERR(rockchip->pipe_rst) !=3D -EPROBE_DEFER) - dev_err(dev, "missing pipe reset property in node\n"); - return PTR_ERR(rockchip->pipe_rst); - } + for (i =3D 0; i < ROCKCHIP_NUM_PM_RSTS; i++) + rockchip->pm_rsts[i].id =3D rockchip_pci_pm_rsts[i]; =20 - rockchip->pm_rst =3D devm_reset_control_get_exclusive(dev, "pm"); - if (IS_ERR(rockchip->pm_rst)) { - if (PTR_ERR(rockchip->pm_rst) !=3D -EPROBE_DEFER) - dev_err(dev, "missing pm reset property in node\n"); - return PTR_ERR(rockchip->pm_rst); - } + err =3D devm_reset_control_bulk_get_exclusive(dev, + ROCKCHIP_NUM_PM_RSTS, + rockchip->pm_rsts); + if (err) + return dev_err_probe(dev, err, "Cannot get the PM reset control\n"); =20 - rockchip->pclk_rst =3D devm_reset_control_get_exclusive(dev, "pclk"); - if (IS_ERR(rockchip->pclk_rst)) { - if (PTR_ERR(rockchip->pclk_rst) !=3D -EPROBE_DEFER) - dev_err(dev, "missing pclk reset property in node\n"); - return PTR_ERR(rockchip->pclk_rst); - } + for (i =3D 0; i < ROCKCHIP_NUM_CORE_RSTS; i++) + rockchip->core_rsts[i].id =3D rockchip_pci_core_rsts[i]; =20 - rockchip->aclk_rst =3D devm_reset_control_get_exclusive(dev, "aclk"); - if (IS_ERR(rockchip->aclk_rst)) { - if (PTR_ERR(rockchip->aclk_rst) !=3D -EPROBE_DEFER) - dev_err(dev, "missing aclk reset property in node\n"); - return PTR_ERR(rockchip->aclk_rst); - } + err =3D devm_reset_control_bulk_get_exclusive(dev, + ROCKCHIP_NUM_CORE_RSTS, + rockchip->core_rsts); + if (err) + return dev_err_probe(dev, err, "Cannot get the CORE reset control\n"); =20 if (rockchip->is_rc) { rockchip->ep_gpio =3D devm_gpiod_get_optional(dev, "ep", @@ -147,23 +115,10 @@ int rockchip_pcie_init_port(struct rockchip_pcie *roc= kchip) int err, i; u32 regs; =20 - err =3D reset_control_assert(rockchip->aclk_rst); - if (err) { - dev_err(dev, "assert aclk_rst err %d\n", err); - return err; - } - - err =3D reset_control_assert(rockchip->pclk_rst); - if (err) { - dev_err(dev, "assert pclk_rst err %d\n", err); - return err; - } - - err =3D reset_control_assert(rockchip->pm_rst); - if (err) { - dev_err(dev, "assert pm_rst err %d\n", err); - return err; - } + err =3D reset_control_bulk_assert(ROCKCHIP_NUM_PM_RSTS, + rockchip->pm_rsts); + if (err) + return dev_err_probe(dev, err, "Couldn't assert PM resets\n"); =20 for (i =3D 0; i < MAX_LANE_NUM; i++) { err =3D phy_init(rockchip->phys[i]); @@ -173,47 +128,17 @@ int rockchip_pcie_init_port(struct rockchip_pcie *roc= kchip) } } =20 - err =3D reset_control_assert(rockchip->core_rst); - if (err) { - dev_err(dev, "assert core_rst err %d\n", err); - goto err_exit_phy; - } - - err =3D reset_control_assert(rockchip->mgmt_rst); - if (err) { - dev_err(dev, "assert mgmt_rst err %d\n", err); - goto err_exit_phy; - } - - err =3D 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 =3D reset_control_assert(rockchip->pipe_rst); - if (err) { - dev_err(dev, "assert pipe_rst err %d\n", err); - goto err_exit_phy; - } + err =3D reset_control_bulk_assert(ROCKCHIP_NUM_CORE_RSTS, + rockchip->core_rsts); + if (err) + return dev_err_probe(dev, err, "Couldn't assert Core resets\n"); =20 udelay(10); =20 - err =3D reset_control_deassert(rockchip->pm_rst); - if (err) { - dev_err(dev, "deassert pm_rst err %d\n", err); - goto err_exit_phy; - } - - err =3D reset_control_deassert(rockchip->aclk_rst); + err =3D reset_control_bulk_deassert(ROCKCHIP_NUM_PM_RSTS, + rockchip->pm_rsts); if (err) { - dev_err(dev, "deassert aclk_rst err %d\n", err); - goto err_exit_phy; - } - - err =3D reset_control_deassert(rockchip->pclk_rst); - if (err) { - dev_err(dev, "deassert pclk_rst err %d\n", err); + dev_err(dev, "Couldn't deassert PM resets %d\n", err); goto err_exit_phy; } =20 @@ -252,35 +177,15 @@ int rockchip_pcie_init_port(struct rockchip_pcie *roc= kchip) goto err_power_off_phy; } =20 - /* - * Please don't reorder the deassert sequence of the following - * four reset pins. - */ - err =3D reset_control_deassert(rockchip->mgmt_sticky_rst); - if (err) { - dev_err(dev, "deassert mgmt_sticky_rst err %d\n", err); - goto err_power_off_phy; - } - - err =3D reset_control_deassert(rockchip->core_rst); + err =3D reset_control_bulk_deassert(ROCKCHIP_NUM_CORE_RSTS, + rockchip->core_rsts); if (err) { - dev_err(dev, "deassert core_rst err %d\n", err); - goto err_power_off_phy; - } - - err =3D reset_control_deassert(rockchip->mgmt_rst); - if (err) { - dev_err(dev, "deassert mgmt_rst err %d\n", err); - goto err_power_off_phy; - } - - err =3D reset_control_deassert(rockchip->pipe_rst); - if (err) { - dev_err(dev, "deassert pipe_rst err %d\n", err); + dev_err(dev, "Couldn't deassert CORE err %d\n", err); goto err_power_off_phy; } =20 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/controlle= r/pcie-rockchip.h index bebab80c9553..cc667c73d42f 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -15,6 +15,7 @@ #include #include #include +#include =20 /* * The upper 16 bits of PCIE_CLIENT_CONFIG are a write mask for the lower = 16 @@ -288,18 +289,29 @@ (((c) << ((b) * 8 + 5)) & \ ROCKCHIP_PCIE_CORE_EP_FUNC_BAR_CFG_BAR_CTRL_MASK(b)) =20 +#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_pm_rsts[] =3D { + "pm", + "pclk", + "aclk", +}; + +static const char * const rockchip_pci_core_rsts[] =3D { + "mgmt-sticky", + "core", + "mgmt", + "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; int num_clks; struct regulator *vpcie12v; /* 12V power supply */ --=20 2.44.0