Skip to contentSkip to conversation

gpio: pmic-eic-sprd: Modification of UNISOC Platform PMIC EIC Driver

PATCH Superseded Wenhua Lin 6 participants 12 messages Sep 21, 2023 – Jan 2, 2024

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Wenhua Lin

author
#0 lore raw

v2 cover gpio: pmic-eic-sprd: Modification of UNISOC Platform PMIC EIC Driver

Recently, some bugs have been discovered during use, and patch1 and patch2 are bug fixes.

Change in V2:
-Change commit message and title in PATCH 1/2.
-PATCH 2/2 add can_sleep flag for PMIC EIC chip
split into a separate patch in PATCH 1/2.
-Delete the modification of IRQF_TRIGGER_LOW.

Wenhua Lin (2):
gpio: pmic-eic-sprd: Two-dimensional arrays maintain pmic eic
gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip

 drivers/gpio/gpio-pmic-eic-sprd.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v2 1/2 gpio: pmic-eic-sprd: Two-dimensional arrays maintain pmic eic

A bank PMIC EIC contains 16 EICs, and the operating registers are BIT0-BIT15, such as BIT0 of the register operated by EIC0. Using the one-dimensional array reg[CACHE_NR_REGS] for maintenance will cause the configuration of other EICs to be affected when operating a certain EIC. In order to solve this problem, the register operation bits of each PMIC EIC are maintained through the two-dimensional array reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS] to avoid mutual interference.

---
 drivers/gpio/gpio-pmic-eic-sprd.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/gpio/gpio-pmic-eic-sprd.c +11 -10
index c3e4d90f6b18..442968bb2490 100644
@@ -57,7 +57,7 @@ struct sprd_pmic_eic {
 	struct gpio_chip chip;
 	struct regmap *map;
 	u32 offset;
-	u8 reg[CACHE_NR_REGS];
+	u8 reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS];
 	struct mutex buslock;
 	int irq;
 };
@@ -151,8 +151,8 @@ static void sprd_pmic_eic_irq_mask(struct irq_data *data)
 	struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
 	u32 offset = irqd_to_hwirq(data);
 
-	pmic_eic->reg[REG_IE] = 0;
-	pmic_eic->reg[REG_TRIG] = 0;
+	pmic_eic->reg[offset][REG_IE] = 0;
+	pmic_eic->reg[offset][REG_TRIG] = 0;
 
 	gpiochip_disable_irq(chip, offset);
 }
@@ -165,8 +165,8 @@ static void sprd_pmic_eic_irq_unmask(struct irq_data *data)
 
 	gpiochip_enable_irq(chip, offset);
 
-	pmic_eic->reg[REG_IE] = 1;
-	pmic_eic->reg[REG_TRIG] = 1;
+	pmic_eic->reg[offset][REG_IE] = 1;
+	pmic_eic->reg[offset][REG_TRIG] = 1;
 }
 
 static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
@@ -174,13 +174,14 @@ static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
 {
 	struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
 	struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
+	u32 offset = irqd_to_hwirq(data);
 
 	switch (flow_type) {
 	case IRQ_TYPE_LEVEL_HIGH:
-		pmic_eic->reg[REG_IEV] = 1;
+		pmic_eic->reg[offset][REG_IEV] = 1;
 		break;
 	case IRQ_TYPE_LEVEL_LOW:
-		pmic_eic->reg[REG_IEV] = 0;
+		pmic_eic->reg[offset][REG_IEV] = 0;
 		break;
 	case IRQ_TYPE_EDGE_RISING:
 	case IRQ_TYPE_EDGE_FALLING:
@@ -222,15 +223,15 @@ static void sprd_pmic_eic_bus_sync_unlock(struct irq_data *data)
 			sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV, 1);
 	} else {
 		sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV,
-				     pmic_eic->reg[REG_IEV]);
+				     pmic_eic->reg[offset][REG_IEV]);
 	}
 
 	/* Set irq unmask */
 	sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IE,
-			     pmic_eic->reg[REG_IE]);
+			     pmic_eic->reg[offset][REG_IE]);
 	/* Generate trigger start pulse for debounce EIC */
 	sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_TRIG,
