CS35L41 has a DSP which is able to run firmware, as well as a tuning file.
Different systems may want to use different firmwares and tuning files, and
some firmwares/tunings may not be compatible with other systems.
To allow a system to select the correct fimware/tuning, we can read an _SUB
from the ACPI. This _SUB can then be used to uniquely identify the system
in the firmware/tuning file name.
Add a helper function which reads the _SUB, so this can be used by other
parts in the future.
Add support inside the CS35L41 ASoC driver to read this _SUB, and save it
appropriately.
Stefan Binding (2):
ACPI: utils: Add api to read _SUB from ACPI
ASoC: cs35l41: Read System Name from ACPI _SUB to identify firmware
drivers/acpi/utils.c | 26 ++++++++++++++++++++++++++
include/linux/acpi.h | 8 ++++++++
sound/soc/codecs/cs35l41.c | 27 +++++++++++++++++++++++++++
3 files changed, 61 insertions(+)
--
2.25.1
When loading firmware, wm_adsp uses a number of parameters to
determine the path of the firmware and tuning files to load.
One of these parameters is system_name.
Add support in cs35l41 to read this system name from the ACPI
_SUB ID in order to uniquely identify the firmware and tuning
mapped to a particular system.
Signed-off-by: Stefan Binding <[email protected]>
---
sound/soc/codecs/cs35l41.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c
index 8766e19d85f1..5df04a2ab5a3 100644
--- a/sound/soc/codecs/cs35l41.c
+++ b/sound/soc/codecs/cs35l41.c
@@ -6,6 +6,7 @@
//
// Author: David Rhodes <[email protected]>
+#include <linux/acpi.h>
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/init.h>
@@ -1142,6 +1143,28 @@ static int cs35l41_dsp_init(struct cs35l41_private *cs35l41)
return ret;
}
+static int cs35l41_probe_acpi(struct cs35l41_private *cs35l41)
+{
+ struct acpi_device *adev;
+ int ret;
+ char sub[ACPI_MAX_SUB_BUF_SIZE];
+
+ adev = ACPI_COMPANION(cs35l41->dev);
+ /* If there is no ACPI_COMPANION, there is no ACPI for this system, return 0 */
+ if (!adev)
+ return 0;
+
+ ret = acpi_get_sub(adev->handle, sub, sizeof(sub));
+ if (ret < 0)
+ return ret;
+
+ cs35l41->dsp.system_name = devm_kstrdup(cs35l41->dev, sub, GFP_KERNEL);
+ if (!cs35l41->dsp.system_name)
+ return -ENOMEM;
+
+ return 0;
+}
+
int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *hw_cfg)
{
u32 regid, reg_revid, i, mtl_revid, int_status, chipid_match;
@@ -1270,6 +1293,10 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *
goto err;
}
+ ret = cs35l41_probe_acpi(cs35l41);
+ if (ret < 0)
+ goto err;
+
ret = cs35l41_dsp_init(cs35l41);
if (ret < 0)
goto err;
--
2.25.1
Hi Stefan,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on rafael-pm/linux-next]
[also build test ERROR on broonie-sound/for-next linus/master v5.19-rc3 next-20220622]
[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]
url: https://github.com/intel-lab-lkp/linux/commits/Stefan-Binding/Read-_SUB-from-ACPI-to-be-able-to-identify-firmware/20220622-211004
base: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next
config: sparc64-randconfig-r002-20220622 (https://download.01.org/0day-ci/archive/20220623/[email protected]/config)
compiler: sparc64-linux-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/338eadc59e88d60759ea445011a6537222b233e3
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Stefan-Binding/Read-_SUB-from-ACPI-to-be-able-to-identify-firmware/20220622-211004
git checkout 338eadc59e88d60759ea445011a6537222b233e3
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=sparc64 SHELL=/bin/bash sound/soc/codecs/
If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
sound/soc/codecs/cs35l41.c: In function 'cs35l41_probe_acpi':
>> sound/soc/codecs/cs35l41.c:1157:32: error: invalid use of undefined type 'struct acpi_device'
1157 | ret = acpi_get_sub(adev->handle, sub, sizeof(sub));
| ^~
vim +1157 sound/soc/codecs/cs35l41.c
1145
1146 static int cs35l41_probe_acpi(struct cs35l41_private *cs35l41)
1147 {
1148 struct acpi_device *adev;
1149 int ret;
1150 char sub[ACPI_MAX_SUB_BUF_SIZE];
1151
1152 adev = ACPI_COMPANION(cs35l41->dev);
1153 /* If there is no ACPI_COMPANION, there is no ACPI for this system, return 0 */
1154 if (!adev)
1155 return 0;
1156
> 1157 ret = acpi_get_sub(adev->handle, sub, sizeof(sub));
1158 if (ret < 0)
1159 return ret;
1160
1161 cs35l41->dsp.system_name = devm_kstrdup(cs35l41->dev, sub, GFP_KERNEL);
1162 if (!cs35l41->dsp.system_name)
1163 return -ENOMEM;
1164
1165 return 0;
1166 }
1167
--
0-DAY CI Kernel Test Service
https://01.org/lkp