[{"id":1771596,"web_url":"http://patchwork.ozlabs.org/comment/1771596/","msgid":"","list_archive_url":null,"date":"2017-09-20T06:07:13","subject":"Re: [PATCH v2 1/4] watchdog: aspeed: Retain watchdog enabled state","submitter":{"id":48628,"url":"http://patchwork.ozlabs.org/api/people/48628/","name":"Joel Stanley","email":"joel@jms.id.au"},"content":"On Wed, Sep 20, 2017 at 3:00 PM, Andrew Jeffery wrote:\n> An unintended post-condition of probe() is that the watchdog is\n> disabled. This behaviour was introduced by an unnecessary write to the\n> control register to configure the hardware based on the devicetree. The\n> write is unnecessary because the cached control value that is\n> manipulated by the code parsing the devicetree is eventually written by\n> aspeed_wdt_enable(), which is when we care how the control register\n> should be configured.\n>\n> Remove the write to restore expected behaviour.\n>\n> Fixes: b7f0b8ad25f3 (\"drivers/watchdog: ASPEED reference dev tree properties for config\")\n> Signed-off-by: Andrew Jeffery \n\nReviewed-by: Joel Stanley \n\nThanks,\n\nJoel","headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","linux-aspeed@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","linux-aspeed@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxq656JQBz9sNw\n\tfor ;\n\tWed, 20 Sep 2017 16:07:41 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xxq65356BzDqBd\n\tfor ;\n\tWed, 20 Sep 2017 16:07:41 +1000 (AEST)","from mail-lf0-x235.google.com (mail-lf0-x235.google.com\n\t[IPv6:2a00:1450:4010:c07::235])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xxq616zlszDqBd;\n\tWed, 20 Sep 2017 16:07:37 +1000 (AEST)","by mail-lf0-x235.google.com with SMTP id k23so1612389lfi.11;\n\tTue, 19 Sep 2017 23:07:37 -0700 (PDT)","by 10.25.103.82 with HTTP; Tue, 19 Sep 2017 23:07:13 -0700 (PDT)"],"Authentication-Results":["ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"cTTQYWhQ\"; dkim-atps=neutral","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"cTTQYWhQ\"; dkim-atps=neutral","ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=gmail.com\n\t(client-ip=2a00:1450:4010:c07::235; helo=mail-lf0-x235.google.com;\n\tenvelope-from=joel.stan@gmail.com; receiver=)","lists.ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"cTTQYWhQ\"; dkim-atps=neutral"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=mime-version:sender:in-reply-to:references:from:date:message-id\n\t:subject:to:cc;\n\tbh=6L97DFAJLZHICeCZAKIVITJ7Yo7ua6Nn3Lv5XJe5VSY=;\n\tb=cTTQYWhQkj01Bg8oIpZjLIqUVTcM2Or+NDwt85niFlzu520grmplE/zLxmo6EEwvW6\n\t88IURx4xHzExWfL/UdONIW3+U4Tx1oWQLO8Ofwo2rX9jZ8Cm8Y4g+bq9IPLzTztpOq0P\n\tsAWmPu/+IwuZg0YDPa00ilgiwEpv18PzrD0BEKrKCM8740ZJaNZ7qSZkR7Zc8TMWxkiC\n\tKZvPckaulcX+xvn/Uo6/OQzuTl5B3533c1Oft+WP2sN8e3mzhd5vmaT7J51w8Nt8E6eq\n\t8Mn5/T/G76dFcYsdCgGDhmvbjE6ls0KltOXnlIxjfyIfDOTlVwwpK//7uR4rJGjILorS\n\tg25A==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:sender:in-reply-to:references:from\n\t:date:message-id:subject:to:cc;\n\tbh=6L97DFAJLZHICeCZAKIVITJ7Yo7ua6Nn3Lv5XJe5VSY=;\n\tb=hUUu6eHPInXoSCGBojCHcnwZBWajneah/ciZZ3O93KuL7s22eIfmTIgA8/8xCKMaDv\n\tI8JCuFJHrC/skHxYxrcwliAcgqSp2qfxoofKaPf9/1R9rKlF4l2ku5beba3yOK2O/mQ0\n\tQlCe4znpz+WjF4bt1tlEMI/6fJwqE8i9yrWvHrxySmViVDEYDy+TK1tcMbt9wWo2nqZn\n\t+m+o7Fvmw/Paev+HG8H0D5fQqCqNp0n9TjsgxIp2BnnV0W9G3tV7dLKW06pR21w2ATiV\n\tWt158mFk4phqfyS31aNMzVYIWQpOiLpB3h9qkx7ahDxlvaGIbbtG+GOp6zUxD14YWx83\n\tj5LQ==","X-Gm-Message-State":"AHPjjUgo4Nupc/14gTR81Fgwrj7MIXZZ/RDJH+tYHHXMLVjGrzAE/Nn7\n\trVxCSjJqMsrJkztKOSPgKNGDYgwEQkJD38CGByI=","X-Google-Smtp-Source":"AOwi7QB7XYguIUEmEufBCLBWi3AqtB1fMObTDKh8IvjuAIPnmUnmaVHKv1r5/MVo5QaoaKDvY+LYVOwoUoyqPCuIx5M=","X-Received":"by 10.25.100.18 with SMTP id y18mr370443lfb.257.1505887653935;\n\tTue, 19 Sep 2017 23:07:33 -0700 (PDT)","MIME-Version":"1.0","In-Reply-To":"<20170920053020.6860-2-andrew@aj.id.au>","References":"<20170920053020.6860-1-andrew@aj.id.au>\n\t<20170920053020.6860-2-andrew@aj.id.au>","From":"Joel Stanley ","Date":"Wed, 20 Sep 2017 15:37:13 +0930","X-Google-Sender-Auth":"udAJrDn7aP58tuH0C7npxillv_M","Message-ID":"","Subject":"Re: [PATCH v2 1/4] watchdog: aspeed: Retain watchdog enabled state","To":"Andrew Jeffery ","Content-Type":"text/plain; charset=\"UTF-8\"","X-BeenThere":"linux-aspeed@lists.ozlabs.org","X-Mailman-Version":"2.1.24","Precedence":"list","List-Id":"Linux ASPEED SoC development ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Ryan Chen , linux-watchdog@vger.kernel.org,\n\tlinux-aspeed@lists.ozlabs.org,\n\tOpenBMC Maillist , \n\tLinux Kernel Mailing List ,\n\tWim Van Sebroeck , Guenter Roeck ","Errors-To":"linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org","Sender":"\"Linux-aspeed\"\n\t"}},{"id":1792244,"web_url":"http://patchwork.ozlabs.org/comment/1792244/","msgid":"<20171022160921.GA12755@roeck-us.net>","list_archive_url":null,"date":"2017-10-22T16:09:21","subject":"Re: [v2,1/4] watchdog: aspeed: Retain watchdog enabled state","submitter":{"id":21889,"url":"http://patchwork.ozlabs.org/api/people/21889/","name":"Guenter Roeck","email":"linux@roeck-us.net"},"content":"On Wed, Sep 20, 2017 at 03:00:17PM +0930, Andrew Jeffery wrote:\n> An unintended post-condition of probe() is that the watchdog is\n> disabled. This behaviour was introduced by an unnecessary write to the\n> control register to configure the hardware based on the devicetree. The\n> write is unnecessary because the cached control value that is\n> manipulated by the code parsing the devicetree is eventually written by\n> aspeed_wdt_enable(), which is when we care how the control register\n> should be configured.\n> \n> Remove the write to restore expected behaviour.\n> \n> Fixes: b7f0b8ad25f3 (\"drivers/watchdog: ASPEED reference dev tree properties for config\")\n> Signed-off-by: Andrew Jeffery \n> Reviewed-by: Joel Stanley \n\nReviewed-by: Guenter Roeck \n\n> ---\n> drivers/watchdog/aspeed_wdt.c | 8 ++++++--\n> 1 file changed, 6 insertions(+), 2 deletions(-)\n> \n> diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c\n> index 79cc766cd30f..6c6dd3f4c48d 100644\n> --- a/drivers/watchdog/aspeed_wdt.c\n> +++ b/drivers/watchdog/aspeed_wdt.c\n> @@ -243,9 +243,13 @@ static int aspeed_wdt_probe(struct platform_device *pdev)\n> \tif (of_property_read_bool(np, \"aspeed,external-signal\"))\n> \t\twdt->ctrl |= WDT_CTRL_WDT_EXT;\n> \n> -\twritel(wdt->ctrl, wdt->base + WDT_CTRL);\n> -\n> \tif (readl(wdt->base + WDT_CTRL) & WDT_CTRL_ENABLE) {\n> +\t\t/*\n> +\t\t * The watchdog is running, but invoke aspeed_wdt_start() to\n> +\t\t * write wdt->ctrl to WDT_CTRL to ensure the watchdog's\n> +\t\t * configuration conforms to the driver's expectations.\n> +\t\t * Primarily, ensure we're using the 1MHz clock source.\n> +\t\t */\n> \t\taspeed_wdt_start(&wdt->wdd);\n> \t\tset_bit(WDOG_HW_RUNNING, &wdt->wdd.status);\n> \t}","headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","linux-aspeed@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","linux-aspeed@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3yKkyF6rp2z9sxR\n\tfor ;\n\tMon, 23 Oct 2017 03:09:57 +1100 (AEDT)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3yKkyF5b1NzDrWG\n\tfor ;\n\tMon, 23 Oct 2017 03:09:57 +1100 (AEDT)","from mail-pf0-x241.google.com (mail-pf0-x241.google.com\n\t[IPv6:2607:f8b0:400e:c00::241])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3yKkxd1pGqzDqZr;\n\tMon, 23 Oct 2017 03:09:24 +1100 (AEDT)","by mail-pf0-x241.google.com with SMTP id b6so15369994pfh.7;\n\tSun, 22 Oct 2017 09:09:24 -0700 (PDT)","from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net.\n\t[108.223.40.66]) by smtp.gmail.com with ESMTPSA id\n\ti89sm9486510pfj.144.2017.10.22.09.09.22\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 22 Oct 2017 09:09:22 -0700 (PDT)"],"Authentication-Results":["ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"I/Ep4p2R\"; dkim-atps=neutral","lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"I/Ep4p2R\"; dkim-atps=neutral","ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=gmail.com\n\t(client-ip=2607:f8b0:400e:c00::241; helo=mail-pf0-x241.google.com;\n\tenvelope-from=groeck7@gmail.com; receiver=)","lists.ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"I/Ep4p2R\"; dkim-atps=neutral"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:in-reply-to:user-agent;\n\tbh=I4c6QpkrRUlMgQyx8gco86zxKD3QmNpV0y0lemIHq5k=;\n\tb=I/Ep4p2REuBGduEUc4KLe+8+IzAnieCSZaaML8y5qxBRFEFFXrXk1tJ/MrMDIh78zL\n\tk22CTW2yGLtph3MZIoBOh4FJ0upPkRG1FYK+ItLoQkfIAoWCbyu9IiWsq8TekEbDxMq4\n\tps84ejdhtDQ721rUXYwSIfkLUAlAY+YWnhXtbR+UzaAu8uwafHiZpk5W5SNFeSJsfWFx\n\tMSRlN4hxUFeUL2tABzqBwBQ/oXekbQ8okMEo2FliMs0+5kgMoGbD2nhL9J2tfGrWqXfh\n\tHgHDCHMPBHffyVWv/IvSTQl/XYaRqYH86eXYZJH1FzXcpYFCzUuej7SdJAaer2SOwX9B\n\tLIIQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:date:from:to:cc:subject:message-id\n\t:references:mime-version:content-disposition:in-reply-to:user-agent; \n\tbh=I4c6QpkrRUlMgQyx8gco86zxKD3QmNpV0y0lemIHq5k=;\n\tb=gI61tfasKxXREV8r7uHa3Va91eOo1JffkTVodmL0lq+RjZd2jvo/vBNE5zU6qF2hLe\n\tDDf4x1cLw43IAaHJ32TX6zVwW9/DNYORbk+CkNHgoLcfRU+L6Pt2+dgPf49lSg9ADr8c\n\tyYZ8W2xNMXAZQZC3lct7tx6m65pyp8+7q4uYPKkrkPxgmyg12EbAFLo0USiUA5mj2933\n\tD6gy5TvF87nsh+NV7FzwCVJb+xsNXxmlsK3GovtV8MM3lPsXjJJy1TFgvUpnS63ljFUh\n\t0C+B7JnaJ3JXLt9AqxqT+hQ2KYfyyjt0c+xPw99FP170GlxKaVwOP7rFq3WhNMQIGT8P\n\tMqpg==","X-Gm-Message-State":"AMCzsaW+JX1QBEoXRxGgbfJXNhSum4x7SgiUPNB3NEGtcz27B0fhbeWC\n\t3BRmMCV/PCaTnEDp9CwxDJM=","X-Google-Smtp-Source":"ABhQp+QAQf/2xZc+IuRNlRaX2vrDyCY/DqKZOYiuBJ9HOi7U2Sfia+ilLPrfzsWIQqMCCbNfPyOXvw==","X-Received":"by 10.99.182.66 with SMTP id v2mr9829777pgt.325.1508688562866;\n\tSun, 22 Oct 2017 09:09:22 -0700 (PDT)","Date":"Sun, 22 Oct 2017 09:09:21 -0700","From":"Guenter Roeck ","To":"Andrew Jeffery ","Subject":"Re: [v2,1/4] watchdog: aspeed: Retain watchdog enabled state","Message-ID":"<20171022160921.GA12755@roeck-us.net>","References":"<20170920053020.6860-2-andrew@aj.id.au>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20170920053020.6860-2-andrew@aj.id.au>","User-Agent":"Mutt/1.5.24 (2015-08-30)","X-BeenThere":"linux-aspeed@lists.ozlabs.org","X-Mailman-Version":"2.1.24","Precedence":"list","List-Id":"Linux ASPEED SoC development ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"ryan_chen@aspeedtech.com, linux-watchdog@vger.kernel.org,\n\tlinux-aspeed@lists.ozlabs.org, openbmc@lists.ozlabs.org,\n\tlinux-kernel@vger.kernel.org, wim@iguana.be","Errors-To":"linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org","Sender":"\"Linux-aspeed\"\n\t"}}]