From patchwork Mon Jan 20 09:53:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1225811 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=vvJ4BZLG; 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 481RpC26cgz9sRK for ; Mon, 20 Jan 2020 20:54:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9FADF817E4; Mon, 20 Jan 2020 10:53:53 +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="vvJ4BZLG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C31D81882; Mon, 20 Jan 2020 10:53:51 +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.7 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-HK2-obe.outbound.protection.outlook.com (mail-hk2apc01on0612.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::612]) (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 921AA817AF for ; Mon, 20 Jan 2020 10:53:46 +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=mGLdcv4SYt4vse2kVihwZF4uZnBgZhX/fcY8EsCgEoyxCkfy9CvGeNjQCFvgEv4IT59k9g22aVHrEV1WJu52q4HWL6py50ghInWpq4u/zz3NPnCj3htTvgQdbmQkPUWlXbq9o4A/DTDoySQZWjS3qMFxql7p9ZcyOhpS+vdrrORzF4z2tzC3iifdYUuVpQbtYIRyvHmZoY4ES8xFo9VrXJ734tIoDjcjaxeYY3xW5J63TVKo6sm6fppr5/m9yF5KeGGWRofPl/WV9CXxfmef0W+8nPV74NA+8D/Ou23wIZN3GySi0gLEOiBKLg2zEV77Z1p6eBCEB2dvG/xduRrySA== 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=hqhDKCNeNm3RB4ctzKtMAQiHvrdbXC8z53TjoDUx6D8=; b=kglCfchaoAO+asIwRaaP5jEwb2YJX510hR+BiVC5dTLZR2n7qSk67qqx2/tXQTrkBv7HvBVt52Vy9xQd1bm26N04XhvupeKi7B81dTf3A1Q8SpafEoOIBSvViMJIvfwRg7m5Xcn1ZwgT2F1vdJVTyLv0Y8nGaC9C7pmnquoA3pE2gMFW0iZMRm1Ahic0AXq4PeQZCJ7WnNeL2wOPotAisWKIQ4IKQM9Vn0/dG2rJrVsrPKpDwjw1ZwmkuLRAsJpaA/gCdWv6znDfUNVaTSsVtXOyEprtAF30wF3LQtTx6BKDxhsL7EERJqqcEw5U70GZGIWkUNzjph4lWz55RhCPMw== 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=hqhDKCNeNm3RB4ctzKtMAQiHvrdbXC8z53TjoDUx6D8=; b=vvJ4BZLGCL6M1CZr2FV6wv20QJh7swvkO433t2W1D/+5w8a5X8HkPJop+NYweD+CD0CIAk8ebqBI1NJR+GYPrWwcx1CHL7ncCj6HcmfTyo7cxx9VMRsluVmCoK/0vvswcF2ldUioUS9Lvv5nMzL2XQrtl4Xocue83AwSf/FBNf8= Received: from TY2PR0101MB2445.apcprd01.prod.exchangelabs.com (20.177.47.144) by TY2PR0101MB2767.apcprd01.prod.exchangelabs.com (20.177.159.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19; Mon, 20 Jan 2020 09:53:43 +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.2644.024; Mon, 20 Jan 2020 09:53:43 +0000 Received: from smok.hrh.localdomain (70.58.207.205) by MWHPR12CA0027.namprd12.prod.outlook.com (2603:10b6:301:2::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2644.19 via Frontend Transport; Mon, 20 Jan 2020 09:53:39 +0000 From: Alex Nemirovsky To: "u-boot@lists.denx.de" , Simon Glass Subject: [PATCH 3/4] watchdog: cortina_wdt: add support for HW WDT on CAxxxx SoCs Thread-Topic: [PATCH 3/4] watchdog: cortina_wdt: add support for HW WDT on CAxxxx SoCs Thread-Index: AQHVz3d/xb53V0C9+U6ll+JsdDDSwg== Date: Mon, 20 Jan 2020 09:53:43 +0000 Message-ID: <1579513995-1822-4-git-send-email-alex.nemirovsky@cortina-access.com> References: <1579513995-1822-1-git-send-email-alex.nemirovsky@cortina-access.com> In-Reply-To: <1579513995-1822-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: MWHPR12CA0027.namprd12.prod.outlook.com (2603:10b6:301:2::13) 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: 25eb46d7-0977-49a1-3f4f-08d79d8ea23c x-ms-traffictypediagnostic: TY2PR0101MB2767:|TY2PR0101MB2767:|TY2PR0101MB2767:|TY2PR0101MB2767: 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:153; x-forefront-prvs: 0288CD37D9 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6029001)(346002)(39840400004)(366004)(396003)(136003)(376002)(189003)(199004)(52116002)(36756003)(71200400001)(6666004)(508600001)(4326008)(16526019)(54906003)(64756008)(66556008)(5660300002)(44832011)(956004)(66446008)(2616005)(110136005)(26005)(186003)(86362001)(6486002)(66946007)(6512007)(316002)(6506007)(2906002)(7416002)(81156014)(81166006)(8936002)(66476007)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:TY2PR0101MB2767; 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: R5Ds5kUGSxbMjBdrbdOK9HHWVcesd3KGGMGxnFfkufDawIgjpPbXfz5yec20TSIfMgjRSeh0mOngMklCdcsh5JB3Y9Wl0ryr0VFyJt45lNf8g9rFBtyCGvXbZLhDyLtdZE4TOqoy9hcAeauBlVCyrWiIPuifvZdPgMIPXLj/Ws7TG+HRzH1zWsSx/ch/9CIt23sLBsN9NPFvus69pPGuuAy60gj5laPSpPCkONW6SQAWs245M2dXx7bbRzXrmF7lCUnHLjAKMDe2RXubSe3/D0fELDaHNui9ciUAp1k5D9Cy22ExQ4IPHFUhDQMgtsBnsvjO/OkeLR+4tzQ/vlf9c6U33LtHlDGIdEMU0hv1S8Qs+WFFA3D7/2FtpcPw142YdN43+v9jLUMd2qHujcUjZzKPqJHH0+47WDp4DtAifqZTR2CFm1sNsIRExlnQBUch MIME-Version: 1.0 X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 25eb46d7-0977-49a1-3f4f-08d79d8ea23c X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jan 2020 09:53:43.1727 (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: UUFxJr0B/aLUOCb2VhUsnkbWWDiet9/Xyk8Uc7RWahqNVaqbUWZPwIqJS3lwifvnbRTna2oPm7rAikk85iBoo/HpO3byXVpo0Ew0qiIJZcT4ObvG9kAQ7XIMctxYyaM3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PR0101MB2767 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: Andy Shevchenko , Heinrich Schuchardt , Prabhakar Kushwaha , Jason Li , Alex Nemirovsky , Stefan Roese , Suniel Mahesh 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. Signed-off-by: Jason Li Signed-off-by: Alex Nemirovsky Reviewed-by: Stefan Roese --- MAINTAINERS | 2 + drivers/watchdog/Kconfig | 8 +++ drivers/watchdog/Makefile | 1 + drivers/watchdog/cortina_wdt.c | 144 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 155 insertions(+) create mode 100644 drivers/watchdog/cortina_wdt.c diff --git a/MAINTAINERS b/MAINTAINERS index b7b3359..f9334f9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -180,6 +180,7 @@ F: board/cortina/common/* F: board/cortina/common/Kconfig F: board/cortina/common/armv8/lowlevel_init.S F: drivers/gpio/cortina_gpio.c +F: drivers/watchdog/cortina_wdt.c ARM/CZ.NIC TURRIS MOX SUPPORT M: Marek Behun @@ -662,6 +663,7 @@ F: board/cortina/common/* F: board/cortina/common/Kconfig F: board/cortina/common/mips/* F: drivers/gpio/cortina_gpio.c +F: drivers/watchdog/cortina_wdt.c MIPS MSCC M: Gregory CLEMENT 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..61df802 --- /dev/null +++ b/drivers/watchdog/cortina_wdt.c @@ -0,0 +1,144 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/* + * Copyright (C) 2020 Cortina-Access + * Author: Jason Li + * + */ + +#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); + unsigned int reg_v; + + cortina_wdt_set_timeout(dev, timeout); + + /* WDT Reset option */ + reg_v = readl(priv->global_config); + reg_v |= WDT_RESET_DEFAULT; + writel(reg_v, priv->global_config); + + /* Enable WDT */ + reg_v = readl(priv->base); + reg_v |= (CTL_WDT_EN | CTL_WDT_RSTEN | CTL_WDT_CLK_SEL); + writel(reg_v, priv->base); + + 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,cortina-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, +};