From patchwork Mon Dec 2 10:03:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180564 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4982467ile; Mon, 2 Dec 2019 02:04:02 -0800 (PST) X-Google-Smtp-Source: APXvYqxqkzKtI3uVWWDuyAjP84KsYhnslfXhO0YEmJf8mcCvgQQiohTzAe1Yct1jKl61ZNKAkdhz X-Received: by 2002:a17:906:4749:: with SMTP id j9mr11008010ejs.132.1575281042425; Mon, 02 Dec 2019 02:04:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575281042; cv=none; d=google.com; s=arc-20160816; b=hNGD0+lDl/X/+bTIWwbjSXgv12alBGCJhSQvbDga5MlhMGJmd7SMBHK0HLr5QX2UIH XZ4NOC9sqUm0re7KiibUZbjJlNAjZs+ppb8uWZSaYascshJNIgytHIjiuvKYxHCiWFuJ UaPTZo/DxZvLLNtglof5AtZfxiHPh/aGIvBRESHHvys456V74qxTWdANL603zH/2ZQIt bQzQ3LYb1N99sPpwU9qdFH8FRQjsqj+yi9bXaICEDHPHlAHiKG77x5kUOORnSSj/Wner ATKWSyHQA53iB4/WLnWgM1hJhQMpDeMSK/DZsTI4hADwppTw5j4lQXARzzus29IexFVg mk6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=sVbw3UdezQ0sD9BTneNk/tIPQpwqVy7LB+WYRpuD1iU=; b=pD4qID4YUY3p3B5Unqb8ejVqGrM5Xf9thV8lSlYJ2KS90Ci87Saz9wf/8FKQdL+iqr 7m3fGbWL8Vg4znXIZ+dUw1qVllnDZp2hVJWqVCPDAQE1I9ORHOAJ7wnuRLrne4T5YdCb ZmWpUeXl1SCd6QvTeClaZAANUU/e15GsO85gdRsjpHJh9Hp1/4lUGg9RPBJpGg70MxvI 1XLFl83qJ16Kms79d+4Dk2l0KZb2AacvaYcUBpILD4U/3tM3iD2k4jKa3nlxNEVXyGPf NXRJQcLDkokcaaqIRfpomLtiEMhG2go41Ay2KX5SqQ32krlU777CpsE/vPvQCdhCLjDn 3T6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qk5HwfTf; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p21si21018960ejz.196.2019.12.02.02.03.54; Mon, 02 Dec 2019 02:04:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qk5HwfTf; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726516AbfLBKDw (ORCPT + 15 others); Mon, 2 Dec 2019 05:03:52 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:56206 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726533AbfLBKDv (ORCPT ); Mon, 2 Dec 2019 05:03:51 -0500 Received: by mail-wm1-f68.google.com with SMTP id a131so16735808wme.5 for ; Mon, 02 Dec 2019 02:03:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sVbw3UdezQ0sD9BTneNk/tIPQpwqVy7LB+WYRpuD1iU=; b=Qk5HwfTf32NYPQMIGTFwZEY52SK16t9YODfdA3aRJFKTBbQZI7gOpiJE26OI6gmIXT PMiOo958L01JPifVa9ORmz46iqKzao1LfUlHUBuxc/VFbbr1r/ti6ccwtV8BcRtAKKDL 38z5hGBRu+G4G3mmhucw1UTfvD8Cl3pktUvXRQzkGUWGeSoo+QR6wjvFP4kG6huyNJW9 XIMX2pKYa2r/59Vu/X03YD519VvRFZuzFyy5a5b2P+p5Smt+pA/wHXJf4Bil14qdWOHP yrc+neFKi2O8Oey3js/Omv8/gFOgsc0hr3vKmCBdCzoDR2g0kDp/rEn9oNPTGI2qSVHt sqWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sVbw3UdezQ0sD9BTneNk/tIPQpwqVy7LB+WYRpuD1iU=; b=P8hiWDvSEwWo4mDrwEBo1oq8WeS4pf3K7v6Z5ox9iA1JvhP1I5K4bWwqiBFh0cMnom ZpQlDyF1segSe+FxNlzt+PRJ1jE+NFj3D5ImlSXS27FOlH75zs4NSBPO0Kb41k1wybkq Ac2zyIUS6iZ5n9g+eeNJmtwfHjqFtV/d15zwpnWnm2VG8ZJ6vK4NglushuIQDXivzsma AxeaZ+41ZF6lFDOQnDiLyJ6fyyZpmK1GaFUro2/+GnRsT/FT9QqN3kcTv2tClm2TXpyu P9iwI66qgPJJcn+auUCpEE5cJQJPq8xlPMW7m7ibH5J4n+jQh03Bw8i4mos9vXhDUlUC bldQ== X-Gm-Message-State: APjAAAW6jwP/4sdyp6MW7HmPtesdMUveq7hwvrP+/xFN8gNJF1wwz0J5 zDWuGvkiCZt/e6te6zyx/K5sJ5BBt3Y= X-Received: by 2002:a05:600c:1108:: with SMTP id b8mr11371586wma.17.1575281029709; Mon, 02 Dec 2019 02:03:49 -0800 (PST) Received: from localhost.localdomain ([2.27.35.155]) by smtp.gmail.com with ESMTPSA id h8sm22975665wrx.63.2019.12.02.02.03.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 02:03:49 -0800 (PST) From: Lee Jones To: stable@vger.kernel.org Subject: [PATCH 4.14 03/14] watchdog: sama5d4: fix WDD value to be always set to max Date: Mon, 2 Dec 2019 10:03:01 +0000 Message-Id: <20191202100312.1397-3-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191202100312.1397-1-lee.jones@linaro.org> References: <20191202100312.1397-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eugen Hristev [ Upstream commit 8632944841d41a36d77dd1fa88d4201b5291100f ] WDD value must be always set to max (0xFFF) otherwise the hardware block will reset the board on the first ping of the watchdog. Signed-off-by: Eugen Hristev Reviewed-by: Guenter Roeck Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Lee Jones --- drivers/watchdog/sama5d4_wdt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.24.0 diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c index 0ae947c3d7bc..d8cf2039c6a4 100644 --- a/drivers/watchdog/sama5d4_wdt.c +++ b/drivers/watchdog/sama5d4_wdt.c @@ -111,9 +111,7 @@ static int sama5d4_wdt_set_timeout(struct watchdog_device *wdd, u32 value = WDT_SEC2TICKS(timeout); wdt->mr &= ~AT91_WDT_WDV; - wdt->mr &= ~AT91_WDT_WDD; wdt->mr |= AT91_WDT_SET_WDV(value); - wdt->mr |= AT91_WDT_SET_WDD(value); /* * WDDIS has to be 0 when updating WDD/WDV. The datasheet states: When @@ -255,7 +253,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) timeout = WDT_SEC2TICKS(wdd->timeout); - wdt->mr |= AT91_WDT_SET_WDD(timeout); + wdt->mr |= AT91_WDT_SET_WDD(WDT_SEC2TICKS(MAX_WDT_TIMEOUT)); wdt->mr |= AT91_WDT_SET_WDV(timeout); ret = sama5d4_wdt_init(wdt);