-			     pmic_eic->reg[REG_TRIG]);
+			     pmic_eic->reg[offset][REG_TRIG]);
 
 	mutex_unlock(&pmic_eic->buslock);
 }
Signature · 1 line
2.17.1
#2 lore raw

Re: [PATCH V2 1/2] gpio: pmic-eic-sprd: Two-dimensional arrays maintain pmic eic

Quoted 86 lines · Wenhua Lin

A bank PMIC EIC contains 16 EICs, and the operating registers are BIT0-BIT15, such as BIT0 of the register operated by EIC0. Using the one-dimensional array reg[CACHE_NR_REGS] for maintenance will cause the configuration of other EICs to be affected when operating a certain EIC. In order to solve this problem, the register operation bits of each PMIC EIC are maintained through the two-dimensional array reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS] to avoid mutual interference.

---
 drivers/gpio/gpio-pmic-eic-sprd.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/gpio/gpio-pmic-eic-sprd.c +11 -11
index c3e4d90f6b18..442968bb2490 100644
@@ -57,7 +57,7 @@ struct sprd_pmic_eic {
        struct gpio_chip chip;
        struct regmap *map;
        u32 offset;
-       u8 reg[CACHE_NR_REGS];
+       u8 reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS];
        struct mutex buslock;
        int irq;
 };
@@ -151,8 +151,8 @@ static void sprd_pmic_eic_irq_mask(struct irq_data *data)
        struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
        u32 offset = irqd_to_hwirq(data);
 
-       pmic_eic->reg[REG_IE] = 0;
-       pmic_eic->reg[REG_TRIG] = 0;
+       pmic_eic->reg[offset][REG_IE] = 0;
+       pmic_eic->reg[offset][REG_TRIG] = 0;
 
        gpiochip_disable_irq(chip, offset);
 }
@@ -165,8 +165,8 @@ static void sprd_pmic_eic_irq_unmask(struct irq_data *data)
 
        gpiochip_enable_irq(chip, offset);
 
-       pmic_eic->reg[REG_IE] = 1;
-       pmic_eic->reg[REG_TRIG] = 1;
+       pmic_eic->reg[offset][REG_IE] = 1;
+       pmic_eic->reg[offset][REG_TRIG] = 1;
 }
 
 static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
@@ -174,13 +174,14 @@ static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
 {
        struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
        struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
+       u32 offset = irqd_to_hwirq(data);
 
        switch (flow_type) {
        case IRQ_TYPE_LEVEL_HIGH:
-               pmic_eic->reg[REG_IEV] = 1;
+               pmic_eic->reg[offset][REG_IEV] = 1;
                break;
        case IRQ_TYPE_LEVEL_LOW:
-               pmic_eic->reg[REG_IEV] = 0;
+               pmic_eic->reg[offset][REG_IEV] = 0;
                break;
        case IRQ_TYPE_EDGE_RISING:
        case IRQ_TYPE_EDGE_FALLING:
@@ -222,15 +223,15 @@ static void sprd_pmic_eic_bus_sync_unlock(struct irq_data *data)
                        sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV, 1);
        } else {
                sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV,
-                                    pmic_eic->reg[REG_IEV]);
+                                    pmic_eic->reg[offset][REG_IEV]);
        }
 
        /* Set irq unmask */
        sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IE,
-                            pmic_eic->reg[REG_IE]);
+                            pmic_eic->reg[offset][REG_IE]);
        /* Generate trigger start pulse for debounce EIC */
        sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_TRIG,
-                            pmic_eic->reg[REG_TRIG]);
+                            pmic_eic->reg[offset][REG_TRIG]);
 
        mutex_unlock(&pmic_eic->buslock);
 }
--
Quoted 2 lines

2.17.1

This looks good to me but I want to let the SPRD maintainers review/test it before applying.

Bart

Reviewed-by on v2 1/2
#3 lore raw

Re: [PATCH V2 1/2] gpio: pmic-eic-sprd: Two-dimensional arrays maintain pmic eic

In reply to Wenhua Lin
Quoted 7 lines · Wenhua Lin

A bank PMIC EIC contains 16 EICs, and the operating registers are BIT0-BIT15, such as BIT0 of the register operated by EIC0. Using the one-dimensional array reg[CACHE_NR_REGS] for maintenance will cause the configuration of other EICs to be affected when operating a certain EIC. In order to solve this problem, the register operation bits of each PMIC EIC are maintained through the two-dimensional array reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS] to avoid mutual interference.

