i2c: rcar: check master irqs before slave irqs

commit c3be0af15959e11fa535d5332ab3d7cf34abd09b upstream.

Due to the HW design, master IRQs are timing critical, so give them
precedence over slave IRQ.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Biju Das <biju.das@bp.renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 6f23b97a15574918eb6cc1884fc35166597c89eb..ee3e02acf77d7a3c698c708be3af635b9002dc22 100644 (file)
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -432,19 +432,17 @@ static bool rcar_i2c_slave_irq(struct rcar_i2c_priv *priv)
 static irqreturn_t rcar_i2c_irq(int irq, void *ptr)
 {
        struct rcar_i2c_priv *priv = ptr;
-       irqreturn_t result = IRQ_HANDLED;
        u32 msr;
 
-       if (rcar_i2c_slave_irq(priv))
-               goto exit;
-
        msr = rcar_i2c_read(priv, ICMSR);
 
        /* Only handle interrupts that are currently enabled */
        msr &= rcar_i2c_read(priv, ICMIER);
        if (!msr) {
-               result = IRQ_NONE;
-               goto exit;
+               if (rcar_i2c_slave_irq(priv))
+                       return IRQ_HANDLED;
+
+               return IRQ_NONE;
        }
 
        /* Arbitration lost */
@@ -481,8 +479,7 @@ out:
                wake_up(&priv->wait);
        }
 
-exit:
-       return result;
+       return IRQ_HANDLED;
 }
 
 static int rcar_i2c_master_xfer(struct i2c_adapter *adap,