Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/814775/?format=api
{ "id": 814775, "url": "http://patchwork.ozlabs.org/api/1.2/patches/814775/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openbmc/patch/20170918054905.16470-2-andrew@aj.id.au/", "project": { "id": 56, "url": "http://patchwork.ozlabs.org/api/1.2/projects/56/?format=api", "name": "OpenBMC development", "link_name": "openbmc", "list_id": "openbmc.lists.ozlabs.org", "list_email": "openbmc@lists.ozlabs.org", "web_url": "http://github.com/openbmc/", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170918054905.16470-2-andrew@aj.id.au>", "list_archive_url": null, "date": "2017-09-18T05:49:02", "name": "[1/4] watchdog: aspeed: Retain watchdog enabled state", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": true, "hash": "8881f7adc5e487683ffa8bddc930cbbca8f25a08", "submitter": { "id": 68332, "url": "http://patchwork.ozlabs.org/api/1.2/people/68332/?format=api", "name": "Andrew Jeffery", "email": "andrew@aj.id.au" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/openbmc/patch/20170918054905.16470-2-andrew@aj.id.au/mbox/", "series": [ { "id": 3562, "url": "http://patchwork.ozlabs.org/api/1.2/series/3562/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openbmc/list/?series=3562", "date": "2017-09-18T05:49:01", "name": "watchdog: aspeed: Retain enabled state and move to", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/3562/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/814775/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/814775/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "openbmc@lists.ozlabs.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "openbmc@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 3xwZst14Cdz9s7F\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 18 Sep 2017 15:52:50 +1000 (AEST)", "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xwZss4hXrzDrhL\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 18 Sep 2017 15:52:49 +1000 (AEST)", "from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com\n\t[66.111.4.25])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xwZpn2TdHzDrbL;\n\tMon, 18 Sep 2017 15:50:09 +1000 (AEST)", "from compute4.internal (compute4.nyi.internal [10.202.2.44])\n\tby mailout.nyi.internal (Postfix) with ESMTP id 75DC820B00;\n\tMon, 18 Sep 2017 01:50:06 -0400 (EDT)", "from frontend1 ([10.202.2.160])\n\tby compute4.internal (MEProxy); Mon, 18 Sep 2017 01:50:06 -0400", "from keelia.au.ibm.com (ppp14-2-0-125.bras21.adl4.internode.on.net\n\t[14.2.0.125])\n\tby mail.messagingengine.com (Postfix) with ESMTPA id DBB217FA1C;\n\tMon, 18 Sep 2017 01:50:02 -0400 (EDT)" ], "Authentication-Results": [ "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=aj.id.au header.i=@aj.id.au header.b=\"ilEDdyWa\";\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=messagingengine.com\n\theader.i=@messagingengine.com header.b=\"OXQB1/kd\"; \n\tdkim-atps=neutral", "lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=aj.id.au header.i=@aj.id.au header.b=\"ilEDdyWa\";\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=messagingengine.com\n\theader.i=@messagingengine.com header.b=\"OXQB1/kd\"; \n\tdkim-atps=neutral", "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=aj.id.au\n\t(client-ip=66.111.4.25; helo=out1-smtp.messagingengine.com;\n\tenvelope-from=andrew@aj.id.au; receiver=<UNKNOWN>)", "lists.ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=aj.id.au header.i=@aj.id.au header.b=\"ilEDdyWa\";\n\tdkim=pass (2048-bit key;\n\tunprotected) header.d=messagingengine.com\n\theader.i=@messagingengine.com\n\theader.b=\"OXQB1/kd\"; dkim-atps=neutral" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=aj.id.au; h=cc\n\t:date:from:in-reply-to:message-id:references:subject:to\n\t:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=T9AdEQ\n\tdqS2BwgFgh5MAUBA55GqXLjQqTwLlJFBDxfhA=; b=ilEDdyWaon9PGaCK/tYHSF\n\t8bptId+L9y0qoYBbh0+aDGrMNh/c+IhbvebnqUTS0w819Jo0GgK0Rkaxbxf790Cm\n\tiX4vmRM2Yzyu9Zl3kQsIeg0lo9qSmAQTjYSIiMBK8E0SDt+rcDteaXh651r7/Fav\n\tZTQAJrvm1AkbTh7lKV83e8wyQxYJZX1YNz7fQd2y5S2sdjPwEdXH7eNWfjBvM759\n\tyzncuu9O/IqTNJMgeM7OX03sbbeW2LB/pl2JrVs2HC6qTokDq4VwrT+y/W4VHtqr\n\tnWNR/bM32nXeHFIbPVqGrHATrru1O58ilaqTo6VuHPcr1GJynWfQueVWKHJv9aQw\n\t==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n\tmessagingengine.com; h=cc:date:from:in-reply-to:message-id\n\t:references:subject:to:x-me-sender:x-me-sender:x-sasl-enc\n\t:x-sasl-enc; s=fm1; bh=T9AdEQdqS2BwgFgh5MAUBA55GqXLjQqTwLlJFBDxf\n\thA=; b=OXQB1/kdTtGrrqspurmkJKi8jnMtcKWKUqUYXtgYCP6x/Qv/OwTVBI3YA\n\t9JHXgLnZI6u69VxRz6a1W5IWglyVGP0jpi+LbBGfsNclxSHu9ZiLNMO0ywPJul7P\n\t23ZxC7of+/uxLvYZn6WcfEjRmiZ1EikvsYivIlYTHxl40oxRAmTpDz60I/Ccclt2\n\tEawSckgFPZ6xkiUL+c1zdQMOLR+ECNWf6AclA2RlGwvHuCG1Zg+3afftao2XlUtv\n\tgEbL1qJEejTsj1Xi5Y+rewaHzk0+GL2CYIIud0k4hgpz1c6HYynUxu4yDTpXVY6K\n\tDOWZ/B7hFcLV7hEFP77lyN6jUGbzA==" ], "X-ME-Sender": "<xms:jl6_WTLJKCOsPTsjLirOVK_vAHs1qr7jqqfqVyVSANSJy-ILaZaO3w>", "X-Sasl-enc": "DAXxHrmqO6/G0OvwYDy1MNHqWa4iNr3OEQ4fyuHayikj 1505713805", "From": "Andrew Jeffery <andrew@aj.id.au>", "To": "linux-watchdog@vger.kernel.org", "Subject": "[PATCH 1/4] watchdog: aspeed: Retain watchdog enabled state", "Date": "Mon, 18 Sep 2017 15:19:02 +0930", "Message-Id": "<20170918054905.16470-2-andrew@aj.id.au>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": "<20170918054905.16470-1-andrew@aj.id.au>", "References": "<20170918054905.16470-1-andrew@aj.id.au>", "X-BeenThere": "openbmc@lists.ozlabs.org", "X-Mailman-Version": "2.1.24", "Precedence": "list", "List-Id": "Development list for OpenBMC <openbmc.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/openbmc>,\n\t<mailto:openbmc-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/openbmc/>", "List-Post": "<mailto:openbmc@lists.ozlabs.org>", "List-Help": "<mailto:openbmc-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/openbmc>,\n\t<mailto:openbmc-request@lists.ozlabs.org?subject=subscribe>", "Cc": "ryan_chen@aspeedtech.com, linux-aspeed@lists.ozlabs.org,\n\tAndrew Jeffery <andrew@aj.id.au>, openbmc@lists.ozlabs.org,\n\tlinux-kernel@vger.kernel.org, wim@iguana.be, linux@roeck-us.net", "Errors-To": "openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org", "Sender": "\"openbmc\"\n\t<openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>" }, "content": "An unintended post-condition of probe() is that the watchdog is\ndisabled. Rework probe() such that we retain the value of the \"enabled\"\nbit from the control register, and take the appropriate actions with\nrespect to the watchdog core if so. Otherwise, just configure the\nwatchdog as directed.\n\nSigned-off-by: Andrew Jeffery <andrew@aj.id.au>\n---\n drivers/watchdog/aspeed_wdt.c | 9 +++++----\n 1 file changed, 5 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c\nindex 79cc766cd30f..99bc6fbd8852 100644\n--- a/drivers/watchdog/aspeed_wdt.c\n+++ b/drivers/watchdog/aspeed_wdt.c\n@@ -221,7 +221,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev)\n \t\treturn -EINVAL;\n \tconfig = ofdid->data;\n \n-\twdt->ctrl = WDT_CTRL_1MHZ_CLK;\n+\twdt->ctrl |= readl(wdt->base + WDT_CTRL) & WDT_CTRL_ENABLE;\n+\twdt->ctrl |= WDT_CTRL_1MHZ_CLK;\n \n \t/*\n \t * Control reset on a per-device basis to ensure the\n@@ -243,11 +244,11 @@ 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+\tif (wdt->ctrl & WDT_CTRL_ENABLE) {\n \t\taspeed_wdt_start(&wdt->wdd);\n \t\tset_bit(WDOG_HW_RUNNING, &wdt->wdd.status);\n+\t} else {\n+\t\twritel(wdt->ctrl, wdt->base + WDT_CTRL);\n \t}\n \n \tif (of_device_is_compatible(np, \"aspeed,ast2500-wdt\")) {\n", "prefixes": [ "1/4" ] }