From patchwork Thu Jan 30 05:29:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1231291 X-Patchwork-Delegate: trini@ti.com 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; dmarc=none (p=none dis=none) header.from=cortina-access.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CortinaAccess.onmicrosoft.com header.i=@CortinaAccess.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-CortinaAccess-onmicrosoft-com header.b=v1PkQRpr; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 487TTq42scz9s1x for ; Thu, 30 Jan 2020 16:30:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E5B8E81B99; Thu, 30 Jan 2020 06:30:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=cortina-access.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=CortinaAccess.onmicrosoft.com header.i=@CortinaAccess.onmicrosoft.com header.b="v1PkQRpr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 20D4381B89; Thu, 30 Jan 2020 06:29:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, FORGED_SPF_HELO,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-pu1apc01on0621.outbound.protection.outlook.com [IPv6:2a01:111:f400:febe::621]) (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 CF75381861 for ; Thu, 30 Jan 2020 06:29:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=cortina-access.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Alex.Nemirovsky@cortina-access.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FbbLDG+XvBHsOxpo8QMupzB00H683RRiyhxgNjEcPACZ8NUhXfk6Mfd+dSHhkmlTIv5ObF71PWVUutIenbGL4Sm+fMv36qS8dLFgD9rxMKBeSDIpnAqvTQl+PGRneCNCzm1aDE1esCnwN2ISNpTBRAMVtOWm+DTUb7Mrbbz4hRemTDkJ5B6w0q6P1/C0qh1OMUPKb1hUPsjipsy0nUd08l83nYVn9HH60ldfQ5FWs18sdhfYEKGI3VDEBel1NVS6Kc0CXhkXlsOl4z2DskkRqm00DLY+jJ2uzev2pL2xS6S3tesvrN6xCdpdSUxBU9Tl5sAAI0F1kQFFltPyFQ6soA== 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=CCLmfkriGRNFu35lR+O7QZHtvq1YFnexC8B1zivQxSc=; b=Ph766ri8LBSVgTcy1gtfcqxYkEMMtBcxv7qNTcK6ffIDumWz63il2LCWx0ycLpJbMeIL3rDAUrpuIgxygsnG1jwdGZwNq4/JnDXaKv5rJo8Irqd0oVc3fuhla2rTYb7D6HGZIGj/LehtARmAXslEK9VU4DsJweZLoYxBoTRvo6+bRkSc9NtVBLIEPOKqJzQHkKOFm/4KeAezJEbasFtGrXlIXYIe9REA98YTfHayO0pmeHb6pMtTitl6L1/MSHd8qsB8BVYlWSbhIZeoDFG8eHvyyvpckYUvqyWn2+D5m4P6db9Aswtf8+G1TxeRH4Z0r3LNk3UfPWmiHpn9vuWHMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cortina-access.com; dmarc=pass action=none header.from=cortina-access.com; dkim=pass header.d=cortina-access.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CortinaAccess.onmicrosoft.com; s=selector2-CortinaAccess-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CCLmfkriGRNFu35lR+O7QZHtvq1YFnexC8B1zivQxSc=; b=v1PkQRpr+MHakDOIlL22AaJMzA0LQqDNmfYRDEtg+GbQ0WhT/QHf+hle7a5NFG8pKvyfybfvnIWY7OfCW8Rcqcl89KHrRrNdbGaFAcPYr4/g/NHrdGrAnjOBPJGeFiVC88yWOXBOqVFBiZh+a49BnPDZwSmWs5es/bp3lWo2Ztg= Received: from TY2PR0101MB2445.apcprd01.prod.exchangelabs.com (20.177.47.144) by TY2PR0101MB3759.apcprd01.prod.exchangelabs.com (20.180.78.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2665.24; Thu, 30 Jan 2020 05:29:52 +0000 Received: from TY2PR0101MB2445.apcprd01.prod.exchangelabs.com ([fe80::80e5:96f9:1120:f31c]) by TY2PR0101MB2445.apcprd01.prod.exchangelabs.com ([fe80::80e5:96f9:1120:f31c%7]) with mapi id 15.20.2665.027; Thu, 30 Jan 2020 05:29:52 +0000 Received: from smok.hrh.localdomain (70.58.207.205) by MWHPR15CA0070.namprd15.prod.outlook.com (2603:10b6:301:4c::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2686.27 via Frontend Transport; Thu, 30 Jan 2020 05:29:51 +0000 From: Alex Nemirovsky To: "u-boot@lists.denx.de" Subject: [PATCH v3 4/6] watchdog: cortina_wdt: add support for HW WDT on CAxxxx SoCs Thread-Topic: [PATCH v3 4/6] watchdog: cortina_wdt: add support for HW WDT on CAxxxx SoCs Thread-Index: AQHV1y5M7pYJAOf2+0O3Tk1drkLCsw== Date: Thu, 30 Jan 2020 05:29:52 +0000 Message-ID: <1580362168-11286-5-git-send-email-alex.nemirovsky@cortina-access.com> References: <1580362168-11286-1-git-send-email-alex.nemirovsky@cortina-access.com> In-Reply-To: <1580362168-11286-1-git-send-email-alex.nemirovsky@cortina-access.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MWHPR15CA0070.namprd15.prod.outlook.com (2603:10b6:301:4c::32) To TY2PR0101MB2445.apcprd01.prod.exchangelabs.com (2603:1096:404:68::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alex.Nemirovsky@cortina-access.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [70.58.207.205] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6e3f35f9-b79a-4b89-1c06-08d7a5456e82 x-ms-traffictypediagnostic: TY2PR0101MB3759:|TY2PR0101MB3759:|TY2PR0101MB3759:|TY2PR0101MB3759: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ld-processed: 0694623c-6669-497c-89c3-3a32a9934313,ExtAddr x-ms-oob-tlc-oobclassifiers: OLM:392; x-forefront-prvs: 02981BE340 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6029001)(396003)(366004)(136003)(376002)(346002)(39850400004)(189003)(199004)(316002)(86362001)(6512007)(36756003)(66476007)(66556008)(66946007)(66446008)(508600001)(64756008)(2906002)(71200400001)(2616005)(956004)(81166006)(81156014)(8676002)(44832011)(5660300002)(8936002)(6916009)(6486002)(186003)(54906003)(16526019)(107886003)(52116002)(6506007)(4326008)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:TY2PR0101MB3759; H:TY2PR0101MB2445.apcprd01.prod.exchangelabs.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:0; received-spf: None (protection.outlook.com: cortina-access.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: oh9xlrZVi1hmnh4PtP/PT0v1H5kImWmULe4hMsQ5ZEEl7q1pXxDY8Kj0FRok3yY9EPIX4mhLYVwutPbpRrb6NuLlnkL3+11eC1J4+jB1fIXS4MzPsr0lBNaRqMTJVXVguHfEngdiOpuvrmz5RIOY4sXGndcsfN8qGirPQ7suN81YVLW8wFxVob0OxaaTs/bNX1rrZuEOgnwjmpKGNkf8GriV+JCXDZbBOudDjXV+zDCwcpVPrzvPvZTsQwKnjlojyFRJ8mz2o43uOpHg/d3VQ6DFtwDApjo5KOESRN9VpmtT3vKfkdC+tZDi3qIiMkYva8tI3uMnXUeg4qS2L6oXSYLzEZ1P7Fz/3YDJhjTr7uQmDGKTTCPoIY1H8nbiZl8q1rNxYdAkJ3WJS4MzQ8cGQ29v4rwurbb4RX46ZCa/CWVLrsdL72GOUvQ6JXeKsZJ9 x-ms-exchange-antispam-messagedata: AQmG5Ni8d0y4EwREN2fHJ5+U0wuj5iTlo+ZaIUxbJKyObZ9jKWNJaXl/IbNkT0rRXgtN4Xp6FgNoySA2AjLsUM/4yr3hASWsQB75ksEOV+Sz55L7YlPIpqc7gGuGMAK0MaRR+AupbAa0vetTcn47cw== MIME-Version: 1.0 X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 6e3f35f9-b79a-4b89-1c06-08d7a5456e82 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2020 05:29:52.5639 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 0694623c-6669-497c-89c3-3a32a9934313 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: A6BHZX+59ixbUJydbwfKmSHG71u25aPTBZPBBN4MGhcncazr4SWU8BBVYhy4aj0bvze0vDj3XrK46pcoQiBhpmdkRzVGAmppQ1jbuwzOEzDN2YJ1zqHZ/RCVOVi6U4i3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PR0101MB3759 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Li , Alex Nemirovsky Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean From: Jason Li Add support for hardware watchdog timer on all Cortina Access CAxxxx family of SoCs. Reviewed-by: Daniel Schwierzeck Reviewed-by: Stefan Roese Signed-off-by: Jason Li Signed-off-by: Alex Nemirovsky --- Changes in v3: None Changes in v2: - Rename driver in DT namespace for consistency between all CA drivers. - Remove blank line after SPDX identifier - Remove authorship comment as it is already recorded within Git and is redundant - Use setbits_32() for read-modify-write operation. drivers/watchdog/Kconfig | 8 +++ drivers/watchdog/Makefile | 1 + drivers/watchdog/cortina_wdt.c | 138 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 drivers/watchdog/cortina_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 8c16d69..2f7dedb 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -99,6 +99,14 @@ config WDT_CDNS Select this to enable Cadence watchdog timer, which can be found on some Xilinx Microzed Platform. +config WDT_CORTINA + bool "Cortina Access CAxxxx watchdog timer support" + depends on WDT + help + Cortina Access CAxxxx watchdog timer support. + This driver support all CPU ISAs supported by Cortina + Access CAxxxx SoCs. + config WDT_MPC8xx bool "MPC8xx watchdog timer support" depends on WDT && MPC8xx diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 955caef..87f92a4 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o obj-$(CONFIG_WDT_ARMADA_37XX) += armada-37xx-wdt.o obj-$(CONFIG_WDT_ASPEED) += ast_wdt.o obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o +obj-$(CONFIG_WDT_CORTINA) += cortina_wdt.o obj-$(CONFIG_WDT_ORION) += orion_wdt.o obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o diff --git a/drivers/watchdog/cortina_wdt.c b/drivers/watchdog/cortina_wdt.c new file mode 100644 index 0000000..f6a0e70 --- /dev/null +++ b/drivers/watchdog/cortina_wdt.c @@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2020 Cortina-Access + * + */ + +#include +#include +#include +#include +#include + +#define CA_WDT_CTRL 0x00 +#define CA_WDT_PS 0x04 +#define CA_WDT_DIV 0x08 +#define CA_WDT_LD 0x0C +#define CA_WDT_LOADE 0x10 +#define CA_WDT_CNT 0x14 +#define CA_WDT_IE 0x18 +#define CA_WDT_INT 0x1C +#define CA_WDT_STAT 0x20 + +/* CA_WDT_CTRL */ +#define CTL_WDT_EN BIT(0) +#define CTL_WDT_RSTEN BIT(1) +#define CTL_WDT_CLK_SEL BIT(2) +/* CA_WDT_LOADE */ +#define WDT_UPD BIT(0) +#define WDT_UPD_PS BIT(1) + +/* Global config */ +#define WDT_RESET_SUB BIT(4) +#define WDT_RESET_ALL_BLOCK BIT(6) +#define WDT_RESET_REMAP BIT(7) +#define WDT_EXT_RESET BIT(8) +#define WDT_RESET_DEFAULT (WDT_EXT_RESET | WDT_RESET_REMAP | \ + WDT_RESET_ALL_BLOCK | WDT_RESET_SUB) + +struct ca_wdt_priv { + void __iomem *base; + void __iomem *global_config; +}; + +static void cortina_wdt_set_timeout(struct udevice *dev, u64 timeout_ms) +{ + struct ca_wdt_priv *priv = dev_get_priv(dev); + + /* Prescale using millisecond unit */ + writel(CORTINA_PER_IO_FREQ / 1000, priv->base + CA_WDT_PS); + + /* Millisecond */ + writel(1, priv->base + CA_WDT_DIV); + + writel(timeout_ms, priv->base + CA_WDT_LD); + writel(WDT_UPD | WDT_UPD_PS, priv->base + CA_WDT_LOADE); +} + +static int cortina_wdt_start(struct udevice *dev, u64 timeout, ulong flags) +{ + struct ca_wdt_priv *priv = dev_get_priv(dev); + + cortina_wdt_set_timeout(dev, timeout); + + /* WDT Reset option */ + setbits_32(priv->global_config, WDT_RESET_DEFAULT); + + /* Enable WDT */ + setbits_32(priv->base, CTL_WDT_EN | CTL_WDT_RSTEN | CTL_WDT_CLK_SEL); + + return 0; +} + +static int cortina_wdt_stop(struct udevice *dev) +{ + struct ca_wdt_priv *priv = dev_get_priv(dev); + + /* Disable WDT */ + writel(0, priv->base); + + return 0; +} + +static int cortina_wdt_reset(struct udevice *dev) +{ + struct ca_wdt_priv *priv = dev_get_priv(dev); + + /* Reload WDT counter */ + writel(WDT_UPD, priv->base + CA_WDT_LOADE); + + return 0; +} + +static int cortina_wdt_expire_now(struct udevice *dev, ulong flags) +{ + /* Set 1ms timeout to reset system */ + cortina_wdt_set_timeout(dev, 1); + hang(); + + return 0; +} + +static int cortina_wdt_probe(struct udevice *dev) +{ + struct ca_wdt_priv *priv = dev_get_priv(dev); + + priv->base = dev_remap_addr_index(dev, 0); + if (!priv->base) + return -ENOENT; + + priv->global_config = dev_remap_addr_index(dev, 1); + if (!priv->global_config) + return -ENOENT; + + /* Stop WDT */ + cortina_wdt_stop(dev); + + return 0; +} + +static const struct wdt_ops cortina_wdt_ops = { + .start = cortina_wdt_start, + .reset = cortina_wdt_reset, + .stop = cortina_wdt_stop, + .expire_now = cortina_wdt_expire_now, +}; + +static const struct udevice_id cortina_wdt_ids[] = { + {.compatible = "cortina,ca-wdt"}, + {} +}; + +U_BOOT_DRIVER(cortina_wdt) = { + .name = "cortina_wdt", + .id = UCLASS_WDT, + .probe = cortina_wdt_probe, + .of_match = cortina_wdt_ids, + .ops = &cortina_wdt_ops, +};