From patchwork Tue Nov 3 20:34:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 316870 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F28BBC388F9 for ; Tue, 3 Nov 2020 21:43:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C56302236F for ; Tue, 3 Nov 2020 21:43:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604439790; bh=wxicaN8Xq01Q9Z8XES/h1oYBUXwh7kb/qivCuBkce54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WBHeFknOwbwdfZ/LEwS2oy00M/z6F1h5DszgkP8AFG/UY4U4QFjNgN+dmGcM7JBbm 5Sqz+5Gt5B2WW+ypyqQq/zVFzsUNua92P1r1meO6XqsMoyEWmG+Fgmxzm+5IbHDNZ5 ktoOLqElayOvMcyLJ3JEE0rmLiCOy2skqsWT+vks= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732247AbgKCUzI (ORCPT ); Tue, 3 Nov 2020 15:55:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:50880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732444AbgKCUxO (ORCPT ); Tue, 3 Nov 2020 15:53:14 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B59E3223AC; Tue, 3 Nov 2020 20:53:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436793; bh=wxicaN8Xq01Q9Z8XES/h1oYBUXwh7kb/qivCuBkce54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dVQn4+4a+IMdwpU1gGp/y3UdkwbohK/H+Q9Sr7eiQHYvzqu+a694l3yYPDpMDMf1Z cdUDdFz9zwUOSPu8acFWhpJEke98ke6ccmZwgGNUF+II+Au2bJdTbwxbrz5A5DCKDg vMWBAPw5wOGLK2oGuQzKLmlvwtFKybtFZxisS6qU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Etienne Carriere , Sudeep Holla , Sasha Levin Subject: [PATCH 5.4 014/214] firmware: arm_scmi: Fix ARCH_COLD_RESET Date: Tue, 3 Nov 2020 21:34:22 +0100 Message-Id: <20201103203251.081486503@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203249.448706377@linuxfoundation.org> References: <20201103203249.448706377@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Etienne Carriere [ Upstream commit 45b9e04d5ba0b043783dfe2b19bb728e712cb32e ] The defination for ARCH_COLD_RESET is wrong. Let us fix it according to the SCMI specification. Link: https://lore.kernel.org/r/20201008143722.21888-5-etienne.carriere@linaro.org Fixes: 95a15d80aa0d ("firmware: arm_scmi: Add RESET protocol in SCMI v2.0") Signed-off-by: Etienne Carriere Signed-off-by: Sudeep Holla Signed-off-by: Sasha Levin --- drivers/firmware/arm_scmi/reset.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/firmware/arm_scmi/reset.c b/drivers/firmware/arm_scmi/reset.c index ab42c21c55175..6d223f345b6c9 100644 --- a/drivers/firmware/arm_scmi/reset.c +++ b/drivers/firmware/arm_scmi/reset.c @@ -35,9 +35,7 @@ struct scmi_msg_reset_domain_reset { #define EXPLICIT_RESET_ASSERT BIT(1) #define ASYNCHRONOUS_RESET BIT(2) __le32 reset_state; -#define ARCH_RESET_TYPE BIT(31) -#define COLD_RESET_STATE BIT(0) -#define ARCH_COLD_RESET (ARCH_RESET_TYPE | COLD_RESET_STATE) +#define ARCH_COLD_RESET 0 }; struct reset_dom_info {