LGTM. And this also deserves a Fixes tag.

Quoted 76 lines
---
  drivers/gpio/gpio-pmic-eic-sprd.c | 21 +++++++++++----------
  1 file changed, 11 insertions(+), 10 deletions(-)
drivers/gpio/gpio-pmic-eic-sprd.c +11 -10
index c3e4d90f6b18..442968bb2490 100644
@@ -57,7 +57,7 @@ struct sprd_pmic_eic {
  	struct gpio_chip chip;
  	struct regmap *map;
  	u32 offset;
-	u8 reg[CACHE_NR_REGS];
+	u8 reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS];
  	struct mutex buslock;
  	int irq;
  };
@@ -151,8 +151,8 @@ static void sprd_pmic_eic_irq_mask(struct irq_data *data)
  	struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
  	u32 offset = irqd_to_hwirq(data);
 
-	pmic_eic->reg[REG_IE] = 0;
-	pmic_eic->reg[REG_TRIG] = 0;
+	pmic_eic->reg[offset][REG_IE] = 0;
+	pmic_eic->reg[offset][REG_TRIG] = 0;
 
  	gpiochip_disable_irq(chip, offset);
  }
@@ -165,8 +165,8 @@ static void sprd_pmic_eic_irq_unmask(struct irq_data *data)
 
  	gpiochip_enable_irq(chip, offset);
 
-	pmic_eic->reg[REG_IE] = 1;
-	pmic_eic->reg[REG_TRIG] = 1;
+	pmic_eic->reg[offset][REG_IE] = 1;
+	pmic_eic->reg[offset][REG_TRIG] = 1;
  }
 
  static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
@@ -174,13 +174,14 @@ static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
  {
  	struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
  	struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
+	u32 offset = irqd_to_hwirq(data);
 
  	switch (flow_type) {
  	case IRQ_TYPE_LEVEL_HIGH:
-		pmic_eic->reg[REG_IEV] = 1;
+		pmic_eic->reg[offset][REG_IEV] = 1;
  		break;
  	case IRQ_TYPE_LEVEL_LOW:
-		pmic_eic->reg[REG_IEV] = 0;
+		pmic_eic->reg[offset][REG_IEV] = 0;
  		break;
  	case IRQ_TYPE_EDGE_RISING:
  	case IRQ_TYPE_EDGE_FALLING:
@@ -222,15 +223,15 @@ static void sprd_pmic_eic_bus_sync_unlock(struct irq_data *data)
  			sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV, 1);
  	} else {
  		sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV,
-				     pmic_eic->reg[REG_IEV]);
+				     pmic_eic->reg[offset][REG_IEV]);
  	}
 
  	/* Set irq unmask */
  	sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IE,
-			     pmic_eic->reg[REG_IE]);
+			     pmic_eic->reg[offset][REG_IE]);
  	/* Generate trigger start pulse for debounce EIC */
  	sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_TRIG,
-			     pmic_eic->reg[REG_TRIG]);
+			     pmic_eic->reg[offset][REG_TRIG]);
 
  	mutex_unlock(&pmic_eic->buslock);
  }
reviewer
#4 lore raw

Re: [PATCH V2 1/2] gpio: pmic-eic-sprd: Two-dimensional arrays maintain pmic eic

Quoted 12 lines · Baolin Wang
Quoted 7 lines · Wenhua Lin

A bank PMIC EIC contains 16 EICs, and the operating registers are BIT0-BIT15, such as BIT0 of the register operated by EIC0. Using the one-dimensional array reg[CACHE_NR_REGS] for maintenance will cause the configuration of other EICs to be affected when operating a certain EIC. In order to solve this problem, the register operation bits of each PMIC EIC are maintained through the two-dimensional array reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS] to avoid mutual interference.

Quoted 1 line

LGTM. And this also deserves a Fixes tag.

Do we really need a two-dimensional array to save 16-bit value?

Quoted 78 lines
Quoted 76 lines
---
  drivers/gpio/gpio-pmic-eic-sprd.c | 21 +++++++++++----------
  1 file changed, 11 insertions(+), 10 deletions(-)
