Received: by 2002:a05:7412:b112:b0:f9:3106:f1c0 with SMTP id az18csp133105rdb; Mon, 18 Dec 2023 01:08:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IG65J84f+s2BwLHUnJV09HYR7vQrsHhxm2UeCsDyJFaE8a+hIQ62n94yx+LmJELCy4bQRJ2 X-Received: by 2002:a17:906:748b:b0:a23:6689:4110 with SMTP id e11-20020a170906748b00b00a2366894110mr113664ejl.52.1702890518225; Mon, 18 Dec 2023 01:08:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702890518; cv=none; d=google.com; s=arc-20160816; b=JONwIaeCPEalMGBP5tuozYA0vmU4RQ6VVllcPEolETtItOE48zeyGbWkWtZHaetjLl SGOqBmdSKYXxIfqBhwEylizKU5tUceHVXTwBrEdW7maw1PVXYVSMzX3CAeY6UPGiiJI/ 2cOS4DYfkGommTiUoe3J3hUomglXCNrt8drcxa1bTOnrn2jxod51StGX9Gx/cibAMFeR hoV+6C0MQ+vqTTtiDA8+jqmWC+pDbEFaT8piIiOOr8naiwJkd+EU+7aQ/NXW6yJ0pumt myzbyZvC43KgfHrYhEawCHAKI5eNYlUFZxWvpsS7TX5qjdD42ouartx6FyLMkcCcvXY1 6FCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:dkim-signature; bh=/aC5ZXcXCviivTsB59zHpG51MKn8bHFzELf0Bgj5dJQ=; fh=/7Crfx1M7QQY+j06MLDjROh1SB3OvesMG8XebREHJaQ=; b=lHEmuClmRGswTMn6Q9kAAWqRl7i3JCQl+RpvIb2na0hv7wr4xtVQuXpTASDySXiNAI ch+4UYRbOL11wTsYTAM+eWixyZ/ZssOMZ+gFRQVMby6LnDWwae+qn+Uv5ngaHQ0vn3j+ 6pt0eS0eefkDMk9jnitBiXbswqIIf8v8oaG5KWo5GiYIYCGr8M4LOVCLp+PTcK5/CUJJ K+zVc3bL/7RKIMuGUTML4zTnMpN6Ff26E/QNCVT2F9HdVJGwwghVwgvGNptVQQn4FG2e bD6LeWTCt5lE8EMBjf3dDoEPptSip/YGrEfK1kzP0d4VXxo9xsmsY3M/30YJb9dQMYRr j7mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mess.org header.s=2020 header.b=Ef95AFuj; dkim=pass header.i=@mess.org header.s=2020 header.b=JJhq0UHZ; spf=pass (google.com: domain of linux-kernel+bounces-3217-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3217-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mess.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id a14-20020a170906684e00b00a235001a307si935236ejs.64.2023.12.18.01.08.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 01:08:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-3217-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@mess.org header.s=2020 header.b=Ef95AFuj; dkim=pass header.i=@mess.org header.s=2020 header.b=JJhq0UHZ; spf=pass (google.com: domain of linux-kernel+bounces-3217-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3217-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mess.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id CE5F51F230C4 for ; Mon, 18 Dec 2023 09:08:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A077B13FE9; Mon, 18 Dec 2023 09:07:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mess.org header.i=@mess.org header.b="Ef95AFuj"; dkim=pass (2048-bit key) header.d=mess.org header.i=@mess.org header.b="JJhq0UHZ" X-Original-To: linux-kernel@vger.kernel.org Received: from gofer.mess.org (gofer.mess.org [88.97.38.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 596DF12B8F; Mon, 18 Dec 2023 09:07:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mess.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mess.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mess.org; s=2020; t=1702890439; bh=LjaOwH9UGD1qjsd41DylO0EFQhH3+r2HBaFpyCOGEtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ef95AFujTW+p0IPeSunN4wL1NmrFEdPxGTqU1UDz3ohrYnK1ZXY49IlCVT0U627Ld +LOZicKSUxhRGhg8cnmwsqQfTzdEwiL/8khv9l5+0G1pf874Iko8IHSJSAlxShjqSO jX+/Epp/0F0Fzc1vaiU09iQcHQUkjAju8rDsHmI2HpDosxRKscHnJjsHuIBPsXGXDt zKbI0k308EY0PoVZeamuhwbFOtN6e/4p/QTRzle4QKcLm5WCxGFUG7+vyFZ7ysDVB7 0KCLvIiSb8slvxkn/eXyGAbjq4pQgUh5t8Yt0iHfsKYuHNVWRw8eojsPX07TXnLhcu 6CZUgSU41cdyQ== Received: by gofer.mess.org (Postfix, from userid 501) id CF0FF100A06; Mon, 18 Dec 2023 09:07:19 +0000 (GMT) X-Spam-Level: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mess.org; s=2020; t=1702890421; bh=LjaOwH9UGD1qjsd41DylO0EFQhH3+r2HBaFpyCOGEtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JJhq0UHZr/w0Fs0e2iqfz0fDUdsaK8ijm7rmAq6jlcaWL+tfnln7/R8UjjYXsh0ho 1dWUZXIVosvb+ntlRapjUN8BHaCRcNKsOrlxha0bC33sKh5Bprh6zO/Mt6Si2AB85l q93/sAUXg+lwW2mIzIH6bYxV4JsCfuDOhHU2hur8EieyBKpB6g8zS7uLc4KQI5YXP6 hhBrEKM1ZSjzubRWOR6hKY4JlW0i350kGAYnylA5OUyFsrYrZPKzDbw+TgVaE6k5pA MEH8muqZBtdp+J5T10TQ51vNrwitFGUXGLa9n++K8ngJYKMT4KSIGg+iJQRHYz8w1Z xuNrGjOUGjLLw== Received: from localhost.localdomain (bigcore-79.local [IPv6:2a02:8011:d000:212:ca7f:54ff:fe51:14d6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by gofer.mess.org (Postfix) with ESMTPSA id 06D361009FD; Mon, 18 Dec 2023 09:07:01 +0000 (GMT) From: Sean Young To: linux-media@vger.kernel.org, linux-pwm@vger.kernel.org, Ivaylo Dimitrov , Thierry Reding , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list Cc: Sean Young , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v9 5/6] pwm: bcm2835: Allow PWM driver to be used in atomic context Date: Mon, 18 Dec 2023 09:06:46 +0000 Message-ID: <5249bb5d6c067692e4cd09573ced2df58966693b.1702890244.git.sean@mess.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit clk_get_rate() may do a mutex lock. Fetch the clock rate once, and prevent rate changes using clk_rate_exclusive_get(). Signed-off-by: Sean Young Reviewed-by: Florian Fainelli --- drivers/pwm/pwm-bcm2835.c | 40 +++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/drivers/pwm/pwm-bcm2835.c b/drivers/pwm/pwm-bcm2835.c index ab30667f4f95..e556ae300c82 100644 --- a/drivers/pwm/pwm-bcm2835.c +++ b/drivers/pwm/pwm-bcm2835.c @@ -28,6 +28,7 @@ struct bcm2835_pwm { struct device *dev; void __iomem *base; struct clk *clk; + unsigned long rate; }; static inline struct bcm2835_pwm *to_bcm2835_pwm(struct pwm_chip *chip) @@ -63,17 +64,11 @@ static int bcm2835_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, { struct bcm2835_pwm *pc = to_bcm2835_pwm(chip); - unsigned long rate = clk_get_rate(pc->clk); unsigned long long period_cycles; u64 max_period; u32 val; - if (!rate) { - dev_err(pc->dev, "failed to get clock rate\n"); - return -EINVAL; - } - /* * period_cycles must be a 32 bit value, so period * rate / NSEC_PER_SEC * must be <= U32_MAX. As U32_MAX * NSEC_PER_SEC < U64_MAX the @@ -88,13 +83,13 @@ static int bcm2835_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, * <=> period < ((U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC/2) / rate * <=> period <= ceil((U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC/2) / rate) - 1 */ - max_period = DIV_ROUND_UP_ULL((u64)U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC / 2, rate) - 1; + max_period = DIV_ROUND_UP_ULL((u64)U32_MAX * NSEC_PER_SEC + NSEC_PER_SEC / 2, pc->rate) - 1; if (state->period > max_period) return -EINVAL; /* set period */ - period_cycles = DIV_ROUND_CLOSEST_ULL(state->period * rate, NSEC_PER_SEC); + period_cycles = DIV_ROUND_CLOSEST_ULL(state->period * pc->rate, NSEC_PER_SEC); /* don't accept a period that is too small */ if (period_cycles < PERIOD_MIN) @@ -103,7 +98,7 @@ static int bcm2835_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, writel(period_cycles, pc->base + PERIOD(pwm->hwpwm)); /* set duty cycle */ - val = DIV_ROUND_CLOSEST_ULL(state->duty_cycle * rate, NSEC_PER_SEC); + val = DIV_ROUND_CLOSEST_ULL(state->duty_cycle * pc->rate, NSEC_PER_SEC); writel(val, pc->base + DUTY(pwm->hwpwm)); /* set polarity */ @@ -151,16 +146,40 @@ static int bcm2835_pwm_probe(struct platform_device *pdev) return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk), "clock not found\n"); + ret = clk_rate_exclusive_get(pc->clk); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "fail to get exclusive rate\n"); + + pc->rate = clk_get_rate(pc->clk); + if (!pc->rate) { + clk_rate_exclusive_put(pc->clk); + return dev_err_probe(&pdev->dev, -EINVAL, + "failed to get clock rate\n"); + } + pc->chip.dev = &pdev->dev; pc->chip.ops = &bcm2835_pwm_ops; + pc->chip.atomic = true; pc->chip.npwm = 2; platform_set_drvdata(pdev, pc); ret = devm_pwmchip_add(&pdev->dev, &pc->chip); - if (ret < 0) + if (ret < 0) { + clk_rate_exclusive_put(pc->clk); return dev_err_probe(&pdev->dev, ret, "failed to add pwmchip\n"); + } + + return 0; +} + +static int bcm2835_pwm_remove(struct platform_device *pdev) +{ + struct bcm2835_pwm *pc = platform_get_drvdata(pdev); + + clk_rate_exclusive_put(pc->clk); return 0; } @@ -197,6 +216,7 @@ static struct platform_driver bcm2835_pwm_driver = { .pm = pm_ptr(&bcm2835_pwm_pm_ops), }, .probe = bcm2835_pwm_probe, + .remove = bcm2835_pwm_remove, }; module_platform_driver(bcm2835_pwm_driver); -- 2.43.0