Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3402795pxf; Mon, 22 Mar 2021 05:46:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5NfgXoLSBLHgf+lsl6155y5KC/Zz5bMbRAOklNWsAwK2GZN7jbctBnbaR8csxqfeEYHHw X-Received: by 2002:a17:906:4e99:: with SMTP id v25mr19202604eju.532.1616417172920; Mon, 22 Mar 2021 05:46:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616417172; cv=none; d=google.com; s=arc-20160816; b=nItlD/PvmKo5jO6TVokYuCSYw2iWSJTGGpasI4npRxiucO/XLf5IASbBOWNDgmKHQD 70QTqz0rYEvgNZJIABb8cySVMi1h6HrySIPD5i7tx7Fe5GioqeA7YObi6bXZKf9YA/F1 Rvs+y+VPK1gtFgpKD46YLglBBafp6GlEk7S1CqX1g12bbCEh2OEnStUTdyl+pNyKMW6d raGPh3SE+nzqMyDTbyPrikJPRM3GhHhROQW912R270zbhMfJ7jMVBCbSF/DMvrnCBlIt xCHRWZtwymzfdNYC57HDFg2RZKt6U99vs1qbW1k/FbxpCbKfGZp01VOnuspHdCjxf2jr GlxQ== 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=fV3QtNwYhJYwwycT3pd5UndY4pN/rdttjIgV5lCTd3ubba27i8oP/zWBz0X+qGIe6K AWnd5bNfTgd44DKbMbPnmz8uNWqVP2Ie6/bgj0/S52vGtX3F234XwYu9cjwIXah4vhRm m5JzXF7Q6xU+lnfKDiy9ZD5wo9+cBkaLKWSZLbSIF6Q0jO+2lfT2ZhrLR0fostmRKPNc tSDub1feeUOLS3WGlHmkeIurAtKrqJHOajq+7b2KPCv8WvRaHiDCqYX/rKoVvpeyNmXq SNe6heb0Y2Ph7SnRf6w0is4u/ZrZe9TvxmPw2O9aVeoJrzSsC3DvCIkeHKXqpvHuJ//s EKOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aGEjh3Qm; 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 n16si10698893edo.395.2021.03.22.05.45.49; Mon, 22 Mar 2021 05:46:12 -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=aGEjh3Qm; 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 S232206AbhCVMlv (ORCPT + 99 others); Mon, 22 Mar 2021 08:41:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:56226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231837AbhCVMgH (ORCPT ); Mon, 22 Mar 2021 08:36:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2367C6191A; Mon, 22 Mar 2021 12:35:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616416546; bh=5UMpya4cxfPq6S+8IcJNUKh0ZUsJOpgbphgAA8riqhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aGEjh3QmlHTSpR/8VOlAizNsV5vveoghqOi4PmZzGRUuMnzTH6FBe+kEht2z61C1+ qUWbWulfIZzGd4/SegyMyAgK3DAokedTSqmp5V9xJUCrhN0VwVUtfsJODnac/Z2KT0 OffwmpRqSp5MErUaiXCz7L/orDFtl1QldVZ5X4ok= 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.10 027/157] ASoC: SOF: intel: fix wrong poll bits in dsp power down Date: Mon, 22 Mar 2021 13:26:24 +0100 Message-Id: <20210322121934.627798262@linuxfoundation.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210322121933.746237845@linuxfoundation.org> References: <20210322121933.746237845@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)