From: Wolfram Sang <wsa@the-dreams.de> To: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Magnus Damm <magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Simon Horman <horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>, Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>, Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>, Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>, Kuninori Morimoto <kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Yoshihiro Kaneko <ykaneko0929-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org> Subject: [PATCH 3/9] i2c: rcar: remove spinlock Date: Thu, 03 Sep 2015 20:20:07 +0000 [thread overview] Message-ID: <1441311613-2681-4-git-send-email-wsa@the-dreams.de> (raw) In-Reply-To: <1441311613-2681-1-git-send-email-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> From: Wolfram Sang <wsa+renesas@sang-engineering.com> We make sure to reinit the HW in the timeout case; then we know that interrupts are always disabled in the sections protected by the spinlock. Thus, we can simply remove it which is a preparation for further refactoring. While here, rename the timeout variable to time_left which is way more readable. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/i2c/busses/i2c-rcar.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index 3594cdab2573b6..e65418b34d868e 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -34,7 +34,6 @@ #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/slab.h> -#include <linux/spinlock.h> /* register offsets */ #define ICSCR 0x00 /* slave ctrl */ @@ -110,7 +109,6 @@ struct rcar_i2c_priv { struct i2c_msg *msg; struct clk *clk; - spinlock_t lock; wait_queue_head_t wait; int pos; @@ -428,9 +426,6 @@ static irqreturn_t rcar_i2c_irq(int irq, void *ptr) irqreturn_t result = IRQ_HANDLED; u32 msr; - /*-------------- spin lock -----------------*/ - spin_lock(&priv->lock); - if (rcar_i2c_slave_irq(priv)) goto exit; @@ -477,9 +472,6 @@ out: } exit: - spin_unlock(&priv->lock); - /*-------------- spin unlock -----------------*/ - return result; } @@ -489,9 +481,8 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, { struct rcar_i2c_priv *priv = i2c_get_adapdata(adap); struct device *dev = rcar_i2c_priv_to_dev(priv); - unsigned long flags; int i, ret; - long timeout; + long time_left; pm_runtime_get_sync(dev); @@ -506,9 +497,6 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, break; } - /*-------------- spin lock -----------------*/ - spin_lock_irqsave(&priv->lock, flags); - /* init each data */ priv->msg = &msgs[i]; priv->pos = 0; @@ -518,13 +506,11 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, rcar_i2c_prepare_msg(priv); - spin_unlock_irqrestore(&priv->lock, flags); - /*-------------- spin unlock -----------------*/ - - timeout = wait_event_timeout(priv->wait, + time_left = wait_event_timeout(priv->wait, rcar_i2c_flags_has(priv, ID_DONE), adap->timeout); - if (!timeout) { + if (!time_left) { + rcar_i2c_init(priv); ret = -ETIMEDOUT; break; } @@ -658,7 +644,6 @@ static int rcar_i2c_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); init_waitqueue_head(&priv->wait); - spin_lock_init(&priv->lock); adap = &priv->adap; adap->nr = pdev->id; -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> To: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Magnus Damm <magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Simon Horman <horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>, Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>, Geert Uytterhoeven <geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>, Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>, Kuninori Morimoto <kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Yoshihiro Kaneko <ykaneko0929-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org> Subject: [PATCH 3/9] i2c: rcar: remove spinlock Date: Thu, 3 Sep 2015 22:20:07 +0200 [thread overview] Message-ID: <1441311613-2681-4-git-send-email-wsa@the-dreams.de> (raw) In-Reply-To: <1441311613-2681-1-git-send-email-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> From: Wolfram Sang <wsa+renesas-jBu1N2QxHDJrcw3mvpCnnVaTQe2KTcn/@public.gmane.org> We make sure to reinit the HW in the timeout case; then we know that interrupts are always disabled in the sections protected by the spinlock. Thus, we can simply remove it which is a preparation for further refactoring. While here, rename the timeout variable to time_left which is way more readable. Signed-off-by: Wolfram Sang <wsa+renesas-jBu1N2QxHDJrcw3mvpCnnVaTQe2KTcn/@public.gmane.org> --- drivers/i2c/busses/i2c-rcar.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index 3594cdab2573b6..e65418b34d868e 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -34,7 +34,6 @@ #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/slab.h> -#include <linux/spinlock.h> /* register offsets */ #define ICSCR 0x00 /* slave ctrl */ @@ -110,7 +109,6 @@ struct rcar_i2c_priv { struct i2c_msg *msg; struct clk *clk; - spinlock_t lock; wait_queue_head_t wait; int pos; @@ -428,9 +426,6 @@ static irqreturn_t rcar_i2c_irq(int irq, void *ptr) irqreturn_t result = IRQ_HANDLED; u32 msr; - /*-------------- spin lock -----------------*/ - spin_lock(&priv->lock); - if (rcar_i2c_slave_irq(priv)) goto exit; @@ -477,9 +472,6 @@ out: } exit: - spin_unlock(&priv->lock); - /*-------------- spin unlock -----------------*/ - return result; } @@ -489,9 +481,8 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, { struct rcar_i2c_priv *priv = i2c_get_adapdata(adap); struct device *dev = rcar_i2c_priv_to_dev(priv); - unsigned long flags; int i, ret; - long timeout; + long time_left; pm_runtime_get_sync(dev); @@ -506,9 +497,6 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, break; } - /*-------------- spin lock -----------------*/ - spin_lock_irqsave(&priv->lock, flags); - /* init each data */ priv->msg = &msgs[i]; priv->pos = 0; @@ -518,13 +506,11 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, rcar_i2c_prepare_msg(priv); - spin_unlock_irqrestore(&priv->lock, flags); - /*-------------- spin unlock -----------------*/ - - timeout = wait_event_timeout(priv->wait, + time_left = wait_event_timeout(priv->wait, rcar_i2c_flags_has(priv, ID_DONE), adap->timeout); - if (!timeout) { + if (!time_left) { + rcar_i2c_init(priv); ret = -ETIMEDOUT; break; } @@ -658,7 +644,6 @@ static int rcar_i2c_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); init_waitqueue_head(&priv->wait); - spin_lock_init(&priv->lock); adap = &priv->adap; adap->nr = pdev->id; -- 2.1.4
next prev parent reply other threads:[~2015-09-03 20:20 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-09-03 20:20 [PATCH 0/9] i2c: rcar: tackle race conditions in the driver Wolfram Sang 2015-09-03 20:20 ` Wolfram Sang 2015-09-03 20:20 ` [PATCH 1/9] i2c: rcar: rework hw init Wolfram Sang 2015-09-03 20:20 ` Wolfram Sang 2015-09-03 20:20 ` [PATCH 2/9] i2c: rcar: remove unused IOERROR state Wolfram Sang 2015-09-03 20:20 ` Wolfram Sang 2015-09-03 20:20 ` [PATCH 6/9] i2c: rcar: don't issue stop when HW does it automatically Wolfram Sang 2015-09-03 20:20 ` Wolfram Sang [not found] ` <1441311613-2681-1-git-send-email-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> 2015-09-03 20:20 ` Wolfram Sang [this message] 2015-09-03 20:20 ` [PATCH 3/9] i2c: rcar: remove spinlock Wolfram Sang 2015-09-03 20:20 ` [PATCH 4/9] i2c: rcar: refactor setup of a msg Wolfram Sang 2015-09-03 20:20 ` Wolfram Sang 2015-09-03 20:20 ` [PATCH 5/9] i2c: rcar: init new messages in irq Wolfram Sang 2015-09-03 20:20 ` Wolfram Sang 2015-10-21 23:10 ` Laurent Pinchart 2015-10-21 23:10 ` Laurent Pinchart 2015-10-22 11:05 ` Wolfram Sang 2015-10-22 11:05 ` Wolfram Sang 2015-10-22 11:12 ` Laurent Pinchart 2015-10-22 11:12 ` Laurent Pinchart 2015-10-23 8:06 ` Wolfram Sang 2015-10-23 8:06 ` Wolfram Sang 2015-10-23 8:57 ` Laurent Pinchart 2015-10-23 9:45 ` Wolfram Sang 2015-10-23 9:45 ` Wolfram Sang 2015-10-23 10:28 ` Laurent Pinchart 2015-10-23 10:28 ` Laurent Pinchart 2015-10-23 12:14 ` Wolfram Sang 2015-10-23 12:14 ` Wolfram Sang 2015-10-23 13:14 ` Laurent Pinchart 2015-10-23 13:14 ` Laurent Pinchart 2015-10-25 15:53 ` Wolfram Sang 2015-10-25 15:53 ` Wolfram Sang 2015-10-29 19:23 ` Wolfram Sang 2015-10-29 19:23 ` Wolfram Sang 2015-10-23 10:04 ` Geert Uytterhoeven 2015-10-23 10:04 ` Geert Uytterhoeven 2015-10-23 10:07 ` Wolfram Sang 2015-10-23 10:07 ` Wolfram Sang 2015-09-03 20:20 ` [PATCH 7/9] i2c: rcar: check master irqs before slave irqs Wolfram Sang 2015-09-03 20:20 ` Wolfram Sang 2015-09-03 20:20 ` [PATCH 8/9] i2c: rcar: revoke START request early Wolfram Sang 2015-09-03 20:20 ` Wolfram Sang 2015-09-03 20:20 ` [PATCH 9/9] i2c: rcar: clean up after refactoring Wolfram Sang 2015-09-03 20:20 ` Wolfram Sang 2015-09-03 20:35 ` [PATCH 0/9] i2c: rcar: tackle race conditions in the driver Laurent Pinchart 2015-09-03 20:35 ` Laurent Pinchart 2015-09-03 20:40 ` Wolfram Sang 2015-09-03 20:40 ` Wolfram Sang 2015-09-03 20:47 ` Laurent Pinchart 2015-09-03 20:47 ` Laurent Pinchart 2015-09-03 20:55 ` Wolfram Sang 2015-09-03 20:55 ` Wolfram Sang 2015-09-04 4:33 ` Magnus Damm 2015-09-04 4:33 ` Magnus Damm 2015-09-05 7:31 ` Wolfram Sang 2015-09-05 7:31 ` Wolfram Sang 2015-09-07 16:04 ` Magnus Damm 2015-09-07 16:04 ` Magnus Damm [not found] ` <CANqRtoRs=f=07B=HSLCVg5G4rnhxj6Heod+spYwxHiKFLZqFWg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-09-08 10:53 ` Wolfram Sang 2015-09-08 10:53 ` Wolfram Sang 2015-09-09 5:08 ` Magnus Damm 2015-09-09 5:08 ` Magnus Damm 2015-09-09 8:54 ` Wolfram Sang 2015-09-09 8:54 ` Wolfram Sang 2015-10-09 21:34 ` Wolfram Sang 2015-10-09 21:34 ` Wolfram Sang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1441311613-2681-4-git-send-email-wsa@the-dreams.de \ --to=wsa@the-dreams.de \ --cc=geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org \ --cc=horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org \ --cc=kuninori.morimoto.gx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org \ --cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org \ --cc=wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org \ --cc=ykaneko0929-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.