Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 14 Feb 2020 15:31:12 -0300
From:   Paul Cercueil <paul@crapouillou.net>
Subject: Re: [PATCH v4 2/6] clocksource: Ingenic: Add high resolution timer
 support for SMP.
To:     =?UTF-8?b?5ZGo55Cw5p2w?= "(Zhou Yanjie)" 
        <zhouyanjie@wanyeetech.com>
Cc:     linux-mips@vger.kernel.org, linux-clk@vger.kernel.org,
        linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
        mturquette@baylibre.com, sboyd@kernel.org, robh+dt@kernel.org,
        mark.rutland@arm.com, ralf@linux-mips.org, paulburton@kernel.org,
        jiaxun.yang@flygoat.com, chenhc@lemote.com, allison@lohutok.net,
        tglx@linutronix.de, daniel.lezcano@linaro.org,
        geert+renesas@glider.be, krzk@kernel.org, keescook@chromium.org,
        ebiederm@xmission.com, miquel.raynal@bootlin.com,
        paul@boddie.org.uk, hns@goldelico.com, sernia.zhou@foxmail.com,
        zhenwenjin@gmail.com, mips-creator-ci20-dev@googlegroups.com,
        1326991897@qq.com
Message-Id: <1581705072.3.1@crapouillou.net>
In-Reply-To: <1581703360-112557-4-git-send-email-zhouyanjie@wanyeetech.com>
References: <1581703360-112557-1-git-send-email-zhouyanjie@wanyeetech.com>
        <1581703360-112557-4-git-send-email-zhouyanjie@wanyeetech.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi Zhou,


