[PATCH] ACPI: GTDT: Correctly number platform devices for MMIO timers

[PATCH] ACPI: GTDT: Correctly number platform devices for MMIO timers

[Marc Zyngier]

Use the actual timer counter instead of the watchdog counter.

Fixes: 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
Reported-by: Pavan Kondeti <pavan.kondeti@oss.qualcomm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Cc: Hanjun Guo <guohanjun@huawei.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Mark Rutland <mark.rutland@arm.com>
---
 drivers/acpi/arm64/gtdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c
index fd995a1d3d248..8cc8af8fd408c 100644
--- a/drivers/acpi/arm64/gtdt.c
+++ b/drivers/acpi/arm64/gtdt.c
@@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
 				continue;
 
 			pdev = platform_device_register_data(NULL, "gtdt-arm-mmio-timer",
-							     gwdt_count, &atm,
+							     mmio_timer_count, &atm,
 							     sizeof(atm));
 			if (IS_ERR(pdev)) {
-				pr_err("Can't register timer %d\n", gwdt_count);
+				pr_err("Can't register timer %d\n", mmio_timer_count);
 				continue;
 			}
 
-- 
2.47.3

Re: [PATCH] ACPI: GTDT: Correctly number platform devices for MMIO timers

[Marc Zyngier]

On 2025-10-30 11:01, Marc Zyngier wrote:
> Use the actual timer counter instead of the watchdog counter.
> 
> Fixes: 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO 
> timers")
> Reported-by: Pavan Kondeti <pavan.kondeti@oss.qualcomm.com>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> Cc: Hanjun Guo <guohanjun@huawei.com>
> Cc: Sudeep Holla <sudeep.holla@arm.com>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Mark Rutland <mark.rutland@arm.com>
> ---
>  drivers/acpi/arm64/gtdt.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c
> index fd995a1d3d248..8cc8af8fd408c 100644
> --- a/drivers/acpi/arm64/gtdt.c
> +++ b/drivers/acpi/arm64/gtdt.c
> @@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
>  				continue;
> 
>  			pdev = platform_device_register_data(NULL, "gtdt-arm-mmio-timer",
> -							     gwdt_count, &atm,
> +							     mmio_timer_count, &atm,
>  							     sizeof(atm));
>  			if (IS_ERR(pdev)) {
> -				pr_err("Can't register timer %d\n", gwdt_count);
> +				pr_err("Can't register timer %d\n", mmio_timer_count);
>  				continue;
>  			}

Any chance for this to be picked before 6.18 is fully baked?

Thanks,

         M.
-- 
Jazz is not dead. It just smells funny...

Re: [PATCH] ACPI: GTDT: Correctly number platform devices for MMIO timers

[Hanjun Guo]

On 2025/10/30 19:01, Marc Zyngier wrote:
> Use the actual timer counter instead of the watchdog counter.
> 
> Fixes: 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
> Reported-by: Pavan Kondeti <pavan.kondeti@oss.qualcomm.com>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> Cc: Hanjun Guo <guohanjun@huawei.com>
> Cc: Sudeep Holla <sudeep.holla@arm.com>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Mark Rutland <mark.rutland@arm.com>
> ---
>   drivers/acpi/arm64/gtdt.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c
> index fd995a1d3d248..8cc8af8fd408c 100644
> --- a/drivers/acpi/arm64/gtdt.c
> +++ b/drivers/acpi/arm64/gtdt.c
> @@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
>   				continue;
>   
>   			pdev = platform_device_register_data(NULL, "gtdt-arm-mmio-timer",
> -							     gwdt_count, &atm,
> +							     mmio_timer_count, &atm,
>   							     sizeof(atm));
>   			if (IS_ERR(pdev)) {
> -				pr_err("Can't register timer %d\n", gwdt_count);
> +				pr_err("Can't register timer %d\n", mmio_timer_count);
>   				continue;
>   			}

"typo" I think :)

Acked-by: Hanjun Guo <guohanjun@huawei.com>

Will this go via ARM64 tree?

Thanks
Hanjun

