irqchip/irq-realtek-rtl: change to readl_be and writel_be
PATCH v3 1/1 irqchip/irq-realtek-rtl: change to readl_be and writel_be
When CONFIG_SWAP_IO_SPACE is enabled, readl() is changed to perform a swap from little endian device to big endian CPU and vice versa for writel(). This is incorrect because the Realtek Interrupt controller is a big endian device and so the LE to BE conversions are unwanted.
Fix this by converting the MMIO accesses to readl_be() and writel_be().
---
Changes in v3:
- Make the commit message more sensible, hopefully.
- Change the __raw variants to readl_be and writel_be.
- Add the note in the driver that the controller is big endian.
Changes in v2:
- Make the commit message clearer.
drivers/irqchip/irq-realtek-rtl.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/irqchip/irq-realtek-rtl.c +13 -7
@@ -1,5 +1,10 @@// SPDX-License-Identifier: GPL-2.0-only /* +* Realtek Interrupt controller. +* +* The Realtek Interrupt controller is a big endian device found in the +* Realtek MIPS SoCs. +* * Copyright (C) 2020 Birger Koblitz <[email protected]> * Copyright (C) 2020 Bert Vermeulen <[email protected]> * Copyright (C) 2020 John Crispin <[email protected]>
@@ -50,18 +55,18 @@ static inline void enable_gimr(unsigned int cpu, unsigned int hw_irq) {u32 gimr; - gimr =readl (REG (cpu,RTL_ICTL_GIMR )); + gimr =readl_be (REG (cpu,RTL_ICTL_GIMR )); gimr |=BIT (hw_irq); -writel (gimr,REG (cpu,RTL_ICTL_GIMR )); +writel_be (gimr,REG (cpu,RTL_ICTL_GIMR )); }static inline void disable_gimr (unsigned int cpu,unsigned int hw_irq) {u32 gimr; - gimr =readl (REG (cpu,RTL_ICTL_GIMR )); + gimr =readl_be (REG (cpu,RTL_ICTL_GIMR )); gimr &= ~BIT (hw_irq); -writel (gimr,REG (cpu,RTL_ICTL_GIMR )); +writel_be (gimr,REG (cpu,RTL_ICTL_GIMR )); }static void write_irr (unsigned int cpu,int hw_irq,u32 value)
@@ -71,9 +76,9 @@ static void write_irr(unsigned int cpu, int hw_irq, u32 value)unsigned int shift =IRR_SHIFT (hw_irq);u32 irr; - irr =readl (irr0 + offset) & ~(0xf << shift); + irr =readl_be (irr0 + offset) & ~(0xf << shift); irr |= (value &0xf ) << shift; -writel (irr, irr0 + offset); +writel_be (irr, irr0 + offset); }static void realtek_ictl_unmask_irq (struct irq_data *i)
@@ -159,7 +164,8 @@ static void realtek_irq_dispatch(struct irq_desc *desc)unsigned int hw_irq;chained_irq_enter (chip, desc); - pending =readl (REG (cpu,RTL_ICTL_GIMR )) &readl (REG (cpu,RTL_ICTL_GISR )) & output->mask; + pending =readl_be (REG (cpu,RTL_ICTL_GIMR )) & +readl_be (REG (cpu,RTL_ICTL_GISR )) & output->mask;if (unlikely (!pending)) {spurious_interrupt ();
Signature · 1 line
2.55.0
[tip: irq/urgent] irqchip/irq-realtek-rtl: Use readl_be()/writel_be() instead of readl()/writel()
The following commit has been merged into the irq/urgent branch of tip:
The following commit has been merged into the irq/urgent branch of tip:
Commit-ID: 58b34b72b64bfbfc5f8ad4d8f229942aff76597e Gitweb: https://git.kernel.org/tip/58b34b72b64bfbfc5f8ad4d8f229942aff76597e Author: Rustam Adilov <[email protected]> AuthorDate: Thu, 20 Aug 2026 21:20:17 +05:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Thu, 20 Aug 2026 18:34:59 +02:00
irqchip/irq-realtek-rtl: Use readl_be()/writel_be() instead of readl()/writel()
When CONFIG_SWAP_IO_SPACE is enabled, readl() performs a swap from little endian device to big endian CPU and vice versa for writel().
This is incorrect for Realtek Interrupt controller as that is a big endian device and so the LE to BE conversions are unwanted.
Fix this by converting the MMIO accesses to readl_be() and writel_be().
--- drivers/irqchip/irq-realtek-rtl.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/irqchip/irq-realtek-rtl.c +13 -7
@@ -1,5 +1,10 @@// SPDX-License-Identifier: GPL-2.0-only /* +* Realtek Interrupt controller. +* +* The Realtek Interrupt controller is a big endian device found in the +* Realtek MIPS SoCs. +* * Copyright (C) 2020 Birger Koblitz <[email protected]> * Copyright (C) 2020 Bert Vermeulen <[email protected]> * Copyright (C) 2020 John Crispin <[email protected]>
@@ -50,18 +55,18 @@ static inline void enable_gimr(unsigned int cpu, unsigned int hw_irq) {u32 gimr; - gimr =readl (REG (cpu,RTL_ICTL_GIMR )); + gimr =readl_be (REG (cpu,RTL_ICTL_GIMR )); gimr |=BIT (hw_irq); -writel (gimr,REG (cpu,RTL_ICTL_GIMR )); +writel_be (gimr,REG (cpu,RTL_ICTL_GIMR )); }static inline void disable_gimr (unsigned int cpu,unsigned int hw_irq) {u32 gimr; - gimr =readl (REG (cpu,RTL_ICTL_GIMR )); + gimr =readl_be (REG (cpu,RTL_ICTL_GIMR )); gimr &= ~BIT (hw_irq); -writel (gimr,REG (cpu,RTL_ICTL_GIMR )); +writel_be (gimr,REG (cpu,RTL_ICTL_GIMR )); }static void write_irr (unsigned int cpu,int hw_irq,u32 value)
@@ -71,9 +76,9 @@ static void write_irr(unsigned int cpu, int hw_irq, u32 value)unsigned int shift =IRR_SHIFT (hw_irq);u32 irr; - irr =readl (irr0 + offset) & ~(0xf << shift); + irr =readl_be (irr0 + offset) & ~(0xf << shift); irr |= (value &0xf ) << shift; -writel (irr, irr0 + offset); +writel_be (irr, irr0 + offset); }static void realtek_ictl_unmask_irq (struct irq_data *i)
@@ -159,7 +164,8 @@ static void realtek_irq_dispatch(struct irq_desc *desc)unsigned int hw_irq;chained_irq_enter (chip, desc); - pending =readl (REG (cpu,RTL_ICTL_GIMR )) &readl (REG (cpu,RTL_ICTL_GISR )) & output->mask; + pending =readl_be (REG (cpu,RTL_ICTL_GIMR )) & +readl_be (REG (cpu,RTL_ICTL_GISR )) & output->mask;if (unlikely (!pending)) {spurious_interrupt ();