From: Wolfram Sang <wsa@the-dreams.de> To: linux-i2c@vger.kernel.org Cc: linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>, Simon Horman <horms@verge.net.au>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Geert Uytterhoeven <geert@linux-m68k.org>, Wolfram Sang <wsa@the-dreams.de>, Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>, Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 01/11] i2c: rcar: make sure clocks are on when doing clock calculation Date: Thu, 19 Nov 2015 15:56:41 +0000 [thread overview] Message-ID: <1447948611-2615-2-git-send-email-wsa@the-dreams.de> (raw) In-Reply-To: <1447948611-2615-1-git-send-email-wsa@the-dreams.de> From: Wolfram Sang <wsa+renesas@sang-engineering.com> When calculating the bus speed, the clock should be on, of course. Most bootloaders left them on, so this went unnoticed so far. Move the ioremapping out of this clock-enabled-block and prepare for adding hw initialization there, too. Reported-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/i2c/busses/i2c-rcar.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index b0ae560b38c308..dac0f5d1945341 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -650,19 +650,23 @@ static int rcar_i2c_probe(struct platform_device *pdev) return PTR_ERR(priv->clk); } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + priv->io = devm_ioremap_resource(dev, res); + if (IS_ERR(priv->io)) + return PTR_ERR(priv->io); + bus_speed = 100000; /* default 100 kHz */ of_property_read_u32(dev->of_node, "clock-frequency", &bus_speed); priv->devtype = (enum rcar_i2c_type)of_match_device(rcar_i2c_dt_ids, dev)->data; + pm_runtime_enable(dev); + pm_runtime_get_sync(dev); ret = rcar_i2c_clock_calculate(priv, bus_speed, dev); if (ret < 0) - return ret; + goto out_pm_put; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - priv->io = devm_ioremap_resource(dev, res); - if (IS_ERR(priv->io)) - return PTR_ERR(priv->io); + pm_runtime_put(dev); irq = platform_get_irq(pdev, 0); init_waitqueue_head(&priv->wait); @@ -682,22 +686,26 @@ static int rcar_i2c_probe(struct platform_device *pdev) dev_name(dev), priv); if (ret < 0) { dev_err(dev, "cannot get irq %d\n", irq); - return ret; + goto out_pm_disable; } - pm_runtime_enable(dev); platform_set_drvdata(pdev, priv); ret = i2c_add_numbered_adapter(adap); if (ret < 0) { dev_err(dev, "reg adap failed: %d\n", ret); - pm_runtime_disable(dev); - return ret; + goto out_pm_disable; } dev_info(dev, "probed\n"); return 0; + + out_pm_put: + pm_runtime_put(dev); + out_pm_disable: + pm_runtime_disable(dev); + return ret; } static int rcar_i2c_remove(struct platform_device *pdev) -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Wolfram Sang <wsa@the-dreams.de> To: linux-i2c@vger.kernel.org Cc: linux-sh@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>, Simon Horman <horms@verge.net.au>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Geert Uytterhoeven <geert@linux-m68k.org>, Wolfram Sang <wsa@the-dreams.de>, Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>, Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Subject: [PATCH v3 01/11] i2c: rcar: make sure clocks are on when doing clock calculation Date: Thu, 19 Nov 2015 16:56:41 +0100 [thread overview] Message-ID: <1447948611-2615-2-git-send-email-wsa@the-dreams.de> (raw) In-Reply-To: <1447948611-2615-1-git-send-email-wsa@the-dreams.de> From: Wolfram Sang <wsa+renesas@sang-engineering.com> When calculating the bus speed, the clock should be on, of course. Most bootloaders left them on, so this went unnoticed so far. Move the ioremapping out of this clock-enabled-block and prepare for adding hw initialization there, too. Reported-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/i2c/busses/i2c-rcar.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index b0ae560b38c308..dac0f5d1945341 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -650,19 +650,23 @@ static int rcar_i2c_probe(struct platform_device *pdev) return PTR_ERR(priv->clk); } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + priv->io = devm_ioremap_resource(dev, res); + if (IS_ERR(priv->io)) + return PTR_ERR(priv->io); + bus_speed = 100000; /* default 100 kHz */ of_property_read_u32(dev->of_node, "clock-frequency", &bus_speed); priv->devtype = (enum rcar_i2c_type)of_match_device(rcar_i2c_dt_ids, dev)->data; + pm_runtime_enable(dev); + pm_runtime_get_sync(dev); ret = rcar_i2c_clock_calculate(priv, bus_speed, dev); if (ret < 0) - return ret; + goto out_pm_put; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - priv->io = devm_ioremap_resource(dev, res); - if (IS_ERR(priv->io)) - return PTR_ERR(priv->io); + pm_runtime_put(dev); irq = platform_get_irq(pdev, 0); init_waitqueue_head(&priv->wait); @@ -682,22 +686,26 @@ static int rcar_i2c_probe(struct platform_device *pdev) dev_name(dev), priv); if (ret < 0) { dev_err(dev, "cannot get irq %d\n", irq); - return ret; + goto out_pm_disable; } - pm_runtime_enable(dev); platform_set_drvdata(pdev, priv); ret = i2c_add_numbered_adapter(adap); if (ret < 0) { dev_err(dev, "reg adap failed: %d\n", ret); - pm_runtime_disable(dev); - return ret; + goto out_pm_disable; } dev_info(dev, "probed\n"); return 0; + + out_pm_put: + pm_runtime_put(dev); + out_pm_disable: + pm_runtime_disable(dev); + return ret; } static int rcar_i2c_remove(struct platform_device *pdev) -- 2.1.4
next prev parent reply other threads:[~2015-11-19 15:56 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-19 15:56 [PATCH v3 00/11] i2c: rcar: tackle race conditions in the driver Wolfram Sang 2015-11-19 15:56 ` Wolfram Sang 2015-11-19 15:56 ` Wolfram Sang [this message] 2015-11-19 15:56 ` [PATCH v3 01/11] i2c: rcar: make sure clocks are on when doing clock calculation Wolfram Sang 2015-11-19 15:56 ` [PATCH v3 02/11] i2c: rcar: rework hw init Wolfram Sang 2015-11-19 15:56 ` Wolfram Sang 2015-11-19 15:56 ` [PATCH v3 03/11] i2c: rcar: remove unused IOERROR state Wolfram Sang 2015-11-19 15:56 ` Wolfram Sang 2015-11-19 15:56 ` [PATCH v3 04/11] i2c: rcar: remove spinlock Wolfram Sang 2015-11-19 15:56 ` Wolfram Sang 2015-11-19 15:56 ` [PATCH v3 05/11] i2c: rcar: refactor setup of a msg Wolfram Sang 2015-11-19 15:56 ` Wolfram Sang 2015-11-19 15:56 ` [PATCH v3 06/11] i2c: rcar: init new messages in irq Wolfram Sang 2015-11-19 15:56 ` Wolfram Sang 2015-11-19 15:56 ` [PATCH v3 07/11] i2c: rcar: don't issue stop when HW does it automatically Wolfram Sang 2015-11-19 15:56 ` Wolfram Sang 2015-11-19 15:56 ` [PATCH v3 08/11] i2c: rcar: check master irqs before slave irqs Wolfram Sang 2015-11-19 15:56 ` Wolfram Sang 2015-11-19 15:56 ` [PATCH v3 09/11] i2c: rcar: revoke START request early Wolfram Sang 2015-11-19 15:56 ` Wolfram Sang 2016-03-31 21:02 ` Sergei Shtylyov 2016-03-31 21:02 ` Sergei Shtylyov 2016-03-31 22:48 ` Wolfram Sang 2016-03-31 22:48 ` Wolfram Sang 2016-04-01 19:55 ` Sergei Shtylyov 2016-04-01 19:55 ` Sergei Shtylyov 2016-04-01 20:14 ` Wolfram Sang 2016-04-01 20:14 ` Wolfram Sang 2016-04-01 23:05 ` Sergei Shtylyov 2016-04-01 23:05 ` Sergei Shtylyov 2016-04-02 7:27 ` Wolfram Sang 2016-04-02 7:27 ` Wolfram Sang 2016-04-02 12:51 ` Sergei Shtylyov 2016-04-02 12:51 ` Sergei Shtylyov 2016-04-03 8:25 ` Wolfram Sang 2016-04-03 8:25 ` Wolfram Sang 2016-04-03 13:35 ` Sergei Shtylyov 2016-04-03 13:35 ` Sergei Shtylyov 2016-04-03 13:47 ` Wolfram Sang 2016-04-03 13:47 ` Wolfram Sang 2015-11-19 15:56 ` [PATCH v3 10/11] i2c: rcar: clean up after refactoring Wolfram Sang 2015-11-19 15:56 ` Wolfram Sang 2015-11-19 15:56 ` [PATCH v3 11/11] i2c: rcar: handle difference in setting up non-first message Wolfram Sang 2015-11-19 15:56 ` Wolfram Sang 2015-11-19 16:01 ` [PATCH v3 00/11] i2c: rcar: tackle race conditions in the driver Laurent Pinchart 2015-11-19 16:01 ` Laurent Pinchart 2015-11-30 13:27 ` Wolfram Sang 2015-11-30 13:27 ` 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=1447948611-2615-2-git-send-email-wsa@the-dreams.de \ --to=wsa@the-dreams.de \ --cc=geert@linux-m68k.org \ --cc=horms@verge.net.au \ --cc=kuninori.morimoto.gx@gmail.com \ --cc=kuninori.morimoto.gx@renesas.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=magnus.damm@gmail.com \ --cc=yoshihiro.shimoda.uh@renesas.com \ /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.