From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1D82E95A8E for ; Mon, 9 Oct 2023 11:56:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346385AbjJIL4r (ORCPT ); Mon, 9 Oct 2023 07:56:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346380AbjJIL4m (ORCPT ); Mon, 9 Oct 2023 07:56:42 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56321A6 for ; Mon, 9 Oct 2023 04:56:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696852601; x=1728388601; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=Ey3XBOcNaPEGg9atuzfryV6OFS88AnMowraWktvyqqM=; b=Y9YqrN1iG/xUKgnFT2lrHcqgkKizS7ihTStqIPVZ8JtrbK9k3rsNkzhh iEKilBpltd1LGlSZWoSLRvHNNrrYs+//0k77GUhkJe3tsNAddk3gk4kp6 OM8ptTyvgIcg7wBARDVwNAt6wwalIyotUHbqu9x+JhGd8LVO3xrRegPHK fEiQNx4cIymaAK9Pj05J8+lip7BPOwmZBgbnjdd7+w8Vl75SCpcvhaNS5 M+gAMlz09FbTLPcIOJB/b9DIJ1yASszpzO0QxtJKIyWvvdakeiSbrOC9N TBFUVmYSq/fYnqO67SA0aX8tDzRqrH+yI+WJMsq7K9Tk4LuGrB2FSwg66 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10857"; a="364417628" X-IronPort-AV: E=Sophos;i="6.03,210,1694761200"; d="scan'208";a="364417628" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2023 04:56:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10857"; a="782463584" X-IronPort-AV: E=Sophos;i="6.03,210,1694761200"; d="scan'208";a="782463584" Received: from swoop-mobl.amr.corp.intel.com (HELO [10.249.36.226]) ([10.249.36.226]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2023 04:56:35 -0700 Message-ID: <697abd63-3ed9-116e-a719-b9de74e6a8d8@linux.intel.com> Date: Mon, 9 Oct 2023 13:56:33 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH v6 11/12] ASoC: SOF: Intel: Move binding to display driver outside of deferred probe To: Takashi Iwai , Maarten Lankhorst Cc: =?UTF-8?Q?P=c3=a9ter_Ujfalusi?= , Kai Vehmanen , Alsa-devel , Jaroslav Kysela , Takashi Iwai , Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Bard Liao , Ranjani Sridharan , Mark Brown , Daniel Baluta , linux-kernel@vger.kernel.org, sound-open-firmware@alsa-project.org References: <20231004145540.32321-1-maarten.lankhorst@linux.intel.com> <20231004145540.32321-12-maarten.lankhorst@linux.intel.com> <87jzrwtiuk.wl-tiwai@suse.de> Content-Language: en-US From: Maarten Lankhorst In-Reply-To: <87jzrwtiuk.wl-tiwai@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hey, On 2023-10-09 08:23, Takashi Iwai wrote: > On Thu, 05 Oct 2023 13:26:18 +0200, > Maarten Lankhorst wrote: >> >> >> >> On 2023-10-05 12:58, Péter Ujfalusi wrote: >>> >>> >>> On 04/10/2023 19:59, Kai Vehmanen wrote: >>>> Hi, >>>> >>>> I'm good with rest of the series, but one patch requires work. >>>> >>>> On Wed, 4 Oct 2023, 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. >>>>> >>>>> Use the -EPROBE_DEFER mechanism instead, which must be returned in the >>>>> probe function. >>>>> >>>>> The previously added probe_early can be used for this, >>>>> and we also use the newly added remove_late for unbinding afterwards. >>>> [...] >>>>> --- a/sound/soc/sof/intel/hda-common-ops.c >>>>> +++ b/sound/soc/sof/intel/hda-common-ops.c >>>>> @@ -19,6 +19,7 @@ struct snd_sof_dsp_ops sof_hda_common_ops = { >>>>> .probe_early = hda_dsp_probe_early, >>>>> .probe = hda_dsp_probe, >>>>> .remove = hda_dsp_remove, >>>>> + .remove_late = hda_dsp_remove_late, >>>>> /* Register IO uses direct mmio */ >>>>> diff --git a/sound/soc/sof/intel/hda.c >>>>> b/sound/soc/sof/intel/hda.c >>>>> index 86a2571488bc..4eb7f04b8ae1 100644 >>>>> --- a/sound/soc/sof/intel/hda.c >>>>> +++ b/sound/soc/sof/intel/hda.c >>>>> @@ -1160,6 +1160,7 @@ int hda_dsp_probe_early(struct snd_sof_dev *sdev) >>>>> return -ENOMEM; >>>>> sdev->pdata->hw_pdata = hdev; >>>>> hdev->desc = chip; >>>>> + ret = hda_init(sdev); >>>>> err: >>>>> return ret; >>>> >>>> I don't think this works. The hda_codec_i915_init() errors are ignored in >>>> hda_init() so this never returns -EPROBE_DEFER. >>>> >>>> So something like this is needed on top (tested quickly on one SOF >>>> machine and this blocks SOF load until i915 or xe driver is loaded): >>>> >>>> --cut-- >>>> diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c >>>> index 9025bfaf6a7e..8b17c82dcc89 100644 >>>> --- a/sound/soc/sof/intel/hda.c >>>> +++ b/sound/soc/sof/intel/hda.c >>>> @@ -863,13 +863,20 @@ static int hda_init(struct snd_sof_dev *sdev) >>>> /* init i915 and HDMI codecs */ >>>> ret = hda_codec_i915_init(sdev); >>>> if (ret < 0) >>>> - dev_warn(sdev->dev, "init of i915 and HDMI codec >>>> failed\n"); >>>> + dev_warn(sdev->dev, "init of i915 and HDMI codec failed >>>> (%d)\n", ret); >>> >>> we should not print anything or maximum dev_dbg in case of EPROBE_DEFER. >> There's dev_err_probe, which is dev_err on error, or sets the reason >> for deferred probe to the arguments if the error is -EPROBE_DEFER. > > I expect you'll respin v7 for addressing this? > > I'd love to merge the series for 6.7, and the time ticks... Done, added the error handling early in the series as a bugfix. Cheers, ~Maarten