From: Darren Ye <darren.ye@mediatek.com>
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>
---
.../mediatek/common/mtk-afe-platform-driver.c | 47 ++++++++++++-------
.../mediatek/common/mtk-afe-platform-driver.h | 2 +
2 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/sound/soc/mediatek/common/mtk-afe-platform-driver.c b/sound/soc/mediatek/common/mtk-afe-platform-driver.c
index 6b6330583941..680a0ab3b22e 100644
--- a/sound/soc/mediatek/common/mtk-afe-platform-driver.c
+++ b/sound/soc/mediatek/common/mtk-afe-platform-driver.c
@@ -86,29 +86,44 @@ 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;
-
- 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;
+ 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, memif_data->reg_ofs_cur, &hw_ptr_lower32);
+ if (ret || hw_ptr_lower32 == 0) {
+ dev_err(dev, "%s hw_ptr_lower32 err\n", __func__);
goto POINTER_RETURN_FRAMES;
}
- 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__);
+ goto POINTER_RETURN_FRAMES;
+ }
}
- pcm_ptr_bytes = hw_ptr - hw_base;
+ ret = regmap_read(regmap, memif_data->reg_ofs_base, &hw_base_lower32);
+ if (ret || hw_base_lower32 == 0) {
+ dev_err(dev, "%s hw_base_lower32 err\n", __func__);
+ goto POINTER_RETURN_FRAMES;
+ }
+ 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__);
+ goto POINTER_RETURN_FRAMES;
+ }
+ }
+ hw_ptr = ((unsigned long long)hw_ptr_upper32 << 32) + hw_ptr_lower32;
+ hw_base = ((unsigned long long)hw_base_upper32 << 32) + hw_base_lower32;
POINTER_RETURN_FRAMES:
- return bytes_to_frames(substream->runtime, pcm_ptr_bytes);
+ 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);
diff --git a/sound/soc/mediatek/common/mtk-afe-platform-driver.h b/sound/soc/mediatek/common/mtk-afe-platform-driver.h
index fcc923b88f12..59dc8d9120a1 100644
--- a/sound/soc/mediatek/common/mtk-afe-platform-driver.h
+++ b/sound/soc/mediatek/common/mtk-afe-platform-driver.h
@@ -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(39, 4))
+
struct mtk_base_afe;
struct snd_pcm;
struct snd_soc_component;
--
2.45.2Hi Darren.Ye,
kernel test robot noticed the following build warnings:
[auto build test WARNING on broonie-sound/for-next]
[also build test WARNING on broonie-spi/for-next robh/for-next linus/master v6.16-rc2 next-20250620]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Darren-Ye/ASoC-mediatek-common-modify-mtk-afe-platform-driver-for-mt8196/20250620-174746
base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
patch link: https://lore.kernel.org/r/20250620094140.11093-2-darren.ye%40mediatek.com
patch subject: [PATCH v5 01/10] ASoC: mediatek: common: modify mtk afe platform driver for mt8196
config: hexagon-allmodconfig (https://download.01.org/0day-ci/archive/20250621/202506211649.TGCEqNZ6-lkp@intel.com/config)
compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250621/202506211649.TGCEqNZ6-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202506211649.TGCEqNZ6-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> sound/soc/mediatek/common/mtk-afe-platform-driver.c:125:18: warning: shift count is negative [-Wshift-count-negative]
125 | pcm_ptr_bytes = MTK_ALIGN_16BYTES(hw_ptr - hw_base);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sound/soc/mediatek/common/mtk-afe-platform-driver.h:15:37: note: expanded from macro 'MTK_ALIGN_16BYTES'
15 | #define MTK_ALIGN_16BYTES(x) ((x) & GENMASK(39, 4))
| ^~~~~~~~~~~~~~
include/linux/bits.h:87:31: note: expanded from macro 'GENMASK'
87 | (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
| ^~~~~~~~~~~~~~~
include/uapi/linux/bits.h:7:56: note: expanded from macro '__GENMASK'
7 | #define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_UL(0) >> (BITS_PER_LONG - 1 - (h))))
| ^ ~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
vim +125 sound/soc/mediatek/common/mtk-afe-platform-driver.c
79
80 snd_pcm_uframes_t mtk_afe_pcm_pointer(struct snd_soc_component *component,
81 struct snd_pcm_substream *substream)
82 {
83 struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
84 struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
85 struct mtk_base_afe_memif *memif = &afe->memif[snd_soc_rtd_to_cpu(rtd, 0)->id];
86 const struct mtk_base_memif_data *memif_data = memif->data;
87 struct regmap *regmap = afe->regmap;
88 struct device *dev = afe->dev;
89 unsigned int hw_ptr_lower32 = 0, hw_ptr_upper32 = 0;
90 unsigned int hw_base_lower32 = 0, hw_base_upper32 = 0;
91 unsigned long long hw_ptr = 0, hw_base = 0;
92 int ret;
93 unsigned long long pcm_ptr_bytes = 0;
94
95 ret = regmap_read(regmap, memif_data->reg_ofs_cur, &hw_ptr_lower32);
96 if (ret || hw_ptr_lower32 == 0) {
97 dev_err(dev, "%s hw_ptr_lower32 err\n", __func__);
98 goto POINTER_RETURN_FRAMES;
99 }
100
101 if (memif_data->reg_ofs_cur_msb) {
102 ret = regmap_read(regmap, memif_data->reg_ofs_cur_msb, &hw_ptr_upper32);
103 if (ret) {
104 dev_err(dev, "%s hw_ptr_upper32 err\n", __func__);
105 goto POINTER_RETURN_FRAMES;
106 }
107 }
108
109 ret = regmap_read(regmap, memif_data->reg_ofs_base, &hw_base_lower32);
110 if (ret || hw_base_lower32 == 0) {
111 dev_err(dev, "%s hw_base_lower32 err\n", __func__);
112 goto POINTER_RETURN_FRAMES;
113 }
114 if (memif_data->reg_ofs_base_msb) {
115 ret = regmap_read(regmap, memif_data->reg_ofs_base_msb, &hw_base_upper32);
116 if (ret) {
117 dev_err(dev, "%s hw_base_upper32 err\n", __func__);
118 goto POINTER_RETURN_FRAMES;
119 }
120 }
121 hw_ptr = ((unsigned long long)hw_ptr_upper32 << 32) + hw_ptr_lower32;
122 hw_base = ((unsigned long long)hw_base_upper32 << 32) + hw_base_lower32;
123
124 POINTER_RETURN_FRAMES:
> 125 pcm_ptr_bytes = MTK_ALIGN_16BYTES(hw_ptr - hw_base);
126 return bytes_to_frames(substream->runtime, (ssize_t)pcm_ptr_bytes);
127 }
128 EXPORT_SYMBOL_GPL(mtk_afe_pcm_pointer);
129
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2025 Red Hat, Inc.