Re: [PATCH v3] can/sja1000: add support for PEAK-System PCMCIA card

[Wolfgang Grandegger <wg@grandegger.com>]

On 02/13/2012 11:01 AM, Stephane Grosjean wrote:
> Hello all,
> 
> I copied&pasted everything in this single mail to simplify...
> 
> Le 13/02/2012 10:14, Marc Kleine-Budde a écrit :
>> On 02/06/2012 04:56 PM, Stephane Grosjean wrote:
>>> This patch adds the support of the PCAN-PC Card (PCMCIA) card from
>>> PEAK-System Technik (http://www.peak-system.com). The PCAN-PC Card is
>>> sja1000 based and exists in 1 or 2 channels.
>>>
>>> Signed-off-by: Stephane Grosjean<s.grosjean@peak-system.com>
>> What's the status of this patch?
>>
> 
> See below please...
> 
>> diff --git a/drivers/net/can/sja1000/sja1000.c
>> b/drivers/net/can/sja1000/sja1000.c
>> index ebbcfca..f7526a7 100644
>> --- a/drivers/net/can/sja1000/sja1000.c
>> +++ b/drivers/net/can/sja1000/sja1000.c
>> @@ -493,6 +493,10 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
>>                  n++;
>>                  status = priv->read_reg(priv, REG_SR);
>>
>> +               /* check for absent controller due to hw unplug */
>> +               if (status == 0xFF)
>> +                       break;
>> +
>>                  if (isrc&  IRQ_WUI)
>>                          netdev_warn(dev, "wakeup interrupt\n");
>>
>> @@ -504,8 +508,8 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
>>                          netif_wake_queue(dev);
>>                  }
>>                  if (isrc&  IRQ_RI) {
>> -                       /* receive interrupt */
>> -                       while (status&  SR_RBS) {
>> +                       /* receive interrupt / check for absent
>> controller */
>> +                       while (status&  SR_RBS&&  status != 0xFF) {
>>                                  sja1000_rx(dev);
>>                                  status = priv->read_reg(priv, REG_SR);
>>                          }
>>
>> @Stephane: Can you check that patch? I'm out of hw right now.
> 
> I confirm that this patch works too...
> So I think I should be able to post a new version of the peak_pcmcia
> during that day (the previous should work but some calls to
> pcmcia_dev_present() are no more useful...)

But that fix should not go to the common interrupt handler, if possible.

Wolfgang.