Received-SPF: pass (google.com: domain of linux-kernel+bounces-72371-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <465d1076-163c-4933-a9b5-e4e8736f5748@amd.com>
Date: Tue, 20 Feb 2024 11:27:30 +0530
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] ASoC: SOF: amd: fix soundwire dependencies
Content-Language: en-US
To: Arnd Bergmann <arnd@kernel.org>,
 Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
 Liam Girdwood <lgirdwood@gmail.com>,
 Peter Ujfalusi <peter.ujfalusi@linux.intel.com>,
 Bard Liao <yung-chuan.liao@linux.intel.com>,
 Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
 Daniel Baluta <daniel.baluta@nxp.com>, Mark Brown <broonie@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Kai Vehmanen
 <kai.vehmanen@linux.intel.com>, Jaroslav Kysela <perex@perex.cz>,
 Takashi Iwai <tiwai@suse.com>,
 V sujith kumar Reddy <Vsujithkumar.Reddy@amd.com>,
 Venkata Prasad Potturu <venkataprasad.potturu@amd.com>,
 sound-open-firmware@alsa-project.org, linux-sound@vger.kernel.org,
 linux-kernel@vger.kernel.org
References: <20240219093900.644574-1-arnd@kernel.org>
From: "Mukunda,Vijendar" <vijendar.mukunda@amd.com>
In-Reply-To: <20240219093900.644574-1-arnd@kernel.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?TjV3SjlkZnQzcUJGUWU2YjZjYUM0SnN3M09VZmdOaDBUQ2RFVDEwM0xOVks0?=
 =?utf-8?B?QVptR05iUTRud1hpMTZEQmN6ZEZUdC9TUTNnRnVXN0cyUXBLWm84RXlVbGY2?=
 =?utf-8?B?b1YrZ0plVmFHcWt3YjM1Q2srQ3dEWnkvd3prNkpRemgrZGYxaUd5ZGFWSTYx?=
 =?utf-8?B?OG9jdWlSNnkvbzJqYnpCUXhVR1JsNnV2S2s4MlN6MzBWbWpTSzkrd1hkcGg4?=
 =?utf-8?B?NVpEdW43aThFWlRPSEhlRUNsREpJYUdjMGFoQ1VZQ0xWeXZJS280cGtOQnVl?=
 =?utf-8?B?ZHBwcGk2TEw1SHE4Rm1iaU1Qdk1CYWY4UGI3d3BXNEpiZEdncGIxYVo1VHBU?=
 =?utf-8?B?TkdIUlllMmpxVHZFNmJldkkzUm5WanpiUFBMMi9RVy9FYW40RTR4cHFzb1RU?=
 =?utf-8?B?SGNqSDMrWGtTQWVCSHpTY1M5ak8vMGdmTGU5M1N2YjMxWk5tbnZxR1JGaisz?=
 =?utf-8?B?Z2hna3RYZGNhY1pGbG84SVJ6VkJSYy9GaHhNRUtBUXdRaHhYOHRPRGNlU1NM?=
 =?utf-8?B?OHRJMXdUVFlrL1p1ZVV4VFMxR2ZxRTBFbk9wZUVwMHZhZXdnd0lLZkgxTUYr?=
 =?utf-8?B?b1ozaXZEL1VEQkxiaDJ2MW9xUTV4a0NWdGRRbmJFZ3dMa0pMdWpPN085M3g1?=
 =?utf-8?B?WUJFY21helBLaGQ4ZEFDb0RwUVI4R2FKbk9jVUZ4b0NUS1U3dk1ROTZGSm9K?=
 =?utf-8?B?ak9BQmVwZDZXNFZaYmpUOHgvZlhXdnc0QzdOYnhrOGJGV1VpbTNTYjluZ05H?=
 =?utf-8?B?U1lGMjNOZXFqRE9ORldyRGFHQUcxYnNoMXVydUZpMzgwbWdjVy9XN2NQNzI2?=
 =?utf-8?B?K0MzeEdFb25MVU5TVFI4TDQybHNUOXJ1cm5NTnJZWUhzUnhJZmdmR2V3ajk2?=
 =?utf-8?B?c2ZOTTlscW5tNmlPMDVCZ0t1N3NnSGlXTzlnNTM1WW9SWUx6YUl1VXZCL2F6?=
 =?utf-8?B?RFNqcVo5czZDMUZkRTYzY3pibmxDQ0thdnJWVXBTK3pEN2dIUWxiT0hZUCsy?=
 =?utf-8?B?U0lqWFFwc293WXRGcE9nNFNOWldpU2FUQUpRZkhJNHprR2FJVWh1M2ZXVGJo?=
 =?utf-8?B?YTdXbDBVNmQ3aTdoMExjSnlsbnVnbkkwVHZZQTU1ODltSndHY1ZDYzNuRFJE?=
 =?utf-8?B?NkM0cnVEY1lBNk9lUFlSRjg2ZWZQWFJERHpDN0VBd0czalpEYUYzcTJsSlJl?=
 =?utf-8?B?UEs2UDJCZ29mUEpNWWgrbFZlMGg4cXdMdG82S2djUTVBNDFnd1RrUnV3QWJm?=
 =?utf-8?B?MGYvek9mOENmMGZiV1lDeVpMeDY4STRiYkZoNHM0WkJrSXJSdnVrQUk1ZVMw?=
 =?utf-8?B?YWhSVFVQeHdEczhJeHlGMlZBYlBVN0tYajZNL1N1Tld0K0ZXSHlGSU9Wb2lh?=
 =?utf-8?B?Z1ZDZFRrWW0renQ5ekY2Ym5pak1rNGR1WENvNmoyenpuQVRxRVp6ODRUdFNV?=
 =?utf-8?B?bmRaakRsTEQ5RVFGcUZsanlGQ1FBdXlFdkl4ajg0Vll0aEtWTGtNZmJHT3V4?=
 =?utf-8?B?QkdERTg1R2NETGkwZTR1T002eW00YUFKVm9wVmYxQklBdlVUdnJxNDJPd2VQ?=
 =?utf-8?B?RnVxV0lXMWR3SnZHSlpDQ2VkcHZVNnZnRzdHeDhaYThIaU5Xekkrc0tjUXZx?=
 =?utf-8?B?VWxZQVl0R2NJQjlOVGJqdzFxZTVnam81cFZyNXBHUk1Ld096Q2dGMndjY2hl?=
 =?utf-8?B?dEw5amVDS1Y5OG52YXFabE9PSzEvaDZwZnFCbER0YXUvbytheGxRZmVCaU9z?=
 =?utf-8?B?aGZwNlQ5Yi9hdTFma3U4TGdPQXFhUjZKWjUyUVBMT2VHYmpmazl1ZnN6SGJm?=
 =?utf-8?B?SWVzUys3SFR6Kzh6dzNYa1IwdlJZZURLaUk0aFNLR1ZpQzV5SkxjaHFMbnlQ?=
 =?utf-8?B?MHpWdWV5Q3p5S0NFYzhrNXkwN2grYzAzQ2kvakJiVXRXOENqRG9TUFhjWExC?=
 =?utf-8?B?bXlSNXQ1d24zN2xnK04wUnd0ejIrSXAvZWczM04wb0Q2NElCTTB4a21sU0hk?=
 =?utf-8?B?OHdEYTBMWFZ3VVJ0b0tCSGp2WG5xYmYxWXVZTWhkUDZIM29RNEVMWFlUMGZV?=
 =?utf-8?B?MnRyUlFISUNsTTJUZUx1ZmdBRTJNSHY2RTN4UjBCVEh5bldqRXh0S3RQRmYx?=
 =?utf-8?Q?1YI2WAoPmi1uLlUnu8x3bnDSp?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e9578477-6c2a-48a4-ed16-08dc31d8d990