Re: [PATCH] ACPI: GTDT: Correctly number platform devices for MMIO timers

[Marc Zyngier]

On Fri, 21 Nov 2025 02:53:17 +0000,
Hanjun Guo <guohanjun@huawei.com> wrote:
> 
> On 2025/10/30 19:01, Marc Zyngier wrote:
> > Use the actual timer counter instead of the watchdog counter.
> > 
> > Fixes: 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
> > Reported-by: Pavan Kondeti <pavan.kondeti@oss.qualcomm.com>
> > Signed-off-by: Marc Zyngier <maz@kernel.org>
> > Cc: Hanjun Guo <guohanjun@huawei.com>
> > Cc: Sudeep Holla <sudeep.holla@arm.com>
> > Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Mark Rutland <mark.rutland@arm.com>
> > ---
> >   drivers/acpi/arm64/gtdt.c | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c
> > index fd995a1d3d248..8cc8af8fd408c 100644
> > --- a/drivers/acpi/arm64/gtdt.c
> > +++ b/drivers/acpi/arm64/gtdt.c
> > @@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
> >   				continue;
> >     			pdev = platform_device_register_data(NULL,
> > "gtdt-arm-mmio-timer",
> > -							     gwdt_count, &atm,
> > +							     mmio_timer_count, &atm,
> >   							     sizeof(atm));
> >   			if (IS_ERR(pdev)) {
> > -				pr_err("Can't register timer %d\n", gwdt_count);
> > +				pr_err("Can't register timer %d\n", mmio_timer_count);
> >   				continue;
> >   			}
> 
> "typo" I think :)
> 
> Acked-by: Hanjun Guo <guohanjun@huawei.com>
> 
> Will this go via ARM64 tree?

Is that where the ACPI updates are routed to? This fixes a patch that
was routed tip, so I'd have expected this to go via the same route.

In any case, I've added Catalin and Will on Cc.

Thanks,

	M.

-- 
Without deviation from the norm, progress is not possible.

Re: [PATCH] ACPI: GTDT: Correctly number platform devices for MMIO timers

[Hanjun Guo]

On 2025/11/21 16:55, Marc Zyngier wrote:
> On Fri, 21 Nov 2025 02:53:17 +0000,
> Hanjun Guo <guohanjun@huawei.com> wrote:
>>
>> On 2025/10/30 19:01, Marc Zyngier wrote:
>>> Use the actual timer counter instead of the watchdog counter.
>>>
>>> Fixes: 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
>>> Reported-by: Pavan Kondeti <pavan.kondeti@oss.qualcomm.com>
>>> Signed-off-by: Marc Zyngier <maz@kernel.org>
>>> Cc: Hanjun Guo <guohanjun@huawei.com>
>>> Cc: Sudeep Holla <sudeep.holla@arm.com>
>>> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
>>> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
>>> Cc: Thomas Gleixner <tglx@linutronix.de>
>>> Cc: Mark Rutland <mark.rutland@arm.com>
>>> ---
>>>    drivers/acpi/arm64/gtdt.c | 4 ++--
>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c
>>> index fd995a1d3d248..8cc8af8fd408c 100644
>>> --- a/drivers/acpi/arm64/gtdt.c
>>> +++ b/drivers/acpi/arm64/gtdt.c
>>> @@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
>>>    				continue;
>>>      			pdev = platform_device_register_data(NULL,
>>> "gtdt-arm-mmio-timer",
>>> -							     gwdt_count, &atm,
>>> +							     mmio_timer_count, &atm,
>>>    							     sizeof(atm));
>>>    			if (IS_ERR(pdev)) {
>>> -				pr_err("Can't register timer %d\n", gwdt_count);
>>> +				pr_err("Can't register timer %d\n", mmio_timer_count);
>>>    				continue;
>>>    			}
>>
>> "typo" I think :)
>>
>> Acked-by: Hanjun Guo <guohanjun@huawei.com>
>>
>> Will this go via ARM64 tree?
> 
> Is that where the ACPI updates are routed to? This fixes a patch that
> was routed tip, so I'd have expected this to go via the same route.
> 
> In any case, I've added Catalin and Will on Cc.

