Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp961680pxb; Wed, 6 Apr 2022 05:24:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzphGlLGlpSK5jkz8N897h1GN2MzxN4wJDdQj1V5RvSWbYotho2MWdpfxkshpYO5W/pOGaK X-Received: by 2002:a17:902:7596:b0:156:8dc9:292a with SMTP id j22-20020a170902759600b001568dc9292amr8405094pll.118.1649247876267; Wed, 06 Apr 2022 05:24:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649247876; cv=none; d=google.com; s=arc-20160816; b=JX65qliLAH6jtqfjqDfN8oqUwde4wuUPmmy5akc24wOFI7Im5yOcQkhKjUBA0lYrRb /HJ270Cp2TZ3oCFye0m5K/NCFt8hPEJUlMBytr3FRXvrEqtFAZGJzn6qVPChYemkQvbJ nscHqoLP88Y9IndJvayZ+6+AvVttK4Gns3lLVlU3BK8tcODRpRODteoeEs+W4vgWlCdP QdWL8HS6/pPgWDXuXSTlR0UCwOF2mixNVjiFUHdVH1R94MzgzzTXWEGpCnVk5REmVov8 iVOSpxseO0yg+micY7TPWFqPca3QHCHv/4E5fjrott+XdmQKnmT6mbWv0/p+H9ZLKxUr +uBg== 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=jXnjvQlBCELFYICYcywg4rFQvhTO7C2UOjevyRo969Y=; b=Q+pKgDMsR7U5yGc+NGGqlgYyY5cxzlIi4A8pWRa83F70G0xgW6NIek/LHdIKBNo2cp OuK+xKeFVVbq486ra9uaJfS8TrqelJ/2WWoNJwjZC0K3F5dH4sPL2/2O+P14B5egu19B lbH7YwmfqtFFmHmzEv2kxPBujMM9N8fCw40TqNF1bSl3urhgM8IKV0V2ALtoDb/dkz9S cyCSim07KafI2kra0Q3WJnY/XjAWBN5PqddHtPfBDzj/Xknxh3lPkbIsn8b+biXZAZ3g yAxsi5yHZVVhQfqOuLMlOk+BIx4M1XTIC3g2+IWACL7zOgyjqRQMWlCi2v9PiOFt3x3q kkcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Hf6SIC8l; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id rm3-20020a17090b3ec300b001c7bfa8f613si4675431pjb.182.2022.04.06.05.24.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 05:24:36 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Hf6SIC8l; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2717660C6D0; Wed, 6 Apr 2022 04:34:04 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1453168AbiDEULM (ORCPT + 99 others); Tue, 5 Apr 2022 16:11:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241245AbiDEK25 (ORCPT ); Tue, 5 Apr 2022 06:28:57 -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 2D022DCA87; Tue, 5 Apr 2022 03:18:12 -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 8B867617CE; Tue, 5 Apr 2022 10:18:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98975C385A1; Tue, 5 Apr 2022 10:18:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649153891; bh=faqY+AXvpbMhVT1szSwVM98pjikIjwm3hnilT/iR77Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hf6SIC8lCAL/jpmkMpaA1E/PhFUfOKIC06CNOqX4HxI3p3xcJL//3o7BXSU6SLluH 4Se5AB0aiV00pjtPGCro0v6TZRDiqr2rGUxrqBm6F/4t8PMoDIJ7YfVEY/W3etIhzE GOn2Fjd4v2TDr+2ha+e+1B7uMgfAgcNk5FEoPzRg= 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.10 384/599] soundwire: intel: fix wrong register name in intel_shim_wake Date: Tue, 5 Apr 2022 09:31:18 +0200 Message-Id: <20220405070310.257483324@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070258.802373272@linuxfoundation.org> References: <20220405070258.802373272@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=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 dad4326a2a71..824d9f900aca 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -521,8 +521,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