Re: [PATCH 5.13 743/800] ASoC: Intel: sof_sdw: add quirk support for Brya and BT-offload

[Greg Kroah-Hartman]

On Tue, Jul 13, 2021 at 05:41:18AM +0200, Stefan Lippers-Hollmann wrote:
> Hi
> 
> On 2021-07-12, Greg Kroah-Hartman wrote:
> > From: Vamshi Krishna Gopal <vamshi.krishna.gopal@xxxxxxxxx>
> >
> > [ Upstream commit 03effde3a2ea1d82c4dd6b634fc6174545d2c34f ]
> >
> > Brya is another ADL-P product.
> >
> > AlderLake has support for Bluetooth audio offload capability.
> > Enable the BT-offload quirk for ADL-P Brya and the Intel RVP.
> [...]
> 
> This patch seems to introduce a build failure into v5.13.2-rc1 on x86_64:
> 
>   CC [M]  sound/soc/intel/boards/sof_sdw.o
>   CC [M]  sound/soc/intel/boards/sof_sdw_rt5682.o
>   CC [M]  sound/soc/intel/boards/sof_sdw_rt700.o
>   CC [M]  sound/soc/intel/boards/sof_sdw_rt711.o
>   CC [M]  sound/soc/intel/boards/sof_sdw_rt711_sdca.o
>   CC [M]  sound/soc/intel/boards/sof_sdw_rt715.o
>   CC [M]  sound/soc/intel/boards/sof_sdw_rt715_sdca.o
>   CC [M]  sound/soc/intel/boards/sof_sdw_dmic.o
>   CC [M]  sound/soc/intel/boards/sof_sdw_hdmi.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sof_rt5682.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-haswell.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-bxt-da7219_max98357a.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-bxt-rt298.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-sof-pcm512x.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-sof-wm8804.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-glk-rt5682_max98357a.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-broadwell.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-bdw-rt5650-mach.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-bytcr-rt5640.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-bytcr-rt5651.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-cht-bsw-rt5672.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-cht-bsw-rt5645.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-cht-bsw-max98090_ti.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-cht-bsw-nau8824.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-byt-cht-cx2072x.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-byt-cht-da7213.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-byt-cht-es8316.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sst-byt-cht-nocodec.o
>   LD [M]  sound/soc/intel/boards/snd-soc-cml_rt1011_rt5682.o
>   LD [M]  sound/soc/intel/boards/snd-soc-kbl_da7219_max98357a.o
>   LD [M]  sound/soc/intel/boards/snd-soc-kbl_da7219_max98927.o
>   CHK     kernel/kheaders_data.tar.xz
>   LD [M]  sound/soc/intel/boards/snd-soc-kbl_rt5663_max98927.o
>   LD [M]  sound/soc/intel/boards/snd-soc-kbl_rt5660.o
>   LD [M]  sound/soc/intel/boards/snd-soc-skl_rt286.o
>   LD [M]  sound/soc/intel/boards/snd-skl_nau88l25_max98357a.o
>   LD [M]  sound/soc/intel/boards/snd-soc-skl_nau88l25_ssm4567.o
>   LD [M]  sound/soc/intel/boards/snd-soc-skl_hda_dsp.o
>   LD [M]  sound/soc/intel/boards/snd-soc-sof_da7219_max98373.o
>   LD [M]  sound/soc/intel/boards/snd-soc-ehl-rt5660.o
>   LD [M]  sound/soc/snd-soc-acpi.o
> /build/linux-aptosid-5.13/sound/soc/intel/boards/sof_sdw.c:200:6: error: implicit declaration of function 'SOF_BT_OFFLOAD_SSP' [-Werror=implicit-function-declaration]
>   200 |      SOF_BT_OFFLOAD_SSP(2) |
>       |      ^~~~~~~~~~~~~~~~~~
>   LD [M]  sound/soundcore.o
>   LD [M]  sound/soc/sof/xtensa/snd-sof-xtensa-dsp.o
> /build/linux-aptosid-5.13/sound/soc/intel/boards/sof_sdw.c:201:6: error: 'SOF_SSP_BT_OFFLOAD_PRESENT' undeclared here (not in a function)
>   201 |      SOF_SSP_BT_OFFLOAD_PRESENT),
>       |      ^~~~~~~~~~~~~~~~~~~~~~~~~~
>   LD [M]  sound/soc/sof/intel/snd-sof-acpi-intel-bdw.o
>   LD [M]  sound/soc/sof/intel/snd-sof-intel-hda.o
>   LD [M]  sound/soc/sof/intel/snd-sof-pci-intel-tng.o
>   LD [M]  sound/soc/sof/intel/snd-sof-pci-intel-apl.o
>   LD [M]  sound/soc/sof/intel/snd-sof-pci-intel-cnl.o
>   LD [M]  sound/soc/sof/intel/snd-sof-pci-intel-icl.o
>   LD [M]  sound/soc/sof/intel/snd-sof-pci-intel-tgl.o
> cc1: some warnings being treated as errors
> make[5]: *** [/build/linux-aptosid-5.13/scripts/Makefile.build:273: sound/soc/intel/boards/sof_sdw.o] Error 1
> 
> > diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
> > index dfad2ad129ab..35ad448902c7 100644
> > --- a/sound/soc/intel/boards/sof_sdw.c
> > +++ b/sound/soc/intel/boards/sof_sdw.c
> > @@ -197,7 +197,21 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
> >  		.driver_data = (void *)(SOF_RT711_JD_SRC_JD1 |
> >  					SOF_SDW_TGL_HDMI |
> >  					SOF_RT715_DAI_ID_FIX |
> > -					SOF_SDW_PCH_DMIC),
> > +					SOF_SDW_PCH_DMIC |
> > +					SOF_BT_OFFLOAD_SSP(2) |
> > +					SOF_SSP_BT_OFFLOAD_PRESENT),
> > +	},
> > +	{
> > +		.callback = sof_sdw_quirk_cb,
> > +		.matches = {
> > +			DMI_MATCH(DMI_SYS_VENDOR, "Google"),
> > +			DMI_MATCH(DMI_PRODUCT_NAME, "Brya"),
> > +		},
> > +		.driver_data = (void *)(SOF_SDW_TGL_HDMI |
> > +					SOF_SDW_PCH_DMIC |
> > +					SOF_SDW_FOUR_SPK |
> > +					SOF_BT_OFFLOAD_SSP(2) |
> > +					SOF_SSP_BT_OFFLOAD_PRESENT),
> >  	},
> >  	{}
> >  };
> 

Already dropped, thanks!

greg k-h