From: Andrew Lunn <andrew@lunn.ch>
To: Sagar Shrikant Kadam <sagar.kadam@sifive.com>
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
peter@korsgaard.com, palmer@sifive.com,
linux-kernel@vger.kernel.org, robh+dt@kernel.org,
linux-i2c@vger.kernel.org, paul.walmsley@sifive.com,
linux-riscv@lists.infradead.org
Subject: Re: [PATCH v1 v1 3/3] i2c-ocores: sifive: add polling mode workaround for FU540-C000 SoC.
Date: Mon, 6 May 2019 15:29:24 +0200 [thread overview]
Message-ID: <20190506132924.GD15291@lunn.ch> (raw)
In-Reply-To: <1557147240-29551-4-git-send-email-sagar.kadam@sifive.com>
> /*
> * 'process_lock' exists because ocores_process() and ocores_process_timeout()
> @@ -239,8 +240,13 @@ static irqreturn_t ocores_isr(int irq, void *dev_id)
> struct ocores_i2c *i2c = dev_id;
> u8 stat = oc_getreg(i2c, OCI2C_STATUS);
>
> - if (!(stat & OCI2C_STAT_IF))
> + if (i2c->flags && SIFIVE_FLAG_POLL) {
Do you really want && here?
> + if (stat & OCI2C_STAT_IF)
> + if (!(stat & OCI2C_STAT_BUSY))
> + return IRQ_NONE;
> + } else if (!(stat & OCI2C_STAT_IF)) {
> return IRQ_NONE;
> + }
>
> ocores_process(i2c, stat);
>
> @@ -356,6 +362,11 @@ static void ocores_process_polling(struct ocores_i2c *i2c)
> ret = ocores_isr(-1, i2c);
> if (ret == IRQ_NONE)
> break; /* all messages have been transferred */
> + else {
> + if (i2c->flags && SIFIVE_FLAG_POLL)
And here?
> + if (i2c->state == STATE_DONE)
> + break;
> + }
> }
> }
>
> @@ -406,7 +417,7 @@ static int ocores_xfer(struct i2c_adapter *adap,
> {
> struct ocores_i2c *i2c = i2c_get_adapdata(adap);
>
> - if (i2c->flags & OCORES_FLAG_POLL)
> + if ((i2c->flags & OCORES_FLAG_POLL) || (i2c->flags & SIFIVE_FLAG_POLL))
You can combine this
if ((i2c->flags & (OCORES_FLAG_POLL | SIFIVE_FLAG_POLL))
> return ocores_xfer_polling(adap, msgs, num);
> return ocores_xfer_core(i2c, msgs, num, false);
> }
> @@ -597,6 +608,7 @@ static int ocores_i2c_probe(struct platform_device *pdev)
> {
> struct ocores_i2c *i2c;
> struct ocores_i2c_platform_data *pdata;
> + const struct of_device_id *match;
> struct resource *res;
> int irq;
> int ret;
> @@ -678,13 +690,21 @@ static int ocores_i2c_probe(struct platform_device *pdev)
>
> irq = platform_get_irq(pdev, 0);
> if (irq == -ENXIO) {
> - i2c->flags |= OCORES_FLAG_POLL;
> + /*
> + * Set a SIFIVE_FLAG_POLL to enable workaround for FU540
> + * in polling mode interface of i2c-ocore driver.
> + */
> + match = of_match_node(ocores_i2c_match, pdev->dev.of_node);
> + if (match && (long)match->data == TYPE_SIFIVE_REV0)
> + i2c->flags |= SIFIVE_FLAG_POLL;
> + else
> + i2c->flags |= OCORES_FLAG_POLL;
Please take a look at the whole code, and consider if it is better to
set both SIFIVE_FLAG_POLL and OCORES_FLAG_POLL. Maybe rename
SIFIVE_FLAG_POLL to OCORES_FLAG_BROKEN_IRQ_BIT?
Thanks
Andrew
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Lunn <andrew@lunn.ch>
To: Sagar Shrikant Kadam <sagar.kadam@sifive.com>
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
peter@korsgaard.com, palmer@sifive.com,
linux-kernel@vger.kernel.org, robh+dt@kernel.org,
linux-i2c@vger.kernel.org, paul.walmsley@sifive.com,
linux-riscv@lists.infradead.org
Subject: Re: [PATCH v1 v1 3/3] i2c-ocores: sifive: add polling mode workaround for FU540-C000 SoC.
Date: Mon, 6 May 2019 15:29:24 +0200 [thread overview]
Message-ID: <20190506132924.GD15291@lunn.ch> (raw)
In-Reply-To: <1557147240-29551-4-git-send-email-sagar.kadam@sifive.com>
> /*
> * 'process_lock' exists because ocores_process() and ocores_process_timeout()
> @@ -239,8 +240,13 @@ static irqreturn_t ocores_isr(int irq, void *dev_id)
> struct ocores_i2c *i2c = dev_id;
> u8 stat = oc_getreg(i2c, OCI2C_STATUS);
>
> - if (!(stat & OCI2C_STAT_IF))
> + if (i2c->flags && SIFIVE_FLAG_POLL) {
Do you really want && here?
> + if (stat & OCI2C_STAT_IF)
> + if (!(stat & OCI2C_STAT_BUSY))
> + return IRQ_NONE;
> + } else if (!(stat & OCI2C_STAT_IF)) {
> return IRQ_NONE;
> + }
>
> ocores_process(i2c, stat);
>
> @@ -356,6 +362,11 @@ static void ocores_process_polling(struct ocores_i2c *i2c)
> ret = ocores_isr(-1, i2c);
> if (ret == IRQ_NONE)
> break; /* all messages have been transferred */
> + else {
> + if (i2c->flags && SIFIVE_FLAG_POLL)
And here?
> + if (i2c->state == STATE_DONE)
> + break;
> + }
> }
> }
>
> @@ -406,7 +417,7 @@ static int ocores_xfer(struct i2c_adapter *adap,
> {
> struct ocores_i2c *i2c = i2c_get_adapdata(adap);
>
> - if (i2c->flags & OCORES_FLAG_POLL)
> + if ((i2c->flags & OCORES_FLAG_POLL) || (i2c->flags & SIFIVE_FLAG_POLL))
You can combine this
if ((i2c->flags & (OCORES_FLAG_POLL | SIFIVE_FLAG_POLL))
> return ocores_xfer_polling(adap, msgs, num);
> return ocores_xfer_core(i2c, msgs, num, false);
> }
> @@ -597,6 +608,7 @@ static int ocores_i2c_probe(struct platform_device *pdev)
> {
> struct ocores_i2c *i2c;
> struct ocores_i2c_platform_data *pdata;
> + const struct of_device_id *match;
> struct resource *res;
> int irq;
> int ret;
> @@ -678,13 +690,21 @@ static int ocores_i2c_probe(struct platform_device *pdev)
>
> irq = platform_get_irq(pdev, 0);
> if (irq == -ENXIO) {
> - i2c->flags |= OCORES_FLAG_POLL;
> + /*
> + * Set a SIFIVE_FLAG_POLL to enable workaround for FU540
> + * in polling mode interface of i2c-ocore driver.
> + */
> + match = of_match_node(ocores_i2c_match, pdev->dev.of_node);
> + if (match && (long)match->data == TYPE_SIFIVE_REV0)
> + i2c->flags |= SIFIVE_FLAG_POLL;
> + else
> + i2c->flags |= OCORES_FLAG_POLL;
Please take a look at the whole code, and consider if it is better to
set both SIFIVE_FLAG_POLL and OCORES_FLAG_POLL. Maybe rename
SIFIVE_FLAG_POLL to OCORES_FLAG_BROKEN_IRQ_BIT?
Thanks
Andrew
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Lunn <andrew@lunn.ch>
To: Sagar Shrikant Kadam <sagar.kadam@sifive.com>
Cc: robh+dt@kernel.org, mark.rutland@arm.com, palmer@sifive.com,
paul.walmsley@sifive.com, peter@korsgaard.com,
linux-i2c@vger.kernel.org, devicetree@vger.kernel.org,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1 v1 3/3] i2c-ocores: sifive: add polling mode workaround for FU540-C000 SoC.
Date: Mon, 6 May 2019 15:29:24 +0200 [thread overview]
Message-ID: <20190506132924.GD15291@lunn.ch> (raw)
In-Reply-To: <1557147240-29551-4-git-send-email-sagar.kadam@sifive.com>
> /*
> * 'process_lock' exists because ocores_process() and ocores_process_timeout()
> @@ -239,8 +240,13 @@ static irqreturn_t ocores_isr(int irq, void *dev_id)
> struct ocores_i2c *i2c = dev_id;
> u8 stat = oc_getreg(i2c, OCI2C_STATUS);
>
> - if (!(stat & OCI2C_STAT_IF))
> + if (i2c->flags && SIFIVE_FLAG_POLL) {
Do you really want && here?
> + if (stat & OCI2C_STAT_IF)
> + if (!(stat & OCI2C_STAT_BUSY))
> + return IRQ_NONE;
> + } else if (!(stat & OCI2C_STAT_IF)) {
> return IRQ_NONE;
> + }
>
> ocores_process(i2c, stat);
>
> @@ -356,6 +362,11 @@ static void ocores_process_polling(struct ocores_i2c *i2c)
> ret = ocores_isr(-1, i2c);
> if (ret == IRQ_NONE)
> break; /* all messages have been transferred */
> + else {
> + if (i2c->flags && SIFIVE_FLAG_POLL)
And here?
> + if (i2c->state == STATE_DONE)
> + break;
> + }
> }
> }
>
> @@ -406,7 +417,7 @@ static int ocores_xfer(struct i2c_adapter *adap,
> {
> struct ocores_i2c *i2c = i2c_get_adapdata(adap);
>
> - if (i2c->flags & OCORES_FLAG_POLL)
> + if ((i2c->flags & OCORES_FLAG_POLL) || (i2c->flags & SIFIVE_FLAG_POLL))
You can combine this
if ((i2c->flags & (OCORES_FLAG_POLL | SIFIVE_FLAG_POLL))
> return ocores_xfer_polling(adap, msgs, num);
> return ocores_xfer_core(i2c, msgs, num, false);
> }
> @@ -597,6 +608,7 @@ static int ocores_i2c_probe(struct platform_device *pdev)
> {
> struct ocores_i2c *i2c;
> struct ocores_i2c_platform_data *pdata;
> + const struct of_device_id *match;
> struct resource *res;
> int irq;
> int ret;
> @@ -678,13 +690,21 @@ static int ocores_i2c_probe(struct platform_device *pdev)
>
> irq = platform_get_irq(pdev, 0);
> if (irq == -ENXIO) {
> - i2c->flags |= OCORES_FLAG_POLL;
> + /*
> + * Set a SIFIVE_FLAG_POLL to enable workaround for FU540
> + * in polling mode interface of i2c-ocore driver.
> + */
> + match = of_match_node(ocores_i2c_match, pdev->dev.of_node);
> + if (match && (long)match->data == TYPE_SIFIVE_REV0)
> + i2c->flags |= SIFIVE_FLAG_POLL;
> + else
> + i2c->flags |= OCORES_FLAG_POLL;
Please take a look at the whole code, and consider if it is better to
set both SIFIVE_FLAG_POLL and OCORES_FLAG_POLL. Maybe rename
SIFIVE_FLAG_POLL to OCORES_FLAG_BROKEN_IRQ_BIT?
Thanks
Andrew
next prev parent reply other threads:[~2019-05-06 13:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-06 12:53 [PATCH v1 v1 0/3] Add dt bindings to support I2C on sifive devices and a fix for polling mode i2c transfers Sagar Shrikant Kadam
2019-05-06 12:53 ` Sagar Shrikant Kadam
2019-05-06 12:53 ` [PATCH v1 v1 1/3] dt-bindings: i2c: add documentation for adding SiFive I2C driver Sagar Shrikant Kadam
2019-05-06 12:53 ` Sagar Shrikant Kadam
2019-05-06 13:19 ` Andrew Lunn
2019-05-06 13:19 ` Andrew Lunn
2019-05-06 17:41 ` Sagar Kadam
2019-05-06 17:41 ` Sagar Kadam
2019-05-06 12:53 ` [PATCH v1 v1 2/3] i2c-ocore: sifive: add support for i2c device on FU540-c000 SoC Sagar Shrikant Kadam
2019-05-06 12:53 ` Sagar Shrikant Kadam
2019-05-06 12:54 ` [PATCH v1 v1 3/3] i2c-ocores: sifive: add polling mode workaround for FU540-C000 SoC Sagar Shrikant Kadam
2019-05-06 12:54 ` Sagar Shrikant Kadam
2019-05-06 13:29 ` Andrew Lunn [this message]
2019-05-06 13:29 ` Andrew Lunn
2019-05-06 13:29 ` Andrew Lunn
2019-05-06 17:54 ` Sagar Kadam
2019-05-06 17:54 ` Sagar Kadam
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=20190506132924.GD15291@lunn.ch \
--to=andrew@lunn.ch \
--cc=devicetree@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=palmer@sifive.com \
--cc=paul.walmsley@sifive.com \
--cc=peter@korsgaard.com \
--cc=robh+dt@kernel.org \
--cc=sagar.kadam@sifive.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: link
Be 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.