Yes, ARM64 ACPI code merged via ARM64 tree.

Thanks
Hanjun

Re: [PATCH] ACPI: GTDT: Correctly number platform devices for MMIO timers

[Will Deacon]

Hey Hanjun,

On Fri, Nov 21, 2025 at 09:14:04PM +0800, Hanjun Guo wrote:
> On 2025/11/21 16:55, Marc Zyngier wrote:
> > On Fri, 21 Nov 2025 02:53:17 +0000,
> > Hanjun Guo <guohanjun@huawei.com> wrote:
> > > 
> > > On 2025/10/30 19:01, Marc Zyngier wrote:
> > > > Use the actual timer counter instead of the watchdog counter.
> > > > 
> > > > Fixes: 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
> > > > Reported-by: Pavan Kondeti <pavan.kondeti@oss.qualcomm.com>
> > > > Signed-off-by: Marc Zyngier <maz@kernel.org>
> > > > Cc: Hanjun Guo <guohanjun@huawei.com>
> > > > Cc: Sudeep Holla <sudeep.holla@arm.com>
> > > > Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> > > > Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> > > > Cc: Thomas Gleixner <tglx@linutronix.de>
> > > > Cc: Mark Rutland <mark.rutland@arm.com>
> > > > ---
> > > >    drivers/acpi/arm64/gtdt.c | 4 ++--
> > > >    1 file changed, 2 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c
> > > > index fd995a1d3d248..8cc8af8fd408c 100644
> > > > --- a/drivers/acpi/arm64/gtdt.c
> > > > +++ b/drivers/acpi/arm64/gtdt.c
> > > > @@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
> > > >    				continue;
> > > >      			pdev = platform_device_register_data(NULL,
> > > > "gtdt-arm-mmio-timer",
> > > > -							     gwdt_count, &atm,
> > > > +							     mmio_timer_count, &atm,
> > > >    							     sizeof(atm));
> > > >    			if (IS_ERR(pdev)) {
> > > > -				pr_err("Can't register timer %d\n", gwdt_count);
> > > > +				pr_err("Can't register timer %d\n", mmio_timer_count);
> > > >    				continue;
> > > >    			}
> > > 
> > > "typo" I think :)
> > > 
> > > Acked-by: Hanjun Guo <guohanjun@huawei.com>
> > > 
> > > Will this go via ARM64 tree?
> > 
> > Is that where the ACPI updates are routed to? This fixes a patch that
> > was routed tip, so I'd have expected this to go via the same route.
> > 
> > In any case, I've added Catalin and Will on Cc.
> 
> Yes, ARM64 ACPI code merged via ARM64 tree.

Catalin and I were chatting the other day and we wondered whether it's
worth adding something to MAINTAINERS so that we get CC'd on arm64 ACPI
patches without you having to add us in manually? We wouldn't merge
anything without an Ack from somebody listed under the "ACPI FOR ARM64"
entry but it would mean that we get picked up by get_maintainer.pl.

What do you think?

I can't tell whether this would be best as an F: line under the arm64
architecture entry, or adding us as R:/M: for the ACPI/arm64 entry.

Will

Re: [PATCH] ACPI: GTDT: Correctly number platform devices for MMIO timers

[Hanjun Guo]

Hi Will,

