Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <18fb40b9-f5b4-60d8-79df-e0719cf48231@intel.com>
Date:   Wed, 19 Jul 2023 17:26:24 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [PATCH 3/7] ASoC: Intel: avs: Move snd_hdac_i915_init to before
 probe_work.
Content-Language: en-US
To:     Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        <alsa-devel@alsa-project.org>
CC:     <sound-open-firmware@alsa-project.org>,
        <linux-kernel@vger.kernel.org>, Jaroslav Kysela <perex@perex.cz>,
        Takashi Iwai <tiwai@suse.com>,
        "Pierre-Louis Bossart" <pierre-louis.bossart@linux.intel.com>,
        Liam Girdwood <liam.r.girdwood@linux.intel.com>,
        Peter Ujfalusi <peter.ujfalusi@linux.intel.com>,
        Bard Liao <yung-chuan.liao@linux.intel.com>,
        Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
        Kai Vehmanen <kai.vehmanen@linux.intel.com>,
        Mark Brown <broonie@kernel.org>,
        "Daniel Baluta" <daniel.baluta@nxp.com>
References: <20230718084522.116952-1-maarten.lankhorst@linux.intel.com>
 <20230718084522.116952-4-maarten.lankhorst@linux.intel.com>
From:   Cezary Rojewski <cezary.rojewski@intel.com>
In-Reply-To: <20230718084522.116952-4-maarten.lankhorst@linux.intel.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZWZuWkpxeFVXSitBRHFsanlKVVJtaTluWTAzcDgvekRvZkVSZldzKytMLzdL?=
 =?utf-8?B?bGFqamRuNGhPMjBPejVVWkZ2eTlNUVc1UWJ3ZkJmdCtmWHFyaXpIRnBpYkla?=
 =?utf-8?B?N2NxOS9rWE85YlEwYis3SlY1UTFIQlFTN0ZGQWIzK21iL2FpWWdjU0FHRWV1?=
 =?utf-8?B?bnVDNlM2blFjajNJT3RuUnlENDdDRGxmVThDQ0hEY0hvdDFrUzhtR2FmTHRL?=
 =?utf-8?B?czJFa05nRnZuWkFqaGNwdTJHakEzR2gxWCtodjdtK1NEUWFCZnpCSjVnWnVE?=
 =?utf-8?B?WnpPNzlHcFVWK0krcHh2N3M2M2c1NlVhNkt2OUhPczRJUUNGVEZ2VWEwempW?=
 =?utf-8?B?OWF5ZlRkTWl0WjlhWWgzRm14NXIxVTZZL3Q0NXRBNzAxWkEwVXUrVk45OXRj?=
 =?utf-8?B?T2c0U3RLOVRmQXBURVBwMy9WcnlDdFo0dEgvRUhxQlVkRXhFdmZlSmpSKytW?=
 =?utf-8?B?SWsxdVJvaHhzMTlLNFB1dnh4bTRjTFY5OGdHeDRpS1RiK0g3cW9UMjFsYklx?=
 =?utf-8?B?cDRtMlVTczRZTHNsT0Q0bnlObEhZcjI5Y0xia0dTNy9BZklVR0sxaWhFRHhG?=
 =?utf-8?B?bGdrYmRDTXprYjNQTFY2blpqcC9wNjFncXZZdHNtaUZ6YlJZRnlMRDlEUjA1?=
 =?utf-8?B?MXhhNVRDVDM0dWxYdHNlMFcvZ01BZXdYRlFmdGZkaWFEU0RVSDNyS2YxR1U1?=
 =?utf-8?B?cnZMTm1aQmJRRjgwcEtMYzVibENWTitGOTk3VVBWZmFMYU8rNUFLWHRUM1JV?=
 =?utf-8?B?S1hVNE5iV3lrRkE0cExLWmdON2pudS81SHZqaWppdmRaR1BtRi9iOWFETlRh?=
 =?utf-8?B?WmxjenZ3eW9nRDdyd1VycXVaaGlQcTVoYmNvaDBrdlpSOVdYNmo3eDcwbldX?=
 =?utf-8?B?L3dOOEVIcXVQb3dodVpMbGdnK2laQWVlb1VxWjZwMlJjcmVxUkx0ZGlZQnU5?=
 =?utf-8?B?dEdGT3lrTVZMWDluTk1aSkFNN2Z3T3BsRVRlMFM4NVhDdm9wd01NRFdUeVhH?=
 =?utf-8?B?SERVdzZ1TmRCQVNhd21KSmFDbXZVamxEWG5VcU9kTjVyeGV4Q3U4aEFFQkFm?=
 =?utf-8?B?clBWcGhXbVJoVVpwVzNYOFRFaFY4UVJFZGZkS3pyNlNmaWhZRHEvT2JIelNI?=
 =?utf-8?B?R3p3VUFFK1ZBMXJzNlBLRS9EWHIwa1YxSUtYbUpyZzlPME1CQlZDMks3OGJz?=
 =?utf-8?B?NEtqSDJHMy9LdzJrWGpwZVRUVmxQdjJqa0hlNXBQUitBb0RjYXNqNDJ0c3RH?=
 =?utf-8?B?ODBDdlBIeWNFd1lMSktINUlVVTJ0MUd2Z1ExdVhJYUpzSDV2NzNmQURVVVk3?=
 =?utf-8?B?SU01dzkrR05aY2h3S3lFSVRQNFFiVlFCNWFWOGtuRDZCN29nY0cxckg5b1NQ?=
 =?utf-8?B?MERVTkcyKzhTZjZ3TXpFSERzZ1hXZ05GRVBxaEF4N2lROUZrMGdJYWpnOGlu?=
 =?utf-8?B?c3pOTUxaWTk1cFhNOU14VWNNdCtuNmtobjczQ1R3a0dTSDAxa3RtMEo2TkF0?=
 =?utf-8?B?SzVIM2NlRHNUNjR1S1Nqc29GMWRzWkxsaWlYb1BidEtScWhvMEZhYUFHK1R4?=
 =?utf-8?B?dlB5OWsza2lOZi9jd1ZJcWlrci9Ga1h3OXQxajR4K2VXaUx5TEdpUFZZSFpu?=
 =?utf-8?B?TTFzUjZxRGxySXpmTXg2ZElOSTNLRUlSSEpOVlBuMWNkbE9RYjNLN3ZsUUoy?=
 =?utf-8?B?akttbmh0TGp3Mlk5MDBINWVlL0V0N0tQZnpvS1dvaDc5S1FydldJd1prVitQ?=
 =?utf-8?B?M2UrZUtUUi9oc0ZBc05uYTlzOGRDNkJOdkM0dC9xVmgxUlRzRzBTd2RhSzFk?=
 =?utf-8?B?REcrLzVsMU9yNEtTSXdIRE0ydmltSlh5eHVtKzZhRUpqaXovMGdRcW44WkJj?=
 =?utf-8?B?czJwK2w4K0pNVzJzNk9DbFkxY1pRTEFFYjlWTjVWNk5KWWhVZDlxemdqSjUr?=
 =?utf-8?B?em5YdmVVYXNTcndrTUI2NUxtOUdhOVpkd0hRZHJoNVZ4MktwRXExdGF2U0Ry?=
 =?utf-8?B?K0xWTmo0ejVlNy9QN1hNVFhJNklUNVFkVXk3UXBnOFd4MU4xU0Qzb0dvRzlo?=
 =?utf-8?B?MHBKdG9UMGt2TTNETzh0M0ZCTXpmWjhlcjk3amNCWDBwYW1OV0FaSGVnOHpl?=
 =?utf-8?B?b25TUjdCem1EaHF5b0pOWUt4RVVWY28xZmtFRjRRMy8zMU5SWnhWTlJJWmhB?=
 =?utf-8?B?YkE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 07821957-73cb-4ffc-3e9e-08db886c88d2