X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB4123.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2024 05:57:41.6066
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Lro8EO66BZVHxEZ9ujGc+Dt2p290s5dzdhaQQpc8V2Ud+/+uUJ5AuEFhuclx+H9lKG8Nq4KmiOJZanMI0BkszQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5874

On 19/02/24 15:08, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The soundwire-amd driver has a bit of a layering violation requiring
> the SOF driver to directly call into its exported symbols rather than
> through an abstraction.
>
> The SND_SOC_SOF_AMD_SOUNDWIRE Kconfig symbol tries to deal with the
> dependency by selecting SOUNDWIRE_AMD in a complicated set of conditions,
> but gets it wrong for a configuration involving SND_SOC_SOF_AMD_COMMON=y,
> SND_SOC_SOF_AMD_ACP63=m, and SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE=m
> SOUNDWIRE_AMD=m, which results in a link failure:
>
> ld.lld: error: undefined symbol: sdw_amd_get_slave_info
>>>> referenced by acp-common.c
> ld.lld: error: undefined symbol: amd_sdw_scan_controller
> ld.lld: error: undefined symbol: sdw_amd_probe
> ld.lld: error: undefined symbol: sdw_amd_exit
>>>> referenced by acp.c
>>>>               sound/soc/sof/amd/acp.o:(amd_sof_acp_remove) in archive vmlinux.a
> In essence, the SND_SOC_SOF_AMD_COMMON option cannot be built-in when
> trying to link against a modular SOUNDWIRE_AMD driver.
>
> Since CONFIG_SOUNDWIRE_AMD is a user-visible option, it really should
> never be selected by another driver in the first place, so replace the
> extra complexity with a normal Kconfig dependency in SND_SOC_SOF_AMD_SOUNDWIRE,
> plus a top-level check that forbids any of the AMD SOF drivers from being
> built-in with CONFIG_SOUNDWIRE_AMD=m.
>
> In normal configs, they should all either be built-in or all loadable
> modules anyway, so this simplification does not limit any real usecases.

