Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp666588pxb; Tue, 5 Apr 2022 17:59:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+B8x8SQN1atA9Pah849rMtnJGSXB0hYFlhqfnGRq4Xo1IF9CH82ys7QqpKtcxd6jjeRWC X-Received: by 2002:a17:906:9b96:b0:6e7:9466:c721 with SMTP id dd22-20020a1709069b9600b006e79466c721mr6330101ejc.758.1649206666662; Tue, 05 Apr 2022 17:57:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649206666; cv=none; d=google.com; s=arc-20160816; b=uRAGi/3YYXie84SEkFVB5S6Ac/lDZjQq2RsIE66hDqstEbvDKkrD7ebkY9YVkfLIZZ EDXnnbMc/daR4fFYXD7R94mMET6L4riHP/ajF7oKnfsA1w/oLGKhC4UjOMen5X1CPmwQ SQvpCxCRPFAR7rVGpyHbBFKhm3TAJELn1YWK6WQtBc+skb0EjYIelHaWu7d/ghWJLf1M ksVmZ/gxNir3fipT71hQ6OT2IMPiyby75LbZpqjMK0cTfDwRUi7K6QzkdYJsAyAvRH3y Wfjt8kkzTAaRmyQCcjteTvviYssF4zUCdGvWJnkTzJQr7t9+4ZmRZ7QogwpznM63H1cI GmCQ== 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=2L+0B7KOxtXxxJXOCPsqsHKHASSh7rw/mvg4KDbHL1w=; b=rHp8ajkaYKiHrOvx1mnV/I559IfZ6qVbw6ys1YjLilbqC4/Yk+urZ/dr2GkcxVW9+k mIYfHBNl22RtBB7qo/MfL36c83zBcpFf9L02eWDmsNPdrfrS9mvZNSmXXsPW+mGSS//P /hbI+5KlfufcPCYL3jt15spHrhRoJ8AZRt5oDTspXzYOmO/XuzvGegZrTd1ppZcLcDJG M9G9/hjV7+Tf+e5tUKKspOb9B9OFtQvUkEITyVkgXWgYrbOtaZOyya+iKVnVh+643zoj x3n6WWfnK17Ur4kuumqbDZFUq0fZY9k2pI3bU8THchVOAPPXMgOH1DF6/zFzi4Vfssvr Iiwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KS736sv6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ka20-20020a170907991400b006dff687b179si9746780ejc.685.2022.04.05.17.57.16; Tue, 05 Apr 2022 17:57:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KS736sv6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S238383AbiDEJeK (ORCPT + 99 others); Tue, 5 Apr 2022 05:34:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239460AbiDEIUG (ORCPT ); Tue, 5 Apr 2022 04:20:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2931F986EA; Tue, 5 Apr 2022 01:13:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B9C8F60B0A; Tue, 5 Apr 2022 08:13:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA909C385A1; Tue, 5 Apr 2022 08:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649146424; bh=csgVznpz+CbDSMa65uT6mHegJRLSqN9GgMqe8LRJoHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KS736sv6URAg8KSfmKGMLOV2RhN9NlVOcmYWZBVbXeUJvpyWqe0WMRwQ3W3p4d41h wFvNwqXBozoUD0RvjiE1uYgA+K+NVuupU/0OtlsUM5T4E1rTHfn8rL0oH156eEAEup hK4dh+wE0Xe4RR+BydxhARZ/k/xy2pboys6Qri4A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Libin Yang , Pierre-Louis Bossart , Rander Wang , Bard Liao , Vinod Koul , Sasha Levin Subject: [PATCH 5.17 0721/1126] soundwire: intel: fix wrong register name in intel_shim_wake Date: Tue, 5 Apr 2022 09:24:28 +0200 Message-Id: <20220405070428.756144289@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070407.513532867@linuxfoundation.org> References: <20220405070407.513532867@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Libin Yang [ Upstream commit 3957db3ae3dae6f8b8168791f154567fe49e1fd7 ] When clearing the sdw wakests status, we should use SDW_SHIM_WAKESTS. Fixes: 4a17c441c7cb ("soundwire: intel: revisit SHIM programming sequences.") Signed-off-by: Libin Yang Reviewed-by: Pierre-Louis Bossart Reviewed-by: Rander Wang Signed-off-by: Bard Liao Link: https://lore.kernel.org/r/20220126011451.27853-1-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/soundwire/intel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 122f7a29d8ca..63101f1ba271 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -448,8 +448,8 @@ static void intel_shim_wake(struct sdw_intel *sdw, bool wake_enable) /* Clear wake status */ wake_sts = intel_readw(shim, SDW_SHIM_WAKESTS); - wake_sts |= (SDW_SHIM_WAKEEN_ENABLE << link_id); - intel_writew(shim, SDW_SHIM_WAKESTS_STATUS, wake_sts); + wake_sts |= (SDW_SHIM_WAKESTS_STATUS << link_id); + intel_writew(shim, SDW_SHIM_WAKESTS, wake_sts); } mutex_unlock(sdw->link_res->shim_lock); } -- 2.34.1