Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3394567pxf; Mon, 22 Mar 2021 05:33:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmAU/1tvp4FlcMNJDHHjLEXDqiIdOYfJYEoW1kBN3D5NW7819U+ubtriR4wsoG+esYqJjq X-Received: by 2002:a05:6402:48c:: with SMTP id k12mr25493695edv.237.1616416433797; Mon, 22 Mar 2021 05:33:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616416433; cv=none; d=google.com; s=arc-20160816; b=kmAy8+fqrUm9xeLlQb0EV8vA+PPLC42CkCHP6KMdiyQAJ+pIHTxOxhGhtrNHRUHECs xhIaEuLBb4/Eue3cJaYOH3orG9YOfnSpVJps4kDfvyhWJLn7D3AWTuHAvVcXIcS/jnEa 8XPw1kaRUqhiGt43baQYZdc8DaDp/gh7nLA4DrSGFshJr0po84NZ7hyc1oUr2nOS4iIN 9uELg6tOg/NiDmJhZLIpaEvXRZZhB6vwWtaeBhD2d5pKPN+S2uCY4qWm7WzAGIgjib+Y DM1hhvydRS1tpV40uaH3gh/ypPGFAETVf5dA934l1FFkxE1XOLVzh9l39iZMmhyBOfFc /GIg== 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=hW+0Xrd2+goOWVQSBpDMsp4ygbdr0eOad+cywwbxHnA=; b=yPJtOQWCTUwokn6RCP+M6HxeTl5k25P4AR3JFV7hBlGM4zKE3gSFLrXIxErxsW4Eh0 U3B+4KQBGPioDXL/oHHO0UZEpIp+5Q9jfm0LnP8aQUf1LJSS6C8LHyUyWcFYPFBeWbRg bx0HePhaqsBYTyoDQE9Ric7YBnCPk8HZam6P+s/IABuse4nAOo0sPInm9W7UkQq8jPUd sTHyug1xfhbmxeilRmf7HWqQoJWeV4fxIT18VziEc1igqZSngJNyfY87V5DT/LRutQaI Y+fbNiYRoDa2wLxPt8gpNy1E6xwPTFEmBNPzEsRuVApj4e05yDKlRFBKy9GA+W6L4/2s Bsbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UyypjqUV; 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 i17si12681628ejo.365.2021.03.22.05.33.30; Mon, 22 Mar 2021 05:33:53 -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=UyypjqUV; 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 S231499AbhCVMcd (ORCPT + 99 others); Mon, 22 Mar 2021 08:32:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:53372 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229692AbhCVMbB (ORCPT ); Mon, 22 Mar 2021 08:31:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7323061992; Mon, 22 Mar 2021 12:31:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616416261; bh=5UMpya4cxfPq6S+8IcJNUKh0ZUsJOpgbphgAA8riqhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UyypjqUVL0c9yDVBf893sJjvn82s7vCu4vdTKvhfE+mg3WJtjNuLZEnIwWdrPpI4z xu8HEZD4bor1kD9BpuVbC2FQiN9psCSdY/Nt+h1IxbrAmGaQQnegv6ONcaihZqeQ42 xOgoAysuA3cNRA/9bDf27pxdkhuiSVbCx8PpwAcU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rander Wang , Ranjani Sridharan , Pan Xiuli , Pierre-Louis Bossart , Mark Brown Subject: [PATCH 5.11 032/120] ASoC: SOF: intel: fix wrong poll bits in dsp power down Date: Mon, 22 Mar 2021 13:26:55 +0100 Message-Id: <20210322121930.726763652@linuxfoundation.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210322121929.669628946@linuxfoundation.org> References: <20210322121929.669628946@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: Pan Xiuli commit fd8299181995093948ec6ca75432e797b4a39143 upstream. The ADSPCS_SPA is Set Power Active bit. To check if DSP is powered down, we need to check ADSPCS_CPA, the Current Power Active bit. Fixes: 747503b1813a3 ("ASoC: SOF: Intel: Add Intel specific HDA DSP HW operations") Reviewed-by: Rander Wang Reviewed-by: Ranjani Sridharan Signed-off-by: Pan Xiuli Signed-off-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20210309004127.4940-1-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/sof/intel/hda-dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -207,7 +207,7 @@ int hda_dsp_core_power_down(struct snd_s ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPCS, adspcs, - !(adspcs & HDA_DSP_ADSPCS_SPA_MASK(core_mask)), + !(adspcs & HDA_DSP_ADSPCS_CPA_MASK(core_mask)), HDA_DSP_REG_POLL_INTERVAL_US, HDA_DSP_PD_TIMEOUT * USEC_PER_MSEC); if (ret < 0)