From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DD30C4338F for ; Mon, 9 Aug 2021 16:19:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E823760EB9 for ; Mon, 9 Aug 2021 16:19:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E823760EB9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nW1mJ/dN1u9/wpiaqPAfKPHf8xuYqYjzFn3fnGOKPAU=; b=gOFz8iyvmDygS5 SsF1EvKphp7d83UbhnKij4/4x4mP390B3j474G0pASDu/1r82T+ARzBW2rbdSRu2QTJ3QAOZqFJiy S2gqw91bZ0Q0HBZj2R2IbaH+L9q29xjYXZoB8fwcRkAYVulsNZgQLnmD/oQ4CUfCqlek6GCJTEZ0X 4uf8I6gDXeA/3RmNXIFLqV0ub9k1f6G+ZesA/CTaE84hPh1uM+xy4PNuSU9+M5DOxA6g6UOxpdqT4 9aogDlVnYryr44UhypFQMTgKZXonHLvblWZNuaEW84U/N28egb8Xd1aaxz6cgDZ0Hbq9xP09RzJuO AaJfV3MrgQatNSoEh3qg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mD7xQ-001Qd3-CJ; Mon, 09 Aug 2021 16:16:56 +0000 Received: from mail-lj1-x22b.google.com ([2a00:1450:4864:20::22b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mD7xL-001Qc5-QZ for linux-arm-kernel@lists.infradead.org; Mon, 09 Aug 2021 16:16:53 +0000 Received: by mail-lj1-x22b.google.com with SMTP id h2so12220732lji.6 for ; Mon, 09 Aug 2021 09:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NSGTRvI+dU9/OZ+C1LQvAOAFprB1mz1jW2qsFy5VOj8=; b=J4HR25xyJWVAE1giNlTN3BGiIqkZJJ1e0QM6OYYhESILiqjRzic0l72mh4qaM3kv7a DIeMIs5NCIQthXz8l5tzywRHdzLOtZzcEBjSRp5/wq5Bw4MpeYtH6CXj3UCcgqi3q0D2 yhAo3WBBbN8rWcqHHEg7+RZ055xcaYUcpdlzOaV3eR9mOwf3we+Se6FoFAdUIFhGkODC DHVZBDIDGsdDFdgJG0AHL3RFNId7798nIoZoHi/zDK1NMLPA6hYagiawIt557Sn9bLTN tedfaEwr5UWj+a4Dk384EX9Xo5LKfkb1y9Ol69XatQBNbzBnKiRNC6BIfKlrzhdy9rAJ CQVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NSGTRvI+dU9/OZ+C1LQvAOAFprB1mz1jW2qsFy5VOj8=; b=eQIiggWYBE7cW5BqtdTT7wrzoCUS8q0DgN8EKCO0fxUldgTu+ENXTRpEx+Adqo0qG1 THJfw127Ke4ERrLIQPfO6avOQeCzUg3njVw+I4JpNsnTWn8/QN2wkcmgOjlKMez258HQ FD7aK0wypBZz3kcxTfm13NyZkZBczxpQ0Zj5blrIDwDY4RiQFX5m9HK7jUPbh9XwlXqQ B7s81Q5Ou8O8GTqvwZ8x2qPUhvzPGLaeA4fpws4jtJMU2WAc+zlAW+/UkAg9E6m2PHUK NQTEb3+U78v4ksg0A9Dr3wgf0rJlR6t9619/3VlmfuGR1/QZKb9v1ToApGfoLYUheTGz EH7A== X-Gm-Message-State: AOAM5310K/LxZvbAzXjtA2kwJOtmIIgwrxhKk7+c8tyeZM+tFaSW77DH DNcOoQTjGRNH0EkEATGpfvULl/DV69Z4BQ/QTKQWdg== X-Google-Smtp-Source: ABdhPJxPOGOQK06zO5eNCgjZEzV4581j/YDQ549IQmrcxK3iGj75Pach3oioOh9HrNJLaCOjfPrwARpRkg4nj8O2TJI= X-Received: by 2002:a2e:bd81:: with SMTP id o1mr16136845ljq.65.1628525809606; Mon, 09 Aug 2021 09:16:49 -0700 (PDT) MIME-Version: 1.0 References: <20210809152651.2297337-1-maz@kernel.org> <20210809152651.2297337-5-maz@kernel.org> In-Reply-To: <20210809152651.2297337-5-maz@kernel.org> From: Oliver Upton Date: Mon, 9 Aug 2021 09:16:38 -0700 Message-ID: Subject: Re: [PATCH 04/13] clocksource/arm_arch_timer: Move drop _tval from erratum function names To: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Rutland , Daniel Lezcano , Thomas Gleixner , Peter Shier , Raghavendra Rao Ananta , Ricardo Koller , Will Deacon , Catalin Marinas , Linus Walleij , kernel-team@android.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210809_091651_928327_CBD3A7DF X-CRM114-Status: GOOD ( 19.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Aug 9, 2021 at 8:27 AM Marc Zyngier wrote: > > The '_tval' name in the erratum handling function names doesn't > make much sense anymore (and they were using CVAL the first place). > > Drop the _tval tag. > > Signed-off-by: Marc Zyngier Reviewed-by: Oliver Upton > --- > drivers/clocksource/arm_arch_timer.c | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c > index 898a07dc01cd..160464f75017 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -371,7 +371,7 @@ EXPORT_SYMBOL_GPL(timer_unstable_counter_workaround); > > static atomic_t timer_unstable_counter_workaround_in_use = ATOMIC_INIT(0); > > -static void erratum_set_next_event_tval_generic(const int access, unsigned long evt, > +static void erratum_set_next_event_generic(const int access, unsigned long evt, > struct clock_event_device *clk) > { > unsigned long ctrl; > @@ -392,17 +392,17 @@ static void erratum_set_next_event_tval_generic(const int access, unsigned long > arch_timer_reg_write(access, ARCH_TIMER_REG_CTRL, ctrl, clk); > } > > -static __maybe_unused int erratum_set_next_event_tval_virt(unsigned long evt, > +static __maybe_unused int erratum_set_next_event_virt(unsigned long evt, > struct clock_event_device *clk) > { > - erratum_set_next_event_tval_generic(ARCH_TIMER_VIRT_ACCESS, evt, clk); > + erratum_set_next_event_generic(ARCH_TIMER_VIRT_ACCESS, evt, clk); > return 0; > } > > -static __maybe_unused int erratum_set_next_event_tval_phys(unsigned long evt, > +static __maybe_unused int erratum_set_next_event_phys(unsigned long evt, > struct clock_event_device *clk) > { > - erratum_set_next_event_tval_generic(ARCH_TIMER_PHYS_ACCESS, evt, clk); > + erratum_set_next_event_generic(ARCH_TIMER_PHYS_ACCESS, evt, clk); > return 0; > } > > @@ -414,8 +414,8 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = { > .desc = "Freescale erratum a005858", > .read_cntpct_el0 = fsl_a008585_read_cntpct_el0, > .read_cntvct_el0 = fsl_a008585_read_cntvct_el0, > - .set_next_event_phys = erratum_set_next_event_tval_phys, > - .set_next_event_virt = erratum_set_next_event_tval_virt, > + .set_next_event_phys = erratum_set_next_event_phys, > + .set_next_event_virt = erratum_set_next_event_virt, > }, > #endif > #ifdef CONFIG_HISILICON_ERRATUM_161010101 > @@ -425,8 +425,8 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = { > .desc = "HiSilicon erratum 161010101", > .read_cntpct_el0 = hisi_161010101_read_cntpct_el0, > .read_cntvct_el0 = hisi_161010101_read_cntvct_el0, > - .set_next_event_phys = erratum_set_next_event_tval_phys, > - .set_next_event_virt = erratum_set_next_event_tval_virt, > + .set_next_event_phys = erratum_set_next_event_phys, > + .set_next_event_virt = erratum_set_next_event_virt, > }, > { > .match_type = ate_match_acpi_oem_info, > @@ -434,8 +434,8 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = { > .desc = "HiSilicon erratum 161010101", > .read_cntpct_el0 = hisi_161010101_read_cntpct_el0, > .read_cntvct_el0 = hisi_161010101_read_cntvct_el0, > - .set_next_event_phys = erratum_set_next_event_tval_phys, > - .set_next_event_virt = erratum_set_next_event_tval_virt, > + .set_next_event_phys = erratum_set_next_event_phys, > + .set_next_event_virt = erratum_set_next_event_virt, > }, > #endif > #ifdef CONFIG_ARM64_ERRATUM_858921 > @@ -454,8 +454,8 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = { > .desc = "Allwinner erratum UNKNOWN1", > .read_cntpct_el0 = sun50i_a64_read_cntpct_el0, > .read_cntvct_el0 = sun50i_a64_read_cntvct_el0, > - .set_next_event_phys = erratum_set_next_event_tval_phys, > - .set_next_event_virt = erratum_set_next_event_tval_virt, > + .set_next_event_phys = erratum_set_next_event_phys, > + .set_next_event_virt = erratum_set_next_event_virt, > }, > #endif > #ifdef CONFIG_ARM64_ERRATUM_1418040 > -- > 2.30.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel