From nobody Tue Oct 7 18:25:18 2025 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (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 D0DC6220F4C; Tue, 8 Jul 2025 11:18:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751973505; cv=none; b=cPmoMpXlpe8e+2UiY2xmqNEBBO5mNRctBOfgeJm6ngZMJ+Z5egxBpPQr9EyH4T/utX3d9eq4a8fd9nfRiYuQ9GB329dnd35hMIWsStluROjI3KtWSLadv7noYoizVhXDUVmUjqxzV6rj21ykOT8prvY5nG6ANkAALXIA1HhYBlk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751973505; c=relaxed/simple; bh=FNsuXq9j0BP4QowlW7jYBD78YUsvp5Is5NWzT8Y0z9k=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZKzJJ7QNH3xqdXiSGErCFKKXYT1zZl1xQfxDeUO6vi5D+5PZzrd3LvBWNcBQ5gAEQIzAhMSIfyUU0zPQQfdP4FXcPqnQmmDCoIupplwNXRtjL6XqtiDWp0U76XrdoANcKblJZMlVxpdr6kKtRpDnuvXniaIbVnFpJH4UN9P9GZE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=IQ1Ft0CG; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="IQ1Ft0CG" X-UUID: 3ecb7a2c5bed11f0b33aeb1e7f16c2b6-20250708 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=XKaEAhAmqSWZKj7IY6xitMYV4V7DR8WsAnd1SNwy43Y=; b=IQ1Ft0CGSJxe6NOQ8hUGqz2Q7F9Tp0X+xLVzYDAQvi4vz6W0cJ9OGtAIA/4bMdoxMZf/Kfeqt9OCaxpxjlWgThOUzFIXt8xp2t4EYVM5RXDwC6jC53/P0BjDhyctCBAtMTGp3jTJyojxY0wfM2mznS22hpH3S41m+6QccQDanvM=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.2,REQID:85577678-2e04-404f-aba1-49054df7ddca,IP:0,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION:r elease,TS:0 X-CID-META: VersionHash:9eb4ff7,CLOUDID:8f20b4bc-a91d-4696-b3f4-d8815e4c200b,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,TC:nil,Content:0|50,EDM:-3 ,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV :0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 3ecb7a2c5bed11f0b33aeb1e7f16c2b6-20250708 Received: from mtkmbs14n2.mediatek.inc [(172.21.101.76)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 2143872235; Tue, 08 Jul 2025 19:18:16 +0800 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Tue, 8 Jul 2025 19:18:14 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Tue, 8 Jul 2025 19:18:13 +0800 From: Darren.Ye To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Jaroslav Kysela , Takashi Iwai , Linus Walleij , Bartosz Golaszewski CC: , , , , , , Darren Ye , Louis-Alexis Eyraud Subject: [PATCH v6 01/10] ASoC: mediatek: common: modify mtk afe platform driver for mt8196 Date: Tue, 8 Jul 2025 19:15:53 +0800 Message-ID: <20250708111806.3992-2-darren.ye@mediatek.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250708111806.3992-1-darren.ye@mediatek.com> References: <20250708111806.3992-1-darren.ye@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Content-Type: text/plain; charset="utf-8" From: Darren Ye Mofify the pcm pointer interface to support 64-bit address access. Signed-off-by: Darren Ye Reviewed-by: AngeloGioacchino Del Regno Tested-by: Louis-Alexis Eyraud --- .../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/so= c/mediatek/common/mtk-afe-platform-driver.c index 70fd05d5ff48..cab4ef035199 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_co= mponent *component, const struct mtk_base_memif_data *memif_data =3D memif->data; struct regmap *regmap =3D afe->regmap; struct device *dev =3D afe->dev; - int reg_ofs_base =3D memif_data->reg_ofs_base; - int reg_ofs_cur =3D memif_data->reg_ofs_cur; - unsigned int hw_ptr =3D 0, hw_base =3D 0; - int ret, pcm_ptr_bytes; - - ret =3D regmap_read(regmap, reg_ofs_cur, &hw_ptr); - if (ret || hw_ptr =3D=3D 0) { - dev_err(dev, "%s hw_ptr err\n", __func__); - pcm_ptr_bytes =3D 0; + unsigned int hw_ptr_lower32 =3D 0, hw_ptr_upper32 =3D 0; + unsigned int hw_base_lower32 =3D 0, hw_base_upper32 =3D 0; + unsigned long long hw_ptr =3D 0, hw_base =3D 0; + int ret; + unsigned long long pcm_ptr_bytes =3D 0; + + ret =3D regmap_read(regmap, memif_data->reg_ofs_cur, &hw_ptr_lower32); + if (ret || hw_ptr_lower32 =3D=3D 0) { + dev_err(dev, "%s hw_ptr_lower32 err\n", __func__); goto POINTER_RETURN_FRAMES; } =20 - ret =3D regmap_read(regmap, reg_ofs_base, &hw_base); - if (ret || hw_base =3D=3D 0) { - dev_err(dev, "%s hw_ptr err\n", __func__); - pcm_ptr_bytes =3D 0; - goto POINTER_RETURN_FRAMES; + if (memif_data->reg_ofs_cur_msb) { + ret =3D 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; + } } =20 - pcm_ptr_bytes =3D hw_ptr - hw_base; + ret =3D regmap_read(regmap, memif_data->reg_ofs_base, &hw_base_lower32); + if (ret || hw_base_lower32 =3D=3D 0) { + dev_err(dev, "%s hw_base_lower32 err\n", __func__); + goto POINTER_RETURN_FRAMES; + } + if (memif_data->reg_ofs_base_msb) { + ret =3D regmap_read(regmap, memif_data->reg_ofs_base_msb, &hw_base_upper= 32); + if (ret) { + dev_err(dev, "%s hw_base_upper32 err\n", __func__); + goto POINTER_RETURN_FRAMES; + } + } + hw_ptr =3D ((unsigned long long)hw_ptr_upper32 << 32) + hw_ptr_lower32; + hw_base =3D ((unsigned long long)hw_base_upper32 << 32) + hw_base_lower32; =20 POINTER_RETURN_FRAMES: - return bytes_to_frames(substream->runtime, pcm_ptr_bytes); + pcm_ptr_bytes =3D 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); =20 diff --git a/sound/soc/mediatek/common/mtk-afe-platform-driver.h b/sound/so= c/mediatek/common/mtk-afe-platform-driver.h index fcc923b88f12..71070b26f8f8 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; =20 +#define MTK_ALIGN_16BYTES(x) ((x) & GENMASK_ULL(39, 4)) + struct mtk_base_afe; struct snd_pcm; struct snd_soc_component; --=20 2.45.2