From patchwork Tue Apr 27 08:41:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meng Li X-Patchwork-Id: 1470674 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-windriversystems-onmicrosoft-com header.b=Y8S5XpHt; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FV1qs3bcCz9t1D for ; Tue, 27 Apr 2021 22:52:08 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4824482BCB; Tue, 27 Apr 2021 14:51:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="Y8S5XpHt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 101E7828FE; Tue, 27 Apr 2021 10:41:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on062d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe45::62d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B8D938168B for ; Tue, 27 Apr 2021 10:41:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Meng.Li@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EBWvPmrGS2Z5kZorYXZ0Ht2JG12nfqzSE1ICX95kwfg3A702f7XkJYw6/JRXEXcyQ2s2HnwDUJKJamxEGZ7oScbwTOK9SIK5ceUzKf1U25Da/COa//8E+DNa2PcEIKXfGhNdEkSIk1f8kokzcxu3xpKXUIfJoGLQ4X0/9tq3KKV3oyXLbdHmvR4vPmwYGt9ReRgwhmMDNRWjjZXX34Uq+7lx0Xwuq/CbkqCQGa76sc6/vMMY4Rt2QSyO0EJrkoGNF7THSUQokSWL64GykTKLgB4k5ATB1qZAbFWhG/bs9/En+9fVTmRy64oGxNN4T4XV+fbrgODPHzqPeNLoauz0hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9fpSA8LP4BI4CcIYy0Gs2TIVrQA+DurPY7YG5Lq0oNw=; b=NFHS4TKe8N3ixPLEAxU1GS+S71EGs9wZcMOqXgeSyoyo3RfFHJwFPFhVaNMpNgatCC3vDz+9YgVqbrKnbgIcuOZsfrMdssoYLxiZoO0V4LWJlmv/7xT/nY/ptV/OciXpmZCKfv7hspyqCiR7bePJ/cau/IF2yMYaKk3rTZZYIWqZtWcyos/VJ8HGvPT+owHvkZrbagQvJfYA3DEDrAO19eUhZ7A/DmL6u6cMaO2jL24Wc/1JN8A7vlAR8LBZ+nGHnkpVyghVGbY/dXonWrdCD8tj0kAqoLIc0oyyQi9MPu5bg8AG+UiHWY9U7twom87pd/h8nBfd+gb/rJ/m9c6GVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriversystems.onmicrosoft.com; s=selector2-windriversystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9fpSA8LP4BI4CcIYy0Gs2TIVrQA+DurPY7YG5Lq0oNw=; b=Y8S5XpHtywBfkZfuiqv/7ZzLM38w9cXv3RpvFD1eLMgi78WkSF/v4dwW4dZRxWWMyp+MeC5thRPNOPM3HbtnT0IpCq4x0nu9pRbMv3S/B74n/86LSH72Nu5QOwmJRncLnlbHfVtbJ5fP6Io/tjvMkJTFyMy9qnwNL2wQ4pTicKE= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from PH0PR11MB5191.namprd11.prod.outlook.com (2603:10b6:510:3e::24) by PH0PR11MB5078.namprd11.prod.outlook.com (2603:10b6:510:3e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.25; Tue, 27 Apr 2021 08:41:30 +0000 Received: from PH0PR11MB5191.namprd11.prod.outlook.com ([fe80::35d1:d393:5e05:4efa]) by PH0PR11MB5191.namprd11.prod.outlook.com ([fe80::35d1:d393:5e05:4efa%7]) with mapi id 15.20.4065.027; Tue, 27 Apr 2021 08:41:30 +0000 From: Meng.Li@windriver.com To: u-boot@lists.denx.de, chin.liang.see@intel.com, dinh.nguyen@intel.com, sjg@chromium.org Cc: meng.li@windriver.com Subject: [PATCH v2, 1/2] driver: watchdog: reset watchdog in designware_wdt_stop() function Date: Tue, 27 Apr 2021 16:41:12 +0800 Message-Id: <20210427084113.9051-1-Meng.Li@windriver.com> X-Mailer: git-send-email 2.17.1 X-Originating-IP: [60.247.85.82] X-ClientProxiedBy: HK2PR04CA0047.apcprd04.prod.outlook.com (2603:1096:202:14::15) To PH0PR11MB5191.namprd11.prod.outlook.com (2603:10b6:510:3e::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pek-mli1-d2.wrs.com (60.247.85.82) by HK2PR04CA0047.apcprd04.prod.outlook.com (2603:1096:202:14::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.27 via Frontend Transport; Tue, 27 Apr 2021 08:41:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 06a3e0e2-2fd4-412b-a62b-08d909584114 X-MS-TrafficTypeDiagnostic: PH0PR11MB5078: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fJxwxe/BNPuEZs+YUUqNJo31megJpv/zT+VTP6iOT2kNcX4pvDjUw2Rb/jS8q2B/yk5ZP2iYHsdOaNr5HhQ4PLf5XEXYJhe6e0E8HzTlm8e2qIhbGAf9PneXIUQGzX64n3Net+V8GCNTpxLC7mpkID39+9MfnqofbE7PHM/doskxI6zoBHKORbVLDxNvHbeVYVSCuKbMoNHhEy4+9m10AfzlPjwqqxIjmwQ92vTfNsqzYkV8hdEfLN2lQxL4x8jUfApsG/N2TlCptAxXE0iZEnHWP4caIHXxpz7ddW2Wu+U/z2diMvDuTt5U85PGW2i5mxA1lzrbS6GDSmD+Klnmzq5Jv3AijLIGQGxOtkjth77WDqAjXvj5CJ1NQKZRGj5qPGjdpOVVM5/qgGfOYoG0mW/HnmOba3TlJS7ZsPESCsnh1VQsl1qLXy2OUo6I0csmk3jozHcRmx82Nz/BGgZ/XXlwybvl2Qt/RWaJTYsDTyBP5JztCHbyvssrzoYOixKZkVg4z4qLydPBb65ihOjRE0Wp4Hk+ch27Hp0/6AC2JCwQFJuZnU+U8El6GkDdiaTugc8DANVckhqH2RGj9MmJ/CENDVBkemj/TGLxS3RaJ3/U+tqRTBrVE6m0S1Ln5yCqRojwD/YnT27epRzQqDWjPECloGxQNCcQd9MnWb/BOdU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR11MB5191.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(396003)(376002)(39840400004)(366004)(107886003)(26005)(186003)(4326008)(16526019)(6512007)(2616005)(6506007)(9686003)(2906002)(38350700002)(956004)(52116002)(8676002)(38100700002)(86362001)(6666004)(1076003)(66946007)(478600001)(8936002)(6486002)(66556008)(36756003)(5660300002)(66476007)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: lIrcQXiW+ktvT/b7J2vIYyqaNquSH8NnVw7LEakGg4n14bje5XETlSyWsjPtG8Z9IrIweZ7jwwmnoaXLwm1CTLemPvoA0YUcqAk645a0j0pbta7e63Aqx301flpnx1D/AL7jtJ/JTWnQifHJgAOjX2otZFnxmq0YsTFelfp3Wn7NBcTF5PY4LBjQGZS6WBVpHyz/4Oxr7OYW6XjFTVHfSwVdUDTMtCOnUsSOTv0Qd5cpJh2X7hL3wTuQPqYYtCd/YkeBdO3hmRt/HYTSVpNeuOPqvQ0udQnGrVedt/MBkTfIJtg9QqOWN9a7OP02vRz1XYX4fPdxuEOoB+Dn7LKPSgw9j7hLONhkYP0bpv7OUQgMa/qKK8Ym+yOD4RVE2JwYyYD4SlsaBSXK4Y4xfgc6APdT8FKoRTQXbAsgPLbxCP5lfmElguEXJflb+et6S8lW2JylretTYIwOP6rCoH1alDHfLEZo0UxZQI5AyzSaycHVUl4IZdjV437kXaDHIfaLqYZXQ2sCdodIzea3b8G2WWQuG25sDME4Rnqd19ke56H1Vl36T5Y5NwWAS7qIIjO3hhwPLlom6lHVe+1fxgv87ttXAS5e4e/UwOSyyTuyo9ydQ2olDmPjsxl20B7hxTNzPdlHLfH5LtvW+mQc3bBCDlpOGY5CP0rzlFuQSe+pcEh9xMsTY3Rh9otM+A2hRm/jVLDZk3hfTKgY+vEiv9nVvaY7cb1/TvJyCF+enObXB8PbVUUWVGz4D8PQZHclEjswBbWZ3bWyNWDzsuwfAqqNqa64x/+TdjVXs0nnwQrT9zJRXjUsFjiiqSSBehbRI3UvXp/5ptmyrpPto1f8Jjoup0qV3vyHTXK58dYGAHrQrTioz0wIaL8xAN2AXoVFe/+OUasSzfa87Lssm16V+ya24kZAfoiDlk4Ct4mBId7uPi0RGfOB+OEubviT4V6YPsDe5eVd9UFmyU2TOFjPjE3bCUquICABwSutbodrSDPbtH+E3wK+XQKwLpNOjWU1yTKz7yLoRU3BNNeHeqh6mRPCOw2ktssYbp2MXbGvbs3yvduY/a2B1ixNgcO/lI0+0t/pzxKEFAM/2vPZq/UgPDyO+Dwov7l8CrDmo3NiUo0MOzIIA70qWkPUlco9UpIq7igVGpNKDzQdOvjJ7WA83DX122mNQ0n3B+E96ppbPmM6jd1ejl8YO4gQ8MlCPYxoN86g1rf+y6RU4SqBVKLcdFGtL3LVmGhdOLceTZzBRQQOyqPLxDYQ1IrkFUH6jfy21Zk1V46Eh2H+F4JcYPt6jnZ6PGSd1yfzV/OBMLzzq33NOCJC/qTbm4Mxps8Q2y37fwKu X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06a3e0e2-2fd4-412b-a62b-08d909584114 X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5191.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2021 08:41:30.7581 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ffiat/Tt4u9I1jiNjGc73j+9scDnrw4qkZNbgUw8oEmcwsOmJ4m6HbmCK/rzMfZGN3u3FIbmisEi9TkkeAiV4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5078 X-Mailman-Approved-At: Tue, 27 Apr 2021 14:51:34 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean From: MengLi In uboot command line environment, watchdog is not able to be stopped with below commands: SOCFPGA_STRATIX10 # wdt dev watchdog@ffd00200 SOCFPGA_STRATIX10 # wdt stop Refer to watchdog driver in linux kernel, it is also need to reset watchdog after disable it so that the disable action takes effect. v2: Change "#if CONFIG_IS_ENABLED(DM_RESET)" into "if (CONFIG_IS_ENABLED(DM_RESET)) {", and define the variable into if condition sentence. Signed-off-by: Meng Li Reviewed-by: Stefan Roese --- drivers/watchdog/designware_wdt.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index 12f09a7a39..57cad1effc 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -96,6 +96,23 @@ static int designware_wdt_stop(struct udevice *dev) designware_wdt_reset(dev); writel(0, priv->base + DW_WDT_CR); + if (CONFIG_IS_ENABLED(DM_RESET)) { + struct reset_ctl_bulk resets; + int ret; + + ret = reset_get_bulk(dev, &resets); + if (ret) + return ret; + + ret = reset_assert_bulk(&resets); + if (ret) + return ret; + + ret = reset_deassert_bulk(&resets); + if (ret) + return ret; + } + return 0; }