[PATCH] can: sja1000: Fix error location forwarding

[PATCH] can: sja1000: Fix error location forwarding

[Alexander Gerasiov]

According to SJA1000 documentation the location of error is available
regardless of an error type. Therefore it should always be forwarded to
SocketCAN.

Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@lvk.cs.msu.su>
Signed-off-by: Alexander GQ Gerasiov <gq@cs.msu.su>
---
 drivers/net/can/sja1000/sja1000.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 8dda3b7..9f10779 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -438,6 +438,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
 
                cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
 
+               /* set error type */
                switch (ecc & ECC_MASK) {
                case ECC_BIT:
                        cf->data[2] |= CAN_ERR_PROT_BIT;
@@ -449,9 +450,12 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
                        cf->data[2] |= CAN_ERR_PROT_STUFF;
                        break;
                default:
-                       cf->data[3] = ecc & ECC_SEG;
                        break;
                }
+
+               /* set error location */
+               cf->data[3] = ecc & ECC_SEG;
+
                /* Error occurred during transmission? */
                if ((ecc & ECC_DIR) == 0)
                        cf->data[2] |= CAN_ERR_PROT_TX;
-- 
2.1.4



-- 
Best regards,
 Alexander Gerasiov

 Contacts:
 e-mail: gq@cs.msu.su  Homepage: http://gerasiov.net  Skype: gerasiov
 PGP fingerprint: 04B5 9D90 DF7C C2AB CD49  BAEA CA87 E9E8 2AAC 33F1

Re: [PATCH] can: sja1000: Fix error location forwarding

[Oliver Hartkopp]

Hello Alexander,

you are right. Thanks for the fix.

On 04/01/2016 06:16 PM, Alexander Gerasiov wrote:
> According to SJA1000 documentation the location of error is available
> regardless of an error type. Therefore it should always be forwarded to
> SocketCAN.
> 
> Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@lvk.cs.msu.su>
> Signed-off-by: Alexander GQ Gerasiov <gq@cs.msu.su>

Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>

Best regards,
Oliver

> ---
>  drivers/net/can/sja1000/sja1000.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
> index 8dda3b7..9f10779 100644
> --- a/drivers/net/can/sja1000/sja1000.c
> +++ b/drivers/net/can/sja1000/sja1000.c
> @@ -438,6 +438,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
>  
>                 cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
>  
> +               /* set error type */
>                 switch (ecc & ECC_MASK) {
>                 case ECC_BIT:
>                         cf->data[2] |= CAN_ERR_PROT_BIT;
> @@ -449,9 +450,12 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
>                         cf->data[2] |= CAN_ERR_PROT_STUFF;
>                         break;
>                 default:
> -                       cf->data[3] = ecc & ECC_SEG;
>                         break;
>                 }
> +
> +               /* set error location */
> +               cf->data[3] = ecc & ECC_SEG;
> +
>                 /* Error occurred during transmission? */
>                 if ((ecc & ECC_DIR) == 0)
>                         cf->data[2] |= CAN_ERR_PROT_TX;
> 

Re: [PATCH] can: sja1000: Fix error location forwarding

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 747 bytes --]

On 04/01/2016 06:16 PM, Alexander Gerasiov wrote:
> According to SJA1000 documentation the location of error is available
> regardless of an error type. Therefore it should always be forwarded to
> SocketCAN.
> 
> Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@lvk.cs.msu.su>
> Signed-off-by: Alexander GQ Gerasiov <gq@cs.msu.su>

Applied to can-next/master. Please use git send-email to send your
patches, your mailer converted tabs to spaces.

Tnx,
Marc
-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 455 bytes --]

Re: [PATCH] can: sja1000: Fix error location forwarding

[Oliver Hartkopp]

Hi Marc,

On 04/11/2016 11:19 AM, Marc Kleine-Budde wrote:

> Applied to can-next/master. Please use git send-email to send your
> patches, your mailer converted tabs to spaces.

can you please push the can[-next] changes so that they become visible.

Tnx,
Oliver

Re: [PATCH] can: sja1000: Fix error location forwarding

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 660 bytes --]

On 04/11/2016 07:00 PM, Oliver Hartkopp wrote:
> Hi Marc,
> 
> On 04/11/2016 11:19 AM, Marc Kleine-Budde wrote:
> 
>> Applied to can-next/master. Please use git send-email to send your
>> patches, your mailer converted tabs to spaces.
> 
> can you please push the can[-next] changes so that they become visible.

Done. All pending changes are on can-next/testing.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 455 bytes --]