Message ID | 20231009115437.99976-1-maarten.lankhorst@linux.intel.com |
---|---|
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp1811964vqo; Mon, 9 Oct 2023 04:56:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHpw5y++qhIAlpqfWWk9gpie/97QqPgYH9h0eWwqAObPjL1sp//VpbrIk5oobd4qQi1Zj0A X-Received: by 2002:a05:6a00:1409:b0:68f:dd50:aef8 with SMTP id l9-20020a056a00140900b0068fdd50aef8mr14793795pfu.4.1696852607626; Mon, 09 Oct 2023 04:56:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696852607; cv=none; d=google.com; s=arc-20160816; b=I4FfMabzD5w9TJRxY4F5Y39mTUI1qiNWSwNsXdBhwA/xT/ZpXQKYW22pfedjiMmJVK ufVNdraax6HHXpmZyC+Md9aYG3sfthRlf19eaWbv67UB1ta31RzWi28S0QTj/0vksuA5 jWU93b3Q7DSEkKk8kXTK5iM1hJN9C029/j/ekvIByHibsajamFooJXpZbQ6s/T/XhcZt r4fhKWuZk6u3G5kYzoiI66DscfJcnQcH5me4FhutSdsvMQFZwUid2wiZ0smxQLpUzoDt +VE84LubqBjhwRMlaghCvKPFyFx0u1xm3dUXOJVibSsgy/wivvkb8zuo1qB66F2752lF mB1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=kiAu5OMZaiXXi0z5I+8qm7pQTCFQwNtt0IDQ6VM0rXw=; fh=gSlqDyTAaX4sD5o7lNdgN6GT1mkO6Z4/Ye0T8jAhwnM=; b=KUvfGsJdGUaUyVwsTmZ6xrfNQsQb57K2lFyQxrkS370uvvmQZSwmY+tgcYEASoLD0u HhefIykj2NvFsAY0DB0kaKUNCiWP5QICuZHAvQV45jdbvg1sZG5K9UTy/jjlI+UtanFS 4XOkayDd6LvYCbn8ewV2ehRuL7iIUwhwjUE4G/muX7LQnzOHbGOQ68OIyx2n2LdRPu6z Aqg+WvdJ3qvG63FYtAGXQBF4FMaFr2BwIoHAyeWFqB4DIWvAHfVMsZvKKZL7j8dAW2/Z p83O7KN5btJyFtspcnmM/hE5vZ6RMqLmRUuDwSLbbj/70nVcgyOLq/eBBZ027UxQw+Z6 xSiQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id z12-20020a056a001d8c00b0068895dea43csi6755570pfw.78.2023.10.09.04.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 04:56:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 999B78093720; Mon, 9 Oct 2023 04:55:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346336AbjJILyv (ORCPT <rfc822;ezelljr.billy@gmail.com> + 18 others); Mon, 9 Oct 2023 07:54:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346335AbjJILyr (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 9 Oct 2023 07:54:47 -0400 Received: from mblankhorst.nl (lankhorst.se [141.105.120.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0B8DAC for <linux-kernel@vger.kernel.org>; Mon, 9 Oct 2023 04:54:44 -0700 (PDT) From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> To: alsa-devel@alsa-project.org Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Cezary Rojewski <cezary.rojewski@intel.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>, linux-kernel@vger.kernel.org, sound-open-firmware@alsa-project.org Subject: [PATCH v7 00/13] sound: Use -EPROBE_DEFER instead of i915 module loading. Date: Mon, 9 Oct 2023 13:54:24 +0200 Message-Id: <20231009115437.99976-1-maarten.lankhorst@linux.intel.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 09 Oct 2023 04:55:36 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779278920051257416 X-GMAIL-MSGID: 1779278920051257416 |
Series |
sound: Use -EPROBE_DEFER instead of i915 module loading.
|
|
Message
Maarten Lankhorst
Oct. 9, 2023, 11:54 a.m. UTC
Explicitly loading i915 becomes a problem when upstreaming the new intel driver for Tiger Lake and higher graphics (xe). By loading i915, it doesn't wait for driver load of xe, and will fail completely before it loads. -EPROBE_DEFER has to be returned before any device is created in probe(), otherwise the removal of the device will cause EPROBE_DEFER to try again in an infinite loop. The conversion is done in gradual steps. First I add an argument to snd_hdac_i915_init to allow for -EPROBE_DEFER so I can convert each driver separately. Then I convert each driver to move snd_hdac_i915_init out of the workqueue. Finally I drop the ability to choose modprobe behavior after the last user is converted. Compared to previous version, I added the patch "ASoC: SOF: Intel: Fix error handling in hda_init()" Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Cc: Cezary Rojewski <cezary.rojewski@intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com> Cc: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Cc: Bard Liao <yung-chuan.liao@linux.intel.com> Cc: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com> Cc: Mark Brown <broonie@kernel.org> Cc: Daniel Baluta <daniel.baluta@nxp.com> Cc: alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Cc: sound-open-firmware@alsa-project.org Maarten Lankhorst (11): ASoC: SOF: core: Ensure sof_ops_free() is still called when probe never ran. ASoC: SOF: Intel: Fix error handling in hda_init() ALSA: hda: Intel: Fix error handling in azx_probe() ALSA: hda: i915: Allow override of gpu binding. ALSA: hda: i915: Add an allow_modprobe argument to snd_hdac_i915_init ALSA: hda: i915: Allow xe as match for i915_component_master_match ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work. ALSA: hda: Intel: Move snd_hdac_i915_init to before probe_work. ASoC: Intel: Skylake: Move snd_hdac_i915_init to before probe_work. ASoC: SOF: Intel: Move binding to display driver outside of deferred probe ALSA: hda: i915: Remove extra argument from snd_hdac_i915_init Pierre-Louis Bossart (2): ASoC: SOF: core: Add probe_early and remove_late callbacks ASoC: SOF: Intel: hda: start splitting the probe sound/hda/hdac_i915.c | 24 ++++++----- sound/pci/hda/hda_intel.c | 60 ++++++++++++++-------------- sound/soc/intel/avs/core.c | 13 ++++-- sound/soc/intel/skylake/skl.c | 31 +++++--------- sound/soc/sof/core.c | 17 +++++++- sound/soc/sof/intel/hda-common-ops.c | 2 + sound/soc/sof/intel/hda.c | 46 +++++++++++++-------- sound/soc/sof/intel/hda.h | 2 + sound/soc/sof/ops.h | 16 ++++++++ sound/soc/sof/sof-priv.h | 2 + 10 files changed, 129 insertions(+), 84 deletions(-)
Comments
Hi Maarteen, On 09/10/2023 14:54, Maarten Lankhorst wrote: > Explicitly loading i915 becomes a problem when upstreaming the new intel driver > for Tiger Lake and higher graphics (xe). By loading i915, it doesn't wait for > driver load of xe, and will fail completely before it loads. > > -EPROBE_DEFER has to be returned before any device is created in probe(), > otherwise the removal of the device will cause EPROBE_DEFER to try again > in an infinite loop. > > The conversion is done in gradual steps. First I add an argument to > snd_hdac_i915_init to allow for -EPROBE_DEFER so I can convert each driver > separately. Then I convert each driver to move snd_hdac_i915_init out of the > workqueue. Finally I drop the ability to choose modprobe behavior after the > last user is converted. > > Compared to previous version, I added the patch > "ASoC: SOF: Intel: Fix error handling in hda_init()" Thank you for the updates. to all: Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> and for sound/soc/sof/ : Acked-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> > Cc: Jaroslav Kysela <perex@perex.cz> > Cc: Takashi Iwai <tiwai@suse.com> > Cc: Cezary Rojewski <cezary.rojewski@intel.com> > Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com> > Cc: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> > Cc: Bard Liao <yung-chuan.liao@linux.intel.com> > Cc: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> > Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com> > Cc: Mark Brown <broonie@kernel.org> > Cc: Daniel Baluta <daniel.baluta@nxp.com> > Cc: alsa-devel@alsa-project.org > Cc: linux-kernel@vger.kernel.org > Cc: sound-open-firmware@alsa-project.org > > Maarten Lankhorst (11): > ASoC: SOF: core: Ensure sof_ops_free() is still called when probe > never ran. > ASoC: SOF: Intel: Fix error handling in hda_init() > ALSA: hda: Intel: Fix error handling in azx_probe() > ALSA: hda: i915: Allow override of gpu binding. > ALSA: hda: i915: Add an allow_modprobe argument to snd_hdac_i915_init > ALSA: hda: i915: Allow xe as match for i915_component_master_match > ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work. > ALSA: hda: Intel: Move snd_hdac_i915_init to before probe_work. > ASoC: Intel: Skylake: Move snd_hdac_i915_init to before probe_work. > ASoC: SOF: Intel: Move binding to display driver outside of deferred > probe > ALSA: hda: i915: Remove extra argument from snd_hdac_i915_init > > Pierre-Louis Bossart (2): > ASoC: SOF: core: Add probe_early and remove_late callbacks > ASoC: SOF: Intel: hda: start splitting the probe > > sound/hda/hdac_i915.c | 24 ++++++----- > sound/pci/hda/hda_intel.c | 60 ++++++++++++++-------------- > sound/soc/intel/avs/core.c | 13 ++++-- > sound/soc/intel/skylake/skl.c | 31 +++++--------- > sound/soc/sof/core.c | 17 +++++++- > sound/soc/sof/intel/hda-common-ops.c | 2 + > sound/soc/sof/intel/hda.c | 46 +++++++++++++-------- > sound/soc/sof/intel/hda.h | 2 + > sound/soc/sof/ops.h | 16 ++++++++ > sound/soc/sof/sof-priv.h | 2 + > 10 files changed, 129 insertions(+), 84 deletions(-) >