From patchwork Sat Jan 4 04:57:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingwei Zheng X-Patchwork-Id: 13926075 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 CB74CE77188 for ; Sat, 4 Jan 2025 04:55:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=CKtVNznWE9ivtuG9PazmrMJTjbIr3cgCBeROWg6IRwA=; b=cvkPGL+oMnrljNnUd8zH/dRnCJ EjCZQ3uoFtBCLlPBcZXgBYLPTGBCMUB6ts1VeXFd1UPubRSoXKDVAEXZyoULloypzhO3U4OuugB7W Rc80oEaIga1sm7CFz5scy8hABA2AYDeuTk4vplFHjzad5k0shQHNq/0lAh5jpANtS02U/gRwWtXq6 pkwaErPr5Xg31aaQh6dShY5NoFMPPCELaIsMFR1+qBAENmEjRnT0GCLVDr8HF/L/mBEJzjJ9LfN9K JSxFC45txuE9w+EqfShBh8s7R9e4hunFQ6eAZWhZZ4faodzdF9t4/JhFYb4pTASLFbmAr4qjsxwbw 3BFAl+BA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tTwCK-0000000ETS9-00Gh; Sat, 04 Jan 2025 04:55:40 +0000 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tTwB7-0000000ETMw-06yc for linux-arm-kernel@lists.infradead.org; Sat, 04 Jan 2025 04:54:26 +0000 Received: by mail-qt1-x832.google.com with SMTP id d75a77b69052e-467bc28277eso106728821cf.1 for ; Fri, 03 Jan 2025 20:54:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735966463; x=1736571263; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CKtVNznWE9ivtuG9PazmrMJTjbIr3cgCBeROWg6IRwA=; b=ZasaNoL2AmCAzrYVRCmU0+xpylw1yFvb1Z5oKMWk9jeNkendxR4bLSf5ZtzyGAxRxR t8crIf60kNoqJav5Lsf/hJ4S8fCCiwngcn3TGUYTdNh0fflS9ADtU0KLLWJUhOR3oimO CIxZIxdthyrNO28GsRg9cEuy30hOgLdQMQOIwj1Jgjim1hEiu3L/S3z80TW62+wHUReX P2XYK+cv+nbe5703keg/fKHEn4ePTn+Xu/gyMBrqfWX2oWi/XNLALDSfkOoccYNlD/kS ORKFYEZB6sl+Slz6j+ykhuwcl+IhvU0Q0vRKd7FLY5oopecnA4l7SJN2w5TuJz1f+eAj ZNUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735966463; x=1736571263; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CKtVNznWE9ivtuG9PazmrMJTjbIr3cgCBeROWg6IRwA=; b=vDGAMSHRdKbD6EGfmIgc8Yij/UueaEFAjUtOlb76k12QQxry6Ne9SR+ovvBK/koFK+ K6Lk6yg0aexmp82JvHUt7wNmHEM3okZXFa3w3xM1zXLlo/3LX14pdM8Rif1tb1nW9/0m 35ly526kdyWOamWpl48HvNhKpBgN9vayKUrmeubee10fK7r470+vAW3ji6OFhVa6ckI3 PCyF3OLZAX5zFkJB0UNW85iUKaa0gmKmKyprCUuPJQG8p6uy9eLtOOdTvZCDcS8IBS2d Zrx2BoB/d1rK7Gt6ewbkAsIddvn6AhTeBkSuzWxvqVojulHFjBuiBwl+Eo7FfD4d4678 qqJA== X-Forwarded-Encrypted: i=1; AJvYcCV7yWClZp5H6I/sobR6pjAnofwcYgwlbRNikYT/Jh4ThqxImYzln9DlO5dZeuZaRCz2lX785qt7/DtngrTJ+neM@lists.infradead.org X-Gm-Message-State: AOJu0YwjcPZjmb2yK7vm2i69/UKZNNUcwf1VRGofd5zVYa35BMHKr9H4 pidHlBlW6GY9qeKtplQWLfE6PfsmCpuAWoghlbSj36iTKODG4rY4 X-Gm-Gg: ASbGncuoyxWUQYBvtqukdgbOc3+JtLLzZ6hDkjJlh+4OD6w0XFNgZ7+1Ag/E3/1lZSy eQResvbu5wmDDJstUxaaUfdDk37GrPrRce/qdOb1ujfM9Uui12kTNFlGuhNqbO0zwuV3o713omK G4OSGgmxulo7z6lNK4h8eRy6xeIZrSSPMbMXwelvqVhxsFzM3C9mOofr+RuzDfe6PBrb2Rmm9cl 6F+hnDob+FCvaJ9A90dyr+nz7Gqf5MPWnJgIi5S/ONGErDt8IsNcbqGp1h1ALkfX/WT X-Google-Smtp-Source: AGHT+IGuRBycg0rPS7jWSLpZFMW1uJJeqNf+gkRAZpqLuLZIePatB2YLOX2g6/Z+dw35DEhFlFiIkQ== X-Received: by 2002:ac8:7d42:0:b0:467:864b:dd6f with SMTP id d75a77b69052e-46a4a9bcd1emr787901711cf.54.1735966462878; Fri, 03 Jan 2025 20:54:22 -0800 (PST) Received: from localhost.localdomain ([128.10.127.250]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46a3e6a106fsm151866871cf.38.2025.01.03.20.54.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 20:54:21 -0800 (PST) From: Mingwei Zheng To: antonio.borneo@foss.st.com Cc: marex@denx.de, linus.walleij@linaro.org, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, make24@iscas.ac.cn, peng.fan@nxp.com, fabien.dessenne@foss.st.com, linux-gpio@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mingwei Zheng , Jiasheng Jiang Subject: [PATCH v9] pinctrl: stm32: Add check for clk_enable() Date: Fri, 3 Jan 2025 23:57:12 -0500 Message-Id: <20250104045712.1317024-1-zmw12306@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250103_205425_085780_C35D0014 X-CRM114-Status: GOOD ( 18.96 ) 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 Convert the driver to clk_bulk*() API. Add check for the return value of clk_bulk_enable() to catch the potential error. Fixes: 05d8af449d93 ("pinctrl: stm32: Keep pinctrl block clock enabled when LEVEL IRQ requested") Signed-off-by: Mingwei Zheng Signed-off-by: Jiasheng Jiang --- Changelog: v8 -> v9: 1. Revert changes from v5 to v6. 2. Add assignment for clk id to avoid NULL pointer dereference. v7 -> v8: 1. Remove all previously registered GPIO chips before disabling the clocks. v6 -> v7: 1. Move clk_bulk_prepare_enable() before calling stm32_gpiolib_register_bank(). v5 -> v6: 1. Call devm_clk_bulk_get_all in stm32_pctl_probe(). v4 -> v5: 1. Move the clock handling from stm32_gpiolib_register_bank() and moving it to its caller. 2. Call clk_bulk_prepare_enable() in stm32_pctl_probe() and clk_bulk_disable_unprepare() for error. v3 -> v4: 1. Add initialization for pctl->clks. 2. Adjust alignment. v2 -> v3: 1. Convert clk_disable_unprepare to clk_bulk_disable and clk_bulk_unprepare. v1 -> v2: 1. Move int ret declaration into if block. --- drivers/pinctrl/stm32/pinctrl-stm32.c | 79 ++++++++++++++------------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c index 5b7fa77c1184..cb6c107b7cdc 100644 --- a/drivers/pinctrl/stm32/pinctrl-stm32.c +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c @@ -86,7 +86,6 @@ struct stm32_pinctrl_group { struct stm32_gpio_bank { void __iomem *base; - struct clk *clk; struct reset_control *rstc; spinlock_t lock; struct gpio_chip gpio_chip; @@ -108,6 +107,7 @@ struct stm32_pinctrl { unsigned ngroups; const char **grp_names; struct stm32_gpio_bank *banks; + struct clk_bulk_data *clks; unsigned nbanks; const struct stm32_pinctrl_match_data *match_data; struct irq_domain *domain; @@ -1308,12 +1308,6 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, struct fwnode if (IS_ERR(bank->base)) return PTR_ERR(bank->base); - err = clk_prepare_enable(bank->clk); - if (err) { - dev_err(dev, "failed to prepare_enable clk (%d)\n", err); - return err; - } - bank->gpio_chip = stm32_gpio_template; fwnode_property_read_string(fwnode, "st,bank-name", &bank->gpio_chip.label); @@ -1360,26 +1354,20 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, struct fwnode bank->fwnode, &stm32_gpio_domain_ops, bank); - if (!bank->domain) { - err = -ENODEV; - goto err_clk; - } + if (!bank->domain) + return -ENODEV; } names = devm_kcalloc(dev, npins, sizeof(char *), GFP_KERNEL); - if (!names) { - err = -ENOMEM; - goto err_clk; - } + if (!names) + return -ENOMEM; for (i = 0; i < npins; i++) { stm32_pin = stm32_pctrl_get_desc_pin_from_gpio(pctl, bank, i); if (stm32_pin && stm32_pin->pin.name) { names[i] = devm_kasprintf(dev, GFP_KERNEL, "%s", stm32_pin->pin.name); - if (!names[i]) { - err = -ENOMEM; - goto err_clk; - } + if (!names[i]) + return -ENOMEM; } else { names[i] = NULL; } @@ -1390,15 +1378,11 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, struct fwnode err = gpiochip_add_data(&bank->gpio_chip, bank); if (err) { dev_err(dev, "Failed to add gpiochip(%d)!\n", bank_nr); - goto err_clk; + return err; } dev_info(dev, "%s bank added\n", bank->gpio_chip.label); return 0; - -err_clk: - clk_disable_unprepare(bank->clk); - return err; } static struct irq_domain *stm32_pctrl_get_irq_domain(struct platform_device *pdev) @@ -1621,6 +1605,15 @@ int stm32_pctl_probe(struct platform_device *pdev) if (!pctl->banks) return -ENOMEM; + pctl->clks = devm_kcalloc(dev, banks, sizeof(*pctl->clks), + GFP_KERNEL); + if (!pctl->clks) + return -ENOMEM; + + for (i = 0; i < banks; ++i) + pctl->clks[i].id = "pctl"; + + i = 0; for_each_gpiochip_node(dev, child) { struct stm32_gpio_bank *bank = &pctl->banks[i]; @@ -1632,24 +1625,26 @@ int stm32_pctl_probe(struct platform_device *pdev) return -EPROBE_DEFER; } - bank->clk = of_clk_get_by_name(np, NULL); - if (IS_ERR(bank->clk)) { + pctl->clks[i].clk = of_clk_get_by_name(np, NULL); + if (IS_ERR(pctl->clks[i].clk)) { fwnode_handle_put(child); - return dev_err_probe(dev, PTR_ERR(bank->clk), + return dev_err_probe(dev, PTR_ERR(pctl->clks[i].clk), "failed to get clk\n"); } i++; } + ret = clk_bulk_prepare_enable(banks, pctl->clks); + if (ret) { + dev_err(dev, "failed to prepare_enable clk (%d)\n", ret); + return ret; + } + for_each_gpiochip_node(dev, child) { ret = stm32_gpiolib_register_bank(pctl, child); if (ret) { fwnode_handle_put(child); - - for (i = 0; i < pctl->nbanks; i++) - clk_disable_unprepare(pctl->banks[i].clk); - - return ret; + goto err_register; } pctl->nbanks++; @@ -1658,6 +1653,15 @@ int stm32_pctl_probe(struct platform_device *pdev) dev_info(dev, "Pinctrl STM32 initialized\n"); return 0; +err_register: + for (i = 0; i < pctl->nbanks; i++) { + struct stm32_gpio_bank *bank = &pctl->banks[i]; + + gpiochip_remove(&bank->gpio_chip); + } + + clk_bulk_disable_unprepare(banks, pctl->clks); + return ret; } static int __maybe_unused stm32_pinctrl_restore_gpio_regs( @@ -1726,10 +1730,8 @@ static int __maybe_unused stm32_pinctrl_restore_gpio_regs( int __maybe_unused stm32_pinctrl_suspend(struct device *dev) { struct stm32_pinctrl *pctl = dev_get_drvdata(dev); - int i; - for (i = 0; i < pctl->nbanks; i++) - clk_disable(pctl->banks[i].clk); + clk_bulk_disable(pctl->nbanks, pctl->clks); return 0; } @@ -1738,10 +1740,11 @@ int __maybe_unused stm32_pinctrl_resume(struct device *dev) { struct stm32_pinctrl *pctl = dev_get_drvdata(dev); struct stm32_pinctrl_group *g = pctl->groups; - int i; + int i, ret; - for (i = 0; i < pctl->nbanks; i++) - clk_enable(pctl->banks[i].clk); + ret = clk_bulk_enable(pctl->nbanks, pctl->clks); + if (ret) + return ret; for (i = 0; i < pctl->ngroups; i++, g++) stm32_pinctrl_restore_gpio_regs(pctl, g->pin);