drivers/gpio/gpio-pmic-eic-sprd.c +11 -10
index c3e4d90f6b18..442968bb2490 100644
@@ -57,7 +57,7 @@ struct sprd_pmic_eic {
      struct gpio_chip chip;
      struct regmap *map;
      u32 offset;
-     u8 reg[CACHE_NR_REGS];
+     u8 reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS];
      struct mutex buslock;
      int irq;
  };
@@ -151,8 +151,8 @@ static void sprd_pmic_eic_irq_mask(struct irq_data *data)
      struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
      u32 offset = irqd_to_hwirq(data);
 
-     pmic_eic->reg[REG_IE] = 0;
-     pmic_eic->reg[REG_TRIG] = 0;
+     pmic_eic->reg[offset][REG_IE] = 0;
+     pmic_eic->reg[offset][REG_TRIG] = 0;
 
      gpiochip_disable_irq(chip, offset);
  }
@@ -165,8 +165,8 @@ static void sprd_pmic_eic_irq_unmask(struct irq_data *data)
 
      gpiochip_enable_irq(chip, offset);
 
-     pmic_eic->reg[REG_IE] = 1;
-     pmic_eic->reg[REG_TRIG] = 1;
+     pmic_eic->reg[offset][REG_IE] = 1;
+     pmic_eic->reg[offset][REG_TRIG] = 1;
  }
 
  static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
@@ -174,13 +174,14 @@ static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
  {
      struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
      struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
+     u32 offset = irqd_to_hwirq(data);
 
      switch (flow_type) {
      case IRQ_TYPE_LEVEL_HIGH:
-             pmic_eic->reg[REG_IEV] = 1;
+             pmic_eic->reg[offset][REG_IEV] = 1;
              break;
      case IRQ_TYPE_LEVEL_LOW:
-             pmic_eic->reg[REG_IEV] = 0;
+             pmic_eic->reg[offset][REG_IEV] = 0;
              break;
      case IRQ_TYPE_EDGE_RISING:
      case IRQ_TYPE_EDGE_FALLING:
@@ -222,15 +223,15 @@ static void sprd_pmic_eic_bus_sync_unlock(struct irq_data *data)
                      sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV, 1);
      } else {
              sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV,
-                                  pmic_eic->reg[REG_IEV]);
+                                  pmic_eic->reg[offset][REG_IEV]);
      }
 
      /* Set irq unmask */
      sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IE,
-                          pmic_eic->reg[REG_IE]);
+                          pmic_eic->reg[offset][REG_IE]);
      /* Generate trigger start pulse for debounce EIC */
      sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_TRIG,
-                          pmic_eic->reg[REG_TRIG]);
+                          pmic_eic->reg[offset][REG_TRIG]);
 
      mutex_unlock(&pmic_eic->buslock);
  }
#5 lore raw

Re: [PATCH V2 1/2] gpio: pmic-eic-sprd: Two-dimensional arrays maintain pmic eic

Quoted 14 lines · Chunyan Zhang
Quoted 12 lines · Baolin Wang
Quoted 7 lines · Wenhua Lin

A bank PMIC EIC contains 16 EICs, and the operating registers are BIT0-BIT15, such as BIT0 of the register operated by EIC0. Using the one-dimensional array reg[CACHE_NR_REGS] for maintenance will cause the configuration of other EICs to be affected when operating a certain EIC. In order to solve this problem, the register operation bits of each PMIC EIC are maintained through the two-dimensional array reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS] to avoid mutual interference.

Quoted 3 lines
Quoted 1 line

LGTM. And this also deserves a Fixes tag.

Do we really need a two-dimensional array to save 16-bit value?

I also considering this, but after more thinking, I think this patch is a simple fix.

Now I realized the problem is that, if we use one array to cache a bank of EICs' status, the pmic_eic->reg[] array can contain incorrect configuration for other EICs in the same bank.

Yes, we can have another fix, for example, setting the pmic_eic->reg[] to some invalid values (maybe -1) in sprd_pmic_eic_bus_sync_unlock() after setting one EIC. Thus when setting another EIC, we can validate if the cached reg is a valid value, if not, we do not need to set the register. But like I said above, this seems more complicated.

