[PATCH] irqchip/gic-v3: Fix GICD_CTLR register naming

[PATCH] irqchip/gic-v3: Fix GICD_CTLR register naming

[Zenghui Yu]

It was incorrectly named as GICD_CTRL in a pr_info() and comments. Fix
them.

Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
---
 drivers/irqchip/irq-gic-v3.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index efc791c43d44..dbeb85677b08 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -190,12 +190,12 @@ static void __init gic_prio_init(void)
 
 	/*
 	 * How priority values are used by the GIC depends on two things:
-	 * the security state of the GIC (controlled by the GICD_CTRL.DS bit)
+	 * the security state of the GIC (controlled by the GICD_CTLR.DS bit)
 	 * and if Group 0 interrupts can be delivered to Linux in the non-secure
 	 * world as FIQs (controlled by the SCR_EL3.FIQ bit). These affect the
 	 * way priorities are presented in ICC_PMR_EL1 and in the distributor:
 	 *
-	 * GICD_CTRL.DS | SCR_EL3.FIQ | ICC_PMR_EL1 | Distributor
+	 * GICD_CTLR.DS | SCR_EL3.FIQ | ICC_PMR_EL1 | Distributor
 	 * -------------------------------------------------------
 	 *      1       |      -      |  unchanged  |  unchanged
 	 * -------------------------------------------------------
@@ -223,7 +223,7 @@ static void __init gic_prio_init(void)
 		dist_prio_nmi = __gicv3_prio_to_ns(dist_prio_nmi);
 	}
 
-	pr_info("GICD_CTRL.DS=%d, SCR_EL3.FIQ=%d\n",
+	pr_info("GICD_CTLR.DS=%d, SCR_EL3.FIQ=%d\n",
 		cpus_have_security_disabled,
 		!cpus_have_group0);
 }
-- 
2.33.0

Re: [PATCH] irqchip/gic-v3: Fix GICD_CTLR register naming

[Marc Zyngier]

On Wed, 09 Jul 2025 14:00:46 +0100,
Zenghui Yu <yuzenghui@huawei.com> wrote:
> 
> It was incorrectly named as GICD_CTRL in a pr_info() and comments. Fix
> them.
> 
> Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
> ---
>  drivers/irqchip/irq-gic-v3.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
> index efc791c43d44..dbeb85677b08 100644
> --- a/drivers/irqchip/irq-gic-v3.c
> +++ b/drivers/irqchip/irq-gic-v3.c
> @@ -190,12 +190,12 @@ static void __init gic_prio_init(void)
>  
>  	/*
>  	 * How priority values are used by the GIC depends on two things:
> -	 * the security state of the GIC (controlled by the GICD_CTRL.DS bit)
> +	 * the security state of the GIC (controlled by the GICD_CTLR.DS bit)
>  	 * and if Group 0 interrupts can be delivered to Linux in the non-secure
>  	 * world as FIQs (controlled by the SCR_EL3.FIQ bit). These affect the
>  	 * way priorities are presented in ICC_PMR_EL1 and in the distributor:
>  	 *
> -	 * GICD_CTRL.DS | SCR_EL3.FIQ | ICC_PMR_EL1 | Distributor
> +	 * GICD_CTLR.DS | SCR_EL3.FIQ | ICC_PMR_EL1 | Distributor
>  	 * -------------------------------------------------------
>  	 *      1       |      -      |  unchanged  |  unchanged
>  	 * -------------------------------------------------------
> @@ -223,7 +223,7 @@ static void __init gic_prio_init(void)
>  		dist_prio_nmi = __gicv3_prio_to_ns(dist_prio_nmi);
>  	}
>  
> -	pr_info("GICD_CTRL.DS=%d, SCR_EL3.FIQ=%d\n",
> +	pr_info("GICD_CTLR.DS=%d, SCR_EL3.FIQ=%d\n",
>  		cpus_have_security_disabled,
>  		!cpus_have_group0);
>  }

Hey, even people at ARM have made the same creative typo[1]!

Acked-by: Marc Zyngier <maz@kernel.org>

Thanks,

	M.

[1] https://developer.arm.com/documentation/198123/0302/Appendix--Legacy-operation

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

[tip: irq/drivers] irqchip/gic-v3: Fix GICD_CTLR register naming

[tip-bot2 for Zenghui Yu]

The following commit has been merged into the irq/drivers branch of tip:

Commit-ID:     97c03ec2c0e0621bbd7a56f5be19bd2de552e6f4
Gitweb:        https://git.kernel.org/tip/97c03ec2c0e0621bbd7a56f5be19bd2de552e6f4
Author:        Zenghui Yu <yuzenghui@huawei.com>
AuthorDate:    Wed, 09 Jul 2025 21:00:46 +08:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 18 Jul 2025 14:56:39 +02:00

irqchip/gic-v3: Fix GICD_CTLR register naming

It was incorrectly named as GICD_CTRL in a pr_info() and comments. Fix
them.

Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/all/20250709130046.1354-1-yuzenghui@huawei.com

---
 drivers/irqchip/irq-gic-v3.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index efc791c..dbeb856 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -190,12 +190,12 @@ static void __init gic_prio_init(void)
 
 	/*
 	 * How priority values are used by the GIC depends on two things:
-	 * the security state of the GIC (controlled by the GICD_CTRL.DS bit)
+	 * the security state of the GIC (controlled by the GICD_CTLR.DS bit)
 	 * and if Group 0 interrupts can be delivered to Linux in the non-secure
 	 * world as FIQs (controlled by the SCR_EL3.FIQ bit). These affect the
 	 * way priorities are presented in ICC_PMR_EL1 and in the distributor:
 	 *
-	 * GICD_CTRL.DS | SCR_EL3.FIQ | ICC_PMR_EL1 | Distributor
+	 * GICD_CTLR.DS | SCR_EL3.FIQ | ICC_PMR_EL1 | Distributor
 	 * -------------------------------------------------------
 	 *      1       |      -      |  unchanged  |  unchanged
 	 * -------------------------------------------------------
@@ -223,7 +223,7 @@ static void __init gic_prio_init(void)
 		dist_prio_nmi = __gicv3_prio_to_ns(dist_prio_nmi);
 	}
 
-	pr_info("GICD_CTRL.DS=%d, SCR_EL3.FIQ=%d\n",
+	pr_info("GICD_CTLR.DS=%d, SCR_EL3.FIQ=%d\n",
 		cpus_have_security_disabled,
 		!cpus_have_group0);
 }