X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6375.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2023 15:26:33.7822
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: AfVRynVxW2ofSDNXgh5ywTm+iGfkKIfnosx4dGxLhix/KN0Z9tLnUxNf1bisb2k0mALBrj430UGECyumq47DPGIzzUDud/APc+1OLHxv38Y=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4650
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2023-07-18 10:45 AM, Maarten Lankhorst wrote:
> Now that we can use -EPROBE_DEFER, it's no longer required to spin off
> the snd_hdac_i915_init into a workqueue. It's likely the whole workqueue
> can be destroyed, but I don't have the means to test this.
> 
> Removing the workqueue would simplify init even further, but is left
> as exercise for the reviewer.
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
>   sound/soc/intel/avs/core.c | 13 +++++++++----
>   1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
> index 3311a6f142001..d3a7f42387e9b 100644
> --- a/sound/soc/intel/avs/core.c
> +++ b/sound/soc/intel/avs/core.c
> @@ -191,10 +191,6 @@ static void avs_hda_probe_work(struct work_struct *work)
>   
>   	pm_runtime_set_active(bus->dev); /* clear runtime_error flag */
>   
> -	ret = snd_hdac_i915_init(bus, true);
> -	if (ret < 0)
> -		dev_info(bus->dev, "i915 init unsuccessful: %d\n", ret);
> -
>   	snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, true);
>   	avs_hdac_bus_init_chip(bus, true);
>   	avs_hdac_bus_probe_codecs(bus);
> @@ -465,10 +461,19 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
>   	pci_set_drvdata(pci, bus);
>   	device_disable_async_suspend(dev);
>   
> +	ret = snd_hdac_i915_init(bus, false);
> +	if (ret == -EPROBE_DEFER)
> +		goto err_unmaster;
> +	else if (ret < 0)
> +		dev_info(bus->dev, "i915 init unsuccessful: %d\n", ret);
> +

While our tests are currently passing I have my doubts about 
EPROBE_DEFER. We do want to have audio functionality there even if some 
problems with HDMI arise along the way - some audio is better than no 
audio. Here, i915 may ruin the day for a platform equipped with 
hda/hdmi/i2c/dmic chips simultaneously.

Also, why call snd_hdac_i915_init() _after_ setting drvdata?

>   	schedule_work(&adev->probe_work);
>   
>   	return 0;
>   
> +err_unmaster:
> +	pci_clear_master(pci);
> +	pci_set_drvdata(pci, NULL);

Not a fan. It's hard to grasp entire error-step within name of a single 
label. Thus I'd suggest "err_<cause>" naming pattern instead. Even here, 
under "unmaster" you hid clearing master and drvdata both. Let's do 
"err_i915_init" instead.

>   err_acquire_irq:
>   	snd_hdac_bus_free_stream_pages(bus);
>   	snd_hdac_ext_stream_free_all(bus);