github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: rockchip: rockchip_sai: Use guard() for spin locks

Browse Source 
Clean up the code using guard() for spin locks.
Merely code refactoring, and no behavior change.

Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
Link: https://patch.msgid.link/20260604033554.96996-4-phucduc.bui@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
bui duc phuc 2026-06-04 10:35:53 +07:00 committed by Mark Brown
parent ec22437fc4
commit f7fe9f7073
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 135 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
sound/soc/rockchip/rockchip_sai.c
View File

@ -18,7 +18,6 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/dmaengine_pcm.h> #include <sound/dmaengine_pcm.h>
#include <sound/tlv.h> #include <sound/tlv.h>
#include "rockchip_sai.h" #include "rockchip_sai.h"
#define DRV_NAME "rockchip-sai" #define DRV_NAME "rockchip-sai"
@ -216,14 +215,12 @@ static void rockchip_sai_xfer_clk_stop_and_wait(struct rk_sai_dev *sai, unsigned
static int rockchip_sai_runtime_suspend(struct device *dev) static int rockchip_sai_runtime_suspend(struct device *dev)
{ {
struct rk_sai_dev *sai = dev_get_drvdata(dev); struct rk_sai_dev *sai = dev_get_drvdata(dev);
unsigned long flags;
rockchip_sai_fsync_lost_detect(sai, 0); rockchip_sai_fsync_lost_detect(sai, 0);
rockchip_sai_fsync_err_detect(sai, 0); rockchip_sai_fsync_err_detect(sai, 0);
spin_lock_irqsave(&sai->xfer_lock, flags); scoped_guard(spinlock_irqsave, &sai->xfer_lock)
rockchip_sai_xfer_clk_stop_and_wait(sai, NULL); rockchip_sai_xfer_clk_stop_and_wait(sai, NULL);
spin_unlock_irqrestore(&sai->xfer_lock, flags);
regcache_cache_only(sai->regmap, true); regcache_cache_only(sai->regmap, true);
/* /*
@ -483,7 +480,6 @@ static int rockchip_sai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
struct rk_sai_dev *sai = snd_soc_dai_get_drvdata(dai); struct rk_sai_dev *sai = snd_soc_dai_get_drvdata(dai);
unsigned int mask = 0, val = 0; unsigned int mask = 0, val = 0;
unsigned int clk_gates; unsigned int clk_gates;
unsigned long flags;
int ret = 0; int ret = 0;
pm_runtime_get_sync(dai->dev); pm_runtime_get_sync(dai->dev);
@ -499,11 +495,11 @@ static int rockchip_sai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
sai->is_master_mode = false; sai->is_master_mode = false;
break; break;
default: default:
ret = -EINVAL; pm_runtime_put(dai->dev);
goto err_pm_put; return -EINVAL;
} }
spin_lock_irqsave(&sai->xfer_lock, flags); scoped_guard(spinlock_irqsave, &sai->xfer_lock) {
rockchip_sai_xfer_clk_stop_and_wait(sai, &clk_gates); rockchip_sai_xfer_clk_stop_and_wait(sai, &clk_gates);
if (sai->initialized) { if (sai->initialized) {
if (sai->has_capture && sai->has_playback) if (sai->has_capture && sai->has_playback)
@ -535,20 +531,20 @@ static int rockchip_sai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;
goto err_xfer_unlock; break;
} }
if (ret == 0) {
regmap_update_bits(sai->regmap, SAI_CKR, mask, val); regmap_update_bits(sai->regmap, SAI_CKR, mask, val);
rockchip_sai_fmt_create(sai, fmt); rockchip_sai_fmt_create(sai, fmt);
}
err_xfer_unlock:
if (clk_gates) if (clk_gates)
regmap_update_bits(sai->regmap, SAI_XFER, regmap_update_bits(sai->regmap, SAI_XFER,
SAI_XFER_CLK_MASK | SAI_XFER_FSS_MASK, SAI_XFER_CLK_MASK | SAI_XFER_FSS_MASK,
clk_gates); clk_gates);
spin_unlock_irqrestore(&sai->xfer_lock, flags); }
err_pm_put:
pm_runtime_put(dai->dev); pm_runtime_put(dai->dev);
return ret; return ret;
@ -564,7 +560,6 @@ static int rockchip_sai_hw_params(struct snd_pcm_substream *substream,
unsigned int ch_per_lane, slot_width; unsigned int ch_per_lane, slot_width;
unsigned int val, fscr, reg; unsigned int val, fscr, reg;
unsigned int lanes, req_lanes; unsigned int lanes, req_lanes;
unsigned long flags;
int ret = 0; int ret = 0;
if (!rockchip_sai_stream_valid(substream, dai)) if (!rockchip_sai_stream_valid(substream, dai))
@ -591,8 +586,8 @@ static int rockchip_sai_hw_params(struct snd_pcm_substream *substream,
dev_err(sai->dev, "not enough lanes (%d) for requested number of %s channels (%d)\n", dev_err(sai->dev, "not enough lanes (%d) for requested number of %s channels (%d)\n",
lanes, reg == SAI_TXCR ? "playback" : "capture", lanes, reg == SAI_TXCR ? "playback" : "capture",
params_channels(params)); params_channels(params));
ret = -EINVAL; pm_runtime_put(sai->dev);
goto err_pm_put; return -EINVAL;
} else { } else {
lanes = req_lanes; lanes = req_lanes;
} }
@ -618,13 +613,13 @@ static int rockchip_sai_hw_params(struct snd_pcm_substream *substream,
val = SAI_XCR_VDW(32); val = SAI_XCR_VDW(32);
break; break;
default: default:
ret = -EINVAL; pm_runtime_put(sai->dev);
goto err_pm_put; return -EINVAL;
} }
val |= SAI_XCR_CSR(lanes); val |= SAI_XCR_CSR(lanes);
spin_lock_irqsave(&sai->xfer_lock, flags); scoped_guard(spinlock_irqsave, &sai->xfer_lock) {
regmap_update_bits(sai->regmap, reg, SAI_XCR_VDW_MASK | SAI_XCR_CSR_MASK, val); regmap_update_bits(sai->regmap, reg, SAI_XCR_VDW_MASK | SAI_XCR_CSR_MASK, val);
@ -655,47 +650,51 @@ static int rockchip_sai_hw_params(struct snd_pcm_substream *substream,
default: default:
dev_err(sai->dev, "Invalid Frame Pulse Width %d\n", sai->fpw); dev_err(sai->dev, "Invalid Frame Pulse Width %d\n", sai->fpw);
ret = -EINVAL; ret = -EINVAL;
goto err_xfer_unlock; break;
} }
if (ret == 0) {
regmap_update_bits(sai->regmap, SAI_FSCR, regmap_update_bits(sai->regmap, SAI_FSCR,
SAI_FSCR_FW_MASK | SAI_FSCR_FPW_MASK, fscr); SAI_FSCR_FW_MASK | SAI_FSCR_FPW_MASK, fscr);
if (sai->is_master_mode) { if (sai->is_master_mode) {
bclk_rate = sai->fw_ratio * slot_width * ch_per_lane * params_rate(params); bclk_rate = sai->fw_ratio * slot_width *
ch_per_lane * params_rate(params);
ret = clk_set_rate(sai->mclk, sai->mclk_rate); ret = clk_set_rate(sai->mclk, sai->mclk_rate);
if (ret) { if (ret)
dev_err(sai->dev, "Failed to set mclk to %u: %pe\n", dev_err(sai->dev, "Failed to set mclk to %u: %pe\n",
sai->mclk_rate, ERR_PTR(ret)); sai->mclk_rate, ERR_PTR(ret));
goto err_xfer_unlock; else {
}
mclk_rate = clk_get_rate(sai->mclk); mclk_rate = clk_get_rate(sai->mclk);
if (mclk_rate < bclk_rate) { if (mclk_rate < bclk_rate) {
dev_err(sai->dev, "Mismatch mclk: %u, at least %u\n", dev_err(sai->dev, "Mismatch mclk: %u, at least %u\n",
mclk_rate, bclk_rate); mclk_rate, bclk_rate);
ret = -EINVAL; ret = -EINVAL;
goto err_xfer_unlock; } else {
}
div_bclk = DIV_ROUND_CLOSEST(mclk_rate, bclk_rate); div_bclk = DIV_ROUND_CLOSEST(mclk_rate, bclk_rate);
mclk_req_rate = bclk_rate * div_bclk; mclk_req_rate = bclk_rate * div_bclk;
if (mclk_rate < mclk_req_rate - CLK_SHIFT_RATE_HZ_MAX || if (mclk_rate <
mclk_rate > mclk_req_rate + CLK_SHIFT_RATE_HZ_MAX) { mclk_req_rate - CLK_SHIFT_RATE_HZ_MAX ||
dev_err(sai->dev, "Mismatch mclk: %u, expected %u (+/- %dHz)\n", mclk_rate >
mclk_rate, mclk_req_rate, CLK_SHIFT_RATE_HZ_MAX); mclk_req_rate + CLK_SHIFT_RATE_HZ_MAX) {
dev_err(sai->dev,
"Mismatch mclk: %u, expected %u (+/- %dHz)\n",
mclk_rate, mclk_req_rate,
CLK_SHIFT_RATE_HZ_MAX);
ret = -EINVAL; ret = -EINVAL;
goto err_xfer_unlock; } else
} regmap_update_bits(sai->regmap,
SAI_CKR,
regmap_update_bits(sai->regmap, SAI_CKR, SAI_CKR_MDIV_MASK, SAI_CKR_MDIV_MASK,
SAI_CKR_MDIV(div_bclk)); SAI_CKR_MDIV(div_bclk));
} }
}
}
}
}
err_xfer_unlock:
spin_unlock_irqrestore(&sai->xfer_lock, flags);
err_pm_put:
pm_runtime_put(sai->dev); pm_runtime_put(sai->dev);
return ret; return ret;
@ -705,7 +704,6 @@ static int rockchip_sai_prepare(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct rk_sai_dev *sai = snd_soc_dai_get_drvdata(dai); struct rk_sai_dev *sai = snd_soc_dai_get_drvdata(dai);
unsigned long flags;
if (!rockchip_sai_stream_valid(substream, dai)) if (!rockchip_sai_stream_valid(substream, dai))
return 0; return 0;
@ -726,13 +724,12 @@ static int rockchip_sai_prepare(struct snd_pcm_substream *substream,
* udelay falls short. * udelay falls short.
*/ */
udelay(20); udelay(20);
spin_lock_irqsave(&sai->xfer_lock, flags); scoped_guard(spinlock_irqsave, &sai->xfer_lock)
regmap_update_bits(sai->regmap, SAI_XFER, regmap_update_bits(sai->regmap, SAI_XFER,
SAI_XFER_CLK_MASK | SAI_XFER_CLK_MASK |
SAI_XFER_FSS_MASK, SAI_XFER_FSS_MASK,
SAI_XFER_CLK_EN | SAI_XFER_CLK_EN |
SAI_XFER_FSS_EN); SAI_XFER_FSS_EN);
spin_unlock_irqrestore(&sai->xfer_lock, flags);
} }
rockchip_sai_fsync_lost_detect(sai, 1); rockchip_sai_fsync_lost_detect(sai, 1);
@ -915,7 +912,6 @@ static int rockchip_sai_set_tdm_slot(struct snd_soc_dai *dai,
int slots, int slot_width) int slots, int slot_width)
{ {
struct rk_sai_dev *sai = snd_soc_dai_get_drvdata(dai); struct rk_sai_dev *sai = snd_soc_dai_get_drvdata(dai);
unsigned long flags;
unsigned int clk_gates; unsigned int clk_gates;
int sw = slot_width; int sw = slot_width;
@ -931,7 +927,7 @@ static int rockchip_sai_set_tdm_slot(struct snd_soc_dai *dai,
return -EINVAL; return -EINVAL;
pm_runtime_get_sync(dai->dev); pm_runtime_get_sync(dai->dev);
spin_lock_irqsave(&sai->xfer_lock, flags); scoped_guard(spinlock_irqsave, &sai->xfer_lock) {
rockchip_sai_xfer_clk_stop_and_wait(sai, &clk_gates); rockchip_sai_xfer_clk_stop_and_wait(sai, &clk_gates);
regmap_update_bits(sai->regmap, SAI_TXCR, SAI_XCR_SBW_MASK, regmap_update_bits(sai->regmap, SAI_TXCR, SAI_XCR_SBW_MASK,
SAI_XCR_SBW(sw)); SAI_XCR_SBW(sw));
@ -940,7 +936,7 @@ static int rockchip_sai_set_tdm_slot(struct snd_soc_dai *dai,
regmap_update_bits(sai->regmap, SAI_XFER, regmap_update_bits(sai->regmap, SAI_XFER,
SAI_XFER_CLK_MASK | SAI_XFER_FSS_MASK, SAI_XFER_CLK_MASK | SAI_XFER_FSS_MASK,
clk_gates); clk_gates);
spin_unlock_irqrestore(&sai->xfer_lock, flags); }
pm_runtime_put(dai->dev); pm_runtime_put(dai->dev);
return 0; return 0;