From patchwork Mon Feb 13 18:26:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 56441 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2503333wrn; Mon, 13 Feb 2023 10:31:32 -0800 (PST) X-Google-Smtp-Source: AK7set/HwrmSAD/E1yKyxIJTSSWWgl3yF2ZZxosagZRDZgV9RYWD3oDoV5L6f5lG4X6Jr73lsP6G X-Received: by 2002:a50:c445:0:b0:4ac:c635:8e03 with SMTP id w5-20020a50c445000000b004acc6358e03mr3379934edf.37.1676313092541; Mon, 13 Feb 2023 10:31:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676313092; cv=none; d=google.com; s=arc-20160816; b=Ff09GqQIg+rZCN50KukGpiMFpXaMwTrAnnoWDWN6wHqfAR/AuwXOiKZI6P6eaa2iZN TrXD/fexZOGhakGiXhlKZqhNkekSNVADOP8tVhb3qGnpx78jt5NA4f7pQ4PnlmbrbN5J L6zbNK8UKGOqzB0z5dEnlYUza8q3bmIO/+LrrXtBLw6v/AxueJg052iGdsR54jVZm3lT Q7GEbQ99FmCtERw9fjWK63EebrSE1zl2c/UO0scq36/CRHHwOR8b43Wej4/bHrKfVoQZ AUoiWsJZpll4CRltegmPYl9Oy/RreLZSZFRFvj05p19KOdbAWv4Rl6wNE1hi3CxOhlAr MTkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=QMGdz4NvmKWLSpnJKtHPB2niywtnGyHsXtKTK+2ZmJI=; b=wCmvwNJCW8ypiKDeXyaFw3WCfu1W6T2Ns2LiwZs6hW1tMrqjZnWzNF0ENzPjMa/dCV NU/PLzv8vVtsiQkMI3aSr+5hLtPgPWBNvzOUD/XQ84exJo6dY9vxn2srgkx/48QjZugM DqDV1/rLgUCvEIQ4vTHljiUqWiPJZ+Bms+Xim32kDA04AI/Q+XMz3UlG/l+N+bLwIPu4 oUTSoeZ4AQT45ZsnqASK1aQAnZWkCRtdZ1NRjm9tl67TcEVy4Mxe4Nq+075ilykSroEN X0aR2NjjgQvDs4UVEfs99ie0+3rYHTgl2pD9MCuHwoPurgIf6xObAUm9WQiEMfNNosxy cyoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=a7kEI9lo; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l25-20020aa7c3d9000000b004acda482ad6si291223edr.651.2023.02.13.10.31.09; Mon, 13 Feb 2023 10:31:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=a7kEI9lo; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231350AbjBMS1B (ORCPT + 99 others); Mon, 13 Feb 2023 13:27:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230201AbjBMS03 (ORCPT ); Mon, 13 Feb 2023 13:26:29 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E88B71711; Mon, 13 Feb 2023 10:26:27 -0800 (PST) Date: Mon, 13 Feb 2023 18:26:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1676312785; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QMGdz4NvmKWLSpnJKtHPB2niywtnGyHsXtKTK+2ZmJI=; b=a7kEI9loER40txcEwyZfolTtcL9K1eaYAvWgSy8VBXJh6ojNQvQcO3JLLEA8QM2saxFyZg jxxugahtxnTEloqsyDUL9OFKh1WYMd7ZRw8vjw3ZsUbizSgktfNpJTBGnAMWbzImabalkx 6Sht9vY3D+p18FDxjUaLOWA10oq+0+0/jTdHVzLOwckhqlTriFiy355nfEJTVn+z3lyLoj UIiEoV1snlRY7f+4i6oZLIdj8Dlkx+ee+P6e3YjfUjcWf6beukGjGCiQ4VFsG5lyWZkVW2 /zsWKaXc3wjcQLSCVhPU9fybFhpcdG2RY2avkonrcHI9eBDb2lt6GW7kJ9AjUw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1676312785; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QMGdz4NvmKWLSpnJKtHPB2niywtnGyHsXtKTK+2ZmJI=; b=acR3+O1NC2e+qtCwjA64lCH2zqXxZYK+9hdNQAayP0JmNm7DY2KSdT5mi3wez5R24Vx5UQ i/y+AMLPQWGmYQDQ== From: "tip-bot2 for Anup Patel" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] clocksource/drivers/timer-riscv: Set CLOCK_EVT_FEAT_C3STOP based on DT Cc: Anup Patel , Conor Dooley , Palmer Dabbelt , Daniel Lezcano , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230103141102.772228-4-apatel@ventanamicro.com> References: <20230103141102.772228-4-apatel@ventanamicro.com> MIME-Version: 1.0 Message-ID: <167631278480.4906.14127562594393289291.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757741677004066685?= X-GMAIL-MSGID: =?utf-8?q?1757741677004066685?= The following commit has been merged into the timers/core branch of tip: Commit-ID: 8932a9533a9cdd1fa2924a061dc87277991507ca Gitweb: https://git.kernel.org/tip/8932a9533a9cdd1fa2924a061dc87277991507ca Author: Anup Patel AuthorDate: Tue, 03 Jan 2023 19:41:02 +05:30 Committer: Daniel Lezcano CommitterDate: Mon, 13 Feb 2023 13:10:16 +01:00 clocksource/drivers/timer-riscv: Set CLOCK_EVT_FEAT_C3STOP based on DT We should set CLOCK_EVT_FEAT_C3STOP for a clock_event_device only when riscv,timer-cannot-wake-cpu DT property is present in the RISC-V timer DT node. This way CLOCK_EVT_FEAT_C3STOP feature is set for clock_event_device based on RISC-V platform capabilities rather than having it set for all RISC-V platforms. Signed-off-by: Anup Patel Reviewed-by: Conor Dooley Acked-by: Palmer Dabbelt Link: https://lore.kernel.org/r/20230103141102.772228-4-apatel@ventanamicro.com Signed-off-by: Daniel Lezcano --- drivers/clocksource/timer-riscv.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c index a0d66fa..1b4b36d 100644 --- a/drivers/clocksource/timer-riscv.c +++ b/drivers/clocksource/timer-riscv.c @@ -28,6 +28,7 @@ #include static DEFINE_STATIC_KEY_FALSE(riscv_sstc_available); +static bool riscv_timer_cannot_wake_cpu; static int riscv_clock_next_event(unsigned long delta, struct clock_event_device *ce) @@ -85,6 +86,8 @@ static int riscv_timer_starting_cpu(unsigned int cpu) ce->cpumask = cpumask_of(cpu); ce->irq = riscv_clock_event_irq; + if (riscv_timer_cannot_wake_cpu) + ce->features |= CLOCK_EVT_FEAT_C3STOP; clockevents_config_and_register(ce, riscv_timebase, 100, 0x7fffffff); enable_percpu_irq(riscv_clock_event_irq, @@ -139,6 +142,13 @@ static int __init riscv_timer_init_dt(struct device_node *n) if (cpuid != smp_processor_id()) return 0; + child = of_find_compatible_node(NULL, NULL, "riscv,timer"); + if (child) { + riscv_timer_cannot_wake_cpu = of_property_read_bool(child, + "riscv,timer-cannot-wake-cpu"); + of_node_put(child); + } + domain = NULL; child = of_get_compatible_child(n, "riscv,cpu-intc"); if (!child) {