Quoted 78 lines
Quoted 78 lines
Quoted 76 lines
---
   drivers/gpio/gpio-pmic-eic-sprd.c | 21 +++++++++++----------
   1 file changed, 11 insertions(+), 10 deletions(-)
drivers/gpio/gpio-pmic-eic-sprd.c +11 -10
index c3e4d90f6b18..442968bb2490 100644
@@ -57,7 +57,7 @@ struct sprd_pmic_eic {
       struct gpio_chip chip;
       struct regmap *map;
       u32 offset;
-     u8 reg[CACHE_NR_REGS];
+     u8 reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS];
       struct mutex buslock;
       int irq;
   };
@@ -151,8 +151,8 @@ static void sprd_pmic_eic_irq_mask(struct irq_data *data)
       struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
       u32 offset = irqd_to_hwirq(data);
 
-     pmic_eic->reg[REG_IE] = 0;
-     pmic_eic->reg[REG_TRIG] = 0;
+     pmic_eic->reg[offset][REG_IE] = 0;
+     pmic_eic->reg[offset][REG_TRIG] = 0;
 
       gpiochip_disable_irq(chip, offset);
   }
@@ -165,8 +165,8 @@ static void sprd_pmic_eic_irq_unmask(struct irq_data *data)
 
       gpiochip_enable_irq(chip, offset);
 
-     pmic_eic->reg[REG_IE] = 1;
-     pmic_eic->reg[REG_TRIG] = 1;
+     pmic_eic->reg[offset][REG_IE] = 1;
+     pmic_eic->reg[offset][REG_TRIG] = 1;
   }
 
   static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
@@ -174,13 +174,14 @@ static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
   {
       struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
       struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
+     u32 offset = irqd_to_hwirq(data);
 
       switch (flow_type) {
       case IRQ_TYPE_LEVEL_HIGH:
-             pmic_eic->reg[REG_IEV] = 1;
+             pmic_eic->reg[offset][REG_IEV] = 1;
               break;
       case IRQ_TYPE_LEVEL_LOW:
-             pmic_eic->reg[REG_IEV] = 0;
+             pmic_eic->reg[offset][REG_IEV] = 0;
               break;
       case IRQ_TYPE_EDGE_RISING:
       case IRQ_TYPE_EDGE_FALLING:
@@ -222,15 +223,15 @@ static void sprd_pmic_eic_bus_sync_unlock(struct irq_data *data)
                       sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV, 1);
       } else {
               sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV,
-                                  pmic_eic->reg[REG_IEV]);
+                                  pmic_eic->reg[offset][REG_IEV]);
       }
 
       /* Set irq unmask */
       sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IE,
-                          pmic_eic->reg[REG_IE]);
+                          pmic_eic->reg[offset][REG_IE]);
       /* Generate trigger start pulse for debounce EIC */
       sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_TRIG,
-                          pmic_eic->reg[REG_TRIG]);
+                          pmic_eic->reg[offset][REG_TRIG]);
 
       mutex_unlock(&pmic_eic->buslock);
   }
reviewer
#6 lore raw

Re: [PATCH V2 1/2] gpio: pmic-eic-sprd: Two-dimensional arrays maintain pmic eic

In reply to Wenhua Lin
Quoted 28 lines · Wenhua Lin

A bank PMIC EIC contains 16 EICs, and the operating registers are BIT0-BIT15, such as BIT0 of the register operated by EIC0. Using the one-dimensional array reg[CACHE_NR_REGS] for maintenance will cause the configuration of other EICs to be affected when operating a certain EIC. In order to solve this problem, the register operation bits of each PMIC EIC are maintained through the two-dimensional array reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS] to avoid mutual interference.

---
 drivers/gpio/gpio-pmic-eic-sprd.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/gpio/gpio-pmic-eic-sprd.c +1 -1
index c3e4d90f6b18..442968bb2490 100644
@@ -57,7 +57,7 @@ struct sprd_pmic_eic {
        struct gpio_chip chip;
        struct regmap *map;
        u32 offset;
-       u8 reg[CACHE_NR_REGS];
+       u8 reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS];
        struct mutex buslock;
        int irq;
 };

