From nobody Fri Dec 19 19:01:37 2025 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D8BB5233129 for ; Thu, 24 Apr 2025 10:25:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745490342; cv=none; b=BmNYWqKC3tmeIywhoTWHLRvxfG02Ego6uNK+Jod/t7MWbr1+35IFtotQwY1RFjP6FM3Eflh+Lsahr/1k95zz35rNzbNLQqgNZBotxwV7NJYRy0mrAciV4Hr8Rvx39tcftF2jzrFg7Qi7TteJ1dPA+Lw/3k5qOKYGqFzc1VqL6Gk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745490342; c=relaxed/simple; bh=h81QwlW+y5jejd+U3IpRD8yw0U0CSxtyIhPIe9+m1d4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VitzEHqXiTHn0D931RPs4QG7NtU/mnJ81KfZUvgtkRMwzj2UimKk2jLg0zrNiuPP6NNB53UFXAiSEYdrWw0HdIdK9ODD05tsi1fD+rNqi3dvrF5RSEZ7HGCOMl04b0fVFmdfwCw2jfXwXMEqn1vtpbIjk1xs80DYoVBdRwANhCA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=jebe452A; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="jebe452A" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-22da3b26532so7810765ad.0 for ; Thu, 24 Apr 2025 03:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1745490339; x=1746095139; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+dIyzL01cgo+crKLDEZdPmeuX1TlRguSNO13pBQrU7o=; b=jebe452AACQtLmGeFmpH9wWCAZZgxZfSZ1PMWHqG9Ji0bipFwn0/a1wIc8dot1GPje K+G0+PKk3lbwPxUenicrFGenx7Cf8Imotv/oEIz5gocQ1p7Ie5g2DpXCWol4GkeLXAG5 f2+swXbFCjyAsg6gxE9xW1S2NCtEs6EcYUnHY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745490339; x=1746095139; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+dIyzL01cgo+crKLDEZdPmeuX1TlRguSNO13pBQrU7o=; b=E4K0q2xSkmi+nELpcrb3NhqVrHXtEndAwfRhZFOJ0K1JI9MAvpvYNoKdQuwPxLUHih 05UTRP1cn+ANkWl9oi4IuB8z+ZnxjEnsjcOQGnMnPQpiuacpo3h89P5IgSgRE9V1GVNh OUqA5haa9QLY661ZSXvc5QC7pO2Y45xc/jK6GnUwRCp7Dg6bMysqygcwxT4hNEkQAPg+ soyHhs+S8pIlTPoNGYggPXDE7DpUpo/0aPpKzwDkCUc1WJt6XybCPiIUU8a7Zh6kCDfg yq2BCCazk+QmCadCaqt2xTiUWmljlVlBSsOboN8viNPL0Ko9L5UNc8ioe1JRCv4XBXd2 qnpg== X-Forwarded-Encrypted: i=1; AJvYcCXtXI2fPxuh95B2GCpOSuSMKe0569X5WxML6iHqOi/K0JHv+MLon2+Z+I4HzeEiVDyGeO+DMpoogMBUZHA=@vger.kernel.org X-Gm-Message-State: AOJu0Yxd/hL4VkYPJs0sqBfXP7Nc8D9yqw/lMvrVCWPIoG+jZkt1aD25 1dYyiWMqnYQQzXCVWDb832OmmdlzbutY2rnajH0QWMNh2ekzskAz81aEUHK8uQ== X-Gm-Gg: ASbGncsnNI8n7P0DDYCQrcZvDpJZ0ATpLHqQjqinVxHPbVcuP69z2bpI+rRyBxMXStb o3k7Kz4IWKu1Gz3xg8yJZsXpurWIpn4sqGY5Eh6z3mtdxHB3N92/K4dsVcRz7DzI/KUYlpinldW YoJXQ3lBYQPJc0lrxXnC2k/Bq5rZW2iO5okNzKhvSZz9/ZBkwfewk/xugZIOwZdluUjzTZVCjlj 3CU4O5oUn8nW203zNCKG4Gb0rzchfGxM5naOj9dWOPgkB1XJFfRkD1+7fZbjNECD6n+X51UBwos EntDyT84cRd48fHSyYRp8Q3ltYSboRueBCeKCFwdvEsbgFuwheqZFnu3+Q== X-Google-Smtp-Source: AGHT+IGDFNqCsjcE5GSWvAg3se5R8IwE/tOMMO7jOQeDrhg6ysHM8d1FMTBh96EPdCO+C4822gNnlw== X-Received: by 2002:a17:902:cacc:b0:220:ff3f:6cc0 with SMTP id d9443c01a7336-22db3d777dbmr28370545ad.38.1745490339232; Thu, 24 Apr 2025 03:25:39 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:fa13:e633:684b:257]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4dda40fsm9680305ad.104.2025.04.24.03.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 03:25:38 -0700 (PDT) From: Chen-Yu Tsai To: Liam Girdwood , Mark Brown , Matthias Brugger , AngeloGioacchino Del Regno , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Jiaxin Yu , linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 06/13] ASoC: mediatek: use reserved memory or enable buffer pre-allocation Date: Thu, 24 Apr 2025 18:25:00 +0800 Message-ID: <20250424102509.1083185-7-wenst@chromium.org> X-Mailer: git-send-email 2.49.0.805.g082f7c87e0-goog In-Reply-To: <20250424102509.1083185-1-wenst@chromium.org> References: <20250424102509.1083185-1-wenst@chromium.org> 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 Content-Type: text/plain; charset="utf-8" In commit 32c9c06adb5b ("ASoC: mediatek: disable buffer pre-allocation") buffer pre-allocation was disabled to accommodate newer platforms that have a limited reserved memory region for the audio frontend. Turns out disabling pre-allocation across the board impacts platforms that don't have this reserved memory region. Buffer allocation failures have been observed on MT8173 and MT8183 based Chromebooks under low memory conditions, which results in no audio playback for the user. Since some MediaTek platforms already have dedicated reserved memory pools for the audio frontend, the plan is to enable this for all of them. This requires device tree changes. As a fallback, reinstate the original policy of pre-allocating audio buffers at probe time of the reserved memory pool cannot be found or used. This patch covers the MT8173, MT8183, MT8186 and MT8192 platforms for now, the reason being that existing MediaTek platform drivers that supported reserved memory were all platforms that mainly supported ChromeOS, and is also the set of devices that I can verify. Fixes: 32c9c06adb5b ("ASoC: mediatek: disable buffer pre-allocation") Signed-off-by: Chen-Yu Tsai --- sound/soc/mediatek/common/mtk-afe-platform-driver.c | 4 +++- sound/soc/mediatek/common/mtk-base-afe.h | 1 + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 7 +++++++ sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 7 +++++++ sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 7 +++++++ sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 7 +++++++ 6 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sound/soc/mediatek/common/mtk-afe-platform-driver.c b/sound/so= c/mediatek/common/mtk-afe-platform-driver.c index 6b6330583941..70fd05d5ff48 100644 --- a/sound/soc/mediatek/common/mtk-afe-platform-driver.c +++ b/sound/soc/mediatek/common/mtk-afe-platform-driver.c @@ -120,7 +120,9 @@ int mtk_afe_pcm_new(struct snd_soc_component *component, struct mtk_base_afe *afe =3D snd_soc_component_get_drvdata(component); =20 size =3D afe->mtk_afe_hardware->buffer_bytes_max; - snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, afe->dev, 0, size= ); + snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, afe->dev, + afe->preallocate_buffers ? size : 0, + size); =20 return 0; } diff --git a/sound/soc/mediatek/common/mtk-base-afe.h b/sound/soc/mediatek/= common/mtk-base-afe.h index f51578b6c50a..a406f2e3e7a8 100644 --- a/sound/soc/mediatek/common/mtk-base-afe.h +++ b/sound/soc/mediatek/common/mtk-base-afe.h @@ -117,6 +117,7 @@ struct mtk_base_afe { struct mtk_base_afe_irq *irqs; int irqs_size; int memif_32bit_supported; + bool preallocate_buffers; =20 struct list_head sub_dais; struct snd_soc_dai_driver *dai_drivers; diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediate= k/mt8173/mt8173-afe-pcm.c index 04ed0cfec174..f93d6348fdf8 100644 --- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -1070,6 +1071,12 @@ static int mt8173_afe_pcm_dev_probe(struct platform_= device *pdev) =20 afe->dev =3D &pdev->dev; =20 + ret =3D of_reserved_mem_device_init(&pdev->dev); + if (ret) { + dev_info(&pdev->dev, "no reserved memory found, pre-allocating buffers i= nstead\n"); + afe->preallocate_buffers =3D true; + } + irq_id =3D platform_get_irq(pdev, 0); if (irq_id <=3D 0) return irq_id < 0 ? irq_id : -ENXIO; diff --git a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c b/sound/soc/mediate= k/mt8183/mt8183-afe-pcm.c index d083b4bf0f95..e7378bee8e50 100644 --- a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c +++ b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include =20 @@ -1094,6 +1095,12 @@ static int mt8183_afe_pcm_dev_probe(struct platform_= device *pdev) afe->dev =3D &pdev->dev; dev =3D afe->dev; =20 + ret =3D of_reserved_mem_device_init(dev); + if (ret) { + dev_info(dev, "no reserved memory found, pre-allocating buffers instead\= n"); + afe->preallocate_buffers =3D true; + } + /* initial audio related clock */ ret =3D mt8183_init_clock(afe); if (ret) { diff --git a/sound/soc/mediatek/mt8186/mt8186-afe-pcm.c b/sound/soc/mediate= k/mt8186/mt8186-afe-pcm.c index db7c93401bee..c73b4664e53e 100644 --- a/sound/soc/mediatek/mt8186/mt8186-afe-pcm.c +++ b/sound/soc/mediatek/mt8186/mt8186-afe-pcm.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -2835,6 +2836,12 @@ static int mt8186_afe_pcm_dev_probe(struct platform_= device *pdev) afe_priv =3D afe->platform_priv; afe->dev =3D &pdev->dev; =20 + ret =3D of_reserved_mem_device_init(dev); + if (ret) { + dev_info(dev, "no reserved memory found, pre-allocating buffers instead\= n"); + afe->preallocate_buffers =3D true; + } + afe->base_addr =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(afe->base_addr)) return PTR_ERR(afe->base_addr); diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c b/sound/soc/mediate= k/mt8192/mt8192-afe-pcm.c index fd6af74d7995..3d32fe46118e 100644 --- a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c +++ b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -2179,6 +2180,12 @@ static int mt8192_afe_pcm_dev_probe(struct platform_= device *pdev) =20 afe->dev =3D dev; =20 + ret =3D of_reserved_mem_device_init(dev); + if (ret) { + dev_info(dev, "no reserved memory found, pre-allocating buffers instead\= n"); + afe->preallocate_buffers =3D true; + } + /* init audio related clock */ ret =3D mt8192_init_clock(afe); if (ret) { --=20 2.49.0.805.g082f7c87e0-goog