On 2025/11/27 23:07, Will Deacon wrote:
> Hey Hanjun,
> 
> On Fri, Nov 21, 2025 at 09:14:04PM +0800, Hanjun Guo wrote:
>> On 2025/11/21 16:55, Marc Zyngier wrote:
>>> On Fri, 21 Nov 2025 02:53:17 +0000,
>>> Hanjun Guo <guohanjun@huawei.com> wrote:
>>>>
>>>> On 2025/10/30 19:01, Marc Zyngier wrote:
>>>>> Use the actual timer counter instead of the watchdog counter.
>>>>>
>>>>> Fixes: 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
>>>>> Reported-by: Pavan Kondeti <pavan.kondeti@oss.qualcomm.com>
>>>>> Signed-off-by: Marc Zyngier <maz@kernel.org>
>>>>> Cc: Hanjun Guo <guohanjun@huawei.com>
>>>>> Cc: Sudeep Holla <sudeep.holla@arm.com>
>>>>> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
>>>>> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
>>>>> Cc: Thomas Gleixner <tglx@linutronix.de>
>>>>> Cc: Mark Rutland <mark.rutland@arm.com>
>>>>> ---
>>>>>     drivers/acpi/arm64/gtdt.c | 4 ++--
>>>>>     1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c
>>>>> index fd995a1d3d248..8cc8af8fd408c 100644
>>>>> --- a/drivers/acpi/arm64/gtdt.c
>>>>> +++ b/drivers/acpi/arm64/gtdt.c
>>>>> @@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
>>>>>     				continue;
>>>>>       			pdev = platform_device_register_data(NULL,
>>>>> "gtdt-arm-mmio-timer",
>>>>> -							     gwdt_count, &atm,
>>>>> +							     mmio_timer_count, &atm,
>>>>>     							     sizeof(atm));
>>>>>     			if (IS_ERR(pdev)) {
>>>>> -				pr_err("Can't register timer %d\n", gwdt_count);
>>>>> +				pr_err("Can't register timer %d\n", mmio_timer_count);
>>>>>     				continue;
>>>>>     			}
>>>>
>>>> "typo" I think :)
>>>>
>>>> Acked-by: Hanjun Guo <guohanjun@huawei.com>
>>>>
>>>> Will this go via ARM64 tree?
>>>
>>> Is that where the ACPI updates are routed to? This fixes a patch that
>>> was routed tip, so I'd have expected this to go via the same route.
>>>
>>> In any case, I've added Catalin and Will on Cc.
>>
>> Yes, ARM64 ACPI code merged via ARM64 tree.
> 
> Catalin and I were chatting the other day and we wondered whether it's
> worth adding something to MAINTAINERS so that we get CC'd on arm64 ACPI
> patches without you having to add us in manually? We wouldn't merge
> anything without an Ack from somebody listed under the "ACPI FOR ARM64"
> entry but it would mean that we get picked up by get_maintainer.pl.
> 
> What do you think?

Looks great to me!

> 
> I can't tell whether this would be best as an F: line under the arm64
> architecture entry, or adding us as R:/M: for the ACPI/arm64 entry.

How about adding M: for the ACPI/arm64 entry? I can send a patch
for this change if you and Catalin agree with it.

Thanks
Hanjun

Re: [PATCH] ACPI: GTDT: Correctly number platform devices for MMIO timers

[Will Deacon]

On Sat, Nov 29, 2025 at 02:02:34PM +0800, Hanjun Guo wrote:
> On 2025/11/27 23:07, Will Deacon wrote:
> > Catalin and I were chatting the other day and we wondered whether it's
> > worth adding something to MAINTAINERS so that we get CC'd on arm64 ACPI
> > patches without you having to add us in manually? We wouldn't merge
> > anything without an Ack from somebody listed under the "ACPI FOR ARM64"
> > entry but it would mean that we get picked up by get_maintainer.pl.
> > 
> > What do you think?
> 
> Looks great to me!
> 
> > 
> > I can't tell whether this would be best as an F: line under the arm64
> > architecture entry, or adding us as R:/M: for the ACPI/arm64 entry.
> 
> How about adding M: for the ACPI/arm64 entry? I can send a patch
> for this change if you and Catalin agree with it.

Sure, that's fine by me. We'll still want Acks from the currently listed
folks when merging patches, though, so we're not letting you off the
hook that easily :p

Will

Re: [PATCH] ACPI: GTDT: Correctly number platform devices for MMIO timers

[Will Deacon]

On Thu, 30 Oct 2025 11:01:15 +0000, Marc Zyngier wrote:
> Use the actual timer counter instead of the watchdog counter.
> 
> 

Applied to arm64 (for-next/fixes), thanks!

[1/1] ACPI: GTDT: Correctly number platform devices for MMIO timers
      https://git.kernel.org/arm64/c/7c16c02e8608

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev