From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 E8646C2D0DA for ; Sun, 29 Dec 2019 17:49:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C33EC22525 for ; Sun, 29 Dec 2019 17:49:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641754; bh=6XbWCqkB4hUxo6GsZ9rZQDKo+H/nZk4HYO2kNkrHJ24=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=p1dK6MXYgXyoXQYJ2zkv8CXbNtPVfELePc0nYKjlLHSNAOeQr2Jn+ibqDSTBFraCR TY4MPERe6g+9ZXvemklhPw3E78+nbNj5m8SNtxEeItDzLhpw2aEQwxs6FRrZ5tduiw kxCqW5C6cFOYSRQxQrGhC3AQ4ndDYHu18AVRF/7s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731273AbfL2RtN (ORCPT ); Sun, 29 Dec 2019 12:49:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:32806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731589AbfL2RtM (ORCPT ); Sun, 29 Dec 2019 12:49:12 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 0557E222C4; Sun, 29 Dec 2019 17:49:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641751; bh=6XbWCqkB4hUxo6GsZ9rZQDKo+H/nZk4HYO2kNkrHJ24=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kjVOdzOxasSB6cEGIcXN0NCHIajMtM/1bHTAITMKHZ/2LmEgtjgbeyamYe0zAbv9K cCUilydLDALzspgfiqLkiRwjanVefZoVnYw+jI112AHNSdlyZie5Awy18Y9vvM9o5L jcqvMp+xj5fFtbIB3zgKjopfHuvL0HFPFgFXKXdU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lingling Xu , Baolin Wang , Mark Brown , Sasha Levin Subject: [PATCH 5.4 197/434] spi: sprd: adi: Add missing lock protection when rebooting Date: Sun, 29 Dec 2019 18:24:10 +0100 Message-Id: <20191229172714.913851671@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lingling Xu [ Upstream commit 91ea1d70607e374b014b4b9bea771ce661f9f64b ] When rebooting the system, we should lock the watchdog after configuration to make sure the watchdog can reboot the system successfully. Signed-off-by: Lingling Xu Signed-off-by: Baolin Wang Link: https://lore.kernel.org/r/7b04711127434555e3a1a86bc6be99860cd86668.1572257085.git.baolin.wang@linaro.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-sprd-adi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c index 9a051286f120..9613cfe3c0a2 100644 --- a/drivers/spi/spi-sprd-adi.c +++ b/drivers/spi/spi-sprd-adi.c @@ -393,6 +393,9 @@ static int sprd_adi_restart_handler(struct notifier_block *this, val |= BIT_WDG_RUN | BIT_WDG_RST; sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_CTRL, val); + /* Lock the watchdog */ + sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOCK, ~WDG_UNLOCK_KEY); + mdelay(1000); dev_emerg(sadi->dev, "Unable to restart system\n"); -- 2.20.1