ALSA: hda: cs35l56: Select SERIAL_MULTI_INSTANTIATE
PATCH 1/1 ALSA: hda: cs35l56: Select SERIAL_MULTI_INSTANTIATE
The ACPI IDs used in the CS35L56 HDA drivers are all handled by the serial multi-instantiate driver which starts multiple Linux device instances from a single ACPI Device() node.
As serial multi-instantiate is not an optional part of the system add it as a dependency in Kconfig so that it is not overlooked.
--- sound/pci/hda/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/Kconfig +2 -0
@@ -162,6 +162,7 @@ config SND_HDA_SCODEC_CS35L56_I2C depends on ACPI || COMPILE_TEST depends on SND_SOC select FW_CS_DSP + select SERIAL_MULTI_INSTANTIATE select SND_HDA_GENERIC select SND_SOC_CS35L56_SHARED select SND_HDA_SCODEC_CS35L56
@@ -178,6 +179,7 @@ config SND_HDA_SCODEC_CS35L56_SPI depends on ACPI || COMPILE_TEST depends on SND_SOC select FW_CS_DSP + select SERIAL_MULTI_INSTANTIATE select SND_HDA_GENERIC select SND_SOC_CS35L56_SHARED select SND_HDA_SCODEC_CS35L56
Signature · 1 line
2.34.1
Quoted 9 lines · Simon Trimmer
The ACPI IDs used in the CS35L56 HDA drivers are all handled by the serial multi-instantiate driver which starts multiple Linux device instances from a single ACPI
Device()node.As serial multi-instantiate is not an optional part of the system add it as a dependency in
Kconfigso that it is not overlooked.Signed-off-by Simon Trimmer <[email protected]>
Applied now to for-linus branch. Thanks.
Takashi
kernel test robot
build botkernel test robot noticed the following build warnings:
Hi Simon,
kernel test robot noticed the following build warnings:
[auto build test WARNING on tiwai-sound/for-next]
[also build test WARNING on linus/master v6.10-rc4 next-20240619] [cannot apply to tiwai-sound/for-linus]
[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/Simon-Trimmer/ALSA-hda-cs35l56-Select-SERIAL_MULTI_INSTANTIATE/20240620-001810 base: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next patch link: https://lore.kernel.org/r/20240619161602.117452-1-simont%40opensource.cirrus.com patch subject: [PATCH] ALSA: hda: cs35l56: Select SERIAL_MULTI_INSTANTIATE config: alpha-kismet-CONFIG_SERIAL_MULTI_INSTANTIATE-CONFIG_SND_HDA_SCODEC_CS35L56_I2C-0-0 (https://download.01.org/0day-ci/archive/20240620/[email protected]/config) reproduce: (https://download.01.org/0day-ci/archive/20240620/[email protected]/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 <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
kismet warnings: (new ones prefixed by >>)
>> kismet: WARNING: unmet direct dependencies detected for SERIAL_MULTI_INSTANTIATE when selected by SND_HDA_SCODEC_CS35L56_I2C
WARNING: unmet direct dependencies detected for SERIAL_MULTI_INSTANTIATE
Depends on [n]: X86_PLATFORM_DEVICES [=n] && I2C [=y] && SPI [=y] && ACPI
Selected by [y]:
- SND_HDA_SCODEC_CS35L56_I2C [=y] && SOUND [=y] && SND [=y] && SND_HDA [=y] && I2C [=y] && (ACPI || COMPILE_TEST [=y]) && SND_SOC [=y]
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botkernel test robot noticed the following build warnings:
Hi Simon,
kernel test robot noticed the following build warnings:
[auto build test WARNING on tiwai-sound/for-next]
[also build test WARNING on linus/master v6.10-rc4]
[cannot apply to tiwai-sound/for-linus next-20240620]
[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/Simon-Trimmer/ALSA-hda-cs35l56-Select-SERIAL_MULTI_INSTANTIATE/20240620-001810 base: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next patch link: https://lore.kernel.org/r/20240619161602.117452-1-simont%40opensource.cirrus.com patch subject: [PATCH] ALSA: hda: cs35l56: Select SERIAL_MULTI_INSTANTIATE config: alpha-kismet-CONFIG_SERIAL_MULTI_INSTANTIATE-CONFIG_SND_HDA_SCODEC_CS35L56_SPI-0-0 (https://download.01.org/0day-ci/archive/20240621/[email protected]/config) reproduce: (https://download.01.org/0day-ci/archive/20240621/[email protected]/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 <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
kismet warnings: (new ones prefixed by >>)
>> kismet: WARNING: unmet direct dependencies detected for SERIAL_MULTI_INSTANTIATE when selected by SND_HDA_SCODEC_CS35L56_SPI
WARNING: unmet direct dependencies detected for SERIAL_MULTI_INSTANTIATE
Depends on [n]: X86_PLATFORM_DEVICES [=n] && I2C [=n] && SPI [=y] && ACPI
Selected by [y]:
- SND_HDA_SCODEC_CS35L56_SPI [=y] && SOUND [=y] && SND [=y] && SND_HDA [=y] && SPI_MASTER [=y] && (ACPI || COMPILE_TEST [=y]) && SND_SOC [=y]
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Simon,
kernel test robot noticed the following build errors:
[auto build test ERROR on tiwai-sound/for-next]
[also build test ERROR on v6.10-rc4]
[cannot apply to tiwai-sound/for-linus linus/master next-20240620] [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/Simon-Trimmer/ALSA-hda-cs35l56-Select-SERIAL_MULTI_INSTANTIATE/20240620-001810 base: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next patch link: https://lore.kernel.org/r/20240619161602.117452-1-simont%40opensource.cirrus.com patch subject: [PATCH] ALSA: hda: cs35l56: Select SERIAL_MULTI_INSTANTIATE config: x86_64-randconfig-013-20240620 (https://download.01.org/0day-ci/archive/20240621/[email protected]/config) compiler: gcc-13 (Ubuntu 13.2.0-4ubuntu3) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240621/[email protected]/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 <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
ld: vmlinux.o: in function `smi_devs_unregister':
>> drivers/platform/x86/serial-multi-instantiate.c:90:(.text+0x5d49e59): undefined reference to `spi_unregister_device' ld: vmlinux.o: in function `smi_spi_probe': >> drivers/platform/x86/serial-multi-instantiate.c:111:(.text+0x5d4a7d6): undefined reference to `acpi_spi_count_resources' >> ld: drivers/platform/x86/serial-multi-instantiate.c:147:(.text+0x5d4a8cf): undefined reference to `spi_add_device' >> ld: drivers/platform/x86/serial-multi-instantiate.c:125:(.text+0x5d4a978): undefined reference to `acpi_spi_device_alloc'
Kconfig warnings: (for reference only)
WARNING: unmet direct dependencies detected for SERIAL_MULTI_INSTANTIATE
Depends on [n]: X86_PLATFORM_DEVICES [=y] && I2C [=y] && SPI [=n] && ACPI [=y]
Selected by [y]:
- SND_HDA_SCODEC_CS35L56_I2C [=y] && SOUND [=y] && SND [=y] && SND_HDA [=y] && I2C [=y] && (ACPI [=y] || COMPILE_TEST [=n]) && SND_SOC [=y]
vim +90 drivers/platform/x86/serial-multi-instantiate.c
35a36cbb7b1ce7 Lucas Tanure 2022-01-21 83
35a36cbb7b1ce7 Lucas Tanure 2022-01-21 84 static void smi_devs_unregister(struct smi *smi)
35a36cbb7b1ce7 Lucas Tanure 2022-01-21 85 {
ed7adc2b69c649 Andy Shevchenko 2022-07-10 86 while (smi->i2c_num--)
ed7adc2b69c649 Andy Shevchenko 2022-07-10 87 i2c_unregister_device(smi->i2c_devs[smi->i2c_num]);
68f201f9061c00 Stefan Binding 2022-01-21 88
ed7adc2b69c649 Andy Shevchenko 2022-07-10 89 while (smi->spi_num--)
ed7adc2b69c649 Andy Shevchenko 2022-07-10 @90 spi_unregister_device(smi->spi_devs[smi->spi_num]);
68f201f9061c00 Stefan Binding 2022-01-21 91 }
68f201f9061c00 Stefan Binding 2022-01-21 92
68f201f9061c00 Stefan Binding 2022-01-21 93 /**
68f201f9061c00 Stefan Binding 2022-01-21 94 * smi_spi_probe - Instantiate multiple SPI devices from inst array
68f201f9061c00 Stefan Binding 2022-01-21 95 * @pdev: Platform device
68f201f9061c00 Stefan Binding 2022-01-21 96 * @smi: Internal struct for Serial multi instantiate driver
68f201f9061c00 Stefan Binding 2022-01-21 97 * @inst_array: Array of instances to probe
68f201f9061c00 Stefan Binding 2022-01-21 98 *
68f201f9061c00 Stefan Binding 2022-01-21 99 * Returns the number of SPI devices instantiate, Zero if none is found or a negative error code.
68f201f9061c00 Stefan Binding 2022-01-21 100 */
8b50c48d59a9cd Andy Shevchenko 2022-07-10 101 static int smi_spi_probe(struct platform_device *pdev, struct smi *smi,
68f201f9061c00 Stefan Binding 2022-01-21 102 const struct smi_instance *inst_array)
68f201f9061c00 Stefan Binding 2022-01-21 103 {
68f201f9061c00 Stefan Binding 2022-01-21 104 struct device *dev = &pdev->dev;
8b50c48d59a9cd Andy Shevchenko 2022-07-10 105 struct acpi_device *adev = ACPI_COMPANION(dev);
68f201f9061c00 Stefan Binding 2022-01-21 106 struct spi_controller *ctlr;
68f201f9061c00 Stefan Binding 2022-01-21 107 struct spi_device *spi_dev;
68f201f9061c00 Stefan Binding 2022-01-21 108 char name[50];
68f201f9061c00 Stefan Binding 2022-01-21 109 int i, ret, count;
68f201f9061c00 Stefan Binding 2022-01-21 110
68f201f9061c00 Stefan Binding 2022-01-21 @111 ret = acpi_spi_count_resources(adev);
68f201f9061c00 Stefan Binding 2022-01-21 112 if (ret < 0)
68f201f9061c00 Stefan Binding 2022-01-21 113 return ret;
f3e13bbc6f5a84 Andy Shevchenko 2022-07-10 114 if (!ret)
2b5b27826a48ee Andy Shevchenko 2022-07-10 115 return -ENOENT;
68f201f9061c00 Stefan Binding 2022-01-21 116
68f201f9061c00 Stefan Binding 2022-01-21 117 count = ret;
68f201f9061c00 Stefan Binding 2022-01-21 118
68f201f9061c00 Stefan Binding 2022-01-21 119 smi->spi_devs = devm_kcalloc(dev, count, sizeof(*smi->spi_devs), GFP_KERNEL);
68f201f9061c00 Stefan Binding 2022-01-21 120 if (!smi->spi_devs)
68f201f9061c00 Stefan Binding 2022-01-21 121 return -ENOMEM;
68f201f9061c00 Stefan Binding 2022-01-21 122
68f201f9061c00 Stefan Binding 2022-01-21 123 for (i = 0; i < count && inst_array[i].type; i++) {
68f201f9061c00 Stefan Binding 2022-01-21 124
68f201f9061c00 Stefan Binding 2022-01-21 @125 spi_dev = acpi_spi_device_alloc(NULL, adev, i);
68f201f9061c00 Stefan Binding 2022-01-21 126 if (IS_ERR(spi_dev)) {
14a9aa99aca6c2 Andy Shevchenko 2022-07-10 127 ret = dev_err_probe(dev, PTR_ERR(spi_dev), "failed to allocate SPI device %s from ACPI\n",
14a9aa99aca6c2 Andy Shevchenko 2022-07-10 128 dev_name(&adev->dev));
68f201f9061c00 Stefan Binding 2022-01-21 129 goto error;
68f201f9061c00 Stefan Binding 2022-01-21 130 }
68f201f9061c00 Stefan Binding 2022-01-21 131
68f201f9061c00 Stefan Binding 2022-01-21 132 ctlr = spi_dev->controller;
68f201f9061c00 Stefan Binding 2022-01-21 133
68f201f9061c00 Stefan Binding 2022-01-21 134 strscpy(spi_dev->modalias, inst_array[i].type, sizeof(spi_dev->modalias));
68f201f9061c00 Stefan Binding 2022-01-21 135
68f201f9061c00 Stefan Binding 2022-01-21 136 ret = smi_get_irq(pdev, adev, &inst_array[i]);
68f201f9061c00 Stefan Binding 2022-01-21 137 if (ret < 0) {
68f201f9061c00 Stefan Binding 2022-01-21 138 spi_dev_put(spi_dev);
68f201f9061c00 Stefan Binding 2022-01-21 139 goto error;
68f201f9061c00 Stefan Binding 2022-01-21 140 }
68f201f9061c00 Stefan Binding 2022-01-21 141 spi_dev->irq = ret;
68f201f9061c00 Stefan Binding 2022-01-21 142
68f201f9061c00 Stefan Binding 2022-01-21 143 snprintf(name, sizeof(name), "%s-%s-%s.%d", dev_name(&ctlr->dev), dev_name(dev),
68f201f9061c00 Stefan Binding 2022-01-21 144 inst_array[i].type, i);
68f201f9061c00 Stefan Binding 2022-01-21 145 spi_dev->dev.init_name = name;
68f201f9061c00 Stefan Binding 2022-01-21 146
68f201f9061c00 Stefan Binding 2022-01-21 @147 ret = spi_add_device(spi_dev);
68f201f9061c00 Stefan Binding 2022-01-21 148 if (ret) {
14a9aa99aca6c2 Andy Shevchenko 2022-07-10 149 dev_err_probe(&ctlr->dev, ret, "failed to add SPI device %s from ACPI\n",
14a9aa99aca6c2 Andy Shevchenko 2022-07-10 150 dev_name(&adev->dev));
68f201f9061c00 Stefan Binding 2022-01-21 151 spi_dev_put(spi_dev);
68f201f9061c00 Stefan Binding 2022-01-21 152 goto error;
68f201f9061c00 Stefan Binding 2022-01-21 153 }
68f201f9061c00 Stefan Binding 2022-01-21 154
e20451f44ca33e Amit Kumar Mahapatra via Alsa-devel 2023-03-10 155 dev_dbg(dev, "SPI device %s using chip select %u", name,
e20451f44ca33e Amit Kumar Mahapatra via Alsa-devel 2023-03-10 156 spi_get_chipselect(spi_dev, 0));
68f201f9061c00 Stefan Binding 2022-01-21 157
68f201f9061c00 Stefan Binding 2022-01-21 158 smi->spi_devs[i] = spi_dev;
68f201f9061c00 Stefan Binding 2022-01-21 159 smi->spi_num++;
68f201f9061c00 Stefan Binding 2022-01-21 160 }
68f201f9061c00 Stefan Binding 2022-01-21 161
68f201f9061c00 Stefan Binding 2022-01-21 162 if (smi->spi_num < count) {
68f201f9061c00 Stefan Binding 2022-01-21 163 dev_dbg(dev, "Error finding driver, idx %d\n", i);
68f201f9061c00 Stefan Binding 2022-01-21 164 ret = -ENODEV;
68f201f9061c00 Stefan Binding 2022-01-21 165 goto error;
68f201f9061c00 Stefan Binding 2022-01-21 166 }
68f201f9061c00 Stefan Binding 2022-01-21 167
68f201f9061c00 Stefan Binding 2022-01-21 168 dev_info(dev, "Instantiated %d SPI devices.\n", smi->spi_num);
68f201f9061c00 Stefan Binding 2022-01-21 169
68f201f9061c00 Stefan Binding 2022-01-21 170 return 0;
68f201f9061c00 Stefan Binding 2022-01-21 171 error:
68f201f9061c00 Stefan Binding 2022-01-21 172 smi_devs_unregister(smi);
68f201f9061c00 Stefan Binding 2022-01-21 173
68f201f9061c00 Stefan Binding 2022-01-21 174 return ret;
35a36cbb7b1ce7 Lucas Tanure 2022-01-21 175 }
35a36cbb7b1ce7 Lucas Tanure 2022-01-21 176 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Simon,
kernel test robot noticed the following build errors:
[auto build test ERROR on tiwai-sound/for-next]
[also build test ERROR on v6.10-rc4]
[cannot apply to tiwai-sound/for-linus linus/master next-20240621] [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/Simon-Trimmer/ALSA-hda-cs35l56-Select-SERIAL_MULTI_INSTANTIATE/20240620-001810 base: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next patch link: https://lore.kernel.org/r/20240619161602.117452-1-simont%40opensource.cirrus.com patch subject: [PATCH] ALSA: hda: cs35l56: Select SERIAL_MULTI_INSTANTIATE config: x86_64-randconfig-016-20240622 (https://download.01.org/0day-ci/archive/20240622/[email protected]/config) compiler: gcc-12 (Ubuntu 12.3.0-9ubuntu2) 12.3.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240622/[email protected]/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 <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
drivers/platform/x86/serial-multi-instantiate.c: In function 'smi_devs_unregister':
>> drivers/platform/x86/serial-multi-instantiate.c:87:17: error: implicit declaration of function 'i2c_unregister_device'; did you mean 'spi_unregister_device'? [-Werror=implicit-function-declaration]
87 | i2c_unregister_device(smi->i2c_devs[smi->i2c_num]);
| ^~~~~~~~~~~~~~~~~~~~~
| spi_unregister_devicecc1: some warnings being treated as errors
Kconfig warnings: (for reference only)
WARNING: unmet direct dependencies detected for SERIAL_MULTI_INSTANTIATE
Depends on [n]: X86_PLATFORM_DEVICES [=n] && I2C [=n] && SPI [=y] && ACPI [=y]
Selected by [m]:
- SND_HDA_SCODEC_CS35L56_SPI [=m] && SOUND [=y] && SND [=m] && SND_HDA [=m] && SPI_MASTER [=y] && (ACPI [=y] || COMPILE_TEST [=n]) && SND_SOC [=m]
vim +87 drivers/platform/x86/serial-multi-instantiate.c
35a36cbb7b1ce75 Lucas Tanure 2022-01-21 83
35a36cbb7b1ce75 Lucas Tanure 2022-01-21 84 static void smi_devs_unregister(struct smi *smi)
35a36cbb7b1ce75 Lucas Tanure 2022-01-21 85 {
ed7adc2b69c6492 Andy Shevchenko 2022-07-10 86 while (smi->i2c_num--)
ed7adc2b69c6492 Andy Shevchenko 2022-07-10 @87 i2c_unregister_device(smi->i2c_devs[smi->i2c_num]);
68f201f9061c000 Stefan Binding 2022-01-21 88
ed7adc2b69c6492 Andy Shevchenko 2022-07-10 89 while (smi->spi_num--)
ed7adc2b69c6492 Andy Shevchenko 2022-07-10 90 spi_unregister_device(smi->spi_devs[smi->spi_num]);
68f201f9061c000 Stefan Binding 2022-01-21 91 }
68f201f9061c000 Stefan Binding 2022-01-21 92 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki