Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp644205pxb; Mon, 25 Oct 2021 15:43:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJFKA7HmBwkQjem3LbagxzSsYNvGeJq8S7pjN2VQ8EltCp9vsWtqatTZ4fbplGtYPpZW6Y X-Received: by 2002:a17:902:b095:b029:12c:de88:7d3b with SMTP id p21-20020a170902b095b029012cde887d3bmr19304329plr.15.1635201782463; Mon, 25 Oct 2021 15:43:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635201782; cv=none; d=google.com; s=arc-20160816; b=SfEsJM/53vUDh9o1MLyUGFiW23qajVYX74Zfk5vAEItVwlcYuVmKS259qL1pZHfOf2 W0TV5Hm2PYFcd69ZznjH2htxFapuUv06wV+tHjtOLRXF+TGailqESMwFON8I8GsYDZ8r NucsZmld3EZ2RkSIaMRVuuTdVrY63pl3FJksjyshEKh8xHEoZCrvkiaMyFtFvjzfDinI lhwiRHxiB4XLugrjB2fJSp+opKXJ/ZYIAlUbjZmKhp/ljKTAB92EoGYxAF4U2tAvtZEi WjZylDWRgQijOoiBUHGnYpoGuqC2mFPNveOtaJJwUbE5Ly2JXXOnFJ+dUz3j2oCKHkyE 7avg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fistuNThy9mSaTbMXcr4x4TAK18bzNhD0DaIDmYSYJw=; b=T2ufSUCfmYAhGwdd/ObKCKsEgQZCjhoP6qIw3Q8Q85IUdkEtrIqAi6w1I8dQqjicZq JrKq3o7YxwPOgS1POdVKLb2urBNlTrwjtL/9EsZoWqdvNNSzz1+OzS56tTK8czOwCUyy 5luw6qOmod48qLlXqATsftcSdRPFmmaIw0n8PgwKGLCdfLepRtpOEqupTCBfxUDC0aop Ph3n5yIeWYiHEKAZGfme2l32CKQ/2nT9FXuq4dbtyc6dnFx0xd0Y5idW9XbTEPaFgHit GQqzF+GbzLc8S6uekgiPNgx233erW9+mG5T3wONI4TmIY8q9yH7EINX6TZcGZZwbMaOW piBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=C0bFT0F3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x34si9287196pfh.31.2021.10.25.15.42.50; Mon, 25 Oct 2021 15:43:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=C0bFT0F3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232470AbhJYT2D (ORCPT + 99 others); Mon, 25 Oct 2021 15:28:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:42844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234832AbhJYTZT (ORCPT ); Mon, 25 Oct 2021 15:25:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EE32760187; Mon, 25 Oct 2021 19:22:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1635189760; bh=u17dEBACuhhNVBqaU2GsXt7cKqeBlviZJa2K65iEX3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C0bFT0F3MRJB2Aijl1ZpHGRUtLVLnGu+9YQLEE2ZxT81MokfmN7VslgGlFXwuDa51 Xtac7RjTkBZE5+2x/wJjXvpSuOTgbO8gn6IZBOzQNk67gQ8acHdnJyhrAAKxeNBcYB Eg26XSrRybSyfWMdWXf760VPjxKSjxnLAL+/jhpo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai Vehmanen , Takashi Iwai , Sasha Levin Subject: [PATCH 4.14 25/30] ALSA: hda: avoid write to STATESTS if controller is in reset Date: Mon, 25 Oct 2021 21:14:45 +0200 Message-Id: <20211025190928.463687915@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211025190922.089277904@linuxfoundation.org> References: <20211025190922.089277904@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kai Vehmanen [ Upstream commit b37a15188eae9d4c49c5bb035e0c8d4058e4d9b3 ] The snd_hdac_bus_reset_link() contains logic to clear STATESTS register before performing controller reset. This code dates back to an old bugfix in commit e8a7f136f5ed ("[ALSA] hda-intel - Improve HD-audio codec probing robustness"). Originally the code was added to azx_reset(). The code was moved around in commit a41d122449be ("ALSA: hda - Embed bus into controller object") and ended up to snd_hdac_bus_reset_link() and called primarily via snd_hdac_bus_init_chip(). The logic to clear STATESTS is correct when snd_hdac_bus_init_chip() is called when controller is not in reset. In this case, STATESTS can be cleared. This can be useful e.g. when forcing a controller reset to retry codec probe. A normal non-power-on reset will not clear the bits. However, this old logic is problematic when controller is already in reset. The HDA specification states that controller must be taken out of reset before writing to registers other than GCTL.CRST (1.0a spec, 3.3.7). The write to STATESTS in snd_hdac_bus_reset_link() will be lost if the controller is already in reset per the HDA specification mentioned. This has been harmless on older hardware. On newer generation of Intel PCIe based HDA controllers, if configured to report issues, this write will emit an unsupported request error. If ACPI Platform Error Interface (APEI) is enabled in kernel, this will end up to kernel log. Fix the code in snd_hdac_bus_reset_link() to only clear the STATESTS if the function is called when controller is not in reset. Otherwise clearing the bits is not possible and should be skipped. Signed-off-by: Kai Vehmanen Link: https://lore.kernel.org/r/20211012142935.3731820-1-kai.vehmanen@linux.intel.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/hda/hdac_controller.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c index 778b42ba90b8..5ae72134159a 100644 --- a/sound/hda/hdac_controller.c +++ b/sound/hda/hdac_controller.c @@ -389,8 +389,9 @@ int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset) if (!full_reset) goto skip_reset; - /* clear STATESTS */ - snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK); + /* clear STATESTS if not in reset */ + if (snd_hdac_chip_readb(bus, GCTL) & AZX_GCTL_RESET) + snd_hdac_chip_writew(bus, STATESTS, STATESTS_INT_MASK); /* reset controller */ snd_hdac_bus_enter_link_reset(bus); -- 2.33.0