Skip to contentSkip to conversation

irqchip/irq-realtek-rtl: change to __raw reads and writes

PATCH In review Rustam Adilov 2 participants 3 messages Jul 25 – Aug 20 irqchip drivers

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 irqchip/irq-realtek-rtl: change to __raw reads and writes

When CONFIG_SWAP_IO_SPACE is enabled, readl() and writel() are changed to perform a byte swap to little endian type. This is incorrect because the devices that use the irq-realtek-rtl driver are all big endian MIPS chips.

Fix this by converting the MMIO accesses to __raw_readl() and __raw_writel(), which do not byte swap the data.

---
Changes in v2:
- Make the commit message clearer.

 drivers/irqchip/irq-realtek-rtl.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/irqchip/irq-realtek-rtl.c +8 -7
index 4b59e0cd86bf..3077f4efb4e2 100644
@@ -50,18 +50,18 @@ static inline void enable_gimr(unsigned int cpu, unsigned int hw_irq)
 {
 	u32 gimr;
 
-	gimr = readl(REG(cpu, RTL_ICTL_GIMR));
+	gimr = __raw_readl(REG(cpu, RTL_ICTL_GIMR));
 	gimr |= BIT(hw_irq);
-	writel(gimr, REG(cpu, RTL_ICTL_GIMR));
+	__raw_writel(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 = __raw_readl(REG(cpu, RTL_ICTL_GIMR));
 	gimr &= ~BIT(hw_irq);
-	writel(gimr, REG(cpu, RTL_ICTL_GIMR));
+	__raw_writel(gimr, REG(cpu, RTL_ICTL_GIMR));
 }
 
 static void write_irr(unsigned int cpu, int hw_irq, u32 value)
@@ -71,9 +71,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 = __raw_readl(irr0 + offset) & ~(0xf << shift);
 	irr |= (value & 0xf) << shift;
-	writel(irr, irr0 + offset);
+	__raw_writel(irr, irr0 + offset);
 }
 
 static void realtek_ictl_unmask_irq(struct irq_data *i)
@@ -159,7 +159,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 = __raw_readl(REG(cpu, RTL_ICTL_GIMR)) &
+		  __raw_readl(REG(cpu, RTL_ICTL_GISR)) & output->mask;
 
 	if (unlikely(!pending)) {
 		spurious_interrupt();
Signature · 1 line
2.55.0
maintainer
#1 lore raw
Quoted 4 lines · Rustam Adilov

When CONFIG_SWAP_IO_SPACE is enabled, readl() and writel() are changed to perform a byte swap to little endian type. This is incorrect because the devices that use the irq-realtek-rtl driver are all big endian MIPS chips.

That still does not make sense. With CONFIG_SWAP_IO_SPACE() enabled readl() performs a address swizzle to convert from BE (CPU) to LE (device). readl() swaps the read data from LE (device) to BE (CPU) and writel() the other way round.

You need that change not because your CPU is big endian. You need it because the device is BE, so you don't want to have the LE -> BE conversion, right?

Btw, please use readl_be() and writel_be() as those are the proper generic interfaces for this.

And please put a comment into the driver explaining that the device is BE.

#2 lore raw
Quoted 6 lines · Thomas Gleixner
Quoted 4 lines · Rustam Adilov

When CONFIG_SWAP_IO_SPACE is enabled, readl() and writel() are changed to perform a byte swap to little endian type. This is incorrect because the devices that use the irq-realtek-rtl driver are all big endian MIPS chips.

Quoted 8 lines

That still does not make sense. With CONFIG_SWAP_IO_SPACE() enabled readl() performs a address swizzle to convert from BE (CPU) to LE (device). readl() swaps the read data from LE (device) to BE (CPU) and writel() the other way round.

You need that change not because your CPU is big endian. You need it because the device is BE, so you don't want to have the LE -> BE conversion, right?

Right, yes. Still getting the grasp of the SWAP_IO_SPACE it seems.

Quoted 5 lines

Btw, please use readl_be() and writel_be() as those are the proper generic interfaces for this.

And please put a comment into the driver explaining that the device is BE.

Okay, will do that in the next version.

Best,
Rustam