Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp807353pxb; Fri, 22 Apr 2022 11:33:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyF17IM9U+h7MFSV5mHqh3vUp/1oljAh+Bt5cLCb5cfw7cfMS/JTuFXnjoda01uwXu5LNia X-Received: by 2002:a17:902:ab56:b0:15a:ccc7:a311 with SMTP id ij22-20020a170902ab5600b0015accc7a311mr5806050plb.22.1650652434169; Fri, 22 Apr 2022 11:33:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650652434; cv=none; d=google.com; s=arc-20160816; b=PO5fTysuMTaC91nz9Cohtt6qsulVChgIlHJ0G6h/NVyhwqcJdgTwX7B58+xnNVa3wK vYsgqea2iCyYwfOs5Mju1Mm2MR3UxQ8RV+If/uB2flD6623o05QNl14NSNphWb+mgv0v yYJ9CQc3QnFCHR2aMrYHzl9w0XjyO/eaVspdW6MBYV20U/o9SMWBJUDmEjqkmYW1/6fv px3EuqXSz2klOzU0zsydHNKTDiFGXlgHDPwXELIaRWFLobTU/9HC76Z296wvFHSviiqk IW1e0TCf2gTY7gIgpxLSBwp4QtD7oEsrLa8yaWLHwd7MpGT4tF+U8afdOZi47eaN0RXh e8gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=6uisFRvQkyfu59hV2NacFstaBmhE8WGMwgum12heCws=; b=crDuRKMzAz2+/XjtR4Es9s57XjxkmwgO2jYRisSNN1EF68tPULxMFBXFybjzKpN4w+ QPrXlsVtREtcpXBIJQfy/vykwP88sOJTPVefFsatbnPd23Ha0lSfNijFLDeT6MDpSAik 2mFfKn+WJe9cifdj+EpRFIVknuF7GSzDfGLnk6/pXwdNNPNQXmhIu3v4kOX1UmIYpDZk 4mZyXzhNdcHno7wnGY3lvVaGDI4evhCNFLS/piMwxNCEyFN0NtMHfQQWqErabTsv20Wx cRP+DGaRjjqBRhzp5G3M3Y7rVcFrMOOh+0M7UGBiAXFYet6PrTbfBKOE4ueEJPnye6t4 v0ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=JkU644EE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hpe.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id h2-20020a17090a470200b001cb7d1e6b6csi9063616pjg.129.2022.04.22.11.33.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 11:33:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=JkU644EE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hpe.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3A2E4116F66; Fri, 22 Apr 2022 11:02:01 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379952AbiDTPDg (ORCPT + 99 others); Wed, 20 Apr 2022 11:03:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379880AbiDTPC4 (ORCPT ); Wed, 20 Apr 2022 11:02:56 -0400 Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 100EE11C0E for ; Wed, 20 Apr 2022 08:00:10 -0700 (PDT) Received: from pps.filterd (m0134420.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 23KEKDDL009926; Wed, 20 Apr 2022 14:59:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=pps0720; bh=6uisFRvQkyfu59hV2NacFstaBmhE8WGMwgum12heCws=; b=JkU644EEN1s2cCmnQFeFxV4YFFETINxxtCNeEFwNPosW4v2xllmhV+gVxHGkLzAXjCHB 5W6SUCUX0u9qWAiyrTousfkxuh7XU/WUFSWeJ9qxGLXKAeizfic4Nyr9vXi79kXHNskI Hi/fZM6QPSP6zPtuFi0AoqC+LPpIdxUJDJcfRW5HclMd3lcAl6gmllW2q6/uNgKhbyby hYX96Skt5kRu8gYHNrKU9xvuueoSulRCEngZtxf4Q0gAYWeNYAj4SRNR+9iEhFK7Eo4r Vjj4QWiCvAN+80cq1UyC7oBxAmyzAsnTuSTFcWU71iYIqIq8ADLGG4GJRQmk0FnUnxw7 4Q== Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) by mx0b-002e3701.pphosted.com (PPS) with ESMTPS id 3fjkub0cnm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Apr 2022 14:59:53 +0000 Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2352.austin.hpe.com (Postfix) with ESMTP id 6CDE562; Wed, 20 Apr 2022 14:59:52 +0000 (UTC) Received: from hpe.com (cigateway-dev.us.rdlabs.hpecorp.net [10.14.73.30]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 1931A39; Wed, 20 Apr 2022 14:59:52 +0000 (UTC) From: nick.hawkins@hpe.com To: verdun@hpe.com, nick@hpe.com, joel@jms.id.au, arnd@arndb.de Cc: Nick Hawkins , Daniel Lezcano , Thomas Gleixner , linux-kernel@vger.kernel.org Subject: [PATCH v4 04/11] clocksource/drivers: Add HPE GXP timer Date: Wed, 20 Apr 2022 10:01:48 -0500 Message-Id: <20220420150156.47405-4-nick.hawkins@hpe.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220420150156.47405-1-nick.hawkins@hpe.com> References: <20220420150156.47405-1-nick.hawkins@hpe.com> X-Proofpoint-ORIG-GUID: aSGDIxVxzxTJA9fOKpEXxNfpBRoPCNa6 X-Proofpoint-GUID: aSGDIxVxzxTJA9fOKpEXxNfpBRoPCNa6 X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-04-20_04,2022-04-20_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 malwarescore=0 phishscore=0 spamscore=0 impostorscore=0 adultscore=0 priorityscore=1501 clxscore=1015 mlxscore=0 mlxlogscore=999 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204200089 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nick Hawkins Add support for the HPE GXP SOC timer. The GXP supports several different kinds of timers but for the purpose of this driver there is only support for the General Timer. The timer has a 1us resolution and is 32 bits. The timer also creates a child watchdog device as the register region is the same based on previous review feedback. Signed-off-by: Nick Hawkins --- v2: *Made watchdog a child of timer as they share the same register region *Fixed watchdog init timeout call *Fixed variable usage u32/u64 *Removed Read Once *fixed error that should have been debug --- drivers/clocksource/Kconfig | 8 ++ drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-gxp.c | 183 ++++++++++++++++++++++++++++++++ 3 files changed, 192 insertions(+) create mode 100644 drivers/clocksource/timer-gxp.c diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index cfb8ea0df3b1..716117f21f95 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -617,6 +617,14 @@ config CLKSRC_ST_LPC Enable this option to use the Low Power controller timer as clocksource. +config GXP_TIMER + bool "GXP timer driver" if COMPILE_TEST + depends on ARCH_HPE + default y + help + Provides a driver for the timer control found on HPE + GXP SOCs. This is required for all GXP SOCs. + config ATCPIT100_TIMER bool "ATCPIT100 timer driver" depends on NDS32 || COMPILE_TEST diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index fa5f624eadb6..35cc32fe6c6a 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -89,3 +89,4 @@ obj-$(CONFIG_GX6605S_TIMER) += timer-gx6605s.o obj-$(CONFIG_HYPERV_TIMER) += hyperv_timer.o obj-$(CONFIG_MICROCHIP_PIT64B) += timer-microchip-pit64b.o obj-$(CONFIG_MSC313E_TIMER) += timer-msc313e.o +obj-$(CONFIG_GXP_TIMER) += timer-gxp.o diff --git a/drivers/clocksource/timer-gxp.c b/drivers/clocksource/timer-gxp.c new file mode 100644 index 000000000000..3fe5be2f94c7 --- /dev/null +++ b/drivers/clocksource/timer-gxp.c @@ -0,0 +1,183 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2022 Hewlett-Packard Enterprise Development Company, L.P.*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define TIMER0_FREQ 1000000 +#define GXP_TIMER_CNT_OFS 0x00 +#define GXP_TIMESTAMP_OFS 0x08 +#define GXP_TIMER_CTRL_OFS 0x14 + +/*TCS Stands for Timer Control/Status: these are masks to be used in*/ +/* the Timer Count Registers */ +#define MASK_TCS_ENABLE 0x01 +#define MASK_TCS_PERIOD 0x02 +#define MASK_TCS_RELOAD 0x04 +#define MASK_TCS_TC 0x80 + +struct gxp_timer { + void __iomem *counter; + void __iomem *control; + struct clock_event_device evt; +}; + +static struct gxp_timer *local_gxp_timer; + +static void __iomem *system_clock __read_mostly; + +static inline struct gxp_timer *to_gxp_timer(struct clock_event_device *evt_dev) +{ + return container_of(evt_dev, struct gxp_timer, evt); +} + +static u64 notrace gxp_sched_read(void) +{ + return readl_relaxed(system_clock); +} + +static int gxp_time_set_next_event(unsigned long event, struct clock_event_device *evt_dev) +{ + struct gxp_timer *timer = to_gxp_timer(evt_dev); + + /* Stop counting and disable interrupt before updating */ + writeb_relaxed(MASK_TCS_TC, timer->control); + writel_relaxed(event, timer->counter); + writeb_relaxed(MASK_TCS_TC | MASK_TCS_ENABLE, timer->control); + + return 0; +} + +static irqreturn_t gxp_timer_interrupt(int irq, void *dev_id) +{ + struct gxp_timer *timer = (struct gxp_timer *)dev_id; + + if (!(readb_relaxed(timer->control) & MASK_TCS_TC)) + return IRQ_NONE; + + writeb_relaxed(MASK_TCS_TC, timer->control); + + timer->evt.event_handler(&timer->evt); + + return IRQ_HANDLED; +} + +static int __init gxp_timer_init(struct device_node *node) +{ + void __iomem *base; + struct clk *clk; + u32 freq; + int ret, irq; + struct gxp_timer *gxp_timer; + + base = of_iomap(node, 0); + if (!base) { + pr_err("Can't remap timer base register"); + ret = -ENXIO; + return ret; + } + + /*Set the offset to the clock register*/ + system_clock = base + GXP_TIMESTAMP_OFS; + + clk = of_clk_get(node, 0); + if (IS_ERR(clk)) { + pr_err("%pOFn clock not found: %d\n", node, (int)PTR_ERR(clk)); + ret = -EIO; + goto err_iounmap; + } + + ret = clk_prepare_enable(clk); + + freq = clk_get_rate(clk); + + sched_clock_register(gxp_sched_read, 32, freq); + clocksource_mmio_init(system_clock, node->name, freq, + 300, 32, clocksource_mmio_readl_up); + + irq = irq_of_parse_and_map(node, 0); + if (irq <= 0) { + ret = -EINVAL; + pr_err("GXP Timer Can't parse IRQ %d", irq); + goto err_iounmap; + } + + gxp_timer = kzalloc(sizeof(*gxp_timer), GFP_KERNEL); + if (!gxp_timer) { + ret = -ENOMEM; + goto err_iounmap; + } + + gxp_timer->counter = base + GXP_TIMER_CNT_OFS; + gxp_timer->control = base + GXP_TIMER_CTRL_OFS; + gxp_timer->evt.name = node->name; + gxp_timer->evt.rating = 300; + gxp_timer->evt.features = CLOCK_EVT_FEAT_ONESHOT; + gxp_timer->evt.set_next_event = gxp_time_set_next_event; + gxp_timer->evt.cpumask = cpumask_of(0); + + local_gxp_timer = gxp_timer; + + ret = request_irq(irq, gxp_timer_interrupt, IRQF_TIMER | IRQF_SHARED, + node->name, gxp_timer); + if (ret) { + pr_err("%s: request_irq() failed %pe\n", "GXP Timer Tick", ERR_PTR(ret)); + goto err_iounmap; + } + + clockevents_config_and_register(&gxp_timer->evt, TIMER0_FREQ, + 0xf, 0xffffffff); + + pr_debug("gxp: system timer (irq = %d)\n", irq); + return 0; + +err_iounmap: + iounmap(system_clock); + iounmap(base); + return ret; +} + +static struct platform_device gxp_watchdog_device = { + .name = "gxp-wdt", + .id = -1, +}; + +/* + * This probe gets called after the timer is already up and running. This will create + * the watchdog device as a child since the registers are shared. + */ + +static int gxp_timer_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + + /* Pass the base address (counter) as platform data and nothing else */ + gxp_watchdog_device.dev.platform_data = local_gxp_timer->counter; + gxp_watchdog_device.dev.parent = dev; + return platform_device_register(&gxp_watchdog_device); +} + +static const struct of_device_id gxp_timer_of_match[] = { + { .compatible = "hpe,gxp-timer", }, + {}, +}; + +static struct platform_driver gxp_timer_driver = { + .probe = gxp_timer_probe, + .driver = { + .name = "gxp-timer", + .of_match_table = gxp_timer_of_match, + .suppress_bind_attrs = true, + }, +}; + +builtin_platform_driver(gxp_timer_driver); + +TIMER_OF_DECLARE(gxp, "hpe,gxp-timer", gxp_timer_init); -- 2.17.1