drivers/gpio/gpio-pmic-eic-sprd.c static void sprd_pmic_eic_irq_mask(struct irq_data *data) · line 155

Quoted 7 lines
drivers/gpio/gpio-pmic-eic-sprd.c +2 -2
@@ -151,8 +151,8 @@ static void sprd_pmic_eic_irq_mask(struct irq_data *data)
        struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
        u32 offset = irqd_to_hwirq(data);
 
-       pmic_eic->reg[REG_IE] = 0;
-       pmic_eic->reg[REG_TRIG] = 0;
+       pmic_eic->reg[offset][REG_IE] = 0;
+       pmic_eic->reg[offset][REG_TRIG] = 0;

I would suggest just using this one-dimensional array which is enough for saving 16-bit values.

To solve the issue mentioned in the commit message, we can set/clear the bit according to the value of 'offset', for example:

pmic_eic->reg[REG_IE] &= ~BIT(offset);

drivers/gpio/gpio-pmic-eic-sprd.c static void sprd_pmic_eic_irq_unmask(struct irq_data *data) · line 169

Quoted 11 lines
drivers/gpio/gpio-pmic-eic-sprd.c +2 -2
        gpiochip_disable_irq(chip, offset);
 }
@@ -165,8 +165,8 @@ static void sprd_pmic_eic_irq_unmask(struct irq_data *data)
 
        gpiochip_enable_irq(chip, offset);
 
-       pmic_eic->reg[REG_IE] = 1;
-       pmic_eic->reg[REG_TRIG] = 1;
+       pmic_eic->reg[offset][REG_IE] = 1;
+       pmic_eic->reg[offset][REG_TRIG] = 1;

For setting operations:

pmic_eic->reg[REG_IE] |= BIT(offset);

Quoted 21 lines
drivers/gpio/gpio-pmic-eic-sprd.c +3 -2
 }
 
 static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
@@ -174,13 +174,14 @@ static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
 {
        struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
        struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
+       u32 offset = irqd_to_hwirq(data);
 
        switch (flow_type) {
        case IRQ_TYPE_LEVEL_HIGH:
-               pmic_eic->reg[REG_IEV] = 1;
+               pmic_eic->reg[offset][REG_IEV] = 1;
                break;
        case IRQ_TYPE_LEVEL_LOW:
-               pmic_eic->reg[REG_IEV] = 0;
+               pmic_eic->reg[offset][REG_IEV] = 0;
                break;
        case IRQ_TYPE_EDGE_RISING:
        case IRQ_TYPE_EDGE_FALLING:

drivers/gpio/gpio-pmic-eic-sprd.c static void sprd_pmic_eic_bus_sync_unlock(struct irq_data *data) · line 226

Quoted 5 lines
drivers/gpio/gpio-pmic-eic-sprd.c +1 -1
@@ -222,15 +223,15 @@ static void sprd_pmic_eic_bus_sync_unlock(struct irq_data *data)
                        sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV, 1);
        } else {
                sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV,
-                                    pmic_eic->reg[REG_IEV]);
+                                    pmic_eic->reg[offset][REG_IEV]);

When using the array we can deal with it like below since sprd_pmic_eic_update() would do a shift for the parameter 'val':

(pmic_eic->reg[REG_IEV] & BIT(offset)) ? 1 : 0;

drivers/gpio/gpio-pmic-eic-sprd.c static void sprd_pmic_eic_bus_sync_unlock(struct irq_data *data) · line 234

Quoted 10 lines
drivers/gpio/gpio-pmic-eic-sprd.c +2 -2
        }
 
        /* Set irq unmask */
        sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IE,
-                            pmic_eic->reg[REG_IE]);
+                            pmic_eic->reg[offset][REG_IE]);
        /* Generate trigger start pulse for debounce EIC */
        sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_TRIG,
-                            pmic_eic->reg[REG_TRIG]);
+                            pmic_eic->reg[offset][REG_TRIG]);

Similar here.

Thanks,
Chunyan

#7 lore raw

Re: [PATCH V2 1/2] gpio: pmic-eic-sprd: Two-dimensional arrays maintain pmic eic

Quoted 92 lines · Chunyan Zhang
Quoted 28 lines · Wenhua Lin