Le sam., f=C3=A9vr. 15, 2020 at 02:02, =E5=91=A8=E7=90=B0=E6=9D=B0 (Zhou Ya=
njie)=20
<zhouyanjie@wanyeetech.com> a =C3=A9crit :
> Enable clock event handling on per CPU core basis.
> Make sure that interrupts raised on the first core execute
> event handlers on the correct CPU core.
>=20
> Tested-by: H. Nikolaus Schaller <hns@goldelico.com>
> Tested-by: Paul Boddie <paul@boddie.org.uk>
> Signed-off-by: =E5=91=A8=E7=90=B0=E6=9D=B0 (Zhou Yanjie) <zhouyanjie@wany=
eetech.com>
> ---
>=20
> Notes:
>     v1->v2:
>     1.Adjust function naming to make it more reasonable.
>     2.Replace function smp_call_function_single() with
>       smp_call_function_single_async() in order to resolve
>       the warning below:
>=20
>     [    0.350942] smp: Brought up 1 node, 2 CPUs
>     [    0.365497] ------------[ cut here ]------------
>     [    0.365522] WARNING: CPU: 0 PID: 1 at kernel/smp.c:300=20
> smp_call_function_single+0x110/0x200
>     [    0.365533] CPU: 0 PID: 1 Comm: swapper/0 Not tainted=20
> 5.5.0-rc1+ #5
>     [    0.365537] Stack : 00000000 59c73bcd 00000037 80074e80=20
> 80000000 80670000 805a0000 80620590
>     [    0.365557]         8065ce38 8fc0dc8c 806d0000 00000000=20
> 80670000 00000001 8fc0dc20 59c73bcd
>     [    0.365574]         00000000 00000000 806f0000 80670000=20
> 00000000 806dab00 00000000 2d302e35
>     [    0.365591]         203a6d6d 806e0000 806e0000 70617773=20
> 80670000 00000000 00000000 00000009
>     [    0.365610]         00000000 8fc94e20 8fc0de30 80690000=20
> 00000018 803592dc 00000000 806d0000
>     [    0.365627]         ...
>     [    0.365634] Call Trace:
>     [    0.365647] [<8001b9a0>] show_stack+0x6c/0x12c
>     [    0.365663] [<804aed20>] dump_stack+0x98/0xc8
>     [    0.365673] [<8003044c>] __warn+0xc4/0xe8
>     [    0.365682] [<800304f4>] warn_slowpath_fmt+0x84/0xb8
>     [    0.365690] [<800a886c>] smp_call_function_single+0x110/0x200
>     [    0.365703] ---[ end trace 5785856ca39c79d5 ]---
>     [    0.365557]         8065ce38 8fc0dc8c 806d0000 00000000=20
> 80670000 00000001 8fc0dc20 59c73bcd
>     [    0.365574]         00000000 00000000 806f0000 80670000=20
> 00000000 806dab00 00000000 2d302e35
>     [    0.365591]         203a6d6d 806e0000 806e0000 70617773=20
> 80670000 00000000 00000000 00000009
>     [    0.365610]         00000000 8fc94e20 8fc0de30 80690000=20
> 00000018 803592dc 00000000 806d0000
>     [    0.365627]         ...
>     [    0.365634] Call Trace:
>     [    0.365647] [<8001b9a0>] show_stack+0x6c/0x12c
>     [    0.365663] [<804aed20>] dump_stack+0x98/0xc8
>     [    0.365673] [<8003044c>] __warn+0xc4/0xe8
>     [    0.365682] [<800304f4>] warn_slowpath_fmt+0x84/0xb8
>     [    0.365690] [<800a886c>] smp_call_function_single+0x110/0x200
>     [    0.365703] ---[ end trace 5785856ca39c79d5 ]---
>=20
>     v2->v3:
>     No Change.
>=20
>     v3->v4:
>     Rebase on top of kernel 5.6-rc1.
>=20
>  drivers/clocksource/ingenic-timer.c | 200=20
> ++++++++++++++++++++++++------------
>  1 file changed, 134 insertions(+), 66 deletions(-)
>=20
> diff --git a/drivers/clocksource/ingenic-timer.c=20
> b/drivers/clocksource/ingenic-timer.c
> index 4bbdb3d..9127c73 100644
> --- a/drivers/clocksource/ingenic-timer.c
> +++ b/drivers/clocksource/ingenic-timer.c
> @@ -1,7 +1,8 @@
>  // SPDX-License-Identifier: GPL-2.0
>  /*
> - * JZ47xx SoCs TCU IRQ driver
> + * XBurst SoCs TCU IRQ driver
>   * Copyright (C) 2019 Paul Cercueil <paul@crapouillou.net>
> + * Copyright (C) 2020 =E5=91=A8=E7=90=B0=E6=9D=B0 (Zhou Yanjie)=20
> <zhouyanjie@wanyeetech.com>
>   */
>=20
>  #include <linux/bitops.h>
> @@ -21,18 +22,23 @@
>=20
>  #include <dt-bindings/clock/ingenic,tcu.h>
>=20
> +static DEFINE_PER_CPU(call_single_data_t, ingenic_cevt_csd);
> +
>  struct ingenic_soc_info {
>  	unsigned int num_channels;
>  };
>=20
>  struct ingenic_tcu {
>  	struct regmap *map;
> +	struct device_node *np;
>  	struct clk *timer_clk, *cs_clk;
> +	unsigned int timer_local[NR_CPUS];
>  	unsigned int timer_channel, cs_channel;
>  	struct clock_event_device cevt;
>  	struct clocksource cs;
> -	char name[4];
> +	char name[16];
>  	unsigned long pwm_channels_mask;
> +	int cpu;
>  };
>=20
>  static struct ingenic_tcu *ingenic_tcu;
> @@ -81,6 +87,25 @@ static int ingenic_tcu_cevt_set_next(unsigned long=20
> next,
>  	return 0;
>  }
>=20
> +static void ingenic_per_cpu_event_handler(void *info)
> +{
> +	struct clock_event_device *cevt =3D (struct clock_event_device *)=20
> info;
> +
> +	if (cevt->event_handler)
> +		cevt->event_handler(cevt);
> +}
> +
> +static void ingenic_tcu_per_cpu_cb(struct clock_event_device *evt)
> +{
> +	struct ingenic_tcu *tcu =3D to_ingenic_tcu(evt);
> +	call_single_data_t *csd;
> +
> +	csd =3D &per_cpu(ingenic_cevt_csd, tcu->cpu);
> +	csd->info =3D (void *) evt;
> +	csd->func =3D ingenic_per_cpu_event_handler;
> +	smp_call_function_single_async(tcu->cpu, csd);
> +}
> +
>  static irqreturn_t ingenic_tcu_cevt_cb(int irq, void *dev_id)
>  {
>  	struct clock_event_device *evt =3D dev_id;
> @@ -88,8 +113,7 @@ static irqreturn_t ingenic_tcu_cevt_cb(int irq,=20
> void *dev_id)
>=20
>  	regmap_write(tcu->map, TCU_REG_TECR, BIT(tcu->timer_channel));
>=20
> -	if (evt->event_handler)
> -		evt->event_handler(evt);
> +	ingenic_tcu_per_cpu_cb(evt);

I guess the check for (evt->event_handler) is still valid here. There's=20
no point in calling ingenic_tcu_per_cpu_cb() if in the end the handler=20
won't do anything.

>=20
>  	return IRQ_HANDLED;
>  }
> @@ -105,14 +129,73 @@ static struct clk * __init=20
> ingenic_tcu_get_clock(struct device_node *np, int id)
>  	return of_clk_get_from_provider(&args);
>  }
>=20
> -static int __init ingenic_tcu_timer_init(struct device_node *np,
> -					 struct ingenic_tcu *tcu)
> +static int __init ingenic_tcu_clocksource_init(struct device_node=20
> *np,
> +					       struct ingenic_tcu *tcu)

