diff mbox

[v6,01/16] spi/spi-atmel: fix probing failure after xfer->speed_hz set

Message ID 1362626815-6628-1-git-send-email-wenyou.yang@atmel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wenyou Yang March 7, 2013, 3:26 a.m. UTC
commit: 059b8ffeee5b427949872bb6ed5db5ae0788054e
cause the atmel spi probing failure.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Cc: spi-devel-general@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org
---
 drivers/spi/spi-atmel.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Sergei Shtylyov March 7, 2013, 12:17 p.m. UTC | #1
Hello.

On 07-03-2013 7:26, Wenyou Yang wrote:

> commit: 059b8ffeee5b427949872bb6ed5db5ae0788054e

    Please also specify the summary line of that commit in parens (or however 
you like).

> cause the atmel spi probing failure.

> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: spi-devel-general@lists.sourceforge.net
> Cc: linux-kernel@vger.kernel.org

WBR, Sergei
Joachim Eastwood March 7, 2013, 12:30 p.m. UTC | #2
On 7 March 2013 04:26, Wenyou Yang <wenyou.yang@atmel.com> wrote:
> commit: 059b8ffeee5b427949872bb6ed5db5ae0788054e
> cause the atmel spi probing failure.
>
> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: spi-devel-general@lists.sourceforge.net
> Cc: linux-kernel@vger.kernel.org
> ---
>  drivers/spi/spi-atmel.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
> index 656d137..1eca815 100644
> --- a/drivers/spi/spi-atmel.c
> +++ b/drivers/spi/spi-atmel.c
> @@ -846,9 +846,9 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
>                         }
>                 }
>
> -               /* FIXME implement these protocol options!! */
> -               if (xfer->speed_hz) {
> -                       dev_dbg(&spi->dev, "no protocol options yet\n");
> +               if (xfer->speed_hz < spi->max_speed_hz) {
> +                       dev_dbg(&spi->dev,
> +                               "speed in transfer less than bus speed\n");
>                         return -ENOPROTOOPT;
>                 }

I sent a similar patch to spi-devl a while ago, which Grant said he applied.
https://patchwork.kernel.org/patch/2165301/

Can't find the patch in any upstream git tree so I guess Grant hasn't
pushed it yet.

regards
Joachim Eastwood
Wenyou Yang March 8, 2013, 1:06 a.m. UTC | #3
Hi Joachim,

> -----Original Message-----

> From: Joachim Eastwood [mailto:manabian@gmail.com]

> Sent: 2013?3?7? 20:31

> To: Yang, Wenyou

> Cc: linux-arm-kernel@lists.infradead.org; grant.likely@secretlab.ca; Ferre,

> Nicolas; plagnioj@jcrosoft.com; richard.genoud@gmail.com; Lin, JM;

> spi-devel-general@lists.sourceforge.net; linux-kernel@vger.kernel.org

> Subject: Re: [PATCH v6 01/16] spi/spi-atmel: fix probing failure after

> xfer->speed_hz set

> 

> On 7 March 2013 04:26, Wenyou Yang <wenyou.yang@atmel.com> wrote:

> > commit: 059b8ffeee5b427949872bb6ed5db5ae0788054e

> > cause the atmel spi probing failure.

> >

> > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>

> > Cc: spi-devel-general@lists.sourceforge.net

> > Cc: linux-kernel@vger.kernel.org

> > ---

> >  drivers/spi/spi-atmel.c |    6 +++---

> >  1 file changed, 3 insertions(+), 3 deletions(-)

> >

> > diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c

> > index 656d137..1eca815 100644

> > --- a/drivers/spi/spi-atmel.c

> > +++ b/drivers/spi/spi-atmel.c

> > @@ -846,9 +846,9 @@ static int atmel_spi_transfer(struct spi_device *spi,

> struct spi_message *msg)

> >                         }

> >                 }

> >

> > -               /* FIXME implement these protocol options!! */