A bank PMIC EIC contains 16 EICs, and the operating registers are BIT0-BIT15, such as BIT0 of the register operated by EIC0. Using the one-dimensional array reg[CACHE_NR_REGS] for maintenance will cause the configuration of other EICs to be affected when operating a certain EIC. In order to solve this problem, the register operation bits of each PMIC EIC are maintained through the two-dimensional array reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS] to avoid mutual interference.

---
 drivers/gpio/gpio-pmic-eic-sprd.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/gpio/gpio-pmic-eic-sprd.c +1 -1
index c3e4d90f6b18..442968bb2490 100644
@@ -57,7 +57,7 @@ struct sprd_pmic_eic {
        struct gpio_chip chip;
        struct regmap *map;
        u32 offset;
-       u8 reg[CACHE_NR_REGS];
+       u8 reg[SPRD_PMIC_EIC_NR][CACHE_NR_REGS];
        struct mutex buslock;
        int irq;
 };

drivers/gpio/gpio-pmic-eic-sprd.c static void sprd_pmic_eic_irq_mask(struct irq_data *data) · line 155

Quoted 7 lines
drivers/gpio/gpio-pmic-eic-sprd.c +2 -2
@@ -151,8 +151,8 @@ static void sprd_pmic_eic_irq_mask(struct irq_data *data)
        struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
        u32 offset = irqd_to_hwirq(data);
 
-       pmic_eic->reg[REG_IE] = 0;
-       pmic_eic->reg[REG_TRIG] = 0;
+       pmic_eic->reg[offset][REG_IE] = 0;
+       pmic_eic->reg[offset][REG_TRIG] = 0;

I would suggest just using this one-dimensional array which is enough for saving 16-bit values.

To solve the issue mentioned in the commit message, we can set/clear the bit according to the value of 'offset', for example:

pmic_eic->reg[REG_IE] &= ~BIT(offset);

drivers/gpio/gpio-pmic-eic-sprd.c static void sprd_pmic_eic_irq_unmask(struct irq_data *data) · line 169

Quoted 11 lines
drivers/gpio/gpio-pmic-eic-sprd.c +2 -2
        gpiochip_disable_irq(chip, offset);
 }
@@ -165,8 +165,8 @@ static void sprd_pmic_eic_irq_unmask(struct irq_data *data)
 
        gpiochip_enable_irq(chip, offset);
 
-       pmic_eic->reg[REG_IE] = 1;
-       pmic_eic->reg[REG_TRIG] = 1;
+       pmic_eic->reg[offset][REG_IE] = 1;
+       pmic_eic->reg[offset][REG_TRIG] = 1;

For setting operations:

pmic_eic->reg[REG_IE] |= BIT(offset);

Quoted 21 lines
drivers/gpio/gpio-pmic-eic-sprd.c +3 -2
 }
 
 static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
@@ -174,13 +174,14 @@ static int sprd_pmic_eic_irq_set_type(struct irq_data *data,
 {
        struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
        struct sprd_pmic_eic *pmic_eic = gpiochip_get_data(chip);
+       u32 offset = irqd_to_hwirq(data);
 
        switch (flow_type) {
        case IRQ_TYPE_LEVEL_HIGH:
-               pmic_eic->reg[REG_IEV] = 1;
+               pmic_eic->reg[offset][REG_IEV] = 1;
                break;
        case IRQ_TYPE_LEVEL_LOW:
-               pmic_eic->reg[REG_IEV] = 0;
+               pmic_eic->reg[offset][REG_IEV] = 0;
                break;
        case IRQ_TYPE_EDGE_RISING:
        case IRQ_TYPE_EDGE_FALLING:

drivers/gpio/gpio-pmic-eic-sprd.c static void sprd_pmic_eic_bus_sync_unlock(struct irq_data *data) · line 226

Quoted 5 lines
drivers/gpio/gpio-pmic-eic-sprd.c +1 -1
@@ -222,15 +223,15 @@ static void sprd_pmic_eic_bus_sync_unlock(struct irq_data *data)
                        sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV, 1);
        } else {
                sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IEV,
-                                    pmic_eic->reg[REG_IEV]);
+                                    pmic_eic->reg[offset][REG_IEV]);

When using the array we can deal with it like below since sprd_pmic_eic_update() would do a shift for the parameter 'val':

