From 46e7ce9148502dfd3c8044cd31693160887ad885 Mon Sep 17 00:00:00 2001 From: Pin-chih Lin Date: Tue, 24 May 2022 15:12:51 +0800 Subject: [PATCH 1/2] topology1: rtnr: set bytes control to read-only Due to security requirement, the config bytes control is set to read-only for RTNR with hard-coded the config blob in the topology. It's WA until the security approval is obtained. Signed-off-by: Pin-chih Lin --- .../sof/pipe-google-rtc-audio-processing-rtnr-capture.m4 | 6 +++--- tools/topology/topology1/sof/pipe-rtnr-capture.m4 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/topology/topology1/sof/pipe-google-rtc-audio-processing-rtnr-capture.m4 b/tools/topology/topology1/sof/pipe-google-rtc-audio-processing-rtnr-capture.m4 index c4deb6ff2606..96b62685a53b 100644 --- a/tools/topology/topology1/sof/pipe-google-rtc-audio-processing-rtnr-capture.m4 +++ b/tools/topology/topology1/sof/pipe-google-rtc-audio-processing-rtnr-capture.m4 @@ -47,9 +47,9 @@ CONTROLBYTES_PRIV(DEF_RTNR_PRIV, ) # RTNR Bytes control with max value of 255 -C_CONTROLBYTES(DEF_RTNR_BYTES, PIPELINE_ID, - CONTROLBYTES_OPS(bytes, 258 binds the mixer control to bytes get/put handlers, 258, 258), - CONTROLBYTES_EXTOPS(258 binds the mixer control to bytes get/put handlers, 258, 258), +C_CONTROLBYTES_READONLY(DEF_RTNR_BYTES, PIPELINE_ID, + CONTROLBYTES_OPS(bytes, 258 binds the mixer control to bytes get handlers, 258), + CONTROLBYTES_EXTOPS(258 binds the mixer control to bytes get handlers, 258), , , , CONTROLBYTES_MAX(, 256), , diff --git a/tools/topology/topology1/sof/pipe-rtnr-capture.m4 b/tools/topology/topology1/sof/pipe-rtnr-capture.m4 index cffa27c82833..5a4b6650cfd1 100644 --- a/tools/topology/topology1/sof/pipe-rtnr-capture.m4 +++ b/tools/topology/topology1/sof/pipe-rtnr-capture.m4 @@ -38,9 +38,9 @@ CONTROLBYTES_PRIV(DEF_RTNR_PRIV, ) # RTNR Bytes control with max value of 255 -C_CONTROLBYTES(DEF_RTNR_BYTES, PIPELINE_ID, - CONTROLBYTES_OPS(bytes, 258 binds the mixer control to bytes get/put handlers, 258, 258), - CONTROLBYTES_EXTOPS(258 binds the mixer control to bytes get/put handlers, 258, 258), +C_CONTROLBYTES_READONLY(DEF_RTNR_BYTES, PIPELINE_ID, + CONTROLBYTES_OPS(bytes, 258 binds the mixer control to bytes get handlers, 258), + CONTROLBYTES_EXTOPS(258 binds the mixer control to bytes get handlers, 258), , , , CONTROLBYTES_MAX(, 256), , From ead1c37c8f083135f89755b3807e495a2c587c85 Mon Sep 17 00:00:00 2001 From: Pin-chih Lin Date: Tue, 24 May 2022 15:13:45 +0800 Subject: [PATCH 2/2] rtnr: add rtnr-only override config Enables component RTNR for mt8195 binary Signed-off-by: Pin-chih Lin --- src/arch/xtensa/configs/override/mt8195_chrome_rtnr.config | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/arch/xtensa/configs/override/mt8195_chrome_rtnr.config diff --git a/src/arch/xtensa/configs/override/mt8195_chrome_rtnr.config b/src/arch/xtensa/configs/override/mt8195_chrome_rtnr.config new file mode 100644 index 000000000000..96da46bb8baa --- /dev/null +++ b/src/arch/xtensa/configs/override/mt8195_chrome_rtnr.config @@ -0,0 +1 @@ +CONFIG_COMP_RTNR=y