> > -               if (xfer->speed_hz) {

> > -                       dev_dbg(&spi->dev, "no protocol options

> yet\n");

> > +               if (xfer->speed_hz < spi->max_speed_hz) {

> > +                       dev_dbg(&spi->dev,

> > +                               "speed in transfer less than bus

> speed\n");

> >                         return -ENOPROTOOPT;

> >                 }

> 

> I sent a similar patch to spi-devl a while ago, which Grant said he applied.

> https://patchwork.kernel.org/patch/2165301/

> 

> Can't find the patch in any upstream git tree so I guess Grant hasn't

> pushed it yet.


Sorry, I didn't notice your patch before.
Furthermore, I made this patch based on your and Grant,s email.

I will drop this patch.

> 

> regards

> Joachim Eastwood


Best Regards,
Wenyou Yang
Wenyou Yang March 8, 2013, 9:43 a.m. UTC | #4
Hi, Serqei,

> -----Original Message-----

> From: Sergei Shtylyov [mailto:sergei.shtylyov@cogentembedded.com]

> Sent: 2013?3?7? 20:18

> To: Yang, Wenyou

> Cc: linux-arm-kernel@lists.infradead.org; richard.genoud@gmail.com; Lin, JM;

> Ferre, Nicolas; linux-kernel@vger.kernel.org; grant.likely@secretlab.ca;

> spi-devel-general@lists.sourceforge.net; plagnioj@jcrosoft.com

> Subject: Re: [PATCH v6 01/16] spi/spi-atmel: fix probing failure after

> xfer->speed_hz set

> 

> Hello.

> 

> On 07-03-2013 7:26, Wenyou Yang wrote:

> 

> > commit: 059b8ffeee5b427949872bb6ed5db5ae0788054e

> 

>     Please also specify the summary line of that commit in parens (or however

> you like).

Thanks for your suggestion.

> 

> > cause the atmel spi probing failure.

> 

> > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>

> > Cc: spi-devel-general@lists.sourceforge.net

> > Cc: linux-kernel@vger.kernel.org

> 

> WBR, Sergei


Best Regards,
Wenyou Yang
Wenyou Yang May 2, 2013, 2:35 a.m. UTC | #5
Hi, Joachim,

> -----Original Message-----

> From: Joachim Eastwood [mailto:manabian@gmail.com]

> Sent: 2013?3?7? 20:31

> To: Yang, Wenyou

> Cc: linux-arm-kernel@lists.infradead.org; grant.likely@secretlab.ca; Ferre,

> Nicolas; plagnioj@jcrosoft.com; richard.genoud@gmail.com; Lin, JM;

> spi-devel-general@lists.sourceforge.net; linux-kernel@vger.kernel.org

> Subject: Re: [PATCH v6 01/16] spi/spi-atmel: fix probing failure after

> xfer->speed_hz set

> 

> On 7 March 2013 04:26, Wenyou Yang <wenyou.yang@atmel.com> wrote:

> > commit: 059b8ffeee5b427949872bb6ed5db5ae0788054e

> > cause the atmel spi probing failure.

> >

> > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>

> > Cc: spi-devel-general@lists.sourceforge.net

> > Cc: linux-kernel@vger.kernel.org

> > ---

> >  drivers/spi/spi-atmel.c |    6 +++---

> >  1 file changed, 3 insertions(+), 3 deletions(-)

> >

> > diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c

> > index 656d137..1eca815 100644

> > --- a/drivers/spi/spi-atmel.c

> > +++ b/drivers/spi/spi-atmel.c

> > @@ -846,9 +846,9 @@ static int atmel_spi_transfer(struct spi_device *spi,

> struct spi_message *msg)

> >                         }

> >                 }

> >

> > -               /* FIXME implement these protocol options!! */

> > -               if (xfer->speed_hz) {

> > -                       dev_dbg(&spi->dev, "no protocol options

> yet\n");

> > +               if (xfer->speed_hz < spi->max_speed_hz) {

> > +                       dev_dbg(&spi->dev,

> > +                               "speed in transfer less than bus

> speed\n");

> >                         return -ENOPROTOOPT;

> >                 }

> 

> I sent a similar patch to spi-devl a while ago, which Grant said he applied.

> https://patchwork.kernel.org/patch/2165301/

> 

> Can't find the patch in any upstream git tree so I guess Grant hasn't

> pushed it yet.

This patch hasn't still applied in any upstream git tree, so Atmel spi master doesn't work.
Could you help do some ping it? 

Thanks.

> 

> regards

> Joachim Eastwood


Best Regards,
Wenyou Yang
Richard Genoud May 2, 2013, 8:12 a.m. UTC | #6
2013/5/2 Yang, Wenyou <Wenyou.Yang@atmel.com>:
> Hi, Joachim,
>
>> -----Original Message-----
>> From: Joachim Eastwood [mailto:manabian@gmail.com]
>> Sent: 2013?3?7? 20:31
>> To: Yang, Wenyou
>> Cc: linux-arm-kernel@lists.infradead.org; grant.likely@secretlab.ca; Ferre,
>> Nicolas; plagnioj@jcrosoft.com; richard.genoud@gmail.com; Lin, JM;
>> spi-devel-general@lists.sourceforge.net; linux-kernel@vger.kernel.org
>> Subject: Re: [PATCH v6 01/16] spi/spi-atmel: fix probing failure after
>> xfer->speed_hz set
>>
>> On 7 March 2013 04:26, Wenyou Yang <wenyou.yang@atmel.com> wrote:
>> > commit: 059b8ffeee5b427949872bb6ed5db5ae0788054e
>> > cause the atmel spi probing failure.
>> >
>> > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
>> > Cc: spi-devel-general@lists.sourceforge.net
>> > Cc: linux-kernel@vger.kernel.org
>> > ---
>> >  drivers/spi/spi-atmel.c |    6 +++---
>> >  1 file changed, 3 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
>> > index 656d137..1eca815 100644
>> > --- a/drivers/spi/spi-atmel.c
>> > +++ b/drivers/spi/spi-atmel.c
>> > @@ -846,9 +846,9 @@ static int atmel_spi_transfer(struct spi_device *spi,
>> struct spi_message *msg)
>> >                         }
>> >                 }
>> >
>> > -               /* FIXME implement these protocol options!! */
>> > -               if (xfer->speed_hz) {
>> > -                       dev_dbg(&spi->dev, "no protocol options
>> yet\n");
>> > +               if (xfer->speed_hz < spi->max_speed_hz) {
>> > +                       dev_dbg(&spi->dev,
>> > +                               "speed in transfer less than bus
>> speed\n");
>> >                         return -ENOPROTOOPT;
>> >                 }
>>
>> I sent a similar patch to spi-devl a while ago, which Grant said he applied.
>> https://patchwork.kernel.org/patch/2165301/
>>
>> Can't find the patch in any upstream git tree so I guess Grant hasn't
>> pushed it yet.
> This patch hasn't still applied in any upstream git tree, so Atmel spi master doesn't work.
> Could you help do some ping it?

it's in linux-next:
3d3522604a5557e80fdcab61c54bd04eaf15b525
merged from spi-current/spi/merge


Richard.
Nicolas Ferre May 2, 2013, 10:34 a.m. UTC | #7
On 02/05/2013 10:12, Richard Genoud :
> 2013/5/2 Yang, Wenyou <Wenyou.Yang@atmel.com>:
>> Hi, Joachim,
>>
>>> -----Original Message-----
>>> From: Joachim Eastwood [mailto:manabian@gmail.com]
>>> Sent: 2013?3?7? 20:31
>>> To: Yang, Wenyou
>>> Cc: linux-arm-kernel@lists.infradead.org; grant.likely@secretlab.ca; Ferre,
>>> Nicolas; plagnioj@jcrosoft.com; richard.genoud@gmail.com; Lin, JM;
>>> spi-devel-general@lists.sourceforge.net; linux-kernel@vger.kernel.org
>>> Subject: Re: [PATCH v6 01/16] spi/spi-atmel: fix probing failure after
>>> xfer->speed_hz set
>>>
>>> On 7 March 2013 04:26, Wenyou Yang <wenyou.yang@atmel.com> wrote:
>>>> commit: 059b8ffeee5b427949872bb6ed5db5ae0788054e
>>>> cause the atmel spi probing failure.
>>>>
>>>> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
>>>> Cc: spi-devel-general@lists.sourceforge.net
>>>> Cc: linux-kernel@vger.kernel.org
>>>> ---
>>>>   drivers/spi/spi-atmel.c |    6 +++---
>>>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
>>>> index 656d137..1eca815 100644
>>>> --- a/drivers/spi/spi-atmel.c
>>>> +++ b/drivers/spi/spi-atmel.c
>>>> @@ -846,9 +846,9 @@ static int atmel_spi_transfer(struct spi_device *spi,
>>> struct spi_message *msg)
>>>>                          }
>>>>                  }
>>>>
>>>> -               /* FIXME implement these protocol options!! */
>>>> -               if (xfer->speed_hz) {
>>>> -                       dev_dbg(&spi->dev, "no protocol options
>>> yet\n");
>>>> +               if (xfer->speed_hz < spi->max_speed_hz) {
>>>> +                       dev_dbg(&spi->dev,
>>>> +                               "speed in transfer less than bus
>>> speed\n");
>>>>                          return -ENOPROTOOPT;
>>>>                  }
>>>
>>> I sent a similar patch to spi-devl a while ago, which Grant said he applied.
>>> https://patchwork.kernel.org/patch/2165301/
>>>
>>> Can't find the patch in any upstream git tree so I guess Grant hasn't
>>> pushed it yet.
>> This patch hasn't still applied in any upstream git tree, so Atmel spi master doesn't work.
>> Could you help do some ping it?
>
> it's in linux-next:
> 3d3522604a5557e80fdcab61c54bd04eaf15b525
> merged from spi-current/spi/merge

Thanks Richard, yes I can find it here:
http://git.secretlab.ca/?p=linux.git;a=commit;h=3d3522604a5557e80fdcab61c54bd04eaf15b525

Grant, Mark,

Can you tell us if this SPI patch will be merged upstream using one of 
your paths?

Best regards,
Mark Brown May 6, 2013, 10:31 a.m. UTC | #8
On Thu, May 02, 2013 at 12:34:55PM +0200, Nicolas Ferre wrote:

> Can you tell us if this SPI patch will be merged upstream using one
> of your paths?

I have no idea what patch this is but if it's not in my tree -next it's
unlikely to be merged.
Wenyou Yang May 7, 2013, 1:11 a.m. UTC | #9
Hi, Mark

> From: Mark Brown [mailto:broonie@kernel.org]

> Sent: 2013?5?6? 18:31

> To: Ferre, Nicolas

> Cc: grant.likely@secretlab.ca; Grant Likely; Richard Genoud; Yang, Wenyou;

> Joachim Eastwood; linux-arm-kernel@lists.infradead.org;

> plagnioj@jcrosoft.com; Lin, JM; spi-devel-general@lists.sourceforge.net;

> linux-kernel@vger.kernel.org

> Subject: Re: [PATCH v6 01/16] spi/spi-atmel: fix probing failure after

> xfer->speed_hz set

> 

> On Thu, May 02, 2013 at 12:34:55PM +0200, Nicolas Ferre wrote:

> 

> > Can you tell us if this SPI patch will be merged upstream using one of

> > your paths?

> 

> I have no idea what patch this is but if it's not in my tree -next it's unlikely to be

> merged.

This is dropped patch, no need to be merged.

We tested Atmel spi in your tree-next , but it doesn't work, the reason is the Joachim Eastwood's patch is not included. 
https://patchwork.kernel.org/patch/2165301/
which Joachim said that Grant said he applied.

Thanks

Best Regards,
Wenyou Yang
Nicolas Ferre May 7, 2013, 9:31 a.m. UTC | #10
On 07/05/2013 03:11, Yang, Wenyou :
> Hi, Mark
> 
>> From: Mark Brown [mailto:broonie@kernel.org]
>> Sent: 2013?5?6? 18:31
>> To: Ferre, Nicolas
>> Cc: grant.likely@secretlab.ca; Grant Likely; Richard Genoud; Yang, Wenyou;
>> Joachim Eastwood; linux-arm-kernel@lists.infradead.org;
>> plagnioj@jcrosoft.com; Lin, JM; spi-devel-general@lists.sourceforge.net;
>> linux-kernel@vger.kernel.org
>> Subject: Re: [PATCH v6 01/16] spi/spi-atmel: fix probing failure after
>> xfer->speed_hz set
>>
>> On Thu, May 02, 2013 at 12:34:55PM +0200, Nicolas Ferre wrote:
>>
>>> Can you tell us if this SPI patch will be merged upstream using one of
>>> your paths?
>>
>> I have no idea what patch this is but if it's not in my tree -next it's unlikely to be
>> merged.
> This is dropped patch, no need to be merged.
> 
> We tested Atmel spi in your tree-next , but it doesn't work, the reason is the Joachim Eastwood's patch is not included.
> https://patchwork.kernel.org/patch/2165301/
> which Joachim said that Grant said he applied.

Hi Wenyou,

Sorry for not having communicating with you after Mark told me the story
about this patch: Mark merged Grant's material in his SPI tree (with is
the official one nowadays). You can see that by browsing linux-next:

 Merge remote-tracking branch 'spi/fix/grant' into spi-linus

Joachim's patch is well included in it. We still have to monitor
inclusion of it in Linus' tree...

Mark, sorry for the noise.

Bye,
diff mbox

Patch

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 656d137..1eca815 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -846,9 +846,9 @@  static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
 			}
 		}
 
-		/* FIXME implement these protocol options!! */
-		if (xfer->speed_hz) {
-			dev_dbg(&spi->dev, "no protocol options yet\n");
+		if (xfer->speed_hz < spi->max_speed_hz) {
+			dev_dbg(&spi->dev,
+				"speed in transfer less than bus speed\n");
 			return -ENOPROTOOPT;
 		}