Please - don't move functions around. It makes the patch extremely hard=20
to review. Just add a forward declaration for=20
ingenic_tcu_clocksource_init() at the top of the file.

> +{
> +	unsigned int channel =3D tcu->cs_channel;
> +	struct clocksource *cs =3D &tcu->cs;
> +	unsigned long rate;
> +	int err;
> +
> +	tcu->cs_clk =3D ingenic_tcu_get_clock(np, channel);
> +	if (IS_ERR(tcu->cs_clk))
> +		return PTR_ERR(tcu->cs_clk);
> +
> +	err =3D clk_prepare_enable(tcu->cs_clk);
> +	if (err)
> +		goto err_clk_put;
> +
> +	rate =3D clk_get_rate(tcu->cs_clk);
> +	if (!rate) {
> +		err =3D -EINVAL;
> +		goto err_clk_disable;
> +	}
> +
> +	/* Reset channel */
> +	regmap_update_bits(tcu->map, TCU_REG_TCSRc(channel),
> +			   0xffff & ~TCU_TCSR_RESERVED_BITS, 0);
> +
> +	/* Reset counter */
> +	regmap_write(tcu->map, TCU_REG_TDFRc(channel), 0xffff);
> +	regmap_write(tcu->map, TCU_REG_TCNTc(channel), 0);
> +
> +	/* Enable channel */
> +	regmap_write(tcu->map, TCU_REG_TESR, BIT(channel));
> +
> +	cs->name =3D "ingenic-timer";
> +	cs->rating =3D 200;
> +	cs->flags =3D CLOCK_SOURCE_IS_CONTINUOUS;
> +	cs->mask =3D CLOCKSOURCE_MASK(16);
> +	cs->read =3D ingenic_tcu_timer_cs_read;
> +
> +	err =3D clocksource_register_hz(cs, rate);
> +	if (err)
> +		goto err_clk_disable;
> +
> +	return 0;
> +
> +err_clk_disable:
> +	clk_disable_unprepare(tcu->cs_clk);
> +err_clk_put:
> +	clk_put(tcu->cs_clk);
> +	return err;
> +}
> +
> +static int ingenic_tcu_setup_per_cpu_cevt(struct device_node *np,
> +				     unsigned int channel)
>  {
> -	unsigned int timer_virq, channel =3D tcu->timer_channel;
> +	unsigned int timer_virq;
>  	struct irq_domain *domain;
> +	struct ingenic_tcu *tcu;
>  	unsigned long rate;
>  	int err;
>=20
> +	tcu =3D kzalloc(sizeof(*tcu), GFP_KERNEL);
> +	if (!tcu)
> +		return -ENOMEM;
> +
> +	tcu->map =3D ingenic_tcu->map;
> +
>  	tcu->timer_clk =3D ingenic_tcu_get_clock(np, channel);
>  	if (IS_ERR(tcu->timer_clk))
>  		return PTR_ERR(tcu->timer_clk);
> @@ -139,13 +222,15 @@ static int __init ingenic_tcu_timer_init(struct=20
> device_node *np,
>  		goto err_clk_disable;
>  	}
>=20
> -	snprintf(tcu->name, sizeof(tcu->name), "TCU");
> +	snprintf(tcu->name, sizeof(tcu->name), "TCU channel.%u", channel);

Make it TCU%u

>=20
>  	err =3D request_irq(timer_virq, ingenic_tcu_cevt_cb, IRQF_TIMER,
>  			  tcu->name, &tcu->cevt);
>  	if (err)
>  		goto err_irq_dispose_mapping;
>=20
> +	tcu->cpu =3D smp_processor_id();
> +	tcu->timer_channel =3D channel;
>  	tcu->cevt.cpumask =3D cpumask_of(smp_processor_id());
>  	tcu->cevt.features =3D CLOCK_EVT_FEAT_ONESHOT;
>  	tcu->cevt.name =3D tcu->name;
> @@ -166,56 +251,23 @@ static int __init ingenic_tcu_timer_init(struct=20
> device_node *np,
>  	return err;
>  }
>=20
> -static int __init ingenic_tcu_clocksource_init(struct device_node=20
> *np,
> -					       struct ingenic_tcu *tcu)
> +static int ingenic_tcu_setup_cevt(unsigned int cpu)
>  {
> -	unsigned int channel =3D tcu->cs_channel;
> -	struct clocksource *cs =3D &tcu->cs;
> -	unsigned long rate;
> -	int err;
> -
> -	tcu->cs_clk =3D ingenic_tcu_get_clock(np, channel);
> -	if (IS_ERR(tcu->cs_clk))
> -		return PTR_ERR(tcu->cs_clk);
> -
> -	err =3D clk_prepare_enable(tcu->cs_clk);
> -	if (err)
> -		goto err_clk_put;
> -
> -	rate =3D clk_get_rate(tcu->cs_clk);
> -	if (!rate) {
> -		err =3D -EINVAL;
> -		goto err_clk_disable;
> -	}
> -
> -	/* Reset channel */
> -	regmap_update_bits(tcu->map, TCU_REG_TCSRc(channel),
> -			   0xffff & ~TCU_TCSR_RESERVED_BITS, 0);
> -
> -	/* Reset counter */
> -	regmap_write(tcu->map, TCU_REG_TDFRc(channel), 0xffff);
> -	regmap_write(tcu->map, TCU_REG_TCNTc(channel), 0);
> -
> -	/* Enable channel */
> -	regmap_write(tcu->map, TCU_REG_TESR, BIT(channel));
> -
> -	cs->name =3D "ingenic-timer";
> -	cs->rating =3D 200;
> -	cs->flags =3D CLOCK_SOURCE_IS_CONTINUOUS;
> -	cs->mask =3D CLOCKSOURCE_MASK(16);
> -	cs->read =3D ingenic_tcu_timer_cs_read;
> +	int ret;
>=20
> -	err =3D clocksource_register_hz(cs, rate);
> -	if (err)
> -		goto err_clk_disable;
> +	ret =3D ingenic_tcu_setup_per_cpu_cevt(ingenic_tcu->np,
> +						ingenic_tcu->timer_local[cpu]);
> +	if (ret)
> +		goto err_tcu_clocksource_cleanup;
>=20
>  	return 0;
>=20
> -err_clk_disable:
> -	clk_disable_unprepare(tcu->cs_clk);
> -err_clk_put:
> -	clk_put(tcu->cs_clk);
> -	return err;
> +err_tcu_clocksource_cleanup:
> +	clocksource_unregister(&ingenic_tcu->cs);
> +	clk_disable_unprepare(ingenic_tcu->cs_clk);
> +	clk_put(ingenic_tcu->cs_clk);
> +	kfree(ingenic_tcu);
> +	return ret;
>  }
>=20
>  static const struct ingenic_soc_info jz4740_soc_info =3D {
> @@ -239,6 +291,7 @@ static int __init ingenic_tcu_init(struct=20
> device_node *np)
>  	const struct ingenic_soc_info *soc_info =3D id->data;
>  	struct ingenic_tcu *tcu;
>  	struct regmap *map;
> +	unsigned cpu =3D 0;
>  	long rate;
>  	int ret;
>=20
> @@ -253,12 +306,14 @@ static int __init ingenic_tcu_init(struct=20
> device_node *np)
>  		return -ENOMEM;
>=20
>  	/* Enable all TCU channels for PWM use by default except channels=20
> 0/1 */
> -	tcu->pwm_channels_mask =3D GENMASK(soc_info->num_channels - 1, 2);
> +	tcu->pwm_channels_mask =3D GENMASK(soc_info->num_channels - 1,
> +								NR_CPUS + 1);
>  	of_property_read_u32(np, "ingenic,pwm-channels-mask",
>  			     (u32 *)&tcu->pwm_channels_mask);
>=20
>  	/* Verify that we have at least two free channels */
> -	if (hweight8(tcu->pwm_channels_mask) > soc_info->num_channels - 2) {
> +	if (hweight8(tcu->pwm_channels_mask) >
> +			soc_info->num_channels - NR_CPUS + 1) {
>  		pr_crit("%s: Invalid PWM channel mask: 0x%02lx\n", __func__,
>  			tcu->pwm_channels_mask);
>  		ret =3D -EINVAL;
> @@ -266,13 +321,29 @@ static int __init ingenic_tcu_init(struct=20
> device_node *np)
>  	}
>=20
>  	tcu->map =3D map;
> +	tcu->np =3D np;
>  	ingenic_tcu =3D tcu;
>=20
> -	tcu->timer_channel =3D find_first_zero_bit(&tcu->pwm_channels_mask,
> +	tcu->timer_local[cpu] =3D find_first_zero_bit(&tcu->pwm_channels_mask,
>  						 soc_info->num_channels);
> -	tcu->cs_channel =3D find_next_zero_bit(&tcu->pwm_channels_mask,
> -					     soc_info->num_channels,
> -					     tcu->timer_channel + 1);
> +
> +	if (NR_CPUS > 1) {
> +		for (cpu =3D 1; cpu < NR_CPUS; cpu++)
> +			tcu->timer_local[cpu] =3D find_next_zero_bit(
> +						&tcu->pwm_channels_mask,
> +						soc_info->num_channels,
> +						tcu->timer_local[cpu - 1] + 1);
> +
> +		tcu->cs_channel =3D find_next_zero_bit(&tcu->pwm_channels_mask,
> +					soc_info->num_channels,
> +					tcu->timer_local[cpu-1] + 1);
> +	} else {
> +		tcu->cs_channel =3D find_next_zero_bit(&tcu->pwm_channels_mask,
> +					soc_info->num_channels,
> +					tcu->timer_local[cpu] + 1);
> +	}
> +
> +
>=20
>  	ret =3D ingenic_tcu_clocksource_init(np, tcu);
>  	if (ret) {
> @@ -280,9 +351,10 @@ static int __init ingenic_tcu_init(struct=20
> device_node *np)
>  		goto err_free_ingenic_tcu;
>  	}
>=20
> -	ret =3D ingenic_tcu_timer_init(np, tcu);
> -	if (ret)
> -		goto err_tcu_clocksource_cleanup;
> +	/* Setup clock events on each CPU core */
> +	ret =3D cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "Ingenic XBurst:=20
> online",
> +				ingenic_tcu_setup_cevt, NULL);
> +	WARN_ON(ret < 0);
>=20
>  	/* Register the sched_clock at the end as there's no way to undo it=20
> */
>  	rate =3D clk_get_rate(tcu->cs_clk);
> @@ -290,10 +362,6 @@ static int __init ingenic_tcu_init(struct=20
> device_node *np)
>=20
>  	return 0;
>=20
> -err_tcu_clocksource_cleanup:
> -	clocksource_unregister(&tcu->cs);
> -	clk_disable_unprepare(tcu->cs_clk);
> -	clk_put(tcu->cs_clk);
>  err_free_ingenic_tcu:
>  	kfree(tcu);
>  	return ret;
> --
> 2.7.4
>=20

=