Skip to contentSkip to conversation

ACPI: GTDT: Correctly number platform devices for MMIO timers

PATCH Applied Marc Zyngier 3 participants 9 messages Oct 30, 2025 – Dec 1, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ACPI: GTDT: Correctly number platform devices for MMIO timers

Use the actual timer counter instead of the watchdog counter.

Fixes 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
Cc Hanjun Guo <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Mark Rutland <[email protected]>
---
 drivers/acpi/arm64/gtdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/arm64/gtdt.c +2 -2
index fd995a1d3d248..8cc8af8fd408c 100644
@@ -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;
 			}
 
Signature · 1 line
2.47.3
#1 lore raw
Quoted 21 lines · Marc Zyngier

Use the actual timer counter instead of the watchdog counter.

Fixes 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
Cc Hanjun Guo <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Mark Rutland <[email protected]>
---
 drivers/acpi/arm64/gtdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/arm64/gtdt.c +0 -0
index fd995a1d3d248..8cc8af8fd408c 100644
@@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
 				continue;

drivers/acpi/arm64/gtdt.c static int __init gtdt_platform_timer_init(void) · line 438

Quoted 10 lines
drivers/acpi/arm64/gtdt.c +2 -2
 
 			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.
Signature · 1 line
Jazz is not dead. It just smells funny...
maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Marc Zyngier
Quoted 21 lines · Marc Zyngier

Use the actual timer counter instead of the watchdog counter.

Fixes 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
Cc Hanjun Guo <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Mark Rutland <[email protected]>
---
  drivers/acpi/arm64/gtdt.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/arm64/gtdt.c +0 -0
index fd995a1d3d248..8cc8af8fd408c 100644
@@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
  				continue;

drivers/acpi/arm64/gtdt.c static int __init gtdt_platform_timer_init(void) · line 438

Quoted 10 lines
drivers/acpi/arm64/gtdt.c +2 -2
 
  			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 :)

Will this go via ARM64 tree?

Thanks
Hanjun

#3 lore raw
Quoted 36 lines · Hanjun Guo
Quoted 21 lines · Marc Zyngier

Use the actual timer counter instead of the watchdog counter.

Fixes 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
Cc Hanjun Guo <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Mark Rutland <[email protected]>
---
  drivers/acpi/arm64/gtdt.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/arm64/gtdt.c +0 -0
index fd995a1d3d248..8cc8af8fd408c 100644
@@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
  				continue;

drivers/acpi/arm64/gtdt.c static int __init gtdt_platform_timer_init(void) · line 438

Quoted 10 lines
drivers/acpi/arm64/gtdt.c +2 -2
    			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 :)

Quoted 3 lines

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.
Signature · 1 line
Without deviation from the norm, progress is not possible.
maintainer
#4 lore raw
Quoted 38 lines · Marc Zyngier
Quoted 36 lines · Hanjun Guo
Quoted 21 lines · Marc Zyngier

Use the actual timer counter instead of the watchdog counter.

Fixes 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
Cc Hanjun Guo <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Mark Rutland <[email protected]>
---
   drivers/acpi/arm64/gtdt.c | 4 ++--
   1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/arm64/gtdt.c +0 -0
index fd995a1d3d248..8cc8af8fd408c 100644
@@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
   				continue;

drivers/acpi/arm64/gtdt.c static int __init gtdt_platform_timer_init(void) · line 438

Quoted 10 lines
drivers/acpi/arm64/gtdt.c +2 -2
     			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 :)

Quoted 8 lines
Quoted 3 lines

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

maintainer
#5 lore raw

Hey Hanjun,

Quoted 41 lines · Hanjun Guo
Quoted 40 lines · Marc Zyngier
Quoted 38 lines · Hanjun Guo
Quoted 21 lines · Marc Zyngier

Use the actual timer counter instead of the watchdog counter.

Fixes 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
Cc Hanjun Guo <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Mark Rutland <[email protected]>
---
   drivers/acpi/arm64/gtdt.c | 4 ++--
   1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/arm64/gtdt.c +0 -0
index fd995a1d3d248..8cc8af8fd408c 100644
@@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
   				continue;

drivers/acpi/arm64/gtdt.c static int __init gtdt_platform_timer_init(void) · line 438

Quoted 10 lines
drivers/acpi/arm64/gtdt.c +2 -2
     			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 :)

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

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

maintainer
#6 lore raw

Hi Will,

Quoted 53 lines · Will Deacon

Hey Hanjun,

Quoted 41 lines · Hanjun Guo
Quoted 40 lines · Marc Zyngier
Quoted 38 lines · Hanjun Guo
Quoted 21 lines · Marc Zyngier

Use the actual timer counter instead of the watchdog counter.

Fixes 5669d92f3efa4 ("ACPI: GTDT: Generate platform devices for MMIO timers")
Cc Hanjun Guo <[email protected]>
Cc Sudeep Holla <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Mark Rutland <[email protected]>
---
    drivers/acpi/arm64/gtdt.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/arm64/gtdt.c +0 -0
index fd995a1d3d248..8cc8af8fd408c 100644
@@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
    				continue;

drivers/acpi/arm64/gtdt.c static int __init gtdt_platform_timer_init(void) · line 438

Quoted 10 lines
drivers/acpi/arm64/gtdt.c +2 -2
      			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 :)

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

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.

Quoted 7 lines

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!

Quoted 3 lines

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

maintainer
#7 lore raw
Quoted 9 lines · Hanjun Guo
Quoted 7 lines · Will Deacon

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?

Quoted 8 lines

Looks great to me!

Quoted 3 lines

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

maintainer Applied
#8 lore raw
In reply to Marc Zyngier
Quoted 3 lines · Marc Zyngier

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,

Signature · 5 lines
Will

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