Tested this patch. SOUNWIRE_AMD flag is not selected by default causing
AMD SOF driver for ACP 6.3 platform is build without enabling SoundWire.
>
> Fixes: d948218424bf ("ASoC: SOF: amd: add code for invoking soundwire manager helper functions")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  sound/soc/sof/amd/Kconfig | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/sof/amd/Kconfig b/sound/soc/sof/amd/Kconfig
> index c3bbe6c70fb2..2729c6eb3feb 100644
> --- a/sound/soc/sof/amd/Kconfig
> +++ b/sound/soc/sof/amd/Kconfig
> @@ -6,6 +6,7 @@
>  
>  config SND_SOC_SOF_AMD_TOPLEVEL
>  	tristate "SOF support for AMD audio DSPs"
> +	depends on SOUNDWIRE_AMD || !SOUNDWIRE_AMD
>  	depends on X86 || COMPILE_TEST
>  	help
>  	  This adds support for Sound Open Firmware for AMD platforms.
> @@ -62,15 +63,14 @@ config SND_SOC_SOF_ACP_PROBES
>  
>  config SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE
>  	tristate
> -	select SOUNDWIRE_AMD if SND_SOC_SOF_AMD_SOUNDWIRE != n
>  	select SND_AMD_SOUNDWIRE_ACPI if ACPI
>  
>  config SND_SOC_SOF_AMD_SOUNDWIRE
>  	tristate "SOF support for SoundWire based AMD platforms"
>  	default SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE
>  	depends on SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE
> -	depends on ACPI && SOUNDWIRE
> -	depends on !(SOUNDWIRE=m && SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE=y)
> +	depends on ACPI
> +	depends on SOUNDWIRE_AMD
>  	help
>  	  This adds support for SoundWire with Sound Open Firmware
>  	  for AMD platforms.