GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 23:21:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

can: EG20T PCH: Enumerate LEC macros

Browse source 
For easy to readable, LEC #define macros are replaced to enums.

Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tomoya 2010-11-29 18:16:15 +00:00 • committed by David S. Miller
parent 15ffc8fddf
commit d68f6837c4
1 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

77
drivers/net/can/pch_can.c
View file

@ -71,21 +71,12 @@
#define PCH_REC 0x00007f00 #define PCH_REC 0x00007f00
#define PCH_TEC 0x000000ff #define PCH_TEC 0x000000ff
#define PCH_TX_OK BIT(3) #define PCH_TX_OK BIT(3)
#define PCH_RX_OK BIT(4) #define PCH_RX_OK BIT(4)
#define PCH_EPASSIV BIT(5) #define PCH_EPASSIV BIT(5)
#define PCH_EWARN BIT(6) #define PCH_EWARN BIT(6)
#define PCH_BUS_OFF BIT(7) #define PCH_BUS_OFF BIT(7)
#define PCH_LEC0 BIT(0)
#define PCH_LEC1 BIT(1)
#define PCH_LEC2 BIT(2)
#define PCH_LEC_ALL (PCH_LEC0 | PCH_LEC1 | PCH_LEC2)
#define PCH_STUF_ERR PCH_LEC0
#define PCH_FORM_ERR PCH_LEC1
#define PCH_ACK_ERR (PCH_LEC0 | PCH_LEC1)
#define PCH_BIT1_ERR PCH_LEC2
#define PCH_BIT0_ERR (PCH_LEC0 | PCH_LEC2)
#define PCH_CRC_ERR (PCH_LEC1 | PCH_LEC2)
/* bit position of certain controller bits. */ /* bit position of certain controller bits. */
#define PCH_BIT_BRP 0 #define PCH_BIT_BRP 0
@ -117,6 +108,16 @@ enum pch_ifreg {
PCH_TX_IFREG, PCH_TX_IFREG,
}; };
enum pch_can_err {
PCH_STUF_ERR = 1,
PCH_FORM_ERR,
PCH_ACK_ERR,
PCH_BIT1_ERR,
PCH_BIT0_ERR,
PCH_CRC_ERR,
PCH_LEC_ALL,
};
enum pch_can_mode { enum pch_can_mode {
PCH_CAN_ENABLE, PCH_CAN_ENABLE,
PCH_CAN_DISABLE, PCH_CAN_DISABLE,
@ -620,7 +621,7 @@ static void pch_can_error(struct net_device *ndev, u32 status)
struct sk_buff *skb; struct sk_buff *skb;
struct pch_can_priv *priv = netdev_priv(ndev); struct pch_can_priv *priv = netdev_priv(ndev);
struct can_frame *cf; struct can_frame *cf;
u32 errc; u32 errc, lec;
struct net_device_stats *stats = &(priv->ndev->stats); struct net_device_stats *stats = &(priv->ndev->stats);
enum can_state state = priv->can.state; enum can_state state = priv->can.state;
@ -665,33 +666,37 @@ static void pch_can_error(struct net_device *ndev, u32 status)
"%s -> CAN controller is ERROR PASSIVE .\n", __func__); "%s -> CAN controller is ERROR PASSIVE .\n", __func__);
} }
if (status & PCH_LEC_ALL) { lec = status & PCH_LEC_ALL;
switch (lec) {
case PCH_STUF_ERR:
cf->data[2] |= CAN_ERR_PROT_STUFF;
priv->can.can_stats.bus_error++; priv->can.can_stats.bus_error++;
stats->rx_errors++; stats->rx_errors++;
switch (status & PCH_LEC_ALL) { break;
case PCH_STUF_ERR: case PCH_FORM_ERR:
cf->data[2] |= CAN_ERR_PROT_STUFF; cf->data[2] |= CAN_ERR_PROT_FORM;
break; priv->can.can_stats.bus_error++;
case PCH_FORM_ERR: stats->rx_errors++;
cf->data[2] |= CAN_ERR_PROT_FORM; break;
break; case PCH_ACK_ERR:
case PCH_ACK_ERR: cf->can_id |= CAN_ERR_ACK;
cf->data[2] |= CAN_ERR_PROT_LOC_ACK | priv->can.can_stats.bus_error++;
CAN_ERR_PROT_LOC_ACK_DEL; stats->rx_errors++;
break; break;
case PCH_BIT1_ERR: case PCH_BIT1_ERR:
case PCH_BIT0_ERR: case PCH_BIT0_ERR:
cf->data[2] |= CAN_ERR_PROT_BIT; cf->data[2] |= CAN_ERR_PROT_BIT;
break; priv->can.can_stats.bus_error++;
case PCH_CRC_ERR: stats->rx_errors++;
cf->data[2] |= CAN_ERR_PROT_LOC_CRC_SEQ | break;
CAN_ERR_PROT_LOC_CRC_DEL; case PCH_CRC_ERR:
break; cf->data[2] |= CAN_ERR_PROT_LOC_CRC_SEQ |
default: CAN_ERR_PROT_LOC_CRC_DEL;
iowrite32(status | PCH_LEC_ALL, &priv->regs->stat); priv->can.can_stats.bus_error++;
break; stats->rx_errors++;
} break;
case PCH_LEC_ALL: /* Written by CPU. No error status */
break;
} }
priv->can.state = state; priv->can.state = state;