Quoted 2 lines

(pmic_eic->reg[REG_IEV] & BIT(offset)) ? 1 : 0;

Thank you very much for your review.
I will fix this issue in patch v3.

Quoted 15 lines

drivers/gpio/gpio-pmic-eic-sprd.c static void sprd_pmic_eic_bus_sync_unlock(struct irq_data *data) · line 234

Quoted 10 lines
drivers/gpio/gpio-pmic-eic-sprd.c +2 -2
        }
 
        /* Set irq unmask */
        sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_IE,
-                            pmic_eic->reg[REG_IE]);
+                            pmic_eic->reg[offset][REG_IE]);
        /* Generate trigger start pulse for debounce EIC */
        sprd_pmic_eic_update(chip, offset, SPRD_PMIC_EIC_TRIG,
-                            pmic_eic->reg[REG_TRIG]);
+                            pmic_eic->reg[offset][REG_TRIG]);

Similar here.

Thanks,
Chunyan

author
#8 lore raw

PATCH v2 2/2 gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip

In reply to Wenhua Lin

The drivers uses a mutex and I2C bus access in its PMIC EIC chip get implementation. This means these functions can sleep and the PMIC EIC chip should set the can_sleep property to true.

This will ensure that a warning is printed when trying to get the value from a context that potentially can't sleep.

---
 drivers/gpio/gpio-pmic-eic-sprd.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpio/gpio-pmic-eic-sprd.c +1 -0
index 442968bb2490..f04a40288638 100644
@@ -353,6 +353,7 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev)
 	pmic_eic->chip.set_config = sprd_pmic_eic_set_config;
 	pmic_eic->chip.set = sprd_pmic_eic_set;
 	pmic_eic->chip.get = sprd_pmic_eic_get;
+	pmic_eic->chip.can_sleep = true;
 
 	irq = &pmic_eic->chip.irq;
 	gpio_irq_chip_set_chip(irq, &pmic_eic_irq_chip);
Signature · 1 line
2.17.1
#9 lore raw

Re: [PATCH V2 2/2] gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip

Quoted 6 lines · Wenhua Lin

The drivers uses a mutex and I2C bus access in its PMIC EIC chip get implementation. This means these functions can sleep and the PMIC EIC chip should set the can_sleep property to true.

This will ensure that a warning is printed when trying to get the value from a context that potentially can't sleep.

This deserves a Fixes tag.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#10 lore raw

Re: [PATCH V2 2/2] gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip

Quoted 6 lines · Andy Shevchenko
Quoted 4 lines · Wenhua Lin

The drivers uses a mutex and I2C bus access in its PMIC EIC chip get implementation. This means these functions can sleep and the PMIC EIC chip should set the can_sleep property to true.

Quoted 10 lines
Quoted 2 lines

This will ensure that a warning is printed when trying to get the value from a context that potentially can't sleep.

This deserves a Fixes tag.

--
With Best Regards,
Andy Shevchenko

Added when applying and queued for fixes.

Bart

Reviewed-by on v2 2/2
#11 lore raw

Re: [PATCH V2 2/2] gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip

In reply to Wenhua Lin
Quoted 6 lines · Wenhua Lin

The drivers uses a mutex and I2C bus access in its PMIC EIC chip get implementation. This means these functions can sleep and the PMIC EIC chip should set the can_sleep property to true.

This will ensure that a warning is printed when trying to get the value from a context that potentially can't sleep.

LGTM.

Quoted 17 lines
---
  drivers/gpio/gpio-pmic-eic-sprd.c | 1 +
  1 file changed, 1 insertion(+)
drivers/gpio/gpio-pmic-eic-sprd.c +1 -0
index 442968bb2490..f04a40288638 100644
@@ -353,6 +353,7 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev)
  	pmic_eic->chip.set_config = sprd_pmic_eic_set_config;
  	pmic_eic->chip.set = sprd_pmic_eic_set;
  	pmic_eic->chip.get = sprd_pmic_eic_get;
+	pmic_eic->chip.can_sleep = true;
 
  	irq = &pmic_eic->chip.irq;
  	gpio_irq_chip_set_chip(irq, &pmic_eic_irq_chip);