On Fri, Sep 22, 2023 at 06:39:48AM +0200, Salvatore Bonaccorso wrote: > Hi Greg, > > On Wed, Sep 20, 2023 at 10:13:14PM +0200, Salvatore Bonaccorso wrote: > > Hi Greg, > > > > On Wed, Sep 20, 2023 at 01:31:17PM +0200, Greg Kroah-Hartman wrote: > > > 5.10-stable review patch. If anyone has any objections, please let me know. > > > > > > ------------------ > > > > > > From: Uday M Bhat <uday.m.bhat@xxxxxxxxx> > > > > > > [ Upstream commit a14aded9299187bb17ef90700eb2cf1120ef5885 ] > > > > > > For soundwire config, SSP1 is used for BT offload. This is enabled > > > in sof_sdw_quirk_table > > > > > > Reviewed-by: Kai Vehmanen <kai.vehmanen@xxxxxxxxxxxxxxx> > > > Reviewed-by: Ranjani Sridharan <ranjani.sridharan@xxxxxxxxxxxxxxx> > > > Reviewed-by: Bard Liao <yung-chuan.liao@xxxxxxxxxxxxxxx> > > > Signed-off-by: Uday M Bhat <uday.m.bhat@xxxxxxxxx> > > > Signed-off-by: Jairaj Arava <jairaj.arava@xxxxxxxxx> > > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx> > > > Link: https://lore.kernel.org/r/20230731214257.444605-5-pierre-louis.bossart@xxxxxxxxxxxxxxx > > > Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> > > > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > > > --- > > > sound/soc/intel/boards/sof_sdw.c | 4 +++- > > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > > > diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c > > > index f36a0fda1b6ae..1955d277fdf20 100644 > > > --- a/sound/soc/intel/boards/sof_sdw.c > > > +++ b/sound/soc/intel/boards/sof_sdw.c > > > @@ -214,7 +214,9 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { > > > DMI_MATCH(DMI_SYS_VENDOR, "Google"), > > > DMI_MATCH(DMI_PRODUCT_NAME, "Rex"), > > > }, > > > - .driver_data = (void *)(SOF_SDW_PCH_DMIC), > > > + .driver_data = (void *)(SOF_SDW_PCH_DMIC | > > > + SOF_BT_OFFLOAD_SSP(1) | > > > + SOF_SSP_BT_OFFLOAD_PRESENT), > > > }, > > > /* LunarLake devices */ > > > { > > > -- > > > 2.40.1 > > > > I see the following build issue while trying to check 5.10.196-rc1: > > > > sound/soc/intel/boards/sof_sdw.c:218:6: error: implicit declaration of function ‘SOF_BT_OFFLOAD_SSP’ [-Werror=implicit-function-declaration] > > 218 | SOF_BT_OFFLOAD_SSP(1) | > > | ^~~~~~~~~~~~~~~~~~ > > sound/soc/intel/boards/sof_sdw.c:219:6: error: ‘SOF_SSP_BT_OFFLOAD_PRESENT’ undeclared here (not in a function) > > 219 | SOF_SSP_BT_OFFLOAD_PRESENT), > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > > cc1: some warnings being treated as errors > > make[7]: *** [scripts/Makefile.build:286: sound/soc/intel/boards/sof_sdw.o] Error 1 > > Would it be better to drop this patch for the 5.10.y series? > > SOF_SSP_BT_OFFLOAD_PRESENT only got introduced in 19f1eace0441 ("ASoC: > Intel: sof_sdw: add support for Bluetooth offload") in 5.14-rc1 and > later the bit changed again in 368fa526e6e3 ("ASoC: Intel: sof_sdw: > extends SOF_RT711_JDSRC to 4 bits") ? > > Again, note I'm only the person seeing a build failure while testing > the new RC version for 5.10.y. Agreed, now dropped. greg k-h
