From patchwork Sat Oct 12 05:06:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13833327 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 A32D0139CE9; Sat, 12 Oct 2024 05:06:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728709594; cv=none; b=mFK5HV5RYSMlqoN6wazmyhDxikWJubcHhrQ+ntPuR1HQPWJXB7ZiswatsPvfqsJgYos6MJZcsvxma5fdDYMVBoKnrb0qsJTm6J+OuYdoAAJjKx3lwpmZ2ct2QScq3xwR7nHzBua8Tj/lxh+sKEVNIbfzfO6mmhTfQQlpjh3RM74= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728709594; c=relaxed/simple; bh=UyZLnBHsR+VLzg85cvMsCfu8ZJAOifu39+GTnkHWUQM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K3moj0qtx5Sdn87BfuWBJ2J9Y2av2gvkbN9GH948hjzvdoPjQ94JRy4U0oDPaEd0DHP92xt4YEw8MzgQGmZRVTNGTnc01agvnoBXKGZzr1QTRowfC4LAdu49sC1XbCGb1s+V3flQoCYjFfTraq75r7obX9dfOWPIeuDsk74k+xI= 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=QFhWh1ig; arc=none smtp.client-ip=209.85.210.178 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="QFhWh1ig" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-71e06ba441cso2239641b3a.1; Fri, 11 Oct 2024 22:06:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728709592; x=1729314392; 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=hVdwZ9INnz1rSSRJAqZ6l2BLOiXSoUY6Jd3SSqJ9fJ0=; b=QFhWh1igKbgG2VmdKLK15jhmlIeyghWn0xrW8sTz1zf4+UvMJUuI6LEK6i/eCsdAB2 89tn3I5BYYpa6crZUtB33AwNCD6D1LC9FTRZQKaUsG6TinOseO//tgp8/QC6ITmD2a5e C40PgVxvi5X5UfjXo0/EGlDccUkCpdRDPWTQFr5s4nYfJcuLKzEfWmbLIuWPtjgvoNzZ u18SXHI4IoKgY5YxBZo0nQN9eXcEEpUo0i7BD0ToC30EjNO+PK4vmr/0g6CV+7x2HBUf UAtAcDLXLewoEbAwuaHXpNU0TEmu4TppeEhQFCgO6zPhde0eEkU5D0yBawDwWZyj+PnV mFXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728709592; x=1729314392; 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=hVdwZ9INnz1rSSRJAqZ6l2BLOiXSoUY6Jd3SSqJ9fJ0=; b=BIHZHWMl2+DSANr/7EJEV/HyQGllhA3B8Y0flvyK7ezQJF2WNGl9JPjoBBLOtqftN3 oiatmLGmxm/VuPp79/+/nmGJRZI9yzH6DGMxTIzUuoXSohn7OVsFT/RgmGQ2S84hldIM +nMu8WvqGAk4GElU21LV1ZSaP6H2utN/PAeBlO0L8B0AzNPLYe0cIuwshZYvTtae5LwX FyhGRTpXxY2H17iEPy0HuXJZbeAqlInaHOSXtIMlwNW7xuRXfB/dW91jr/kVuLRGI3Y4 642J3uHMKzLVAbmzOwLJyOhH4zFIdbPEAZjZwghMZ5AGCyz7bBygcczFGz99RG6MlV7/ 8J1g== X-Forwarded-Encrypted: i=1; AJvYcCUVJoPu0Bwq9wJkbkAsIF6O0I3TXotW4vaiK1P7DVOO3OyuLw3brbSbOwF0RJEDxzLAMSJQpnpE9wSu4qg=@vger.kernel.org, AJvYcCVXThKj9VGNMy9JmCnUS/13LsRzh12lR9JMS5Fe7mhJuLdjoHAkMzDtdAA41gtOVcNn0ciras2rA3or@vger.kernel.org X-Gm-Message-State: AOJu0YyZSseiiQCW2ksnB85+gs2H6Ghc+NGPzovjQuC+6MiV9BuWjA/0 Y7NUNt3RfBlIVIp7toukviZMo/jrFXiLQt9243kG653gL12xovY/qKap1A== X-Google-Smtp-Source: AGHT+IG6hfffFkqnW00YmxEtnyyslCZ1TgJ6ch7+yc84KUAa5gHmGPezTpWnj8SUYjLC034jL5kBbg== X-Received: by 2002:a05:6a00:3d4b:b0:71d:fbf3:f771 with SMTP id d2e1a72fcca58-71e380bb0dbmr7375679b3a.24.1728709591850; Fri, 11 Oct 2024 22:06:31 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.221]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e4ad1b9f7sm859809b3a.190.2024.10.11.22.06.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2024 22:06:31 -0700 (PDT) From: Anand Moon To: Shawn Lin , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , 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 v7 1/3] PCI: rockchip: Simplify clock handling by using clk_bulk*() function Date: Sat, 12 Oct 2024 10:36:03 +0530 Message-ID: <20241012050611.1908-2-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241012050611.1908-1-linux.amoon@gmail.com> References: <20241012050611.1908-1-linux.amoon@gmail.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Refactor 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. - Replace devm_clk_get() with devm_clk_bulk_get_all(). - Replace clk_prepare_enable() with clk_bulk_prepare_enable(). - Replace clk_disable_unprepare() with clk_bulk_disable_unprepare(). Signed-off-by: Anand Moon Reviewed-by: Manivannan Sadhasivam --- v7: Update the functional change in commmit message. v6: None. v5: switch to use use devm_clk_bulk_get_all()? gets rid of hardcoding the clock names in driver. v4: use dev_err_probe for error patch. v3: Fix typo in commit message, dropped reported by. v2: Fix compilation error reported by Intel test robot. --- drivers/pci/controller/pcie-rockchip.c | 65 +++----------------------- drivers/pci/controller/pcie-rockchip.h | 7 ++- 2 files changed, 10 insertions(+), 62 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c index c07d7129f1c7..2777ef0cb599 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c @@ -127,29 +127,9 @@ 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); - } - - 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); - } + rockchip->num_clks = devm_clk_bulk_get_all(dev, &rockchip->clks); + if (rockchip->num_clks < 0) + return dev_err_probe(dev, err, "failed to get clocks\n"); return 0; } @@ -372,39 +352,11 @@ int rockchip_pcie_enable_clocks(struct rockchip_pcie *rockchip) struct device *dev = rockchip->dev; int err; - err = clk_prepare_enable(rockchip->aclk_pcie); - if (err) { - dev_err(dev, "unable to enable aclk_pcie clock\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; - } + err = clk_bulk_prepare_enable(rockchip->num_clks, rockchip->clks); + if (err) + return dev_err_probe(dev, err, "failed to enable clocks\n"); 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 +364,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..bebab80c9553 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -11,6 +11,7 @@ #ifndef _PCIE_ROCKCHIP_H #define _PCIE_ROCKCHIP_H +#include #include #include #include @@ -299,10 +300,8 @@ 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; + int num_clks; struct regulator *vpcie12v; /* 12V power supply */ struct regulator *vpcie3v3; /* 3.3V power supply */ struct regulator *vpcie1v8; /* 1.8V power supply */ From patchwork Sat Oct 12 05:06:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13833328 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 3BEAE12F588; Sat, 12 Oct 2024 05:06:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728709599; cv=none; b=a+01K/rkVAygax1DqB5q6ufYOlK1eZEvpaPIt/tkE61NCii9uQKRNxz1VHwpeuieciSIBIYYmI+kAH9fy1Di9BIZSFLv/pyDPYN2+obCNQMEc+FnagkpP8vvqNdWZlrH9WSUxOrXasUZYFU7WM6zBKzlpamdU1hOCz+rSm0uzso= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728709599; c=relaxed/simple; bh=B7mXjWmXjnLhhF/ML2pcFrTTYi2DFefxW71JuLO+KHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hsvfkx7Ly2tEyaI4ZWVvXTwc5ZepPGIxONkPiX9QXdI1j5Q46f1UeVIZnZq5bDJRthk4QGZHEUOIiELDaa/8myHfKngrFR8Yw5x/mpEbTN4Q8llDlBDfQuVayNEg1oAXZ7s5o96cuzDzW/WYAO3fM+yYtfALHQJ6imNHyRQqaYU= 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=D0JvwQ3p; arc=none smtp.client-ip=209.85.210.182 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="D0JvwQ3p" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-71df8585a42so2077912b3a.3; Fri, 11 Oct 2024 22:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728709597; x=1729314397; 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=0wpn7B9Wtu3Iag2UMSF/s43VYHpuMNQiv15wMhgNrH0=; b=D0JvwQ3pE+Lgm1UCQW0PFUAWxCq2iIr2T+PGLWBKXxjrElzO9tGU0FdT60Q/gW/jlI a8fngQ7aNgZup/mVhF4Fs++RBUPs4Rwkepr0eUi8cvZDJcCe8nt8W2T5cFiWsEFcLzYG zf9EHx38rkVmi9BT3lVOUkqmARUtvMUlER6X/ti/gmciuZHFAaQ8rEbb1DrYguePhu8B HSgjORWpIKZ9H6ydKAP9gCeLFcZcCIM307jCzvzMxmOlv2B8bxgbekOyP4NBNNcVKtBe 4nEc03v/uwkwHMk+3iWr88eyKaz7QksxWFij0q55V+LSocSa/ectcRuwRLsIEHQGZoJ9 RwKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728709597; x=1729314397; 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=0wpn7B9Wtu3Iag2UMSF/s43VYHpuMNQiv15wMhgNrH0=; b=nM/+YIeczuTZz98pMswYoo5pnRTE8cmS57i2RN21jGZjGBxuCdgUmtUuYRBMyOb5se 0JXCtYsxNgSYlKzPtNEWeG1Ky+VVmrWiDeRBPd2qclzi6BP596FAnlsY8M9Pa43srsG8 t7up+jnAb8d7kAG7XXjpjG2lQxSTMzXQ3EEv7NaAS8Quf7WUHu4uxIU3i5xwB6PE7icQ 4R6ucrqSVTZpY3wkiuXzFWPHT2delQh1g5HFp9kH77braMbo7D0iXqN4isfb03IX5PYR OiwPZdfFoNUg/fMeUceZkmD8gU72ElxNJ8JGNpYQXgrDk7KrW3ZC2TSiMhoOfXILiIMn IpTQ== X-Forwarded-Encrypted: i=1; AJvYcCXLVr1hFUvmXqJBhSP3wSvXnQBPxXz0wzZWHr9uD2EsklhTcPAyy1OFTPTF3g4GA/aS1ITX6g4kAouW@vger.kernel.org, AJvYcCXmmzYvlqSX0bTzKGpbzxUatqCmnuSkQ8JAZoPjt7Ovasp7YbTaYgZQ9XGW5c6QAhPoH3DcXIyIa2xj9U8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4UD8MDZrN7Ag5Q3lBMMLR7mcyfgfPld1uSe97oVqQdpvVkkf9 uDZfPbnsMHQErl57iE+rcIETMm9P+f0vD0bH9xnzwZ98LRzZ/CJy X-Google-Smtp-Source: AGHT+IHdgxQSWB1iZ5ATGcBFggAhGVl31eDwJP8ZSAoh7j+MvFbLYIWYD4qCh22mXfzqB+Gvgd12JQ== X-Received: by 2002:a05:6a00:14c2:b0:71e:989:e714 with SMTP id d2e1a72fcca58-71e37ec58c6mr8669206b3a.11.1728709597460; Fri, 11 Oct 2024 22:06:37 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.221]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e4ad1b9f7sm859809b3a.190.2024.10.11.22.06.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2024 22:06:37 -0700 (PDT) From: Anand Moon To: Shawn Lin , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , 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 v7 2/3] PCI: rockchip: Simplify reset control handling by using reset_control_bulk*() function Date: Sat, 12 Oct 2024 10:36:04 +0530 Message-ID: <20241012050611.1908-3-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241012050611.1908-1-linux.amoon@gmail.com> References: <20241012050611.1908-1-linux.amoon@gmail.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Refactor the reset control 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. Spilt the reset controller in two groups as pre the RK3399 TRM. After power up, the software driver should de-assert the reset of PCIe PHY, then wait the PLL locked by polling the status, if PLL has locked, then can de-assert the reset simultaneously driver need to De-assert the reset pins simultionaly. PIPE_RESET_N/MGMT_STICKY_RESET_N/MGMT_RESET_N/RESET_N. - replace devm_reset_control_get_exclusive() with devm_reset_control_bulk_get_exclusive(). - replace reset_control_assert with reset_control_bulk_assert(). - replace reset_control_deassert with reset_control_bulk_deassert(). Signed-off-by: Anand Moon --- 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 | 151 +++++-------------------- drivers/pci/controller/pcie-rockchip.h | 26 +++-- 2 files changed, 49 insertions(+), 128 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c index 2777ef0cb599..9a118e2b8cbd 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, @@ -69,55 +69,23 @@ 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_exclusive(dev, + ROCKCHIP_NUM_PM_RSTS, + rockchip->pm_rsts); + if (err) + return dev_err_probe(dev, err, "cannot get the reset control\n"); - 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_exclusive(dev, + ROCKCHIP_NUM_CORE_RSTS, + rockchip->core_rsts); + if (err) + return dev_err_probe(dev, err, "cannot get the reset control\n"); if (rockchip->is_rc) { rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", @@ -147,23 +115,10 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) int err, i; u32 regs; - err = reset_control_assert(rockchip->aclk_rst); - 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); - return err; - } + err = reset_control_bulk_assert(ROCKCHIP_NUM_PM_RSTS, + rockchip->pm_rsts); + if (err) + return dev_err_probe(dev, err, "reset bulk assert pm reset\n"); for (i = 0; i < MAX_LANE_NUM; i++) { err = phy_init(rockchip->phys[i]); @@ -173,47 +128,17 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) } } - err = reset_control_assert(rockchip->core_rst); - 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); - goto err_exit_phy; - } + err = reset_control_bulk_assert(ROCKCHIP_NUM_CORE_RSTS, + rockchip->core_rsts); + if (err) + return dev_err_probe(dev, err, "reset bulk assert core reset\n"); 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); + err = 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 = reset_control_deassert(rockchip->pclk_rst); - if (err) { - dev_err(dev, "deassert pclk_rst err %d\n", err); + dev_err(dev, "reset bulk deassert pm err %d\n", err); goto err_exit_phy; } @@ -256,31 +181,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); - 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); + err = 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 = 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 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 bebab80c9553..2761699f670b 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -15,6 +15,7 @@ #include #include #include +#include /* * 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)) +#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[] = { + "pm", + "pclk", + "aclk", +}; + +static const char * const rockchip_pci_core_rsts[] = { + "mgmt-sticky", + "mgmt", + "core", + "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 */ From patchwork Sat Oct 12 05:06:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Moon X-Patchwork-Id: 13833329 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 1E92012F588; Sat, 12 Oct 2024 05:06:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728709607; cv=none; b=cMdIP/3mgYEc7b27wfAcOBfTDVeUJ9rA0lEuqLnDzY0jYqSy8UvJGSekdWdnP1YXD5gbgl2Swi4S6NpqGm7/y4jt6DdbS3PZSBS+x6ZtEuHh6dRDn2+fuFAb6OTUugAlGG2CGGLPhTXKMBE2DqzqbizgG8a40oEO6E94FU0IOWA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728709607; c=relaxed/simple; bh=TvbJoRWmZ3IE3J8cwVIHQKM4m47ajNC1mqy4uVaJVCU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fEdqX9H1K64TRPWle9Hv0CGQHMbOX+p+3gt8DsjzHb4i0fuH9TOZdU4IACbhCGTnf10vvr2+tu/p7UbJyngY1YBTtoz6wM9W3xYEAbgi+boANsM1akS/Rdr9aZ3wkEB42jB/9ztRqQXnXgYeIHU2fl+V/ec3wLN4OBHRvilov98= 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=SwEeW8NH; arc=none smtp.client-ip=209.85.210.176 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="SwEeW8NH" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-71e053cf1f3so2436214b3a.2; Fri, 11 Oct 2024 22:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728709605; x=1729314405; 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=myoEO0ww2czFo+NDaKnAm+OqHSFtr4LH3EKBGNBM3z4=; b=SwEeW8NHNTnNijyAM4AAjG+rDWMq83Deim7EHgyN9NdYVfoRXUca8VzQOoI6cUjkhb IE8dzsfRZbO1aMKPJlVeITfZ63z91AtKtLkcNaf18/roOfYU6zcVVFqvgCwfMb3T9rGo /cyXEQOHf2r6i+msU4hf/qF+ksKF4AqJGTaAnPjsgubREzqvL/F6SnOE9G+MZQ0i3yWX nJVUQEL0IsoXgOXG0suU/4KBHW9yIQ4Lp1d2LGljcOGin9Qgc3PmaCjIbsMFA6LKxXjn h8lJqoENIel/49cLfcd0k3jsYge0f4vhVfUM3PEya4jbWPiFpinpycWGNqqgwuVpHIiT Hmqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728709605; x=1729314405; 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=myoEO0ww2czFo+NDaKnAm+OqHSFtr4LH3EKBGNBM3z4=; b=ANkjzWEnZ4BTJ/JdO5oMMPIEDq5Rqxccn8H/nl6qMDCbjSxQhEMSJMMiuTnOTiIooG 0+aJI98tUDnnRfy6FE/oq9KH8+FP9P0Ktr3Aa6EXsPQ/77hsdQMAbqxMO/dzpFM84Mys hGPxTG0tyUKb6oK/XK8mdensyDrGrxIEI4+HeL5kXQOO1pvhE9ChyfZsfwsaHsq5VarX BO6eVzDTLm54ZUZ7psVk6jduJCMrLvRydd72Z5+aSUoAERKobJ5jCok0XWus6KofMq99 AVlNI7exFN9gqfGDTW/PgOiCX/Ur9LzFY1+vHLdxl1A93Wx6obEc5wAHuJtD/yRqCKNZ nLbw== X-Forwarded-Encrypted: i=1; AJvYcCW2HP1v2FoxLsyuXwHOYjsygEd/6GE/rQOT7P/zotNE2Oc8FEXwxJHqw5NrMruvGE4VM23PPNlA/3FOkEw=@vger.kernel.org, AJvYcCWMEZ5SNTVTvPiIzJxwsfKg21QNYgEoIgic57oN47Z29Sv2H+cvo7JHyqUbOcoz3tOMYvNfcUmI1ZgZ@vger.kernel.org X-Gm-Message-State: AOJu0Yzjyn6NsDm7tYT3/Py4sUVjsNSavQVCAgaPH9DrhaFLxZkEzePK W/i8dXD1324FbULzNhmZsUS0gBrPAB128z7lTG61cvgpB8gQhICL X-Google-Smtp-Source: AGHT+IHbWnSJOFSlNgJF4OYXyX8KdfVCrRAO9/1mq47VYfOabgDCcVZ58F7Tw4bhokGiBoTcmX26tg== X-Received: by 2002:a05:6a20:c997:b0:1d7:1277:8d22 with SMTP id adf61e73a8af0-1d8bcfb296dmr8295467637.43.1728709605470; Fri, 11 Oct 2024 22:06:45 -0700 (PDT) Received: from localhost.localdomain ([113.30.217.221]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71e4ad1b9f7sm859809b3a.190.2024.10.11.22.06.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2024 22:06:45 -0700 (PDT) From: Anand Moon To: Shawn Lin , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , 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 v7 3/3] PCI: rockchip: Refactor rockchip_pcie_disable_clocks() function signature Date: Sat, 12 Oct 2024 10:36:05 +0530 Message-ID: <20241012050611.1908-4-linux.amoon@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241012050611.1908-1-linux.amoon@gmail.com> References: <20241012050611.1908-1-linux.amoon@gmail.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Refactor the rockchip_pcie_disable_clocks function to accept a struct rockchip_pcie pointer instead of a void pointer. This change improves type safety and code readability by explicitly specifying the expected data type. Reviewed-by: Manivannan Sadhasivam Signed-off-by: Anand Moon --- v7: None v6: Fix the subject, add the missing () in the function name. v5: Fix the commit message and add r-b Manivannan. v4: None v3: None v2: No --- drivers/pci/controller/pcie-rockchip.c | 3 +-- drivers/pci/controller/pcie-rockchip.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c index 9a118e2b8cbd..c3147111f1a7 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c @@ -269,9 +269,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); } diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h index 2761699f670b..7f0f938e9195 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -347,7 +347,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);