Received: by 10.223.164.221 with SMTP id h29csp771783wrb; Wed, 1 Nov 2017 05:19:06 -0700 (PDT) X-Google-Smtp-Source: ABhQp+R+4rn8XmfwwuatnhyFcYb3+X/du41t5crU30wyM9Aizv/tI5LPnSGe7FEWN/yxEmfCJW5G X-Received: by 10.101.72.65 with SMTP id i1mr6023611pgs.436.1509538746546; Wed, 01 Nov 2017 05:19:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509538746; cv=none; d=google.com; s=arc-20160816; b=B7DPwzcSRwtsWNGQTki8QD2Qo8DkcDNCRYw67QxILocbEpESKk7L8oWa292eYUheCJ Ap1gheYHbBTim1TVfz8JGn9fJm99Y0ItG71aM89IKMRpcNKmfpg/6qdEb9kk8ZKx4cOI xnd1c2nhj8conYf51Z0ivgpAWqpZ8WZrs3t1JyGIGtWck8L7gJau9OVlkS/0bcNNCIeN 6JXxFeRN1bA6CN9tcqhcZJo4hqdHC9x0m+rGGPR9i9cxADhn+5Jd3xk44Fd3d/xjbAnV JppJ4y3DYlGiDjmxQQ+pL8tg1CVBiuSszAEjNk74ZTEuRadUE/0qgk2Xj2FFamCP1mnq bHEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=0aVbTi2ZLdCid8vTU71aaKeg0OVM2bhdlrgH3RkH88k=; b=xX3o8egV+n7y/9VksDvv2aayYr7r1GsmvN9p/HBrWMYoH/6WwJVZTEYbnImSJLVdrT oYWP4FN0/H9uQz+tbMkOhUX7iINBVhiF5fXQEWIfvuhhrG0mSKjbPfbDtliN05PNskmi S+ydIxLprtKlmZy8OKrcTB5tQynsQmYepncJ78k/g/qRJUFfF4wrkz87iJvOSBUfOsGb WiJA4jUgKwvCjPwOrw0uK6LpR/DlfuZLZExX2MyecZWoU3ax16Z4Zl0V/eRs4UXoAwK1 DHm80QPBcc/B+aFVbDxLRVw2wFvmZhOcuUkSsJyjHUjaD9XI1T6u/LZO9kWAgbT/5reW 9+HQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f81si908429pfj.30.2017.11.01.05.18.51; Wed, 01 Nov 2017 05:19:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754668AbdKAMRy (ORCPT + 99 others); Wed, 1 Nov 2017 08:17:54 -0400 Received: from 212.199.177.27.static.012.net.il ([212.199.177.27]:41191 "EHLO herzl.nuvoton.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754617AbdKAMRg (ORCPT ); Wed, 1 Nov 2017 08:17:36 -0400 Received: from talu34.nuvoton.co.il (ntil-fw [212.199.177.25]) by herzl.nuvoton.co.il (8.13.8/8.13.8) with ESMTP id vA1BxYQ0010948; Wed, 1 Nov 2017 13:59:34 +0200 Received: by talu34.nuvoton.co.il (Postfix, from userid 10070) id 1381B5A918; Wed, 1 Nov 2017 14:16:48 +0200 (IST) From: Tomer Maimon To: robh+dt@kernel.org, mark.rutland@arm.com, daniel.lezcano@linaro.org, tglx@linutronix.de, avifishman70@gmail.com, brendanhiggins@google.com, raltherr@google.com, joel@jms.id.au Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, openbmc@lists.ozlabs.org, Tomer Maimon Subject: [PATCH v2 1/2] clocksource: npcm: add NPCM7xx timer driver Date: Wed, 1 Nov 2017 14:16:43 +0200 Message-Id: <1509538604-8218-2-git-send-email-tmaimon77@gmail.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1509538604-8218-1-git-send-email-tmaimon77@gmail.com> References: <1509538604-8218-1-git-send-email-tmaimon77@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add Nuvoton BMC NPCM7xx timer driver. the clocksource Enable 24-bit TIMER0 and TIMER1 counters, while TIMER0 serves as clockevent and TIMER1 serves as clocksource. Signed-off-by: Tomer Maimon --- drivers/clocksource/Kconfig | 8 ++ drivers/clocksource/Makefile | 1 + drivers/clocksource/npcm7xx-timer.c | 224 ++++++++++++++++++++++++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 drivers/clocksource/npcm7xx-timer.c diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index cc6062049170..46184af75d6c 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -140,6 +140,14 @@ config VT8500_TIMER help Enables support for the VT8500 driver. +config NPCM7XX_TIMER + bool "NPCM7xx timer driver" if COMPILE_TEST + depends on HAS_IOMEM + select CLKSRC_MMIO + help + Enable 24-bit TIMER0 and TIMER1 counters in the NPCM7xx arcithcture, + While TIMER0 serves as clockevent and TIMER1 serves as clocksource. + config CADENCE_TTC_TIMER bool "Cadence TTC timer driver" if COMPILE_TEST depends on COMMON_CLK diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index dbc1ad14515e..f2a9318a1eec 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -53,6 +53,7 @@ obj-$(CONFIG_CLKSRC_TI_32K) += timer-ti-32k.o obj-$(CONFIG_CLKSRC_NPS) += timer-nps.o obj-$(CONFIG_OXNAS_RPS_TIMER) += timer-oxnas-rps.o obj-$(CONFIG_OWL_TIMER) += owl-timer.o +obj-$(CONFIG_NPCM7XX_TIMER) += npcm7xx-timer.o obj-$(CONFIG_ARC_TIMERS) += arc_timer.o obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o diff --git a/drivers/clocksource/npcm7xx-timer.c b/drivers/clocksource/npcm7xx-timer.c new file mode 100644 index 000000000000..d1ea5c183a69 --- /dev/null +++ b/drivers/clocksource/npcm7xx-timer.c @@ -0,0 +1,224 @@ + +/* + * Copyright (c) 2017 Nuvoton Technology corporation. + * Copyright 2017 Google, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation;version 2 of the License. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct npcm7xx_clockevent_data { + struct clock_event_device cvd; + void __iomem *timer_base; + unsigned int rate; +}; + +/* Timers registers */ +#define NPCM7XX_REG_TCSR0 0x0 /* Timer 0 Control and Status Register */ +#define NPCM7XX_REG_TICR0 0x8 /* Timer 0 Initial Count Register */ +#define NPCM7XX_REG_TCSR1 0x4 /* Timer 1 Control and Status Register */ +#define NPCM7XX_REG_TICR1 0xc /* Timer 1 Initial Count Register */ +#define NPCM7XX_REG_TDR1 0x14 /* Timer 1 Data Register */ +#define NPCM7XX_REG_TISR 0x18 /* Timer Interrupt Status Register */ + +/* Timers control */ +#define NPCM7XX_Tx_RESETINT 0x1f +#define NPCM7XX_Tx_PERIOD BIT(27) +#define NPCM7XX_Tx_INTEN BIT(29) +#define NPCM7XX_Tx_COUNTEN BIT(30) +#define NPCM7XX_Tx_ONESHOT 0x0 +#define NPCM7XX_Tx_OPER GENMASK(3, 27) +#define NPCM7XX_Tx_MIN_PRESCALE 0x1 +#define NPCM7XX_Tx_TDR_MASK_BITS 24 +#define NPCM7XX_Tx_MAX_CNT 0xFFFFFF +#define NPCM7XX_T0_CLR_INT 0x1 +#define NPCM7XX_Tx_CLR_CSR 0x0 + +/* Timers operating mode */ +#define NPCM7XX_START_PERIODIC_Tx (NPCM7XX_Tx_PERIOD | NPCM7XX_Tx_COUNTEN | \ + NPCM7XX_Tx_INTEN | \ + NPCM7XX_Tx_MIN_PRESCALE) + +#define NPCM7XX_START_ONESHOT_Tx (NPCM7XX_Tx_ONESHOT | NPCM7XX_Tx_COUNTEN | \ + NPCM7XX_Tx_INTEN | \ + NPCM7XX_Tx_MIN_PRESCALE) +#define NPCM7XX_START_Tx (NPCM7XX_Tx_COUNTEN | NPCM7XX_Tx_PERIOD | \ + NPCM7XX_Tx_MIN_PRESCALE) + +static int npcm7xx_timer_oneshot(struct clock_event_device *evt) +{ + u32 val; + struct npcm7xx_clockevent_data *cevtd = + container_of(evt, struct npcm7xx_clockevent_data, cvd); + + val = readl(cevtd->timer_base + NPCM7XX_REG_TCSR0); + val &= ~NPCM7XX_Tx_OPER; + + val = readl(cevtd->timer_base + NPCM7XX_REG_TCSR0); + val |= NPCM7XX_START_ONESHOT_Tx; + writel(val, cevtd->timer_base + NPCM7XX_REG_TCSR0); + + return 0; +} + +static int npcm7xx_timer_periodic(struct clock_event_device *evt) +{ + struct npcm7xx_clockevent_data *cevtd = + container_of(evt, struct npcm7xx_clockevent_data, cvd); + u32 val; + + val = readl(cevtd->timer_base + NPCM7XX_REG_TCSR0); + val &= ~NPCM7XX_Tx_OPER; + + writel((cevtd->rate / HZ), cevtd->timer_base + NPCM7XX_REG_TICR0); + val |= NPCM7XX_START_PERIODIC_Tx; + + writel(val, cevtd->timer_base + NPCM7XX_REG_TCSR0); + + return 0; +} + +static int npcm7xx_clockevent_setnextevent(unsigned long evt, + struct clock_event_device *clk) +{ + struct npcm7xx_clockevent_data *cevtd = + container_of(clk, struct npcm7xx_clockevent_data, cvd); + u32 val; + + writel(evt, cevtd->timer_base + NPCM7XX_REG_TICR0); + val = readl(cevtd->timer_base + NPCM7XX_REG_TCSR0); + val |= NPCM7XX_START_Tx; + writel(val, cevtd->timer_base + NPCM7XX_REG_TCSR0); + + return 0; +} + +static struct npcm7xx_clockevent_data npcm7xx_clockevent_data = { + .cvd = { + .name = "npcm7xx-timer0", + .features = CLOCK_EVT_FEAT_PERIODIC | + CLOCK_EVT_FEAT_ONESHOT, + .set_next_event = npcm7xx_clockevent_setnextevent, + .set_state_shutdown = npcm7xx_timer_oneshot, + .set_state_periodic = npcm7xx_timer_periodic, + .set_state_oneshot = npcm7xx_timer_oneshot, + .tick_resume = npcm7xx_timer_oneshot, + .rating = 300 + }, +}; + +static irqreturn_t npcm7xx_timer0_interrupt(int irq, void *dev_id) +{ + struct npcm7xx_clockevent_data *cevtd = dev_id; + struct clock_event_device *evt = &cevtd->cvd; + + writel(NPCM7XX_T0_CLR_INT, cevtd->timer_base + NPCM7XX_REG_TISR); + + if (evt->event_handler) { + evt->event_handler(evt); + return IRQ_HANDLED; + } + + return IRQ_NONE; +} + +static struct irqaction npcm7xx_timer0_irq = { + .name = "npcm7xx-timer0", + .flags = IRQF_TIMER | IRQF_IRQPOLL, + .handler = npcm7xx_timer0_interrupt, + .dev_id = &npcm7xx_clockevent_data, +}; + +static void __init npcm7xx_clockevents_init(int irq, u32 rate) +{ + writel(NPCM7XX_Tx_CLR_CSR, + npcm7xx_clockevent_data.timer_base + NPCM7XX_REG_TCSR0); + + writel(NPCM7XX_Tx_RESETINT, + npcm7xx_clockevent_data.timer_base + NPCM7XX_REG_TISR); + setup_irq(irq, &npcm7xx_timer0_irq); + npcm7xx_clockevent_data.cvd.cpumask = cpumask_of(0); + + clockevents_config_and_register(&npcm7xx_clockevent_data.cvd, rate, + 0x1, NPCM7XX_Tx_MAX_CNT); +} + +static void __init npcm7xx_clocksource_init(u32 rate) +{ + u32 val; + + writel(NPCM7XX_Tx_CLR_CSR, + npcm7xx_clockevent_data.timer_base + NPCM7XX_REG_TCSR1); + writel(NPCM7XX_Tx_MAX_CNT, + npcm7xx_clockevent_data.timer_base + NPCM7XX_REG_TICR1); + + val = readl(npcm7xx_clockevent_data.timer_base + NPCM7XX_REG_TCSR1); + val |= NPCM7XX_START_Tx; + writel(val, npcm7xx_clockevent_data.timer_base + NPCM7XX_REG_TCSR1); + + clocksource_mmio_init(npcm7xx_clockevent_data.timer_base + + NPCM7XX_REG_TDR1, + "npcm7xx-timer1", rate, + 300, (unsigned int)NPCM7XX_Tx_TDR_MASK_BITS, + clocksource_mmio_readl_down); +} + +static int __init npcm7xx_timer_init(struct device_node *np) +{ + struct clk *clk; + int irq, ret; + u32 rate; + + irq = irq_of_parse_and_map(np, 0); + if (!irq) + return -EINVAL; + + npcm7xx_clockevent_data.timer_base = of_iomap(np, 0); + if (!npcm7xx_clockevent_data.timer_base) + return -ENXIO; + + clk = of_clk_get(np, 0); + + if (IS_ERR(clk)) { + ret = of_property_read_u32(np, "clock-frequency", &rate); + if (ret) + goto err_iounmap; + } else { + clk_prepare_enable(clk); + rate = clk_get_rate(clk); + } + + /* Clock input is divided by PRESCALE + 1 before it is fed */ + /* to the counter */ + rate = rate / (NPCM7XX_Tx_MIN_PRESCALE + 1); + + npcm7xx_clockevent_data.rate = rate; + + npcm7xx_clocksource_init(rate); + npcm7xx_clockevents_init(irq, rate); + + pr_info("Enabling NPCM7xx clocksource timer base: %p, IRQ: %u\n", + npcm7xx_clockevent_data.timer_base, irq); + + return 0; + +err_iounmap: + iounmap(npcm7xx_clockevent_data.timer_base); + return ret; + +} + +TIMER_OF_DECLARE(npcm7xx, "nuvoton,npcm7xx-timer", npcm7xx_timer_init); + -- 2.14.1 From 1585871479368878593@xxx Mon Dec 04 16:28:18 +0000 2017 X-GM-THRID: 1585871479368878593 X-Gmail-Labels: Inbox,Category Promotions,HistoricalUnread