Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2716025imj; Mon, 11 Feb 2019 07:25:15 -0800 (PST) X-Google-Smtp-Source: AHgI3Ib4hyvrCyu2YSOInPiCwVTL6lp2wIvz59n0UtctK+kqTMxVlSbO63Ah9kQLSb4+yfuQ7FP/ X-Received: by 2002:a63:da45:: with SMTP id l5mr34231524pgj.111.1549898715400; Mon, 11 Feb 2019 07:25:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549898715; cv=none; d=google.com; s=arc-20160816; b=PN4wPk2N79aJ68Vmedkd5ImrjYvpIM5C9ZC5y5V+0c2YVlIeV8pUU+YG0J2qx8vbcT TUtv0egVnvc0Uy75Te0KjQgsE1upS/trXnlZ5NuiavjaLP05qZcO1RPS3xXRnCNOUxL2 b2W7JkUCmWDu6Zr0cFPJxTHRy/TGbh0usu7mwDY8APydzCAHnDixO5QytzC2Y/sS+hw3 arLSNdAob0e3O76KJQctcAkf2H/kuV2JFOfGyCqDQ3PnLSGr/BZucuJy+u22u3vZcW2H iV0jfszeM56mdHPo2JenStRYhyjKYGwkrkdod584MiPxGT7wefGtPXv8IAp0O4eukjkn SZ3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7VtHdTmrn9YqfAC1qM9o8pe+Mln15Eb7w7q2kpSssds=; b=l5aoKWaa6gABaMDb0D1gVq57AY1MwyiSitA8qL9GMyp0pdtIbJvpd/boylMbEtb9J+ G7qBeNUvFeYyCg2ar1M97xqSD0Bfm8oiDzbllNs0GMXIC9fl0uJQBRgY7f/z84P8EeTA /NnRJatRP1h3VlymxuHVI7ZMY3HXz63PhZfteq+Pvq9wOcBO60xmKqUVec0ILcJPSAs+ YBsJRjiAVCY6s6vcuOw+o8bIeYGKOUhxkwNLHVXHWPGS+sX0CQiuAMvzRYpTuOKFliO6 YMhLsmtJBHIl6PXgpZtLRageyUZ+qUpe+lYlKJE7vp2CBWILAYng/aCr87WvZvQABa/u Fl+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2Qe0TOyC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l5si347935pgn.17.2019.02.11.07.24.58; Mon, 11 Feb 2019 07:25:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2Qe0TOyC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390466AbfBKPCn (ORCPT + 99 others); Mon, 11 Feb 2019 10:02:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:50906 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390445AbfBKPCk (ORCPT ); Mon, 11 Feb 2019 10:02:40 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D3861222AF; Mon, 11 Feb 2019 15:02:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897359; bh=y+0SqmY9T6bRRi0tBk1BjjKAM/LszRClbDJhj9YOqiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2Qe0TOyC1aHGYz/QVoZpSWhwmjb1Oulh5qft1Lo5GCWjzIZo3tVKzXyIWG7JnDfTO a/uaEkm0eAgIlrVHZQ/2zz3lgiI71SjSbQwhX/DGpK5FldxEeUjQd09J+Nb5QqNPAv hKaCgZr1Ba3d/Z65UNE5tYqg1YGd0HieTWCQr2kw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 4.14 176/205] ALSA: hda - Serialize codec registrations Date: Mon, 11 Feb 2019 15:19:34 +0100 Message-Id: <20190211141839.888247360@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141827.214852402@linuxfoundation.org> References: <20190211141827.214852402@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai commit 305a0ade180981686eec1f92aa6252a7c6ebb1cf upstream. In the current code, the codec registration may happen both at the codec bind time and the end of the controller probe time. In a rare occasion, they race with each other, leading to Oops due to the still uninitialized card device. This patch introduces a simple flag to prevent the codec registration at the codec bind time as long as the controller probe is going on. The controller probe invokes snd_card_register() that does the whole registration task, and we don't need to register each piece beforehand. Cc: Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/hda_bind.c | 3 ++- sound/pci/hda/hda_codec.h | 1 + sound/pci/hda/hda_intel.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -109,7 +109,8 @@ static int hda_codec_driver_probe(struct err = snd_hda_codec_build_controls(codec); if (err < 0) goto error_module; - if (codec->card->registered) { + /* only register after the bus probe finished; otherwise it's racy */ + if (!codec->bus->bus_probing && codec->card->registered) { err = snd_card_register(codec->card); if (err < 0) goto error_module; --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -68,6 +68,7 @@ struct hda_bus { unsigned int response_reset:1; /* controller was reset */ unsigned int in_reset:1; /* during reset operation */ unsigned int no_response_fallback:1; /* don't fallback at RIRB error */ + unsigned int bus_probing :1; /* during probing process */ int primary_dig_out_type; /* primary digital out PCM type */ unsigned int mixer_assigned; /* codec addr for mixer name */ --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2236,6 +2236,7 @@ static int azx_probe_continue(struct azx int val; int err; + to_hda_bus(bus)->bus_probing = 1; hda->probe_continued = 1; /* bind with i915 if needed */ @@ -2341,6 +2342,7 @@ i915_power_fail: if (err < 0) hda->init_failed = 1; complete_all(&hda->probe_wait); + to_hda_bus(bus)->bus_probing = 0; return err; }