ASoC: mediatek: common: modify mtk afe platform driver for mt8196

Mofify the pcm pointer interface to support 64-bit address access.

Signed-off-by: Darren Ye <darren.ye@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: Louis-Alexis Eyraud <louisalexis.eyraud@collabora.com>
Signed-off-by: Cyril Chao <Cyril.Chao@mediatek.com>
Link: https://patch.msgid.link/20260430022417.32282-2-Cyril.Chao@mediatek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Darren Ye 2026-04-30 10:23:14 +08:00 committed by Mark Brown
parent 7fd2df204f
commit 1aadc0147b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 39 additions and 17 deletions

View File

@ -87,29 +87,49 @@ snd_pcm_uframes_t mtk_afe_pcm_pointer(struct snd_soc_component *component,
const struct mtk_base_memif_data *memif_data = memif->data;
struct regmap *regmap = afe->regmap;
struct device *dev = afe->dev;
int reg_ofs_base = memif_data->reg_ofs_base;
int reg_ofs_cur = memif_data->reg_ofs_cur;
unsigned int hw_ptr = 0, hw_base = 0;
int ret, pcm_ptr_bytes;
unsigned int hw_ptr_lower32 = 0, hw_ptr_upper32 = 0;
unsigned int hw_base_lower32 = 0, hw_base_upper32 = 0;
unsigned long long hw_ptr = 0, hw_base = 0;
int ret;
unsigned long long pcm_ptr_bytes = 0;
ret = regmap_read(regmap, reg_ofs_cur, &hw_ptr);
if (ret || hw_ptr == 0) {
dev_err(dev, "%s hw_ptr err\n", __func__);
pcm_ptr_bytes = 0;
goto POINTER_RETURN_FRAMES;
ret = regmap_read(regmap, memif_data->reg_ofs_cur, &hw_ptr_lower32);
if (ret) {
dev_err(dev, "%s hw_ptr_lower32 err\n", __func__);
return 0;
}
ret = regmap_read(regmap, reg_ofs_base, &hw_base);
if (ret || hw_base == 0) {
dev_err(dev, "%s hw_ptr err\n", __func__);
pcm_ptr_bytes = 0;
goto POINTER_RETURN_FRAMES;
if (memif_data->reg_ofs_cur_msb) {
ret = regmap_read(regmap, memif_data->reg_ofs_cur_msb, &hw_ptr_upper32);
if (ret) {
dev_err(dev, "%s hw_ptr_upper32 err\n", __func__);
return 0;
}
}
pcm_ptr_bytes = hw_ptr - hw_base;
ret = regmap_read(regmap, memif_data->reg_ofs_base, &hw_base_lower32);
if (ret) {
dev_err(dev, "%s hw_base_lower32 err\n", __func__);
return 0;
}
if (memif_data->reg_ofs_base_msb) {
ret = regmap_read(regmap, memif_data->reg_ofs_base_msb, &hw_base_upper32);
if (ret) {
dev_err(dev, "%s hw_base_upper32 err\n", __func__);
return 0;
}
}
POINTER_RETURN_FRAMES:
return bytes_to_frames(substream->runtime, pcm_ptr_bytes);
hw_ptr = ((unsigned long long)hw_ptr_upper32 << 32) | hw_ptr_lower32;
hw_base = ((unsigned long long)hw_base_upper32 << 32) | hw_base_lower32;
if (!hw_ptr || !hw_base) {
dev_err(dev, "hw_ptr or hw_base = 0 err\n");
return 0;
}
pcm_ptr_bytes = MTK_ALIGN_16BYTES(hw_ptr - hw_base);
return bytes_to_frames(substream->runtime, (ssize_t)pcm_ptr_bytes);
}
EXPORT_SYMBOL_GPL(mtk_afe_pcm_pointer);

View File

@ -12,6 +12,8 @@
#define AFE_PCM_NAME "mtk-afe-pcm"
extern const struct snd_soc_component_driver mtk_afe_pcm_platform;
#define MTK_ALIGN_16BYTES(x) ((x) & GENMASK_ULL(39, 4))
struct mtk_base_afe;
struct snd_pcm;
struct snd_soc_component;