From patchwork Tue Oct 10 12:30:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yicong Yang X-Patchwork-Id: 150742 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp162693vqb; Tue, 10 Oct 2023 05:33:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHlO3JscshQGZpi2gH8rM/xpTWZa3fobmxF2BKtRF2IAezq4BJpX4b6VHhuO2GS++eoE9o+ X-Received: by 2002:a05:6a20:4404:b0:169:9802:fd72 with SMTP id ce4-20020a056a20440400b001699802fd72mr16409915pzb.62.1696941225599; Tue, 10 Oct 2023 05:33:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696941225; cv=none; d=google.com; s=arc-20160816; b=GR+G5EZVabWbUF1j6qZ2Lz7gawOFlyswty6Anc+8Ss5CgU/EntWZRH3Pjz054A+8xb AFktLQydmggKnaLhTLTLXnE6ycXOh7Drhz7U+fifrBg5+JqbdgJzBWEj7dXyV/562+Im ULKXFqhFgmVX8IzyJdk6dTqqI9FgKS7WZtpGYzTfkp1QDbNxIzfTeYW6mHMyfbvakgVp p7WTOMg1UbAA5utgHcvN1pQlmfYifo8vD35F6U/MnRqaOBu1LUxrkmKqwytJ9ekEbI12 YPkGzYL6aROsHTRi0PSX0SAm20Ig1Xr4+O2+WnA3kxwgXIMI4xhVwC7O4dWKUqfr4r1o FH4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=3yoMTI+jU+4fhxrJpdrDSOOmAj/Cf8YNu20Py9PCQsU=; fh=8Ol9km2NKn2Rn3Mriqm9O8G9ZvsYmwWidDIgbBZEFNI=; b=qH03H0dMMHKPAPcNcOA66cAyJ13nqUcrGnaysP/ryoD4a3wn7Dwzvy+G8kuepxLsf+ sZXp9P+CD27upRCkF4V3Puj6dAFkigAdPSXjeiAm5SeRcYdrvEsmVyPTBXmluBLF4ZbI qFfA8svRClmbu3I6N08cHVify2brmQ0hIxcReSEb7xiBqAiyw2f5pq1s4oj9MTrGPH7m CNrAqDdhPA5FeJw/yExABLjlkYvDe7Hw7vQ5LXBA0ERwa10hKZVG8Kz6O90nMpzHVQJx UN92vi6trXHqkJqgwcTM5RzIf4RUe79DExXT1vRlAw/d46FZ0XxA05UJNTmm+BQ1MsJl DtZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id c66-20020a633545000000b0056a19c7c2e5si11582416pga.361.2023.10.10.05.33.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 05:33:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id BB362801BCAC; Tue, 10 Oct 2023 05:33:40 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231816AbjJJMd2 (ORCPT + 20 others); Tue, 10 Oct 2023 08:33:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231371AbjJJMdZ (ORCPT ); Tue, 10 Oct 2023 08:33:25 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2C54B0 for ; Tue, 10 Oct 2023 05:33:23 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4S4Zw61yY1zNnx2; Tue, 10 Oct 2023 20:29:26 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Tue, 10 Oct 2023 20:33:21 +0800 From: Yicong Yang To: , , , CC: , , , , , , , , Subject: [RFC PATCH 1/3] clocksource/drivers/arm_arch_timer: Split the function of __arch_timer_setup() Date: Tue, 10 Oct 2023 20:30:31 +0800 Message-ID: <20231010123033.23258-2-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20231010123033.23258-1-yangyicong@huawei.com> References: <20231010123033.23258-1-yangyicong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Tue, 10 Oct 2023 05:33:40 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779371842845323969 X-GMAIL-MSGID: 1779371842845323969 From: Yicong Yang Currently we use __arch_timer_setup() to setup and register clockevents device for both cp15 and memory-mapped timer. However there's not too much in common of the setups for cp15 and memory-mapped timer. So split the setup function for cp15 and memory-mapped timer into separate functions. This will also allows future extension for platform timers. Signed-off-by: Yicong Yang --- drivers/clocksource/arm_arch_timer.c | 105 ++++++++++++++------------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 7dd2c615bce2..2e20a8ec50ca 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -849,65 +849,68 @@ static u64 __arch_timer_check_delta(void) return CLOCKSOURCE_MASK(arch_counter_get_width()); } -static void __arch_timer_setup(unsigned type, - struct clock_event_device *clk) +static void __arch_timer_setup_cp15(struct clock_event_device *clk) { + typeof(clk->set_next_event) sne; u64 max_delta; clk->features = CLOCK_EVT_FEAT_ONESHOT; - if (type == ARCH_TIMER_TYPE_CP15) { - typeof(clk->set_next_event) sne; - - arch_timer_check_ool_workaround(ate_match_local_cap_id, NULL); - - if (arch_timer_c3stop) - clk->features |= CLOCK_EVT_FEAT_C3STOP; - clk->name = "arch_sys_timer"; - clk->rating = 450; - clk->cpumask = cpumask_of(smp_processor_id()); - clk->irq = arch_timer_ppi[arch_timer_uses_ppi]; - switch (arch_timer_uses_ppi) { - case ARCH_TIMER_VIRT_PPI: - clk->set_state_shutdown = arch_timer_shutdown_virt; - clk->set_state_oneshot_stopped = arch_timer_shutdown_virt; - sne = erratum_handler(set_next_event_virt); - break; - case ARCH_TIMER_PHYS_SECURE_PPI: - case ARCH_TIMER_PHYS_NONSECURE_PPI: - case ARCH_TIMER_HYP_PPI: - clk->set_state_shutdown = arch_timer_shutdown_phys; - clk->set_state_oneshot_stopped = arch_timer_shutdown_phys; - sne = erratum_handler(set_next_event_phys); - break; - default: - BUG(); - } - - clk->set_next_event = sne; - max_delta = __arch_timer_check_delta(); - } else { - clk->features |= CLOCK_EVT_FEAT_DYNIRQ; - clk->name = "arch_mem_timer"; - clk->rating = 400; - clk->cpumask = cpu_possible_mask; - if (arch_timer_mem_use_virtual) { - clk->set_state_shutdown = arch_timer_shutdown_virt_mem; - clk->set_state_oneshot_stopped = arch_timer_shutdown_virt_mem; - clk->set_next_event = - arch_timer_set_next_event_virt_mem; - } else { - clk->set_state_shutdown = arch_timer_shutdown_phys_mem; - clk->set_state_oneshot_stopped = arch_timer_shutdown_phys_mem; - clk->set_next_event = - arch_timer_set_next_event_phys_mem; - } + arch_timer_check_ool_workaround(ate_match_local_cap_id, NULL); - max_delta = CLOCKSOURCE_MASK(56); + if (arch_timer_c3stop) + clk->features |= CLOCK_EVT_FEAT_C3STOP; + clk->name = "arch_sys_timer"; + clk->rating = 450; + clk->cpumask = cpumask_of(smp_processor_id()); + clk->irq = arch_timer_ppi[arch_timer_uses_ppi]; + switch (arch_timer_uses_ppi) { + case ARCH_TIMER_VIRT_PPI: + clk->set_state_shutdown = arch_timer_shutdown_virt; + clk->set_state_oneshot_stopped = arch_timer_shutdown_virt; + sne = erratum_handler(set_next_event_virt); + break; + case ARCH_TIMER_PHYS_SECURE_PPI: + case ARCH_TIMER_PHYS_NONSECURE_PPI: + case ARCH_TIMER_HYP_PPI: + clk->set_state_shutdown = arch_timer_shutdown_phys; + clk->set_state_oneshot_stopped = arch_timer_shutdown_phys; + sne = erratum_handler(set_next_event_phys); + break; + default: + BUG(); } + clk->set_next_event = sne; + max_delta = __arch_timer_check_delta(); + clk->set_state_shutdown(clk); + clockevents_config_and_register(clk, arch_timer_rate, 0xf, max_delta); +} + +static void __arch_timer_setup_mem(struct clock_event_device *clk) +{ + u64 max_delta; + clk->features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_DYNIRQ; + clk->name = "arch_mem_timer"; + clk->rating = 400; + clk->cpumask = cpu_possible_mask; + if (arch_timer_mem_use_virtual) { + clk->set_state_shutdown = arch_timer_shutdown_virt_mem; + clk->set_state_oneshot_stopped = arch_timer_shutdown_virt_mem; + clk->set_next_event = + arch_timer_set_next_event_virt_mem; + } else { + clk->set_state_shutdown = arch_timer_shutdown_phys_mem; + clk->set_state_oneshot_stopped = arch_timer_shutdown_phys_mem; + clk->set_next_event = + arch_timer_set_next_event_phys_mem; + } + + max_delta = CLOCKSOURCE_MASK(56); + + clk->set_state_shutdown(clk); clockevents_config_and_register(clk, arch_timer_rate, 0xf, max_delta); } @@ -1004,7 +1007,7 @@ static int arch_timer_starting_cpu(unsigned int cpu) struct clock_event_device *clk = this_cpu_ptr(arch_timer_evt); u32 flags; - __arch_timer_setup(ARCH_TIMER_TYPE_CP15, clk); + __arch_timer_setup_cp15(clk); flags = check_ppi_trigger(arch_timer_ppi[arch_timer_uses_ppi]); enable_percpu_irq(arch_timer_ppi[arch_timer_uses_ppi], flags); @@ -1294,7 +1297,7 @@ static int __init arch_timer_mem_register(void __iomem *base, unsigned int irq) arch_timer_mem->base = base; arch_timer_mem->evt.irq = irq; - __arch_timer_setup(ARCH_TIMER_TYPE_MEM, &arch_timer_mem->evt); + __arch_timer_setup_mem(&arch_timer_mem->evt); if (arch_timer_mem_use_virtual) func = arch_timer_handler_virt_mem; From patchwork Tue Oct 10 12:30:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yicong Yang X-Patchwork-Id: 150743 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp162722vqb; Tue, 10 Oct 2023 05:33:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH7dyxx7mlOeFCg6orV2pEXWbWcE0Qfixff1Pmk9v3WUlMF9n6oZ7ccm+fdFWfiKLElt336 X-Received: by 2002:a05:6a00:a23:b0:68e:3eab:9e18 with SMTP id p35-20020a056a000a2300b0068e3eab9e18mr16958333pfh.12.1696941228627; Tue, 10 Oct 2023 05:33:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696941228; cv=none; d=google.com; s=arc-20160816; b=0s9vAwPi8K4uIJw2kDNMHaoj1l63MdHy+J3yCXimQjWU74VKmMtTQ+wflkawfgH5DK 3HH0lZHgnpdKQd9EXXGT8xjF2K5P4QnMx9PpqEIMBgPT00wxdMlbXNQwy/wo1tTQel5C WhZFjCcu/jwFpxkFxtzy3Vt6aII8RCivdzfT58/UeKFnbgEJOzDG/R+Mn57ywdMdZgLl bdo1EDLxN0ceTNSVqwzpWbsNPIdMPwbBK+lzASzwBJ/LWeBC1JSR7qkw66eFqr1K+q+v gkPkS7YI1HmeciAfSWqaPrB++qw3sUYeMXZ1OuS6Q+hywQeK4MnXqjhr6nGoxDoTxs/l naIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0xf+/WBqogCb5PICNiGJIpwMvwBVXxUckIkWSxPnxaQ=; fh=8Ol9km2NKn2Rn3Mriqm9O8G9ZvsYmwWidDIgbBZEFNI=; b=0B5cEOmYFxjjeSemAKVnK2+OH9YLpQq3NVhUYO0E25Wb/npQ638KvuFd+/k8TT+HrZ /JHo/GpFv1pSZp2MMAEcG0t19FN6MQsqHNDFBVh9YVBH+tVa2tGhvk1gBp2o44PG4r0G 8EyTAjjX0C4rpDjOwSM5To/PuRvpFMDF6r7rXHA+4FAN8oq70blHnSAmx2ZoHjw2jhr9 GX+AFzSDhjWqUDMKW4U4sz3Cnt6CwutkeScQlAOaQGQuvXww34yVDUfPHJDPrbJIGHR9 4X9ftv9rIFKYy8z2jVsrEmYvbeX0rbv+XK+ymUpbO/DO+37mhxk6bp1xivUgKMvimsJt IUkQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id q6-20020a056a00150600b0065b4e2b52c5si9798036pfu.196.2023.10.10.05.33.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 05:33:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id E9A3383762CB; Tue, 10 Oct 2023 05:33:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231371AbjJJMda (ORCPT + 20 others); Tue, 10 Oct 2023 08:33:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231663AbjJJMd0 (ORCPT ); Tue, 10 Oct 2023 08:33:26 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB719B6 for ; Tue, 10 Oct 2023 05:33:23 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4S4ZvL17YfztTHX; Tue, 10 Oct 2023 20:28:46 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Tue, 10 Oct 2023 20:33:22 +0800 From: Yicong Yang To: , , , CC: , , , , , , , , Subject: [RFC PATCH 2/3] clocksource/drivers/arm_arch_timer: Extend and export arch_timer_mem_register() Date: Tue, 10 Oct 2023 20:30:32 +0800 Message-ID: <20231010123033.23258-3-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20231010123033.23258-1-yangyicong@huawei.com> References: <20231010123033.23258-1-yangyicong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 10 Oct 2023 05:33:45 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779371845830691213 X-GMAIL-MSGID: 1779371845830691213 From: Yicong Yang Currently the memory-mapped timer will be probed by the GTDT table on ACPI based systems, and the timer interrupt can only be the GSI (SPI interrupt for arm64) per ACPI spec. However the generic timer specification doesn't restrict the interrupt type and per BSA Spec section 3.8.1 (DEN0094C 1.0C) the timer interrupt can also be a LPI interrupt. So this patch extends and exports the arch_timer_mem_register() function to allow other drivers registers a generic timer using LPI interrupt and probed by other means rather than GTDT. Note that the GTDT timer still has a higher priority, if a GTDT timer is registered, we'll block later registration of other timers. Signed-off-by: Yicong Yang --- drivers/clocksource/arm_arch_timer.c | 26 +++++++++++++++++--------- include/clocksource/arm_arch_timer.h | 2 ++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 2e20a8ec50ca..6e9445192ca4 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -66,7 +66,7 @@ struct arch_timer { struct clock_event_device evt; }; -static struct arch_timer *arch_timer_mem __ro_after_init; +static struct arch_timer *arch_timer_mem; #define to_arch_timer(e) container_of(e, struct arch_timer, evt) @@ -888,15 +888,16 @@ static void __arch_timer_setup_cp15(struct clock_event_device *clk) clockevents_config_and_register(clk, arch_timer_rate, 0xf, max_delta); } -static void __arch_timer_setup_mem(struct clock_event_device *clk) +static void __arch_timer_setup_mem(struct clock_event_device *clk, + bool irq_virtual, const char *name) { u64 max_delta; clk->features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_DYNIRQ; - clk->name = "arch_mem_timer"; + clk->name = name; clk->rating = 400; clk->cpumask = cpu_possible_mask; - if (arch_timer_mem_use_virtual) { + if (irq_virtual) { clk->set_state_shutdown = arch_timer_shutdown_virt_mem; clk->set_state_oneshot_stopped = arch_timer_shutdown_virt_mem; clk->set_next_event = @@ -1286,25 +1287,30 @@ static int __init arch_timer_register(void) return err; } -static int __init arch_timer_mem_register(void __iomem *base, unsigned int irq) +int arch_timer_mem_register(void __iomem *base, unsigned int irq, + bool irq_virtual, const char *name) { int ret; irq_handler_t func; + /* If we've already register a memory timer, fail the registration */ + if (arch_timer_mem) + return -EEXIST; + arch_timer_mem = kzalloc(sizeof(*arch_timer_mem), GFP_KERNEL); if (!arch_timer_mem) return -ENOMEM; arch_timer_mem->base = base; arch_timer_mem->evt.irq = irq; - __arch_timer_setup_mem(&arch_timer_mem->evt); + __arch_timer_setup_mem(&arch_timer_mem->evt, irq_virtual, name); - if (arch_timer_mem_use_virtual) + if (irq_virtual) func = arch_timer_handler_virt_mem; else func = arch_timer_handler_phys_mem; - ret = request_irq(irq, func, IRQF_TIMER, "arch_mem_timer", &arch_timer_mem->evt); + ret = request_irq(irq, func, IRQF_TIMER, name, &arch_timer_mem->evt); if (ret) { pr_err("Failed to request mem timer irq\n"); kfree(arch_timer_mem); @@ -1313,6 +1319,7 @@ static int __init arch_timer_mem_register(void __iomem *base, unsigned int irq) return ret; } +EXPORT_SYMBOL_GPL(arch_timer_mem_register); static const struct of_device_id arch_timer_of_match[] __initconst = { { .compatible = "arm,armv7-timer", }, @@ -1560,7 +1567,8 @@ arch_timer_mem_frame_register(struct arch_timer_mem_frame *frame) return -ENXIO; } - ret = arch_timer_mem_register(base, irq); + ret = arch_timer_mem_register(base, irq, arch_timer_mem_use_virtual, + "arch_mem_timer"); if (ret) { iounmap(base); return ret; diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index cbbc9a6dc571..d0fa2065586c 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -89,6 +89,8 @@ extern u32 arch_timer_get_rate(void); extern u64 (*arch_timer_read_counter)(void); extern struct arch_timer_kvm_info *arch_timer_get_kvm_info(void); extern bool arch_timer_evtstrm_available(void); +extern int arch_timer_mem_register(void __iomem *base, unsigned int irq, + bool irq_virtual, const char *name); #else From patchwork Tue Oct 10 12:30:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yicong Yang X-Patchwork-Id: 150741 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp162647vqb; Tue, 10 Oct 2023 05:33:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFxZeTKzDTwHukQOGkc0uV7Qp6qlpEbwFP8RNVo3A5T4tJuQOwKMM4w7FXNo4BUgHQgAuPn X-Received: by 2002:a17:90b:3891:b0:274:862f:3439 with SMTP id mu17-20020a17090b389100b00274862f3439mr14923333pjb.13.1696941220570; Tue, 10 Oct 2023 05:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696941220; cv=none; d=google.com; s=arc-20160816; b=uqad8ButvW+Kv69CMfjTRZaZ5qAieOlJrMbzXTJldjdRAVPm2BPYX6EwA8RsyDSP3e Ekez+GvAzbFjSCoF/L6CnwkhkKRUcOODmwcoblxIDGYPtwZgG86SlZ+zATmJvuNJNuJb rOLtsDcdqeiDO3lMMsCLorJjUYld/HZg/BoGqoWbq14ulNtsTi6GwLxXEMtKx/cU3583 syNTUyAXHU7894zqFOASSEegqFq1KTnyfPtnBawrDAwDuko8gORFjVspyi+NyjKAEJih AwAPU3yzfg3bFaFI1ydXJTFfWIverb9AsiBU3vny/vkVIbhWGro0y4svGLV7S2BrXFC0 mPTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=WIhuHzqwW8vt7VAfloSveg7nBAE6MX0WnBTdz2i8HD8=; fh=8Ol9km2NKn2Rn3Mriqm9O8G9ZvsYmwWidDIgbBZEFNI=; b=nUzlyiREvZHXNTG1riQtybMb9ehdzc1rZ9dgTGfl9ubTcLAR3bAwEA2D/C2c5yXzWx SrbSYL7CGuwPKsWqfWQmTuWk9Zou6VHlVwpcV7oynmCWZp3eSwIKXIBxf1W+v4DtoA+U eh9FGeAElFFA5v5hVgci2JgyS3aTNLWo74XiHgR/T7OC9eb4KAcUg7PuWXytZPTJXFW7 O99HhNDEXXX/g3RroiYX5B8nY2Ym7UL2lyLdrfzQyBTmBacC31nUwgM3BrpHASo5qWpD no6guk0f8nRw/Kn/bWwuHtVZ5DfG+jRnE2WYpSBwPo0Yf4rMqZVHp530eUQzA7T20ghk SGJg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id v13-20020a17090a088d00b0027491203b43si1791997pjc.189.2023.10.10.05.33.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 05:33:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id F38468166933; Tue, 10 Oct 2023 05:33:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231905AbjJJMdd (ORCPT + 20 others); Tue, 10 Oct 2023 08:33:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231593AbjJJMd0 (ORCPT ); Tue, 10 Oct 2023 08:33:26 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A2CCB7 for ; Tue, 10 Oct 2023 05:33:24 -0700 (PDT) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4S4Zwf0rHCzVlV2; Tue, 10 Oct 2023 20:29:54 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Tue, 10 Oct 2023 20:33:22 +0800 From: Yicong Yang To: , , , CC: , , , , , , , , Subject: [RFC PATCH 3/3] clocksource/drivers: Add HiSilicon system timer driver Date: Tue, 10 Oct 2023 20:30:33 +0800 Message-ID: <20231010123033.23258-4-yangyicong@huawei.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20231010123033.23258-1-yangyicong@huawei.com> References: <20231010123033.23258-1-yangyicong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 10 Oct 2023 05:33:40 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779371837339329720 X-GMAIL-MSGID: 1779371837339329720 From: Yicong Yang HiSilicon system timer is compatible with arm's generic timer specification but is enumerated through DSDT and can use SPI/LPI interrupt as timer interrupt. This patch adds the support for the timer. The driver probes the device IO memory and interrupt resources through DSDT and then reuse the codes of the arm_arch_timer for setup and register the clockevent device. Example DSDT node will be like: Device (TIM0) { Name (_HID, "HISI03F2") // _HID: Hardware ID Name (_UID, Zero) // _UID: Unique ID Name (RBUF, ResourceTemplate () { QWordMemory (ResourceConsumer, PosDecode, MinFixed, MaxFixed, NonCacheable, ReadWrite, 0x0000000000000000, // Granularity 0x0000000401170000, // Range Minimum 0x0000000401170fff, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000000001000, // Length ,, , AddressRangeMemory, TypeStatic) Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) { 0x000003C6, } }) Method (_CRS, 0, NotSerialized) { Return (RBUF) } } Signed-off-by: Yicong Yang --- drivers/clocksource/Kconfig | 10 ++++ drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-hisi-sys.c | 68 ++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 drivers/clocksource/timer-hisi-sys.c diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 0ba0dc4ecf06..2e43cd6e2add 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -732,4 +732,14 @@ config GOLDFISH_TIMER help Support for the timer/counter of goldfish-rtc +config HISI_SYS_TIMER + tristate "HiSilicon system timer driver" + depends on ARM_ARCH_TIMER && ARM64 && ACPI + help + Support for HiSilicon system timer which used as a clockevent + device. + + This driver can also be built as a module. If so, the module + will be called timer_hisi_sys. + endmenu diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 368c3461dab8..39ababd0d4dd 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -89,3 +89,4 @@ obj-$(CONFIG_MSC313E_TIMER) += timer-msc313e.o obj-$(CONFIG_GOLDFISH_TIMER) += timer-goldfish.o obj-$(CONFIG_GXP_TIMER) += timer-gxp.o obj-$(CONFIG_CLKSRC_LOONGSON1_PWM) += timer-loongson1-pwm.o +obj-$(CONFIG_HISI_SYS_TIMER) += timer-hisi-sys.o diff --git a/drivers/clocksource/timer-hisi-sys.c b/drivers/clocksource/timer-hisi-sys.c new file mode 100644 index 000000000000..1ef39d97e83d --- /dev/null +++ b/drivers/clocksource/timer-hisi-sys.c @@ -0,0 +1,68 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Driver for HiSilicon system timer driver. + * + * The device is fully compatible with ARM's Generic Timer specification. + * The device is enumerated through DSDT rather than GTDT and can use + * LPI interrupt besides SPI. + * + * Copyright (c) 2023 HiSilicon Technologies Co., Ltd. + * Author: Yicong Yang + */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define DRV_NAME "hisi_sys_timer" + +#define CNTFRQ 0x10 + +static const struct acpi_device_id hisi_sys_timer_acpi_ids[] = { + { "HISI03F2", 0 }, + { } +}; +MODULE_DEVICE_TABLE(acpi, hisi_sys_timer_acpi_ids); + +static int hisi_sys_timer_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + void __iomem *iobase; + int ret, irq; + u32 freq; + + iobase = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(iobase)) + return PTR_ERR(iobase); + + irq = platform_get_irq(pdev, 0); + if (irq <= 0) + return dev_err_probe(dev, ret, "failed to get interrupt\n"); + + ret = arch_timer_mem_register(iobase, irq, false, DRV_NAME); + if (ret) + return dev_err_probe(dev, ret, "failed to register timer\n"); + + freq = readl_relaxed(iobase + CNTFRQ); + dev_info(dev, "%s works at %ldMHz\n", DRV_NAME, freq / HZ_PER_MHZ); + return 0; +} + +static struct platform_driver hisi_sys_timer_driver = { + .probe = hisi_sys_timer_probe, + .driver = { + .name = DRV_NAME, + .acpi_match_table = hisi_sys_timer_acpi_ids, + }, +}; +module_platform_driver(hisi_sys_timer_driver); + +MODULE_AUTHOR("Yicong Yang "); +MODULE_DESCRIPTION("HiSilicon system timer driver"); +MODULE_LICENSE("GPL");