pinctrl: intel: refine ->irq_set_type() hook
Subsystems (3)
PATCH v4 1/1 pinctrl: intel: refine ->irq_set_type() hook
Refine ->irq_set_type() hook and improve its readability by:
- Reducing scope of spinlock by moving unneeded operations out of it.
- Dropping redundant PADCFG0_RXEVCFG_SHIFT and including it directly into PADCFG0_RXEVCFG_* definitions.
- Utilizing temporary variables for common operations.
- Simplifying if-else-if chain.
--- drivers/pinctrl/intel/pinctrl-intel.c | 45 ++++++++++++++------------- 1 file changed, 24 insertions(+), 21 deletions(-)
drivers/pinctrl/intel/pinctrl-intel.c +24 -21
@@ -55,12 +55,11 @@/* Offset from pad_regs */ #define PADCFG0 0x000 -#define PADCFG0_RXEVCFG_SHIFT 25#define PADCFG0_RXEVCFG_MASK GENMASK(26, 25) -#define PADCFG0_RXEVCFG_LEVEL 0 -#define PADCFG0_RXEVCFG_EDGE 1 -#define PADCFG0_RXEVCFG_DISABLED 2 -#define PADCFG0_RXEVCFG_EDGE_BOTH 3 +#define PADCFG0_RXEVCFG_LEVEL (0 << 25) +#define PADCFG0_RXEVCFG_EDGE (1 << 25) +#define PADCFG0_RXEVCFG_DISABLED (2 << 25) +#define PADCFG0_RXEVCFG_EDGE_BOTH (3 << 25)#define PADCFG0_PREGFRXSEL BIT(24)#define PADCFG0_RXINV BIT(23)#define PADCFG0_GPIROUTIOXAPIC BIT(20)
@@ -1127,9 +1126,9 @@ static int intel_gpio_irq_type(struct irq_data *d, unsigned int type)struct gpio_chip *gc =irq_data_get_irq_chip_data (d);struct intel_pinctrl *pctrl =gpiochip_get_data (gc);unsigned int pin =intel_gpio_to_pin (pctrl,irqd_to_hwirq (d),NULL ,NULL ); +u32 rxevcfg, rxinv, value;unsigned long flags;void __iomem *reg; -u32 value; reg =intel_get_padcfg (pctrl, pin,PADCFG0 );if (!reg)
@@ -1145,28 +1144,32 @@ static int intel_gpio_irq_type(struct irq_data *d, unsigned int type)return -EPERM ; } -raw_spin_lock_irqsave (&pctrl->lock, flags); - -intel_gpio_set_gpio_mode (reg); - - value =readl (reg); - - value &= ~(PADCFG0_RXEVCFG_MASK |PADCFG0_RXINV ); -if ((type &IRQ_TYPE_EDGE_BOTH ) ==IRQ_TYPE_EDGE_BOTH ) { - value |=PADCFG0_RXEVCFG_EDGE_BOTH <<PADCFG0_RXEVCFG_SHIFT ; + rxevcfg =PADCFG0_RXEVCFG_EDGE_BOTH ; }else if (type &IRQ_TYPE_EDGE_FALLING ) { - value |=PADCFG0_RXEVCFG_EDGE <<PADCFG0_RXEVCFG_SHIFT ; - value |=PADCFG0_RXINV ; + rxevcfg =PADCFG0_RXEVCFG_EDGE ; }else if (type &IRQ_TYPE_EDGE_RISING ) { - value |=PADCFG0_RXEVCFG_EDGE <<PADCFG0_RXEVCFG_SHIFT ; + rxevcfg =PADCFG0_RXEVCFG_EDGE ; }else if (type &IRQ_TYPE_LEVEL_MASK ) { -if (type &IRQ_TYPE_LEVEL_LOW ) - value |=PADCFG0_RXINV ; + rxevcfg =PADCFG0_RXEVCFG_LEVEL ; }else { - value |=PADCFG0_RXEVCFG_DISABLED <<PADCFG0_RXEVCFG_SHIFT ; + rxevcfg =PADCFG0_RXEVCFG_DISABLED ; } +if (type ==IRQ_TYPE_EDGE_FALLING || type ==IRQ_TYPE_LEVEL_LOW ) + rxinv =PADCFG0_RXINV ; +else + rxinv =0 ; + +raw_spin_lock_irqsave (&pctrl->lock, flags); + +intel_gpio_set_gpio_mode (reg); + + value =readl (reg); + + value = (value & ~PADCFG0_RXINV ) | rxinv; + value = (value & ~PADCFG0_RXEVCFG_MASK ) | rxevcfg; +writel (value, reg);if (type &IRQ_TYPE_EDGE_BOTH )
base-commit: e95433c367e681dc6d4613706bd74f483a25acd8
Signature · 1 line
2.17.1
Quoted 7 lines · Raag Jadav
Refine ->irq_set_type() hook and improve its readability by:
- Reducing scope of spinlock by moving unneeded operations out of it.
- Dropping redundantPADCFG0_RXEVCFG_SHIFTand including it directly into PADCFG0_RXEVCFG_* definitions.
- Utilizing temporary variables for common operations.
- Simplifying if-else-if chain.
Two questions out of curiosity.
Do we gain or lose bytes with this?
Quoted 71 lines
Signed-off-by Raag Jadav <[email protected]>--- drivers/pinctrl/intel/pinctrl-intel.c | 45 ++++++++++++++------------- 1 file changed, 24 insertions(+), 21 deletions(-)drivers/pinctrl/intel/pinctrl-intel.c +13
-21@@ -55,12 +55,11 @@/* Offset from pad_regs */ #define PADCFG0 0x000 -#define PADCFG0_RXEVCFG_SHIFT 25#define PADCFG0_RXEVCFG_MASK GENMASK(26, 25) -#define PADCFG0_RXEVCFG_LEVEL 0 -#define PADCFG0_RXEVCFG_EDGE 1 -#define PADCFG0_RXEVCFG_DISABLED 2 -#define PADCFG0_RXEVCFG_EDGE_BOTH 3 +#define PADCFG0_RXEVCFG_LEVEL (0 << 25) +#define PADCFG0_RXEVCFG_EDGE (1 << 25) +#define PADCFG0_RXEVCFG_DISABLED (2 << 25) +#define PADCFG0_RXEVCFG_EDGE_BOTH (3 << 25)#define PADCFG0_PREGFRXSEL BIT(24)#define PADCFG0_RXINV BIT(23)#define PADCFG0_GPIROUTIOXAPIC BIT(20)@@ -1127,9 +1126,9 @@ static int intel_gpio_irq_type(struct irq_data *d, unsigned int type)struct gpio_chip *gc =irq_data_get_irq_chip_data (d);struct intel_pinctrl *pctrl =gpiochip_get_data (gc);unsigned int pin =intel_gpio_to_pin (pctrl,irqd_to_hwirq (d),NULL ,NULL ); +u32 rxevcfg, rxinv, value;unsigned long flags;void __iomem *reg; -u32 value; reg =intel_get_padcfg (pctrl, pin,PADCFG0 );if (!reg)@@ -1145,28 +1144,32 @@ static int intel_gpio_irq_type(struct irq_data *d, unsigned int type)return -EPERM ; } -raw_spin_lock_irqsave (&pctrl->lock, flags); - -intel_gpio_set_gpio_mode (reg); - - value =readl (reg); - - value &= ~(PADCFG0_RXEVCFG_MASK |PADCFG0_RXINV ); -if ((type &IRQ_TYPE_EDGE_BOTH ) ==IRQ_TYPE_EDGE_BOTH ) { - value |=PADCFG0_RXEVCFG_EDGE_BOTH <<PADCFG0_RXEVCFG_SHIFT ; + rxevcfg =PADCFG0_RXEVCFG_EDGE_BOTH ; }else if (type &IRQ_TYPE_EDGE_FALLING ) { - value |=PADCFG0_RXEVCFG_EDGE <<PADCFG0_RXEVCFG_SHIFT ; - value |=PADCFG0_RXINV ; + rxevcfg =PADCFG0_RXEVCFG_EDGE ; }else if (type &IRQ_TYPE_EDGE_RISING ) { - value |=PADCFG0_RXEVCFG_EDGE <<PADCFG0_RXEVCFG_SHIFT ; + rxevcfg =PADCFG0_RXEVCFG_EDGE ; }else if (type &IRQ_TYPE_LEVEL_MASK ) { -if (type &IRQ_TYPE_LEVEL_LOW ) - value |=PADCFG0_RXINV ; + rxevcfg =PADCFG0_RXEVCFG_LEVEL ; }else { - value |=PADCFG0_RXEVCFG_DISABLED <<PADCFG0_RXEVCFG_SHIFT ; + rxevcfg =PADCFG0_RXEVCFG_DISABLED ; } +if (type ==IRQ_TYPE_EDGE_FALLING || type ==IRQ_TYPE_LEVEL_LOW ) + rxinv =PADCFG0_RXINV ; +else
drivers/pinctrl/intel/pinctrl-intel.c static int intel_gpio_irq_type(struct irq_data *d, unsigned int type) · line 1171
Quoted 10 lines
drivers/pinctrl/intel/pinctrl-intel.c +9
-0+ rxinv =0 ; + +raw_spin_lock_irqsave (&pctrl->lock, flags); + +intel_gpio_set_gpio_mode (reg); + + value =readl (reg); + value = (value & ~PADCFG0_RXINV ) | rxinv; + value = (value & ~PADCFG0_RXEVCFG_MASK ) | rxevcfg;
Same question if we change this to be similar to the current code, i.e.
value = readl(reg); value &= ~(PADCFG0_RXEVCFG_MASK | PADCFG0_RXINV); value |= rxevcfg; value |= rxinv;
And I would keep blank lines after readl() and before writel() since we have more than a single line in between.
Quoted 8 lines
drivers/pinctrl/intel/pinctrl-intel.c +0
-0writel (value, reg);if (type &IRQ_TYPE_EDGE_BOTH )base-commit:
e95433c367e681dc6d4613706bd74f483a25acd8Signature · 1 line
2.17.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 11 lines · Raag Jadav
Quoted 7 lines
Refine ->irq_set_type() hook and improve its readability by:
- Reducing scope of spinlock by moving unneeded operations out of it.
- Dropping redundantPADCFG0_RXEVCFG_SHIFTand including it directly into PADCFG0_RXEVCFG_* definitions.
- Utilizing temporary variables for common operations.
- Simplifying if-else-if chain.Two questions out of curiosity.
Do we gain or lose bytes with this?
add/remove: 0/0 grow/shrink: 1/0 up/down: 33/0 (33)
Function old new delta intel_gpio_irq_type 317 350 +33
Total: Before=10469, After=10502, chg +0.32%
Quoted 7 lines
drivers/pinctrl/intel/pinctrl-intel.c static int intel_gpio_irq_type(struct irq_data *d, unsigned int type) · line 1171
Quoted 4 lines
drivers/pinctrl/intel/pinctrl-intel.c +3
-0+ value =readl (reg); + value = (value & ~PADCFG0_RXINV ) | rxinv; + value = (value & ~PADCFG0_RXEVCFG_MASK ) | rxevcfg;Same question if we change this to be similar to the current code, i.e.
Quoted 8 lines
value = readl(reg); value &= ~(PADCFG0_RXEVCFG_MASK | PADCFG0_RXINV); value |= rxevcfg; value |= rxinv;And I would keep blank lines after
readl()and beforewritel()since we have more than a single line in between.
add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-9 (-9)
Function old new delta intel_gpio_irq_type 317 308 -9
Total: Before=10469, After=10460, chg -0.09%
Quoted 30 lines · Raag
Quoted 11 lines · Raag Jadav
Quoted 7 lines
Refine ->irq_set_type() hook and improve its readability by:
- Reducing scope of spinlock by moving unneeded operations out of it.
- Dropping redundantPADCFG0_RXEVCFG_SHIFTand including it directly into PADCFG0_RXEVCFG_* definitions.
- Utilizing temporary variables for common operations.
- Simplifying if-else-if chain.Two questions out of curiosity.
Do we gain or lose bytes with this?add/remove: 0/0 grow/shrink: 1/0 up/down: 33/0 (33)
Function old new delta intel_gpio_irq_type 317 350 +33Total: Before=10469, After=10502, chg +0.32%
Quoted 13 lines
drivers/pinctrl/intel/pinctrl-intel.c static int intel_gpio_irq_type(struct irq_data *d, unsigned int type) · line 1171
Quoted 4 lines
drivers/pinctrl/intel/pinctrl-intel.c +3
-0+ value =readl (reg); + value = (value & ~PADCFG0_RXINV ) | rxinv; + value = (value & ~PADCFG0_RXEVCFG_MASK ) | rxevcfg;Same question if we change this to be similar to the current code, i.e.
value = readl(reg); value &= ~(PADCFG0_RXEVCFG_MASK | PADCFG0_RXINV); value |= rxevcfg; value |= rxinv;
Quoted 7 lines
Quoted 2 lines
And I would keep blank lines after
readl()and beforewritel()since we have more than a single line in between.add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-9 (-9)
Function old new delta intel_gpio_irq_type 317 308 -9Total: Before=10469, After=10460, chg -0.09%
Do I understand correctly that this is your patch + suggested above?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 35 lines · Raag
Quoted 5 lines
Quoted 5 lines · Raag Jadav
Quoted 4 lines
Refine ->irq_set_type() hook and improve its readability by:
- Reducing scope of spinlock by moving unneeded operations out of it.
- Dropping redundantPADCFG0_RXEVCFG_SHIFTand including itdirectly
Quoted 28 lines
Quoted 6 lines
Quoted 3 lines
into PADCFG0_RXEVCFG_* definitions.
- Utilizing temporary variables for common operations.
- Simplifying if-else-if chain.Two questions out of curiosity.
Do we gain or lose bytes with this?add/remove: 0/0 grow/shrink: 1/0 up/down: 33/0 (33)
Function old new delta intel_gpio_irq_type 317 350 +33Total: Before=10469, After=10502, chg +0.32%
Quoted 15 lines
drivers/pinctrl/intel/pinctrl-intel.c static int intel_gpio_irq_type(struct irq_data *d, unsigned int type) · line 1171
Quoted 4 lines
drivers/pinctrl/intel/pinctrl-intel.c +3
-0+ value =readl (reg); + value = (value & ~PADCFG0_RXINV ) | rxinv; + value = (value & ~PADCFG0_RXEVCFG_MASK ) | rxevcfg;Same question if we change this to be similar to the current code, i.e.
value = readl(reg); value &= ~(PADCFG0_RXEVCFG_MASK | PADCFG0_RXINV); value |= rxevcfg; value |= rxinv;And I would keep blank lines after
readl()and beforewritel()since we have more than a single line in between.
Quoted 6 lines
Quoted 4 lines
add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-9 (-9)
Function old new delta intel_gpio_irq_type 317 308 -9Total: Before=10469, After=10460, chg -0.09%
Do I understand correctly that this is your patch + suggested above?
Yes, this is tested with gcc 7.5.0 with default -O2.
I see some reordering in disassembly even with this simple change, and I'm not entirely sure what kind of weird tricks gcc is pulling here.
Quoted 1 line · Raag
Quoted 1 line · Raag
...
Quoted 10 lines
Quoted 6 lines
Quoted 4 lines
add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-9 (-9)
Function old new delta intel_gpio_irq_type 317 308 -9Total: Before=10469, After=10460, chg -0.09%
Do I understand correctly that this is your patch + suggested above?
Yes, this is tested with gcc 7.5.0 with default -O2.
I see some reordering in disassembly even with this simple change, and I'm not entirely sure what kind of weird tricks gcc is pulling here.
For me gcc (Debian 12.2.0-14) 12.2.0 gives the same, +4 bytes. I am going to apply v4 with suggested tweaks.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 7 lines · Raag Jadav
Refine ->irq_set_type() hook and improve its readability by:
- Reducing scope of spinlock by moving unneeded operations out of it.
- Dropping redundantPADCFG0_RXEVCFG_SHIFTand including it directly into PADCFG0_RXEVCFG_* definitions.
- Utilizing temporary variables for common operations.
- Simplifying if-else-if chain.
Pushed to my review and testing queue, thanks!
Signature · 2 lines
With Best Regards, Andy Shevchenko