Skip to contentSkip to conversation

extcon: palmas: Handle ID interrupt properly using USB_ID_INT_SRC

PATCH Applied George Cherian 3 participants 4 messages Oct 10, 2013 – Oct 21, 2013 External connector subsystem (extcon)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 extcon: palmas: Handle ID interrupt properly using USB_ID_INT_SRC

Always cross check with the ID state and the source of interrupt. Also add a case in which ID Source is ID_GND but LATCH state is set wrongly. This uses the previous Link stat to determine the new state.

---
 drivers/extcon/extcon-palmas.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/extcon/extcon-palmas.c +12 -3
index 6e83e9a..2aea4bc 100644
@@ -78,20 +78,24 @@ static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
 
 static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
 {
-	unsigned int set;
+	unsigned int set, id_src;
 	struct palmas_usb *palmas_usb = _palmas_usb;
 
 	palmas_read(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
 		PALMAS_USB_ID_INT_LATCH_SET, &set);
+	palmas_read(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
+		PALMAS_USB_ID_INT_SRC, &id_src);
 
-	if (set & PALMAS_USB_ID_INT_SRC_ID_GND) {
+	if ((set & PALMAS_USB_ID_INT_SRC_ID_GND) &&
+				(id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
 		palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
 			PALMAS_USB_ID_INT_LATCH_CLR,
 			PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND);
 		palmas_usb->linkstat = PALMAS_USB_STATE_ID;
 		extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", true);
 		dev_info(palmas_usb->dev, "USB-HOST cable is attached\n");
-	} else if (set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) {
+	} else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) &&
+				(id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) {
 		palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
 			PALMAS_USB_ID_INT_LATCH_CLR,
 			PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT);
@@ -103,6 +107,11 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
 		palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
 		extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", false);
 		dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
+	} else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) &&
+				(id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
+		palmas_usb->linkstat = PALMAS_USB_STATE_ID;
+		extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", true);
+		dev_info(palmas_usb->dev, " USB-HOST cable is attached\n");
 	}
 
 	return IRQ_HANDLED;
Signature · 1 line
1.8.1
#1 lore raw

Laxman/Chanwoo/Kishon,

Any comments on this!!
Regards
-George

Quoted 53 lines · George Cherian

Always cross check with the ID state and the source of interrupt. Also add a case in which ID Source is ID_GND but LATCH state is set wrongly. This uses the previous Link stat to determine the new state.

---
  drivers/extcon/extcon-palmas.c | 15 ++++++++++++---
  1 file changed, 12 insertions(+), 3 deletions(-)
drivers/extcon/extcon-palmas.c +12 -3
index 6e83e9a..2aea4bc 100644
@@ -78,20 +78,24 @@ static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
 
  static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
  {
-	unsigned int set;
+	unsigned int set, id_src;
  	struct palmas_usb *palmas_usb = _palmas_usb;
 
  	palmas_read(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
  		PALMAS_USB_ID_INT_LATCH_SET, &set);
+	palmas_read(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
+		PALMAS_USB_ID_INT_SRC, &id_src);
 
-	if (set & PALMAS_USB_ID_INT_SRC_ID_GND) {
+	if ((set & PALMAS_USB_ID_INT_SRC_ID_GND) &&
+				(id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
  		palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
  			PALMAS_USB_ID_INT_LATCH_CLR,
  			PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND);
  		palmas_usb->linkstat = PALMAS_USB_STATE_ID;
  		extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", true);
  		dev_info(palmas_usb->dev, "USB-HOST cable is attached\n");
-	} else if (set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) {
+	} else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) &&
+				(id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) {
  		palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
  			PALMAS_USB_ID_INT_LATCH_CLR,
  			PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT);
@@ -103,6 +107,11 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
  		palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
  		extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", false);
  		dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
+	} else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) &&
+				(id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
+		palmas_usb->linkstat = PALMAS_USB_STATE_ID;
+		extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", true);
+		dev_info(palmas_usb->dev, " USB-HOST cable is attached\n");
  	}
 
  	return IRQ_HANDLED;
Signature · 1 line
-George
#2 lore raw
Quoted 10 lines · George Cherian

Laxman/Chanwoo/Kishon,

Any comments on this!!
Regards
-George

Quoted 4 lines · George Cherian

Always cross check with the ID state and the source of interrupt. Also add a case in which ID Source is ID_GND but LATCH state is set wrongly. This uses the previous Link stat to determine the new state.

Looks good to me.

maintainer Applied
#3 lore raw
In reply to George Cherian

Hi George,

Quoted 47 lines · George Cherian

Laxman/Chanwoo/Kishon,

Any comments on this!!
Regards
-George

Quoted 41 lines · George Cherian

Always cross check with the ID state and the source of interrupt. Also add a case in which ID Source is ID_GND but LATCH state is set wrongly. This uses the previous Link stat to determine the new state.

---
  drivers/extcon/extcon-palmas.c | 15 ++++++++++++---
  1 file changed, 12 insertions(+), 3 deletions(-)
drivers/extcon/extcon-palmas.c +7 -2
index 6e83e9a..2aea4bc 100644
@@ -78,20 +78,24 @@ static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
    static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
  {
-    unsigned int set;
+    unsigned int set, id_src;
      struct palmas_usb *palmas_usb = _palmas_usb;
        palmas_read(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
          PALMAS_USB_ID_INT_LATCH_SET, &set);
+    palmas_read(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
+        PALMAS_USB_ID_INT_SRC, &id_src);
  -    if (set & PALMAS_USB_ID_INT_SRC_ID_GND) {
+    if ((set & PALMAS_USB_ID_INT_SRC_ID_GND) &&
+                (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
          palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
              PALMAS_USB_ID_INT_LATCH_CLR,
              PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND);
          palmas_usb->linkstat = PALMAS_USB_STATE_ID;
          extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", true);
          dev_info(palmas_usb->dev, "USB-HOST cable is attached\n");
-    } else if (set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) {
+    } else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) &&
+                (id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) {
          palmas_write(palmas_usb->palmas, PALMAS_USB_OTG_BASE,
              PALMAS_USB_ID_INT_LATCH_CLR,
              PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT);
@@ -103,6 +107,11 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
          palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
          extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", false);
Quoted 10 lines

drivers/extcon/extcon-palmas.c static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb) · line 117

Quoted 8 lines
drivers/extcon/extcon-palmas.c +5 -0
          dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
+    } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) &&
+                (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
+        palmas_usb->linkstat = PALMAS_USB_STATE_ID;
+        extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", true);
+        dev_info(palmas_usb->dev, " USB-HOST cable is attached\n");
      }
        return IRQ_HANDLED;

Applied it on next branch.

Thanks.
Chanwoo Choi