From: Claudiu Beznea <claudiu.beznea@microchip.com>
To: <daniel.lezcano@linaro.org>, <robh+dt@kernel.org>,
<mark.rutland@arm.com>, <linux@armlinux.org.uk>, <nsekhar@ti.com>,
<bgolaszewski@baylibre.com>, <monstr@monstr.eu>,
<john@phrozen.org>, <ralf@linux-mips.org>, <paul.burton@mips.com>,
<jhogan@kernel.org>, <lftan@altera.com>, <tglx@linutronix.de>,
<vgupta@synopsys.com>, <marc.zyngier@arm.com>,
<patrice.chotard@st.com>, <mcoquelin.stm32@gmail.com>,
<alexandre.torgue@st.com>, <eric@anholt.net>, <wahrenst@gmx.net>,
<f.fainelli@gmail.com>, <rjui@broadcom.com>,
<sbranden@broadcom.com>, <bcm-kernel-feedback-list@broadcom.com>,
<linus.walleij@linaro.org>, <shc_work@mail.ru>,
<kgene@kernel.org>, <krzk@kernel.org>,
<ysato@users.sourceforge.jp>, <liviu.dudau@arm.com>,
<sudeep.holla@arm.com>, <lorenzo.pieralisi@arm.com>,
<shawnguo@kernel.org>, <s.hauer@pengutronix.de>,
<kernel@pengutronix.de>, <festevam@gmail.com>,
<linux-imx@nxp.com>, <baohua@kernel.org>,
<nicolas.ferre@microchip.com>, <alexandre.belloni@bootlin.com>,
<ludovic.desroches@microchip.com>, <baruch@tkos.co.il>,
<u.kleine-koenig@pengutronix.de>, <guoren@kernel.org>,
<kaloz@openwrt.org>, <khalasa@piap.pl>, <ssantosh@kernel.org>,
<vz@mleia.com>, <slemieux.tyco@gmail.com>, <khilman@baylibre.com>,
<avifishman70@gmail.com>, <tmaimon77@gmail.com>,
<tali.perry1@gmail.com>, <venture@google.com>, <yuenn@google.com>,
<benjaminfair@google.com>, <afaerber@suse.de>,
<manivannan.sadhasivam@linaro.org>, <narmstrong@baylibre.com>,
<agross@kernel.org>, <palmer@sifive.com>, <aou@eecs.berkeley.edu>,
<heiko@sntech.de>, <orsonzhai@gmail.com>,
<baolin.wang@linaro.org>, <zhang.lyra@gmail.com>,
<maxime.ripard@bootlin.com>, <wens@csie.org>,
<thierry.reding@gmail.com>, <jonathanh@nvidia.com>,
<linux@prisktech.co.nz>, <john.stultz@linaro.org>,
<sboyd@kernel.org>, <matthias.bgg@gmail.com>
Cc: <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mips@vger.kernel.org>, <nios2-dev@lists.rocketboards.org>,
<linux-snps-arc@lists.infradead.org>,
<linux-stm32@st-md-mailman.stormreply.com>,
<linux-rpi-kernel@lists.infradead.org>,
<linux-samsung-soc@vger.kernel.org>,
<uclinux-h8-devel@lists.sourceforge.jp>,
<linux-amlogic@lists.infradead.org>, <openbmc@lists.ozlabs.org>,
<linux-oxnas@groups.io>, <linux-arm-msm@vger.kernel.org>,
<linux-unisoc@lists.infradead.org>,
<linux-riscv@lists.infradead.org>,
<linux-rockchip@lists.infradead.org>,
<linux-tegra@vger.kernel.org>,
<linux-mediatek@lists.infradead.org>,
"Claudiu Beznea" <claudiu.beznea@microchip.com>
Subject: [PATCH 1/7] clocksource/drivers/c-sky: request timer_of_init only for probing CPU
Date: Tue, 10 Sep 2019 16:47:10 +0300 [thread overview]
Message-ID: <1568123236-767-2-git-send-email-claudiu.beznea@microchip.com> (raw)
In-Reply-To: <1568123236-767-1-git-send-email-claudiu.beznea@microchip.com>
timer_of_init() was initially called for all possible CPUs although it
was requested clock with index 0 for the same device_node on behalf of
all possible CPUs. This patch keeps the timer_of_init() only for probing
CPU and use the information obtained by timer_of_init() to also
initialize the timer_of structure for the rest of CPUs. Since the
probing CPU was requested also a per CPU interrupt, and the
timer_of_init() has such a mechanism implemented, the patch took also
the chance to pass TIMER_OF_IRQ flag to timer_of_init(). Apart from
this csky_mptimer_irq variable was removed and information in per CPU
timer_of objects was used instead (to->clkevt.irq).
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
drivers/clocksource/timer-mp-csky.c | 45 +++++++++++++++++++------------------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/drivers/clocksource/timer-mp-csky.c b/drivers/clocksource/timer-mp-csky.c
index 183a9955160a..dd263c8de580 100644
--- a/drivers/clocksource/timer-mp-csky.c
+++ b/drivers/clocksource/timer-mp-csky.c
@@ -15,7 +15,7 @@
#define PTIM_LVR "cr<6, 14>"
#define PTIM_TSR "cr<1, 14>"
-static int csky_mptimer_irq;
+static irqreturn_t csky_timer_interrupt(int irq, void *dev);
static int csky_mptimer_set_next_event(unsigned long delta,
struct clock_event_device *ce)
@@ -47,7 +47,7 @@ static int csky_mptimer_oneshot_stopped(struct clock_event_device *ce)
}
static DEFINE_PER_CPU(struct timer_of, csky_to) = {
- .flags = TIMER_OF_CLOCK,
+ .flags = TIMER_OF_CLOCK | TIMER_OF_IRQ,
.clkevt = {
.rating = 300,
.features = CLOCK_EVT_FEAT_PERCPU |
@@ -57,6 +57,10 @@ static DEFINE_PER_CPU(struct timer_of, csky_to) = {
.set_state_oneshot_stopped = csky_mptimer_oneshot_stopped,
.set_next_event = csky_mptimer_set_next_event,
},
+ .of_irq = {
+ .percpu = true,
+ .handler = csky_timer_interrupt,
+ },
};
static irqreturn_t csky_timer_interrupt(int irq, void *dev)
@@ -79,7 +83,7 @@ static int csky_mptimer_starting_cpu(unsigned int cpu)
to->clkevt.cpumask = cpumask_of(cpu);
- enable_percpu_irq(csky_mptimer_irq, 0);
+ enable_percpu_irq(to->clkevt.irq, 0);
clockevents_config_and_register(&to->clkevt, timer_of_rate(to),
2, ULONG_MAX);
@@ -89,7 +93,9 @@ static int csky_mptimer_starting_cpu(unsigned int cpu)
static int csky_mptimer_dying_cpu(unsigned int cpu)
{
- disable_percpu_irq(csky_mptimer_irq);
+ struct timer_of *to = per_cpu_ptr(&csky_to, cpu);
+
+ disable_percpu_irq(to->clkevt.irq);
return 0;
}
@@ -117,8 +123,8 @@ struct clocksource csky_clocksource = {
static int __init csky_mptimer_init(struct device_node *np)
{
- int ret, cpu, cpu_rollback;
- struct timer_of *to = NULL;
+ struct timer_of *to = this_cpu_ptr(&csky_to);
+ int ret, cpu;
/*
* Csky_mptimer is designed for C-SKY SMP multi-processors and
@@ -132,20 +138,20 @@ static int __init csky_mptimer_init(struct device_node *np)
* We use private irq for the mptimer and irq number is the same
* for every core. So we use request_percpu_irq() in timer_of_init.
*/
- csky_mptimer_irq = irq_of_parse_and_map(np, 0);
- if (csky_mptimer_irq <= 0)
- return -EINVAL;
- ret = request_percpu_irq(csky_mptimer_irq, csky_timer_interrupt,
- "csky_mp_timer", &csky_to);
+ ret = timer_of_init(np, to);
if (ret)
return -EINVAL;
for_each_possible_cpu(cpu) {
- to = per_cpu_ptr(&csky_to, cpu);
- ret = timer_of_init(np, to);
- if (ret)
- goto rollback;
+ struct timer_of *cpu_to = per_cpu_ptr(&csky_to, cpu);
+
+ if (to == cpu_to)
+ continue;
+
+ cpu_to->clkevt.irq = to->of_irq.irq;
+ cpu_to->of_clk.rate = to->of_clk.rate;
+ cpu_to->of_clk.period = to->of_clk.period;
}
clocksource_register_hz(&csky_clocksource, timer_of_rate(to));
@@ -156,18 +162,13 @@ static int __init csky_mptimer_init(struct device_node *np)
csky_mptimer_starting_cpu,
csky_mptimer_dying_cpu);
if (ret)
- return -EINVAL;
+ goto rollback;
return 0;
rollback:
- for_each_possible_cpu(cpu_rollback) {
- if (cpu_rollback == cpu)
- break;
+ timer_of_cleanup(to);
- to = per_cpu_ptr(&csky_to, cpu_rollback);
- timer_of_cleanup(to);
- }
return -EINVAL;
}
TIMER_OF_DECLARE(csky_mptimer, "csky,mptimer", csky_mptimer_init);
--
2.7.4
next prev parent reply other threads:[~2019-09-10 13:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-10 13:47 [PATCH 0/7] add support for clocksource/clockevent DT selection Claudiu Beznea
2019-09-10 13:47 ` Claudiu Beznea [this message]
2019-09-10 13:47 ` [PATCH 2/7] clocksource: change timer registration macros Claudiu Beznea
2019-09-10 13:47 ` [PATCH 3/7] clocksource/timer_of: use BIT() macro Claudiu Beznea
2019-09-10 13:47 ` [PATCH 4/7] dt-bindings: chosen: Add clocksource and clockevent selection Claudiu Beznea
2019-09-11 7:34 ` Neil Armstrong
2019-09-10 13:47 ` [PATCH 5/7] clocksource/drivers/timer-of: add support support for timer's functionalities Claudiu Beznea
2019-09-10 13:47 ` [PATCH 6/7] drivers/clocksource/timer-of: keep declaration on one line Claudiu Beznea
2019-09-10 13:47 ` [PATCH 7/7] clocksource/drivers/integrator-ap: parse the chosen node Claudiu Beznea
2019-09-25 17:19 ` [PATCH 0/7] add support for clocksource/clockevent DT selection Daniel Lezcano
2019-09-26 8:42 ` Claudiu.Beznea
2019-10-02 13:35 ` Claudiu.Beznea
2019-10-03 10:43 ` Claudiu.Beznea
2019-10-13 18:16 ` Daniel Lezcano
2019-10-15 9:23 ` Claudiu.Beznea
2019-10-18 20:24 ` Daniel Lezcano
2019-10-21 8:58 ` Claudiu.Beznea
2019-10-21 14:17 ` Daniel Lezcano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1568123236-767-2-git-send-email-claudiu.beznea@microchip.com \
--to=claudiu.beznea@microchip.com \
--cc=afaerber@suse.de \
--cc=agross@kernel.org \
--cc=alexandre.belloni@bootlin.com \
--cc=alexandre.torgue@st.com \
--cc=aou@eecs.berkeley.edu \
--cc=avifishman70@gmail.com \
--cc=baohua@kernel.org \
--cc=baolin.wang@linaro.org \
--cc=baruch@tkos.co.il \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=benjaminfair@google.com \
--cc=bgolaszewski@baylibre.com \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=eric@anholt.net \
--cc=f.fainelli@gmail.com \
--cc=festevam@gmail.com \
--cc=guoren@kernel.org \
--cc=heiko@sntech.de \
--cc=jhogan@kernel.org \
--cc=john.stultz@linaro.org \
--cc=john@phrozen.org \
--cc=jonathanh@nvidia.com \
--cc=kaloz@openwrt.org \
--cc=kernel@pengutronix.de \
--cc=kgene@kernel.org \
--cc=khalasa@piap.pl \
--cc=khilman@baylibre.com \
--cc=krzk@kernel.org \
--cc=lftan@altera.com \
--cc=linus.walleij@linaro.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-oxnas@groups.io \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-unisoc@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=linux@prisktech.co.nz \
--cc=liviu.dudau@arm.com \
--cc=lorenzo.pieralisi@arm.com \
--cc=ludovic.desroches@microchip.com \
--cc=manivannan.sadhasivam@linaro.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=maxime.ripard@bootlin.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=monstr@monstr.eu \
--cc=narmstrong@baylibre.com \
--cc=nicolas.ferre@microchip.com \
--cc=nios2-dev@lists.rocketboards.org \
--cc=nsekhar@ti.com \
--cc=openbmc@lists.ozlabs.org \
--cc=orsonzhai@gmail.com \
--cc=palmer@sifive.com \
--cc=patrice.chotard@st.com \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.org \
--cc=rjui@broadcom.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=sboyd@kernel.org \
--cc=sbranden@broadcom.com \
--cc=shawnguo@kernel.org \
--cc=shc_work@mail.ru \
--cc=slemieux.tyco@gmail.com \
--cc=ssantosh@kernel.org \
--cc=sudeep.holla@arm.com \
--cc=tali.perry1@gmail.com \
--cc=tglx@linutronix.de \
--cc=thierry.reding@gmail.com \
--cc=tmaimon77@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=uclinux-h8-devel@lists.sourceforge.jp \
--cc=venture@google.com \
--cc=vgupta@synopsys.com \
--cc=vz@mleia.com \
--cc=wahrenst@gmx.net \
--cc=wens@csie.org \
--cc=ysato@users.sourceforge.jp \
--cc=yuenn@google.com \
--cc=zhang.lyra@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).