From patchwork Tue Dec 12 08:34:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Young X-Patchwork-Id: 13488718 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 CD006C4167B for ; Tue, 12 Dec 2023 08:35:15 +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=3tm/ahSa2DPNr4Cxe6WYbB1Jwv9OhLkMyDeiYJ54FlI=; b=VNVUgxVPOi7ue9 w9Ksn02imFGfcwK+wwJwYpJflYHLFiLARFmlJvL25365gJ8qipeWSFzzg/Ogjsop7F3YD29B+erYE OeoJ8jieTQpyqw0EerFX1LjXeCaNImos3MMSY1sR8OIBOWnLtd7/HE9cRv4eU7Q8waCY8gFnbk1D9 zEnkha78vdLcw4AZbqfXL2TEHdnyK9S4xqy6q0XfG0Ob8Mhk4hu9cIt1vlKxxPzw1WC+khWYGwloI cdEpJNV0KgfH2moiVGIMLbOfgWSOCTjM74ebLuHRpALPRRK/i1T88GgxwCqZOLxDRlBKvCIwcaY3t HZuz962wEUS4U8bDwYAA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rCyE1-00B4G6-2i; Tue, 12 Dec 2023 08:34:45 +0000 Received: from gofer.mess.org ([2a02:8011:d000:212::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rCyDw-00B4DH-2l; Tue, 12 Dec 2023 08:34:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mess.org; s=2020; t=1702370079; bh=gTEti/8B23Lhh743tVWTymBVRCEpQHU5KFyCDk5okO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EIIBoiOPOYzLW9r9sSnAnks3qgG5fw+Pcz6S/aPh/zrxDmiIp5vu6bktkjQOEf+t/ GdDBfzDC3zYG0vbqUoLOPUq/+PR3XQ83gAmYP2wO9ToTKUDGxi40XVIDFdDCndott7 QXRiLtD+r9HRzdTHqg6yBZOlfUjIirEDccV9qCISjQ6YvZX2AkUBqdpL34bCoEWbJ8 tTdjLXl8I8Dx8ZQ7TcphGJsqNybTD392huYf1oedC0eTVFmf+B+kHeeYN68H14Pzbb HlD6YTedX5hM/k+/ZLp3rEZEiIhOpuooXAg0LnYw194GuZbYSw5TOexYsjH9O/CNAg A0sYPzpLZdlBQ== Received: by gofer.mess.org (Postfix, from userid 501) id B3EEC100A01; Tue, 12 Dec 2023 08:34:39 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mess.org; s=2020; t=1702370062; bh=gTEti/8B23Lhh743tVWTymBVRCEpQHU5KFyCDk5okO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pxTwT/yu6GbqALKFR6VoMRiIFXgE8GntD/iXPUVaPjQfJF49/FqkAtQtcpqxIqV3o ZwIMYifyK/VqRJ8JJx7/w1+8wXYCfmh3uj/uOEGMURFEM5ZtwNsschKbRYti5WuRuS 8DoHG+Ltz0a245V2kiAOds0OHKmz8Nw/4PHv/JDWhuKIkG9TofUYGeq5MzQabz9xWf KBW32GBSlXHVVSrAy9lBSNOnXoovEB4VQ/M1gkK0bs4uSOALyuMuyFI65YqBkVGD0J nRbpeqEI05LIVcGyqtQhokCAyMxV3hX5Eb24TBppmawjv2X8ZTOWEKKFM/iykl0LuW y/a7gJlj2/Z/g== Received: from localhost.localdomain (bigcore-58.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 E672310029E; Tue, 12 Dec 2023 08:34:22 +0000 (GMT) From: Sean Young To: linux-media@vger.kernel.org, linux-pwm@vger.kernel.org, Ivaylo Dimitrov , Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden Cc: Sean Young , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 5/6] pwm: bcm2835: Allow PWM driver to be used in atomic context Date: Tue, 12 Dec 2023 08:34:04 +0000 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231212_003441_033417_D373ED30 X-CRM114-Status: GOOD ( 16.31 ) 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 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 Reviewed-by: Uwe Kleine-König --- drivers/pwm/pwm-bcm2835.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/drivers/pwm/pwm-bcm2835.c b/drivers/pwm/pwm-bcm2835.c index ab30667f4f951..309d52ec43bbe 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,31 @@ 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; } @@ -169,6 +179,7 @@ static int bcm2835_pwm_suspend(struct device *dev) { struct bcm2835_pwm *pc = dev_get_drvdata(dev); + clk_rate_exclusive_put(pc->clk); clk_disable_unprepare(pc->clk); return 0;