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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,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 A74A2C47082 for ; Mon, 24 May 2021 02:23:42 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6F57861132 for ; Mon, 24 May 2021 02:23:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F57861132 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5ACDD82E8D; Mon, 24 May 2021 04:23:29 +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="Vk06rOKM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6B27682E87; Mon, 24 May 2021 04:23:23 +0200 (CEST) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) (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 209F082E7F for ; Mon, 24 May 2021 04:23:19 +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=prvs=0778e3ee5a=meng.li@windriver.com Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 14O2NBlw031035; Sun, 23 May 2021 19:23:11 -0700 Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2102.outbound.protection.outlook.com [104.47.55.102]) by mx0a-0064b401.pphosted.com with ESMTP id 38qrtb08af-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 23 May 2021 19:23:11 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LUzu8axg+QeIXe+8HFNz76EKiEgLH7oN5qrSNJftFBaXM+4helXqRe+rhON1lrwRl2XsA0YudL1URJOuh5fZMzxwAIoIPt0lujxfDPyIUICLovWxq0bnQR9JMm+xOOpay5Qn1z47x3z7GeSlmhiVWs4WP+JSOEn4g8Ijt9fyw2eYvoLwTYkxNx5oNjBUKfwIttiNSWlkUY5HjxSG5+N/F8yzzkAHrgLP8wJbwsygBzcNiRx5vlJdm4Cfkzj6Q1D2r+YWrsNOtA2DtusraDHfawC6HJw0n5e2Cl39jH/tjn/iNi0lU9eU95/Qn2/PJwUgGVw+QtUQyP20uAhjcK8t9w== 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=BZ46MTQNgTCA5TqhK4G4oBN7Ebsxvl2xy7X7D04YkCU=; b=UxaYfzqVkkm/c3jBNT1FRlya0T+PRNNQIr2x/r6Rb5tt95AbBsXdHQeofzl2IpJwF0TSzoMQ5CUhgTXWXu3cxPGQGd2wNNMrSkTSc53U7MaNVuoKYrury3kZSG+eAWAnZqL+m7M6YAHveyUJToLExsutec2J5bSHlJ/Z7rY4lrsNhkZ++cHfRz1f7Z4qciFSMNfLofJCP/RVrtmMHYEoxqDXlfWUAOcKIw3Uq8JqAF7WVN8Hw2Na0wMy/FcFnNRZYZ/C1X9RRC8hK7yvafJRcwFjTdFoMtt2K5lyUut250+VZR/FbZ1fHt1vwJmAK3fQh6kg7Rw5qsCJ4NgLCJ5/IQ== 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=BZ46MTQNgTCA5TqhK4G4oBN7Ebsxvl2xy7X7D04YkCU=; b=Vk06rOKMpFJUcj0F73F0WbGhj9QEtbBRjvYCasgj4A9imvUBW8CES6u6IBbiKpKnChFYp4T++3hgcOFCYxK1rGun7Pbz/jLnxdctdAnpNccR0DKbb2b9OWRXSqzWQ42cLs/36Q905ZqEP3F652aL5IvnrGmAKCmaWHWA8yRPzno= 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 PH0PR11MB5205.namprd11.prod.outlook.com (2603:10b6:510:3d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.26; Mon, 24 May 2021 02:23:08 +0000 Received: from PH0PR11MB5191.namprd11.prod.outlook.com ([fe80::ac4d:5dd3:c365:cd49]) by PH0PR11MB5191.namprd11.prod.outlook.com ([fe80::ac4d:5dd3:c365:cd49%9]) with mapi id 15.20.4150.027; Mon, 24 May 2021 02:23:08 +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: sr@denx.de, sean.anderson@seco.com, meng.li@windriver.com Subject: [PATCH v5, 1/2] driver: watchdog: reset watchdog in designware_wdt_stop() function Date: Mon, 24 May 2021 10:22:48 +0800 Message-Id: <20210524022249.16841-1-Meng.Li@windriver.com> X-Mailer: git-send-email 2.17.1 Content-Type: text/plain X-Originating-IP: [60.247.85.82] X-ClientProxiedBy: HK2PR02CA0155.apcprd02.prod.outlook.com (2603:1096:201:1f::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 HK2PR02CA0155.apcprd02.prod.outlook.com (2603:1096:201:1f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.26 via Frontend Transport; Mon, 24 May 2021 02:23:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ff2f9c4-fe5f-4d3c-c58d-08d91e5ade56 X-MS-TrafficTypeDiagnostic: PH0PR11MB5205: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R5Lw6LDPoFS9S/Eapmq9KNAjxL7sSilezSxF5rVdDsGfTbQWobZHkBWwIpnv15dcxPDsseAt5NNkb2rPF3wCuG/hWPhDo1z6XK2CmhbORmrfrWvJSEKXWScANpb+QTXudS6fIvYw0GVyxZ6DYNL3Qhz5NjNrS+w+Sb6MR1YoW2LQkG5zwZz+JteDqXN0hhsdvgsgc3uOxH4OjiNB6Yvk/na3xN5XOxICiXI5Tht1RVeSmfT3YrgFavkwSVACXM5OmdpKlxZGdDCxuQGF1VbSn7DzpnrzhICyHLRtXlz4Q/UWrXeoi3wRasdhxN5MyMBBC0utwzFv3RzNYc3wjbg40tGEyVx29B40TJKcgJJzhW0RHtQyik9/EO5sY7w+au+Y2osqEYW2+sJW2V2Lu3aVe+m14HAMnuA+vNuyNdxDl3wHyXSYIsbQ59ql/RXYMcLQnDCWwzhYI8fxsGZcigc6daCTXL+H0sox18y2y9eQLz2ERYDg2oQInL6MuJoIBRydRuX4Y1KQNKHrvyKgahYqBKq6L8VhEW2S+nwn/aZ1kTSApf86cO/S8GncRrZHttxIYgrNhzhzhyYNDBubSWgP/KaYNTx3kn210M3ynVHpZI0pPfF9dopJXeZbOswBYgwyLcmFsjILQPTZbRK/2afHzJk8CpVnnIPoEdrUWiuY/Zk= 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)(366004)(396003)(346002)(136003)(376002)(39840400004)(9686003)(478600001)(6512007)(2906002)(83380400001)(66476007)(86362001)(38100700002)(2616005)(66556008)(38350700002)(16526019)(186003)(956004)(6666004)(66946007)(26005)(8936002)(316002)(1076003)(6486002)(8676002)(6506007)(5660300002)(107886003)(4326008)(36756003)(52116002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?LSiQX9BpCvGw9wUOPJTWlqgc/t3gMgPxuKoWgDVKCvI/MJhGjvBNJdNCMBzr?= =?us-ascii?Q?PXgcLDD7qUiCZY6zNBZCCrmLEs0Om41PNY2S0k6AiZg2bbq1dYOQdZnMvYga?= =?us-ascii?Q?6hTxLTWFyA4/+tvg/VFQ10v+UvAgWoHTk+/jQc9DDW63MBUXm21Mquu1pP8f?= =?us-ascii?Q?w3cZi48sscU7/XRUhVyy/9SY0nSgLHKBqZQpYNc6U4wMRNcj/fRwUFFrHl8B?= =?us-ascii?Q?7sQEfVjP2qcYTkH22Ol0EzJ6Q7rVSbVqymK78D/BBlNaqR5EDan/2CtZ060S?= =?us-ascii?Q?quk0XD+1gx+z4o1dlRFQrLX1/D+Cg/vOQX/kCOP3nwmgOR7SjpG/APQAdZK6?= =?us-ascii?Q?+3N4MDKXA3cTqSPuQMHAJClAkJKHvJ1Ix6zMmdQ596CORV9liG0TM6npzRk0?= =?us-ascii?Q?7X8ZxpyOzdsrEZqT1870zyTrpurzvSNJi6DZITnynesh0kq4lFmPQb5Srrdl?= =?us-ascii?Q?3ZA3MGZpoj9BADlPhHlN2u84lVY660T3hORSQ94Y4asaHXvqvukjFhhKnm6b?= =?us-ascii?Q?eepIxcimbI2eq/zUmXjnNgByoc3XnAJFX8ZJXBrRcOX91j9L6Sjld1DQMwki?= =?us-ascii?Q?0kZ27CBtC1C2cI3UsH3d0G6MUXluIWoCPWl9pRfciHR7j1558NM3ClKdldXi?= =?us-ascii?Q?1CWusEqIe7GE3tZ12tFOA1i4o7kMmJ9yQEtG6KqzoSq97ebJi9oym7Xv7d66?= =?us-ascii?Q?A1xrCiH2EL4SqEPFim1yrhPGy6eQu+qi5rTtzrGzUfxWgL1Iv4ZTR0poXXdA?= =?us-ascii?Q?Q0yy+EoLiTC0pHVZDHrlMY9vj5e54KexPDL7AuTG3SgpGZsxKeq8txq1pg7B?= =?us-ascii?Q?rLcl7tSEUgCqNry89KOsIJczlc3es/qD/1pkJPLV96nHIuhZCRaO228oJTbe?= =?us-ascii?Q?twuZp4szy9JSmz45FQ2LxOyb6uR0cy7nh3wXgPhuFnSPkdjR6nKv6D4ZTyIy?= =?us-ascii?Q?fwMTu0WPwowxzptvlm0K9N5wIXu5Ql5fpzb9MHo27/KUjIl7jzvPTxtKAjJk?= =?us-ascii?Q?OV3gLybMAzTzOi0dr1nwEyFQvAAi1FYaqDdeagomq6gQGOI4AI/09sXz7Xse?= =?us-ascii?Q?WGYbfZer2i5D8uaKp/Pb4rZjEHJ5nA3C6Cyk3H8ZIQyEcvnedxrain4Qzqu7?= =?us-ascii?Q?iKgQgy748daaC0vryWpcZb3ELJ721vlWfYkRh1V76zNiGJuS93yJqSHOPeJE?= =?us-ascii?Q?pJ+Qo0aNF6anw6kVIcGVtEze24elrF+/fKoXRsT9TJgUVKTqHGdvntN3efHn?= =?us-ascii?Q?QHiMENWwmM5QQwNYLQNj1PJ0Xp2ff8teeu+EecRbLs/Og1I5q/7KyCCP/beC?= =?us-ascii?Q?kQ9S8SOhv8XvvxNSDvQQeFRk?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ff2f9c4-fe5f-4d3c-c58d-08d91e5ade56 X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5191.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2021 02:23:07.7675 (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: fTGW1IHGgwDEjoyKE7TzZlDOx4mBWON0NyNDG1WybIEhSrpKF+J0e6S+3ewIauCqSAmRceYoH2rnrtrK8NYvUQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5205 X-Proofpoint-GUID: _VORK1Ox6THilsDDVN4U12RM3VQkvnP_ X-Proofpoint-ORIG-GUID: _VORK1Ox6THilsDDVN4U12RM3VQkvnP_ X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.761 definitions=2021-05-24_02:2021-05-20, 2021-05-24 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 priorityscore=1501 lowpriorityscore=0 spamscore=0 phishscore=0 suspectscore=0 mlxlogscore=999 impostorscore=0 adultscore=0 malwarescore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105240015 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. Signed-off-by: Meng Li Reviewed-by: Stefan Roese --- v5: fix build issue, and verify this patch with latest upstream u-boot. v4: Remove the unauthorized signature. v3: Add the resets to designware_wdt_priv and initialize it in probe(). v2: Change "#if CONFIG_IS_ENABLED(DM_RESET)" into "if (CONFIG_IS_ENABLED(DM_RESET)) {", and define the variable into if condition sentence. --- drivers/watchdog/designware_wdt.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index 9e5487168c..afed81e6c6 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -22,6 +22,7 @@ struct designware_wdt_priv { void __iomem *base; unsigned int clk_khz; + struct reset_ctl_bulk *resets; }; /* @@ -95,6 +96,18 @@ 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)) { + int ret; + + ret = reset_assert_bulk(priv->resets); + if (ret) + return ret; + + ret = reset_deassert_bulk(priv->resets); + if (ret) + return ret; + } + return 0; } @@ -143,13 +156,11 @@ static int designware_wdt_probe(struct udevice *dev) #endif if (CONFIG_IS_ENABLED(DM_RESET)) { - struct reset_ctl_bulk resets; - - ret = reset_get_bulk(dev, &resets); + ret = reset_get_bulk(dev, priv->resets); if (ret) goto err; - ret = reset_deassert_bulk(&resets); + ret = reset_deassert_bulk(priv->resets); if (ret) goto err; } -- 2.17.1