pch_can: Add flow control processing
Subsystems (3)
PATCH v9 1/20 pch_can: Add flow control processing
Currently, there is no flow control processing. Thus, Add flow control processing as
when there is no empty of tx buffer, netif_stop_queue is called.
When there is empty buffer, netif_wake_queue is called.
--- drivers/net/can/pch_can.c | 31 ++++++++++++------------------- 1 files changed, 12 insertions(+), 19 deletions(-)
drivers/net/can/pch_can.c +12 -19
@@ -102,6 +102,10 @@#define PCH_FIFO_THRESH 16 +/* TxRqst2 show status of MsgObjNo.17~32 */ +#define PCH_TREQ2_TX_MASK (((1 << PCH_TX_OBJ_NUM) - 1) <<\ + (PCH_RX_OBJ_END - 16)) +enum pch_ifreg {PCH_RX_IFREG ,PCH_TX_IFREG ,
@@ -871,6 +875,8 @@ MSG_OBJ: dlc =8 ; stats->tx_bytes += dlc; stats->tx_packets++; +if (int_stat ==PCH_TX_OBJ_END ) +netif_wake_queue (ndev); } int_stat =pch_can_int_pending (priv);
@@ -1009,18 +1015,6 @@ static int pch_close(struct net_device *ndev)return 0 ; } -static int pch_get_msg_obj_sts (struct net_device *ndev,u32 obj_id) -{ -u32 buffer_status =0 ; -struct pch_can_priv *priv =netdev_priv (ndev); - -/* Getting the message object status. */ - buffer_status = (u32 )pch_can_get_buffer_status (priv); - -return buffer_status & obj_id; -} - -static netdev_tx_t pch_xmit (struct sk_buff *skb,struct net_device *ndev) {int i, j;
@@ -1031,17 +1025,16 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)if (can_dropped_invalid_skb (ndev, skb))return NETDEV_TX_OK ; -if (priv->tx_obj ==PCH_TX_OBJ_END ) {/* Point tail Obj */ -while (pch_get_msg_obj_sts (ndev, (((1 <<PCH_TX_OBJ_NUM )-1 ) << -PCH_RX_OBJ_NUM ))) -udelay (500 ); +if (priv->tx_obj ==PCH_TX_OBJ_END ) { +if (ioread32 (&priv->regs->treq2) &PCH_TREQ2_TX_MASK ) +netif_stop_queue (ndev); - priv->tx_obj =PCH_TX_OBJ_START ;/* Point head of Tx Obj ID */ - tx_buffer_avail = priv->tx_obj;/* Point Tail of Tx Obj */ + tx_buffer_avail = priv->tx_obj; + priv->tx_obj =PCH_TX_OBJ_START ; }else { tx_buffer_avail = priv->tx_obj; + priv->tx_obj++; } - priv->tx_obj++;/* Reading the Msg Obj from the Msg RAM to the Interface register. */ iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[1 ].cmask);
Signature · 1 line
1.6.0.6
PATCH v9 2/20 pch_can: Divide poll function
To easy to read/understand, divide poll function into two sub-functions.
--- drivers/net/can/pch_can.c | 71 ++++++++++++++++++++++----------------------- 1 files changed, 35 insertions(+), 36 deletions(-)
drivers/net/can/pch_can.c +35 -36
@@ -819,72 +819,71 @@ RX_NEXT:return rcv_pkts; } -static int pch_can_rx_poll (struct napi_struct *napi,int quota) + +static void pch_can_tx_complete (struct net_device *ndev,u32 int_stat) { -struct net_device *ndev = napi->dev;struct pch_can_priv *priv =netdev_priv (ndev);struct net_device_stats *stats = &(priv->ndev->stats);u32 dlc; + +can_get_echo_skb (ndev, int_stat -PCH_RX_OBJ_END -1 ); +iowrite32 (PCH_CMASK_RX_TX_GET |PCH_CMASK_CLRINTPND , + &priv->regs->ifregs[1 ].cmask); +pch_can_check_if_busy (&priv->regs->ifregs[1 ].creq, int_stat); + dlc =get_can_dlc (ioread32 (&priv->regs->ifregs[1 ].mcont) & +PCH_IF_MCONT_DLC ); + stats->tx_bytes += dlc; + stats->tx_packets++; +if (int_stat ==PCH_TX_OBJ_END ) +netif_wake_queue (ndev); +} + +static int pch_can_rx_poll (struct napi_struct *napi,int quota) +{ +struct net_device *ndev = napi->dev; +struct pch_can_priv *priv =netdev_priv (ndev);u32 int_stat;int rcv_pkts =0 ;u32 reg_stat; int_stat =pch_can_int_pending (priv);if (!int_stat) -return 0 ; + goto end; -INT_STAT: -if (int_stat ==PCH_STATUS_INT ) { +if ((int_stat ==PCH_STATUS_INT ) && (quota >0 )) { reg_stat =ioread32 (&priv->regs->stat);if (reg_stat & (PCH_BUS_OFF |PCH_LEC_ALL )) { -if ((reg_stat &PCH_LEC_ALL ) !=PCH_LEC_ALL ) +if (reg_stat &PCH_BUS_OFF || + (reg_stat &PCH_LEC_ALL ) !=PCH_LEC_ALL ) {pch_can_error (ndev, reg_stat); + quota--; + } } -if (reg_stat &PCH_TX_OK ) { -iowrite32 (PCH_CMASK_RX_TX_GET , - &priv->regs->ifregs[1 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[1 ].creq, -ioread32 (&priv->regs->intr)); +if (reg_stat &PCH_TX_OK )pch_can_bit_clear (&priv->regs->stat,PCH_TX_OK ); - }if (reg_stat &PCH_RX_OK )pch_can_bit_clear (&priv->regs->stat,PCH_RX_OK ); int_stat =pch_can_int_pending (priv); -if (int_stat ==PCH_STATUS_INT ) - goto INT_STAT; } -MSG_OBJ: +if (quota ==0 ) + goto end; +if ((int_stat >=PCH_RX_OBJ_START ) && (int_stat <=PCH_RX_OBJ_END )) { - rcv_pkts =pch_can_rx_normal (ndev, int_stat); -if (rcv_pkts <0 ) -return 0 ; + rcv_pkts +=pch_can_rx_normal (ndev, int_stat); + quota -= rcv_pkts; +if (quota <0 ) + goto end; }else if ((int_stat >=PCH_TX_OBJ_START ) && (int_stat <=PCH_TX_OBJ_END )) {/* Handle transmission interrupt */ -can_get_echo_skb (ndev, int_stat -PCH_RX_OBJ_END -1 ); -iowrite32 (PCH_CMASK_RX_TX_GET |PCH_CMASK_CLRINTPND , - &priv->regs->ifregs[1 ].cmask); - dlc =ioread32 (&priv->regs->ifregs[1 ].mcont) & -PCH_IF_MCONT_DLC ; -pch_can_check_if_busy (&priv->regs->ifregs[1 ].creq, int_stat); -if (dlc >8 ) - dlc =8 ; - stats->tx_bytes += dlc; - stats->tx_packets++; -if (int_stat ==PCH_TX_OBJ_END ) -netif_wake_queue (ndev); +pch_can_tx_complete (ndev, int_stat); } - int_stat =pch_can_int_pending (priv); -if (int_stat ==PCH_STATUS_INT ) - goto INT_STAT; -else if (int_stat >=1 && int_stat <=32 ) - goto MSG_OBJ; - +end:napi_complete (napi);pch_can_set_int_enables (priv,PCH_CAN_ALL );
Signature · 1 line
1.6.0.6
PATCH v9 3/20 pch_can: Fix endianness issue
there is endianness issue both Tx and Rx.
Currently, data is set like below.
Register:
MSB--LSB
x x D0 D1
x x D2 D3
x x D4 D5
x x D6 D7
But Data to be sent must be set like below.
Register:
MSB--LSB
x x D1 D0
x x D3 D2
x x D5 D4
x x D7 D6 (x means reserved area.)
--- drivers/net/can/pch_can.c | 47 +++++++++++++++++++------------------------- 1 files changed, 20 insertions(+), 27 deletions(-)
drivers/net/can/pch_can.c +20 -27
@@ -138,10 +138,7 @@ struct pch_can_if_regs {u32 id1;u32 id2;u32 mcont; -u32 dataa1; -u32 dataa2; -u32 datab1; -u32 datab2; +u32 data[4 ];u32 rsv[13 ]; };
@@ -424,10 +421,10 @@ static void pch_can_clear_buffers(struct pch_can_priv *priv)iowrite32 (0x0 , &priv->regs->ifregs[0 ].id1);iowrite32 (0x0 , &priv->regs->ifregs[0 ].id2);iowrite32 (0x0 , &priv->regs->ifregs[0 ].mcont); -iowrite32 (0x0 , &priv->regs->ifregs[0 ].dataa1); -iowrite32 (0x0 , &priv->regs->ifregs[0 ].dataa2); -iowrite32 (0x0 , &priv->regs->ifregs[0 ].datab1); -iowrite32 (0x0 , &priv->regs->ifregs[0 ].datab2); +iowrite32 (0x0 , &priv->regs->ifregs[0 ].data[0 ]); +iowrite32 (0x0 , &priv->regs->ifregs[0 ].data[1 ]); +iowrite32 (0x0 , &priv->regs->ifregs[0 ].data[2 ]); +iowrite32 (0x0 , &priv->regs->ifregs[0 ].data[3 ]);iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_MASK |PCH_CMASK_ARB |PCH_CMASK_CTRL , &priv->regs->ifregs[0 ].cmask);
@@ -441,10 +438,10 @@ static void pch_can_clear_buffers(struct pch_can_priv *priv)iowrite32 (0x0 , &priv->regs->ifregs[1 ].id1);iowrite32 (0x0 , &priv->regs->ifregs[1 ].id2);iowrite32 (0x0 , &priv->regs->ifregs[1 ].mcont); -iowrite32 (0x0 , &priv->regs->ifregs[1 ].dataa1); -iowrite32 (0x0 , &priv->regs->ifregs[1 ].dataa2); -iowrite32 (0x0 , &priv->regs->ifregs[1 ].datab1); -iowrite32 (0x0 , &priv->regs->ifregs[1 ].datab2); +iowrite32 (0x0 , &priv->regs->ifregs[1 ].data[0 ]); +iowrite32 (0x0 , &priv->regs->ifregs[1 ].data[1 ]); +iowrite32 (0x0 , &priv->regs->ifregs[1 ].data[2 ]); +iowrite32 (0x0 , &priv->regs->ifregs[1 ].data[3 ]);iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_MASK |PCH_CMASK_ARB |PCH_CMASK_CTRL , &priv->regs->ifregs[1 ].cmask);
@@ -707,12 +704,13 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 int_stat)canid_t id;u32 ide;u32 rtr; -int i, j, k; +int i, k;int rcv_pkts =0 ;struct sk_buff *skb;struct can_frame *cf;struct pch_can_priv *priv =netdev_priv (ndev);struct net_device_stats *stats = &(priv->ndev->stats); +u16 data_reg;/* Reading the messsage object from the Message RAM */ iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[0 ].cmask);
@@ -778,12 +776,10 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 int_stat) ((ioread32 (&priv->regs->ifregs[0 ].mcont)) &0x0f ); } -for (i =0 , j =0 ; i < cf->can_dlc; j++) { - reg =ioread32 (&priv->regs->ifregs[0 ].dataa1 + j*4 ); - cf->data[i++] =cpu_to_le32 (reg &0xff ); -if (i == cf->can_dlc) -break ; - cf->data[i++] =cpu_to_le32 ((reg >>8 ) &0xff ); +for (i =0 ; i < cf->can_dlc; i +=2 ) { + data_reg =ioread16 (&priv->regs->ifregs[0 ].data[i /2 ]); + cf->data[i] = data_reg; + cf->data[i +1 ] = data_reg >>8 ; }netif_receive_skb (skb);
@@ -1016,10 +1012,10 @@ static int pch_close(struct net_device *ndev)static netdev_tx_t pch_xmit (struct sk_buff *skb,struct net_device *ndev) { -int i, j;struct pch_can_priv *priv =netdev_priv (ndev);struct can_frame *cf = (struct can_frame *)skb->data;int tx_buffer_avail =0 ; +int i;if (can_dropped_invalid_skb (ndev, skb))return NETDEV_TX_OK ;
@@ -1060,13 +1056,10 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)if (cf->can_id &CAN_RTR_FLAG )pch_can_bit_clear (&priv->regs->ifregs[1 ].id2,PCH_ID2_DIR ); -for (i =0 , j =0 ; i < cf->can_dlc; j++) { -iowrite32 (le32_to_cpu (cf->data[i++]), - (&priv->regs->ifregs[1 ].dataa1) + j*4 ); -if (i == cf->can_dlc) -break ; -iowrite32 (le32_to_cpu (cf->data[i++] <<8 ), - (&priv->regs->ifregs[1 ].dataa1) + j*4 ); +/* Copy data to register */ +for (i =0 ; i < cf->can_dlc; i +=2 ) { +iowrite16 (cf->data[i] | (cf->data[i +1 ] <<8 ), + &priv->regs->ifregs[1 ].data[i /2 ]); }can_put_echo_skb (skb, ndev, tx_buffer_avail -PCH_RX_OBJ_END -1 );
Signature · 1 line
1.6.0.6
PATCH v9 4/20 pch_can: Improve rx processing
Replace complex "goto" to "do~while".
For easy to read/understand, it divides a rx function into some functions.
--- drivers/net/can/pch_can.c | 158 +++++++++++++++++++++++---------------------- 1 files changed, 82 insertions(+), 76 deletions(-)
drivers/net/can/pch_can.c +82 -76
@@ -698,83 +698,110 @@ static irqreturn_t pch_can_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static int pch_can_rx_normal (struct net_device *ndev,u32 int_stat) +static void pch_fifo_thresh (struct pch_can_priv *priv,int obj_id) +{ +if (obj_id <PCH_FIFO_THRESH ) { +iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_CTRL | +PCH_CMASK_ARB , &priv->regs->ifregs[0 ].cmask); + +/* Clearing the Dir bit. */ +pch_can_bit_clear (&priv->regs->ifregs[0 ].id2,PCH_ID2_DIR ); + +/* Clearing NewDat & IntPnd */ +pch_can_bit_clear (&priv->regs->ifregs[0 ].mcont, +PCH_IF_MCONT_INTPND ); +pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, obj_id); + }else if (obj_id >PCH_FIFO_THRESH ) { +pch_can_int_clr (priv, obj_id); + }else if (obj_id ==PCH_FIFO_THRESH ) { +int cnt; +for (cnt =0 ; cnt <PCH_FIFO_THRESH ; cnt++) +pch_can_int_clr (priv, cnt +1 ); + } +} + +static void pch_can_rx_msg_lost (struct net_device *ndev,int obj_id) +{ +struct pch_can_priv *priv =netdev_priv (ndev); +struct net_device_stats *stats = &(priv->ndev->stats); +struct sk_buff *skb; +struct can_frame *cf; + +netdev_dbg (priv->ndev,"Msg Obj is overwritten.\n" ); +pch_can_bit_clear (&priv->regs->ifregs[0 ].mcont, +PCH_IF_MCONT_MSGLOST ); +iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_CTRL , + &priv->regs->ifregs[0 ].cmask); +pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, obj_id); + + skb =alloc_can_err_skb (ndev, &cf); +if (!skb) +return ; + + cf->can_id |=CAN_ERR_CRTL ; + cf->data[1 ] =CAN_ERR_CRTL_RX_OVERFLOW ; + stats->rx_over_errors++; + stats->rx_errors++; + +netif_receive_skb (skb); +} + +static int pch_can_rx_normal (struct net_device *ndev,u32 obj_num,int quota) {u32 reg;canid_t id; -u32 ide; -u32 rtr; -int i, k;int rcv_pkts =0 ;struct sk_buff *skb;struct can_frame *cf;struct pch_can_priv *priv =netdev_priv (ndev);struct net_device_stats *stats = &(priv->ndev->stats); +int i; +u32 id2;u16 data_reg; -/* Reading the messsage object from the Message RAM */ -iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[0 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, int_stat); + do { + /* Reading the messsage object from the Message RAM */ + iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask); + pch_can_check_if_busy(&priv->regs->ifregs[0].creq, obj_num); -/* Reading the MCONT register. */ - reg =ioread32 (&priv->regs->ifregs[0 ].mcont); - reg &=0xffff ; + /* Reading the MCONT register. */ + reg = ioread32(&priv->regs->ifregs[0].mcont); + + if (reg & PCH_IF_MCONT_EOB) + break; -for (k = int_stat; !(reg &PCH_IF_MCONT_EOB ); k++) { /* If MsgLost bit set. */ if (reg & PCH_IF_MCONT_MSGLOST) { -dev_err (&priv->ndev->dev,"Msg Obj is overwritten.\n" ); -pch_can_bit_clear (&priv->regs->ifregs[0 ].mcont, -PCH_IF_MCONT_MSGLOST ); -iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_CTRL , - &priv->regs->ifregs[0 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, k); - - skb =alloc_can_err_skb (ndev, &cf); -if (!skb) -return -ENOMEM ; - - priv->can.can_stats.error_passive++; - priv->can.state =CAN_STATE_ERROR_PASSIVE ; - cf->can_id |=CAN_ERR_CRTL ; - cf->data[1 ] |=CAN_ERR_CRTL_RX_OVERFLOW ; - cf->data[2 ] |=CAN_ERR_PROT_OVERLOAD ; - stats->rx_packets++; - stats->rx_bytes += cf->can_dlc; - -netif_receive_skb (skb); + pch_can_rx_msg_lost(ndev, obj_num); rcv_pkts++; - goto RX_NEXT; + quota--; + obj_num++; + continue; + } else if (!(reg & PCH_IF_MCONT_NEWDAT)) { + obj_num++; + continue; } -if (!(reg &PCH_IF_MCONT_NEWDAT )) - goto RX_NEXT; skb = alloc_can_skb(priv->ndev, &cf); if (!skb) return -ENOMEM; /* Get Received data */ - ide = ((ioread32 (&priv->regs->ifregs[0 ].id2)) &PCH_ID2_XTD ) >> -14 ; -if (ide) { + id2 = ioread32(&priv->regs->ifregs[0].id2); + if (id2 & PCH_ID2_XTD) { id = (ioread32(&priv->regs->ifregs[0].id1) & 0xffff); - id |= (((ioread32 (&priv->regs->ifregs[0 ].id2)) & -0x1fff ) <<16 ); - cf->can_id = (id &CAN_EFF_MASK ) |CAN_EFF_FLAG ; + id |= (((id2) & 0x1fff) << 16); + cf->can_id = id | CAN_EFF_FLAG; } else { - id = (((ioread32 (&priv->regs->ifregs[0 ].id2)) & - (CAN_SFF_MASK <<2 )) >>2 ); - cf->can_id = (id &CAN_SFF_MASK ); + id = (id2 >> 2) & CAN_SFF_MASK; + cf->can_id = id; } - rtr = (ioread32 (&priv->regs->ifregs[0 ].id2) &PCH_ID2_DIR ); -if (rtr) { - cf->can_dlc =0 ; + if (id2 & PCH_ID2_DIR) cf->can_id |= CAN_RTR_FLAG; - }else { - cf->can_dlc = - ((ioread32 (&priv->regs->ifregs[0 ].mcont)) &0x0f ); - } + + cf->can_dlc = get_can_dlc((ioread32(&priv->regs-> + ifregs[0].mcont)) & 0xF); for (i = 0; i < cf->can_dlc; i += 2) { data_reg = ioread16(&priv->regs->ifregs[0].data[i / 2]);
@@ -785,33 +812,12 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 int_stat)netif_receive_skb (skb); rcv_pkts++; stats->rx_packets++; + quota--; stats->rx_bytes += cf->can_dlc; -if (k <PCH_FIFO_THRESH ) { -iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_CTRL | -PCH_CMASK_ARB , &priv->regs->ifregs[0 ].cmask); - -/* Clearing the Dir bit. */ -pch_can_bit_clear (&priv->regs->ifregs[0 ].id2, -PCH_ID2_DIR ); - -/* Clearing NewDat & IntPnd */ -pch_can_bit_clear (&priv->regs->ifregs[0 ].mcont, -PCH_IF_MCONT_INTPND ); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, k); - }else if (k >PCH_FIFO_THRESH ) { -pch_can_int_clr (priv, k); - }else if (k ==PCH_FIFO_THRESH ) { -int cnt; -for (cnt =0 ; cnt <PCH_FIFO_THRESH ; cnt++) -pch_can_int_clr (priv, cnt+1 ); - } -RX_NEXT: -/* Reading the messsage object from the Message RAM */ -iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[0 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, k); - reg =ioread32 (&priv->regs->ifregs[0 ].mcont); - } +pch_fifo_thresh (priv, obj_num); + obj_num++; + }while (quota >0 );return rcv_pkts; }
@@ -869,7 +875,7 @@ static int pch_can_rx_poll(struct napi_struct *napi, int quota) goto end;if ((int_stat >=PCH_RX_OBJ_START ) && (int_stat <=PCH_RX_OBJ_END )) { - rcv_pkts +=pch_can_rx_normal (ndev, int_stat); + rcv_pkts +=pch_can_rx_normal (ndev, int_stat, quota); quota -= rcv_pkts;if (quota <0 ) goto end;
Signature · 1 line
1.6.0.6
PATCH v9 5/20 pch_can: Fix warnings
Currently, in case CONFIG_PM is disabled, compiler outputs warnings. Move six functions which are used only CONFIG_PM is enabled, into "#ifdef CONFIG_PM" area.
--- drivers/net/can/pch_can.c | 146 ++++++++++++++++++++++---------------------- 1 files changed, 73 insertions(+), 73 deletions(-)
drivers/net/can/pch_can.c +73 -73
@@ -245,23 +245,6 @@ static void pch_can_set_optmode(struct pch_can_priv *priv)iowrite32 (reg_val, &priv->regs->opt); } -static void pch_can_set_int_custom (struct pch_can_priv *priv) -{ -/* Clearing the IE, SIE and EIE bits of Can control register. */ -pch_can_bit_clear (&priv->regs->cont,PCH_CTRL_IE_SIE_EIE ); - -/* Appropriately setting them. */ -pch_can_bit_set (&priv->regs->cont, - ((priv->int_enables &PCH_MSK_CTRL_IE_SIE_EIE ) <<1 )); -} - -/* This function retrieves interrupt enabled for the CAN device. */ -static void pch_can_get_int_enables (struct pch_can_priv *priv,u32 *enables) -{ -/* Obtaining the status of IE, SIE and EIE interrupt bits. */ - *enables = ((ioread32 (&priv->regs->cont) &PCH_CTRL_IE_SIE_EIE ) >>1 ); -} -static void pch_can_set_int_enables (struct pch_can_priv *priv,enum pch_can_mode interrupt_no) {
@@ -355,61 +338,11 @@ static void pch_can_set_tx_all(struct pch_can_priv *priv, u32 set)pch_can_set_rxtx (priv, i, set,PCH_TX_IFREG ); } -static u32 pch_can_get_rxtx_ir (struct pch_can_priv *priv,u32 buff_num, -enum pch_ifreg dir) -{ -u32 ie, enable; - -if (dir) - ie =PCH_IF_MCONT_RXIE ; -else - ie =PCH_IF_MCONT_TXIE ; - -iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[dir].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[dir].creq, buff_num); - -if (((ioread32 (&priv->regs->ifregs[dir].id2)) &PCH_ID_MSGVAL ) && - ((ioread32 (&priv->regs->ifregs[dir].mcont)) & ie)) { - enable =1 ; - }else { - enable =0 ; - } -return enable; -} -static int pch_can_int_pending (struct pch_can_priv *priv) {return ioread32 (&priv->regs->intr) &0xffff ; } -static void pch_can_set_rx_buffer_link (struct pch_can_priv *priv, -u32 buffer_num,u32 set) -{ -iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[0 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, buffer_num); -iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_CTRL , - &priv->regs->ifregs[0 ].cmask); -if (set ==PCH_ENABLE ) -pch_can_bit_clear (&priv->regs->ifregs[0 ].mcont, -PCH_IF_MCONT_EOB ); -else -pch_can_bit_set (&priv->regs->ifregs[0 ].mcont,PCH_IF_MCONT_EOB ); - -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, buffer_num); -} - -static void pch_can_get_rx_buffer_link (struct pch_can_priv *priv, -u32 buffer_num,u32 *link) -{ -iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[0 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, buffer_num); - -if (ioread32 (&priv->regs->ifregs[0 ].mcont) &PCH_IF_MCONT_EOB ) - *link =PCH_DISABLE ; -else - *link =PCH_ENABLE ; -} -static void pch_can_clear_buffers (struct pch_can_priv *priv) {int i;
@@ -583,12 +516,6 @@ static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask) } } -static int pch_can_get_buffer_status (struct pch_can_priv *priv) -{ -return (ioread32 (&priv->regs->treq1) &0xffff ) | - ((ioread32 (&priv->regs->treq2) &0xffff ) <<16 ); -} -static void pch_can_reset (struct pch_can_priv *priv) {/* write to sw reset register */
@@ -1109,6 +1036,79 @@ static void __devexit pch_can_remove(struct pci_dev *pdev) }#ifdef CONFIG_PM +static void pch_can_set_int_custom (struct pch_can_priv *priv) +{ +/* Clearing the IE, SIE and EIE bits of Can control register. */ +pch_can_bit_clear (&priv->regs->cont,PCH_CTRL_IE_SIE_EIE ); + +/* Appropriately setting them. */ +pch_can_bit_set (&priv->regs->cont, + ((priv->int_enables &PCH_MSK_CTRL_IE_SIE_EIE ) <<1 )); +} + +/* This function retrieves interrupt enabled for the CAN device. */ +static void pch_can_get_int_enables (struct pch_can_priv *priv,u32 *enables) +{ +/* Obtaining the status of IE, SIE and EIE interrupt bits. */ + *enables = ((ioread32 (&priv->regs->cont) &PCH_CTRL_IE_SIE_EIE ) >>1 ); +} + +static u32 pch_can_get_rxtx_ir (struct pch_can_priv *priv,u32 buff_num, +enum pch_ifreg dir) +{ +u32 ie, enable; + +if (dir) + ie =PCH_IF_MCONT_RXIE ; +else + ie =PCH_IF_MCONT_TXIE ; + +iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[dir].cmask); +pch_can_check_if_busy (&priv->regs->ifregs[dir].creq, buff_num); + +if (((ioread32 (&priv->regs->ifregs[dir].id2)) &PCH_ID_MSGVAL ) && + ((ioread32 (&priv->regs->ifregs[dir].mcont)) & ie)) { + enable =1 ; + }else { + enable =0 ; + } +return enable; +} + +static void pch_can_set_rx_buffer_link (struct pch_can_priv *priv, +u32 buffer_num,u32 set) +{ +iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[0 ].cmask); +pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, buffer_num); +iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_CTRL , + &priv->regs->ifregs[0 ].cmask); +if (set ==PCH_ENABLE ) +pch_can_bit_clear (&priv->regs->ifregs[0 ].mcont, +PCH_IF_MCONT_EOB ); +else +pch_can_bit_set (&priv->regs->ifregs[0 ].mcont,PCH_IF_MCONT_EOB ); + +pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, buffer_num); +} + +static void pch_can_get_rx_buffer_link (struct pch_can_priv *priv, +u32 buffer_num,u32 *link) +{ +iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[0 ].cmask); +pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, buffer_num); + +if (ioread32 (&priv->regs->ifregs[0 ].mcont) &PCH_IF_MCONT_EOB ) + *link =PCH_DISABLE ; +else + *link =PCH_ENABLE ; +} + +static int pch_can_get_buffer_status (struct pch_can_priv *priv) +{ +return (ioread32 (&priv->regs->treq1) &0xffff ) | + ((ioread32 (&priv->regs->treq2) &0xffff ) <<16 ); +} +static int pch_can_suspend (struct pci_dev *pdev,pm_message_t state) {int i;/* Counter variable. */
Signature · 1 line
1.6.0.6
PATCH v9 6/20 pch_can: Rename function/macro name
For easy to read/understand, Rename function/macro name.
--- drivers/net/can/pch_can.c | 176 ++++++++++++++++++++------------------------- 1 files changed, 77 insertions(+), 99 deletions(-)
drivers/net/can/pch_can.c +77 -99
@@ -32,8 +32,6 @@#include <linux/can/dev.h> #include <linux/can/error.h> -#define PCH_ENABLE 1/* The enable flag */ -#define PCH_DISABLE 0/* The disable flag */ #define PCH_CTRL_INIT BIT(0)/* The INIT bit of CANCONT register. */ #define PCH_CTRL_IE BIT(1)/* The IE bit of CAN control register */ #define PCH_CTRL_IE_SIE_EIE (BIT(3) | BIT(2) | BIT(1))
@@ -78,11 +76,12 @@#define PCH_BUS_OFF BIT(7)/* bit position of certain controller bits. */ -#define PCH_BIT_BRP 0 -#define PCH_BIT_SJW 6 -#define PCH_BIT_TSEG1 8 -#define PCH_BIT_TSEG2 12 -#define PCH_BIT_BRPE_BRPE 6 +#define PCH_BIT_BRP_SHIFT 0 +#define PCH_BIT_SJW_SHIFT 6 +#define PCH_BIT_TSEG1_SHIFT 8 +#define PCH_BIT_TSEG2_SHIFT 12 +#define PCH_BIT_BRPE_BRPE_SHIFT 6 +#define PCH_MSK_BITT_BRP 0x3f#define PCH_MSK_BRPE_BRPE 0x3c0#define PCH_MSK_CTRL_IE_SIE_EIE 0x07
@@ -170,19 +169,16 @@ struct pch_can_regs {struct pch_can_priv {struct can_priv can; -unsigned int can_num;struct pci_dev *dev; -int tx_enable[PCH_TX_OBJ_END ]; -int rx_enable[PCH_TX_OBJ_END ]; -int rx_link[PCH_TX_OBJ_END ]; -unsigned int int_enables; -unsigned int int_stat; +u32 tx_enable[PCH_TX_OBJ_END ]; +u32 rx_enable[PCH_TX_OBJ_END ]; +u32 rx_link[PCH_TX_OBJ_END ]; +u32 int_enables;struct net_device *ndev; -unsigned int msg_obj[PCH_TX_OBJ_END ];struct pch_can_regs __iomem *regs;struct napi_struct napi; -unsigned int tx_obj;/* Point next Tx Obj index */ -unsigned int use_msi; +int tx_obj;/* Point next Tx Obj index */ +int use_msi; };static struct can_bittiming_const pch_can_bittiming_const = {
@@ -245,14 +241,27 @@ static void pch_can_set_optmode(struct pch_can_priv *priv)iowrite32 (reg_val, &priv->regs->opt); } +static void pch_can_rw_msg_obj (void __iomem *creq_addr,u32 num) +{ +int counter =PCH_COUNTER_LIMIT ; +u32 ifx_creq; + +iowrite32 (num, creq_addr); +while (counter) { + ifx_creq =ioread32 (creq_addr) &PCH_IF_CREQ_BUSY ; +if (!ifx_creq) +break ; + counter--; +udelay (1 ); + } +if (!counter) +pr_err ("%s:IF1 BUSY Flag is set forever.\n" , __func__); +} +static void pch_can_set_int_enables (struct pch_can_priv *priv,enum pch_can_mode interrupt_no) {switch (interrupt_no) { -case PCH_CAN_ENABLE : -pch_can_bit_set (&priv->regs->cont,PCH_CTRL_IE ); -break ; -case PCH_CAN_DISABLE :pch_can_bit_clear (&priv->regs->cont,PCH_CTRL_IE );break ;
@@ -271,25 +280,8 @@ static void pch_can_set_int_enables(struct pch_can_priv *priv, } } -static void pch_can_check_if_busy (u32 __iomem *creq_addr,u32 num) -{ -u32 counter =PCH_COUNTER_LIMIT ; -u32 ifx_creq; - -iowrite32 (num, creq_addr); -while (counter) { - ifx_creq =ioread32 (creq_addr) &PCH_IF_CREQ_BUSY ; -if (!ifx_creq) -break ; - counter--; -udelay (1 ); - } -if (!counter) -pr_err ("%s:IF1 BUSY Flag is set forever.\n" , __func__); -} -static void pch_can_set_rxtx (struct pch_can_priv *priv,u32 buff_num, -u32 set,enum pch_ifreg dir) +int set,enum pch_ifreg dir) {u32 ie;
@@ -300,27 +292,27 @@ static void pch_can_set_rxtx(struct pch_can_priv *priv, u32 buff_num,/* Reading the receive buffer data from RAM to Interface1 registers */ iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[dir].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[dir].creq, buff_num); +pch_can_rw_msg_obj (&priv->regs->ifregs[dir].creq, buff_num);/* Setting the IF1MASK1 register to access MsgVal and RxIE bits */ iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_ARB |PCH_CMASK_CTRL , &priv->regs->ifregs[dir].cmask); -if (set ==PCH_ENABLE ) { +if (set) {/* Setting the MsgVal and RxIE bits */ pch_can_bit_set (&priv->regs->ifregs[dir].mcont, ie);pch_can_bit_set (&priv->regs->ifregs[dir].id2,PCH_ID_MSGVAL ); - }else if (set ==PCH_DISABLE ) { + }else {/* Resetting the MsgVal and RxIE bits */ pch_can_bit_clear (&priv->regs->ifregs[dir].mcont, ie);pch_can_bit_clear (&priv->regs->ifregs[dir].id2,PCH_ID_MSGVAL ); } -pch_can_check_if_busy (&priv->regs->ifregs[dir].creq, buff_num); +pch_can_rw_msg_obj (&priv->regs->ifregs[dir].creq, buff_num); } -static void pch_can_set_rx_all (struct pch_can_priv *priv,u32 set) +static void pch_can_set_rx_all (struct pch_can_priv *priv,int set) {int i;
@@ -329,7 +321,7 @@ static void pch_can_set_rx_all(struct pch_can_priv *priv, u32 set)pch_can_set_rxtx (priv, i, set,PCH_RX_IFREG ); } -static void pch_can_set_tx_all (struct pch_can_priv *priv,u32 set) +static void pch_can_set_tx_all (struct pch_can_priv *priv,int set) {int i;
@@ -338,16 +330,16 @@ static void pch_can_set_tx_all(struct pch_can_priv *priv, u32 set)pch_can_set_rxtx (priv, i, set,PCH_TX_IFREG ); } -static int pch_can_int_pending (struct pch_can_priv *priv) +static u32 pch_can_int_pending (struct pch_can_priv *priv) {return ioread32 (&priv->regs->intr) &0xffff ; } -static void pch_can_clear_buffers (struct pch_can_priv *priv) +static void pch_can_clear_if_buffers (struct pch_can_priv *priv) { -int i; +int i;/* Msg Obj ID (1~32) */ -for (i =PCH_RX_OBJ_START ; i <=PCH_RX_OBJ_END ; i++) { +for (i =PCH_RX_OBJ_START ; i <=PCH_TX_OBJ_END ; i++) {iowrite32 (PCH_CMASK_RX_TX_SET , &priv->regs->ifregs[0 ].cmask);iowrite32 (0xffff , &priv->regs->ifregs[0 ].mask1);iowrite32 (0xffff , &priv->regs->ifregs[0 ].mask2);
@@ -361,24 +353,7 @@ static void pch_can_clear_buffers(struct pch_can_priv *priv)iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_MASK |PCH_CMASK_ARB |PCH_CMASK_CTRL , &priv->regs->ifregs[0 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, i); - } - -for (i =PCH_TX_OBJ_START ; i <=PCH_TX_OBJ_END ; i++) { -iowrite32 (PCH_CMASK_RX_TX_SET , &priv->regs->ifregs[1 ].cmask); -iowrite32 (0xffff , &priv->regs->ifregs[1 ].mask1); -iowrite32 (0xffff , &priv->regs->ifregs[1 ].mask2); -iowrite32 (0x0 , &priv->regs->ifregs[1 ].id1); -iowrite32 (0x0 , &priv->regs->ifregs[1 ].id2); -iowrite32 (0x0 , &priv->regs->ifregs[1 ].mcont); -iowrite32 (0x0 , &priv->regs->ifregs[1 ].data[0 ]); -iowrite32 (0x0 , &priv->regs->ifregs[1 ].data[1 ]); -iowrite32 (0x0 , &priv->regs->ifregs[1 ].data[2 ]); -iowrite32 (0x0 , &priv->regs->ifregs[1 ].data[3 ]); -iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_MASK | -PCH_CMASK_ARB |PCH_CMASK_CTRL , - &priv->regs->ifregs[1 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[1 ].creq, i); +pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, i); } }
@@ -389,7 +364,7 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)for (i =PCH_RX_OBJ_START ; i <=PCH_RX_OBJ_END ; i++) {iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[0 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, i); +pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, i);iowrite32 (0x0 , &priv->regs->ifregs[0 ].id1);iowrite32 (0x0 , &priv->regs->ifregs[0 ].id2);
@@ -403,6 +378,9 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)/* In case FIFO mode, Last EoB of Rx Obj must be 1 */ if (i ==PCH_RX_OBJ_END )pch_can_bit_set (&priv->regs->ifregs[0 ].mcont, +PCH_IF_MCONT_EOB ); +else +pch_can_bit_clear (&priv->regs->ifregs[0 ].mcont,PCH_IF_MCONT_EOB );iowrite32 (0 , &priv->regs->ifregs[0 ].mask1);
@@ -414,13 +392,13 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)PCH_CMASK_ARB |PCH_CMASK_CTRL , &priv->regs->ifregs[0].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, i); +pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, i); }for (i =PCH_TX_OBJ_START ; i <=PCH_TX_OBJ_END ; i++) {iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[1 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[1 ].creq, i); +pch_can_rw_msg_obj (&priv->regs->ifregs[1 ].creq, i);/* Resetting DIR bit for reception */ iowrite32 (0x0 , &priv->regs->ifregs[1 ].id1);
@@ -441,7 +419,7 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)PCH_CMASK_ARB |PCH_CMASK_CTRL , &priv->regs->ifregs[1].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[1 ].creq, i); +pch_can_rw_msg_obj (&priv->regs->ifregs[1 ].creq, i); } }
@@ -451,7 +429,7 @@ static void pch_can_init(struct pch_can_priv *priv)pch_can_set_run_mode (priv,PCH_CAN_STOP );/* Clearing all the message object buffers. */ -pch_can_clear_buffers (priv); +pch_can_clear_if_buffers (priv);/* Configuring the respective message object as either rx/tx object. */ pch_can_config_rx_tx_buffers (priv);
@@ -496,7 +474,7 @@ static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)pch_can_bit_clear (&priv->regs->ifregs[0 ].mcont,PCH_IF_MCONT_NEWDAT |PCH_IF_MCONT_INTPND ); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, mask); +pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, mask); }else if ((mask >=PCH_TX_OBJ_START ) && (mask <=PCH_TX_OBJ_END )) {/* Setting CMASK for clearing interrupts for frame transmission. */
@@ -512,7 +490,7 @@ static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)pch_can_bit_clear (&priv->regs->ifregs[1 ].mcont,PCH_IF_MCONT_NEWDAT |PCH_IF_MCONT_INTPND |PCH_IF_MCONT_TXRQXT ); -pch_can_check_if_busy (&priv->regs->ifregs[1 ].creq, mask); +pch_can_rw_msg_obj (&priv->regs->ifregs[1 ].creq, mask); } }
@@ -637,7 +615,7 @@ static void pch_fifo_thresh(struct pch_can_priv *priv, int obj_id)/* Clearing NewDat & IntPnd */ pch_can_bit_clear (&priv->regs->ifregs[0 ].mcont,PCH_IF_MCONT_INTPND ); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, obj_id); +pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, obj_id); }else if (obj_id >PCH_FIFO_THRESH ) {pch_can_int_clr (priv, obj_id); }else if (obj_id ==PCH_FIFO_THRESH ) {
@@ -659,7 +637,7 @@ static void pch_can_rx_msg_lost(struct net_device *ndev, int obj_id) PCH_IF_MCONT_MSGLOST);iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_CTRL , &priv->regs->ifregs[0 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, obj_id); +pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, obj_id); skb =alloc_can_err_skb (ndev, &cf);if (!skb)
@@ -689,7 +667,7 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota) do { /* Reading the messsage object from the Message RAM */ iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask); - pch_can_check_if_busy(&priv->regs->ifregs[0].creq, obj_num); + pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_num); /* Reading the MCONT register. */ reg = ioread32(&priv->regs->ifregs[0].mcont);
@@ -758,7 +736,7 @@ static void pch_can_tx_complete(struct net_device *ndev, u32 int_stat)can_get_echo_skb (ndev, int_stat -PCH_RX_OBJ_END -1 );iowrite32 (PCH_CMASK_RX_TX_GET |PCH_CMASK_CLRINTPND , &priv->regs->ifregs[1 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[1 ].creq, int_stat); +pch_can_rw_msg_obj (&priv->regs->ifregs[1 ].creq, int_stat); dlc =get_can_dlc (ioread32 (&priv->regs->ifregs[1 ].mcont) &PCH_IF_MCONT_DLC ); stats->tx_bytes += dlc;
@@ -767,7 +745,7 @@ static void pch_can_tx_complete(struct net_device *ndev, u32 int_stat)netif_wake_queue (ndev); } -static int pch_can_rx_poll (struct napi_struct *napi,int quota) +static int pch_can_poll (struct napi_struct *napi,int quota) {struct net_device *ndev = napi->dev;struct pch_can_priv *priv =netdev_priv (ndev);
@@ -832,10 +810,10 @@ static int pch_set_bittiming(struct net_device *ndev) brp = (bt->tq) / (1000000000 /PCH_CAN_CLK ) -1 ; canbit = brp &PCH_MSK_BITT_BRP ; - canbit |= (bt->sjw -1 ) <<PCH_BIT_SJW ; - canbit |= (bt->phase_seg1 + bt->prop_seg -1 ) <<PCH_BIT_TSEG1 ; - canbit |= (bt->phase_seg2 -1 ) <<PCH_BIT_TSEG2 ; - bepe = (brp &PCH_MSK_BRPE_BRPE ) >>PCH_BIT_BRPE_BRPE ; + canbit |= (bt->sjw -1 ) <<PCH_BIT_SJW_SHIFT ; + canbit |= (bt->phase_seg1 + bt->prop_seg -1 ) <<PCH_BIT_TSEG1_SHIFT ; + canbit |= (bt->phase_seg2 -1 ) <<PCH_BIT_TSEG2_SHIFT ; + bepe = (brp &PCH_MSK_BRPE_BRPE ) >>PCH_BIT_BRPE_BRPE_SHIFT ;iowrite32 (canbit, &priv->regs->bitt);iowrite32 (bepe, &priv->regs->brpe);pch_can_bit_clear (&priv->regs->cont,PCH_CTRL_CCE );
@@ -947,7 +925,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev) {struct pch_can_priv *priv =netdev_priv (ndev);struct can_frame *cf = (struct can_frame *)skb->data; -int tx_buffer_avail =0 ; +int tx_obj_no;int i;if (can_dropped_invalid_skb (ndev, skb))
@@ -957,16 +935,16 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)if (ioread32 (&priv->regs->treq2) &PCH_TREQ2_TX_MASK )netif_stop_queue (ndev); - tx_buffer_avail = priv->tx_obj; + tx_obj_no = priv->tx_obj; priv->tx_obj =PCH_TX_OBJ_START ; }else { - tx_buffer_avail = priv->tx_obj; + tx_obj_no = priv->tx_obj; priv->tx_obj++; }/* Reading the Msg Obj from the Msg RAM to the Interface register. */ iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[1 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[1 ].creq, tx_buffer_avail); +pch_can_rw_msg_obj (&priv->regs->ifregs[1 ].creq, tx_obj_no);/* Setting the CMASK register. */ pch_can_bit_set (&priv->regs->ifregs[1 ].cmask,PCH_CMASK_ALL );
@@ -995,7 +973,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev) &priv->regs->ifregs[1].data[i / 2]); } -can_put_echo_skb (skb, ndev, tx_buffer_avail -PCH_RX_OBJ_END -1 ); +can_put_echo_skb (skb, ndev, tx_obj_no -PCH_RX_OBJ_END -1 );/* Updating the size of the data. */ pch_can_bit_clear (&priv->regs->ifregs[1 ].mcont,0x0f );
@@ -1010,7 +988,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)pch_can_bit_set (&priv->regs->ifregs[1 ].mcont,PCH_IF_MCONT_NEWDAT |PCH_IF_MCONT_TXRQXT ); -pch_can_check_if_busy (&priv->regs->ifregs[1 ].creq, tx_buffer_avail); +pch_can_rw_msg_obj (&priv->regs->ifregs[1 ].creq, tx_obj_no);return NETDEV_TX_OK ; }
@@ -1064,7 +1042,7 @@ static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num, ie =PCH_IF_MCONT_TXIE ;iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[dir].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[dir].creq, buff_num); +pch_can_rw_msg_obj (&priv->regs->ifregs[dir].creq, buff_num);if (((ioread32 (&priv->regs->ifregs[dir].id2)) &PCH_ID_MSGVAL ) && ((ioread32 (&priv->regs->ifregs[dir].mcont)) & ie)) {
@@ -1076,37 +1054,37 @@ static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num, }static void pch_can_set_rx_buffer_link (struct pch_can_priv *priv, -u32 buffer_num,u32 set) +u32 buffer_num,int set) {iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[0 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, buffer_num); +pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, buffer_num);iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_CTRL , &priv->regs->ifregs[0 ].cmask); -if (set ==PCH_ENABLE ) +if (set)pch_can_bit_clear (&priv->regs->ifregs[0 ].mcont,PCH_IF_MCONT_EOB );else pch_can_bit_set (&priv->regs->ifregs[0 ].mcont,PCH_IF_MCONT_EOB ); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, buffer_num); +pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, buffer_num); }static void pch_can_get_rx_buffer_link (struct pch_can_priv *priv,u32 buffer_num,u32 *link) {iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[0 ].cmask); -pch_can_check_if_busy (&priv->regs->ifregs[0 ].creq, buffer_num); +pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, buffer_num);if (ioread32 (&priv->regs->ifregs[0 ].mcont) &PCH_IF_MCONT_EOB ) - *link =PCH_DISABLE ; + *link =0 ;else - *link =PCH_ENABLE ; + *link =1 ; }static int pch_can_get_buffer_status (struct pch_can_priv *priv) {return (ioread32 (&priv->regs->treq1) &0xffff ) | - ((ioread32 (&priv->regs->treq2) &0xffff ) <<16 ); + (ioread32 (&priv->regs->treq2) <<16 ); }static int pch_can_suspend (struct pci_dev *pdev,pm_message_t state)
@@ -1114,7 +1092,7 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)int i;/* Counter variable. */ int retval;/* Return value. */ u32 buf_stat;/* Variable for reading the transmit buffer status. */ -u32 counter =0xFFFFFF ; +int counter =PCH_COUNTER_LIMIT ;struct net_device *dev =pci_get_drvdata (pdev);struct pch_can_priv *priv =netdev_priv (dev);
@@ -1291,7 +1269,7 @@ static int __devinit pch_can_probe(struct pci_dev *pdev, ndev->netdev_ops = &pch_can_netdev_ops; priv->can.clock.freq =PCH_CAN_CLK ;/* Hz */ -netif_napi_add (ndev, &priv->napi, pch_can_rx_poll,PCH_RX_OBJ_END ); +netif_napi_add (ndev, &priv->napi, pch_can_poll,PCH_RX_OBJ_END ); rc =register_candev (ndev);if (rc) {
Signature · 1 line
1.6.0.6
PATCH v9 7/20 pch_can: Change functions type
Currently, these two functions spec(returned value) is unnatural. Thus, change the return value's spec
--- drivers/net/can/pch_can.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-)
drivers/net/can/pch_can.c +10 -8
@@ -1025,10 +1025,10 @@ static void pch_can_set_int_custom(struct pch_can_priv *priv) }/* This function retrieves interrupt enabled for the CAN device. */ -static void pch_can_get_int_enables (struct pch_can_priv *priv,u32 *enables) +static u32 pch_can_get_int_enables (struct pch_can_priv *priv) {/* Obtaining the status of IE, SIE and EIE interrupt bits. */ - *enables = ((ioread32 (&priv->regs->cont) &PCH_CTRL_IE_SIE_EIE ) >>1 ); +return (ioread32 (&priv->regs->cont) &PCH_CTRL_IE_SIE_EIE ) >>1 ; } static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,
@@ -1069,16 +1069,18 @@ static void pch_can_set_rx_buffer_link(struct pch_can_priv *priv,pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, buffer_num); } -static void pch_can_get_rx_buffer_link (struct pch_can_priv *priv, -u32 buffer_num,u32 *link) +static u32 pch_can_get_rx_buffer_link (struct pch_can_priv *priv,u32 buffer_num) { +u32 link; +iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[0 ].cmask);pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, buffer_num);if (ioread32 (&priv->regs->ifregs[0 ].mcont) &PCH_IF_MCONT_EOB ) - *link =0 ; + link =0 ;else - *link =1 ; + link =1 ; +return link; }static int pch_can_get_buffer_status (struct pch_can_priv *priv)
@@ -1115,7 +1117,7 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)dev_err (&pdev->dev,"%s -> Transmission time out.\n" , __func__);/* Save interrupt configuration and then disable them */ -pch_can_get_int_enables (priv, &(priv->int_enables)); + priv->int_enables =pch_can_get_int_enables (priv);pch_can_set_int_enables (priv,PCH_CAN_DISABLE );/* Save Tx buffer enable state */
@@ -1128,7 +1130,7 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)/* Save Rx buffer enable state */ for (i =PCH_RX_OBJ_START ; i <=PCH_RX_OBJ_END ; i++) { priv->rx_enable[i] =pch_can_get_rxtx_ir (priv, i,PCH_RX_IFREG ); -pch_can_get_rx_buffer_link (priv, i, &priv->rx_link[i]); + priv->rx_link[i] =pch_can_get_rx_buffer_link (priv, i); }/* Disable all Receive buffers */
Signature · 1 line
1.6.0.6
PATCH v9 8/20 pch_can: Reduce register access
For improve tx/rx speed, reduce register access.
--- drivers/net/can/pch_can.c | 55 +++++++++++++++++--------------------------- 1 files changed, 21 insertions(+), 34 deletions(-)
drivers/net/can/pch_can.c +21 -34
@@ -372,9 +372,6 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)pch_can_bit_set (&priv->regs->ifregs[0 ].mcont,PCH_IF_MCONT_UMASK ); -/* Set FIFO mode set to 0 except last Rx Obj*/ -pch_can_bit_clear (&priv->regs->ifregs[0 ].mcont, -PCH_IF_MCONT_EOB );/* In case FIFO mode, Last EoB of Rx Obj must be 1 */ if (i ==PCH_RX_OBJ_END ) pch_can_bit_set(&priv->regs->ifregs[0].mcont,
@@ -402,14 +399,11 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)/* Resetting DIR bit for reception */ iowrite32 (0x0 , &priv->regs->ifregs[1 ].id1); -iowrite32 (0x0 , &priv->regs->ifregs[1 ].id2); -pch_can_bit_set (&priv->regs->ifregs[1 ].id2,PCH_ID2_DIR ); +iowrite32 (PCH_ID2_DIR , &priv->regs->ifregs[1 ].id2);/* Setting EOB bit for transmitter */ -iowrite32 (PCH_IF_MCONT_EOB , &priv->regs->ifregs[1 ].mcont); - -pch_can_bit_set (&priv->regs->ifregs[1 ].mcont, -PCH_IF_MCONT_UMASK ); +iowrite32 (PCH_IF_MCONT_EOB |PCH_IF_MCONT_UMASK , + &priv->regs->ifregs[1 ].mcont);iowrite32 (0 , &priv->regs->ifregs[1 ].mask1);pch_can_bit_clear (&priv->regs->ifregs[1 ].mask2,0x1fff );
@@ -524,12 +518,12 @@ static void pch_can_error(struct net_device *ndev, u32 status)dev_err (&ndev->dev,"%s -> Bus Off occurres.\n" , __func__); } + errc =ioread32 (&priv->regs->errc);/* Warning interrupt. */ if (status &PCH_EWARN ) { state =CAN_STATE_ERROR_WARNING ; priv->can.can_stats.error_warning++; cf->can_id |=CAN_ERR_CRTL ; - errc =ioread32 (&priv->regs->errc);if (((errc &PCH_REC ) >>8 ) >96 ) cf->data[1 ] |=CAN_ERR_CRTL_RX_WARNING ;if ((errc &PCH_TEC ) >96 )
@@ -542,7 +536,6 @@ static void pch_can_error(struct net_device *ndev, u32 status) priv->can.can_stats.error_passive++; state =CAN_STATE_ERROR_PASSIVE ; cf->can_id |=CAN_ERR_CRTL ; - errc =ioread32 (&priv->regs->errc);if (((errc &PCH_REC ) >>8 ) >127 ) cf->data[1 ] |=CAN_ERR_CRTL_RX_PASSIVE ;if ((errc &PCH_TEC ) >127 )
@@ -927,6 +920,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)struct can_frame *cf = (struct can_frame *)skb->data;int tx_obj_no;int i; +u32 id2;if (can_dropped_invalid_skb (ndev, skb))return NETDEV_TX_OK ;
@@ -950,22 +944,23 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)pch_can_bit_set (&priv->regs->ifregs[1 ].cmask,PCH_CMASK_ALL );/* If ID extended is set. */ -pch_can_bit_clear (&priv->regs->ifregs[1 ].id1,0xffff ); -pch_can_bit_clear (&priv->regs->ifregs[1 ].id2,0x1fff |PCH_ID2_XTD );if (cf->can_id &CAN_EFF_FLAG ) { -pch_can_bit_set (&priv->regs->ifregs[1 ].id1, - cf->can_id &0xffff ); -pch_can_bit_set (&priv->regs->ifregs[1 ].id2, - ((cf->can_id >>16 ) &0x1fff ) |PCH_ID2_XTD ); +iowrite32 (cf->can_id &0xffff , &priv->regs->ifregs[1 ].id1); + id2 = ((cf->can_id >>16 ) &0x1fff ) |PCH_ID2_XTD ; }else { -pch_can_bit_set (&priv->regs->ifregs[1 ].id1,0 ); -pch_can_bit_set (&priv->regs->ifregs[1 ].id2, - (cf->can_id &CAN_SFF_MASK ) <<2 ); +iowrite32 (0 , &priv->regs->ifregs[1 ].id1); + id2 = (cf->can_id &CAN_SFF_MASK ) <<2 ; } + id2 |=PCH_ID_MSGVAL ; +/* If remote frame has to be transmitted.. */ if (cf->can_id &CAN_RTR_FLAG ) -pch_can_bit_clear (&priv->regs->ifregs[1 ].id2,PCH_ID2_DIR ); + id2 &= ~PCH_ID2_DIR ; +else + id2 |=PCH_ID2_DIR ; + +iowrite32 (id2, &priv->regs->ifregs[1 ].id2);/* Copy data to register */ for (i =0 ; i < cf->can_dlc; i +=2 ) {
@@ -976,17 +971,8 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)can_put_echo_skb (skb, ndev, tx_obj_no -PCH_RX_OBJ_END -1 );/* Updating the size of the data. */ -pch_can_bit_clear (&priv->regs->ifregs[1 ].mcont,0x0f ); -pch_can_bit_set (&priv->regs->ifregs[1 ].mcont, cf->can_dlc); - -/* Clearing IntPend, NewDat & TxRqst */ -pch_can_bit_clear (&priv->regs->ifregs[1 ].mcont, -PCH_IF_MCONT_NEWDAT |PCH_IF_MCONT_INTPND | -PCH_IF_MCONT_TXRQXT ); - -/* Setting NewDat, TxRqst bits */ -pch_can_bit_set (&priv->regs->ifregs[1 ].mcont, -PCH_IF_MCONT_NEWDAT |PCH_IF_MCONT_TXRQXT ); +iowrite32 (cf->can_dlc |PCH_IF_MCONT_NEWDAT |PCH_IF_MCONT_TXRQXT | +PCH_IF_MCONT_TXIE , &priv->regs->ifregs[1 ].mcont);pch_can_rw_msg_obj (&priv->regs->ifregs[1 ].creq, tx_obj_no);
@@ -1211,9 +1197,10 @@ static int pch_can_get_berr_counter(const struct net_device *dev, struct can_berr_counter *bec) {struct pch_can_priv *priv =netdev_priv (dev); +u32 errc =ioread32 (&priv->regs->errc); - bec->txerr =ioread32 (&priv->regs->errc) &PCH_TEC ; - bec->rxerr = (ioread32 (&priv->regs->errc) &PCH_REC ) >>8 ; + bec->txerr = errc &PCH_TEC ; + bec->rxerr = (errc &PCH_REC ) >>8 ;return 0 ; }
Signature · 1 line
1.6.0.6
PATCH v9 9/20 pch_can: Change Copyright and module description
Currently, Copyright and module description are not formal.
--- drivers/net/can/pch_can.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/can/pch_can.c +2 -2
@@ -1,6 +1,6 @@/* * Copyright (C) 1999 - 2010 Intel Corporation. -* Copyright (C) 2010 OKI SEMICONDUCTOR Co., LTD. +* Copyright (C) 2010 OKI SEMICONDUCTOR CO., LTD. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
@@ -1301,6 +1301,6 @@ static void __exit pch_can_pci_exit(void) }module_exit (pch_can_pci_exit); -MODULE_DESCRIPTION ("Controller Area Network Driver" ); +MODULE_DESCRIPTION ("Intel EG20T PCH CAN(Controller Area Network) Driver" );MODULE_LICENSE ("GPL v2" );MODULE_VERSION ("0.94" );
Signature · 1 line
1.6.0.6
PATCH v9 10/20 pch_can: Replace netdev_dbg instead of dev_dbg partly
For easy to readable, use netdev_dbg instead of dev_dbg partly
--- drivers/net/can/pch_can.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
drivers/net/can/pch_can.c +8 -8
@@ -222,7 +222,7 @@ static void pch_can_set_run_mode(struct pch_can_priv *priv,break ;default : -dev_err (&priv->ndev->dev,"%s -> Invalid Mode.\n" , __func__); +netdev_err (priv->ndev,"%s -> Invalid Mode.\n" , __func__);break ; } }
@@ -275,7 +275,7 @@ static void pch_can_set_int_enables(struct pch_can_priv *priv,break ;default : -dev_err (&priv->ndev->dev,"Invalid interrupt number.\n" ); +netdev_err (priv->ndev,"Invalid interrupt number.\n" );break ; } }
@@ -528,7 +528,7 @@ static void pch_can_error(struct net_device *ndev, u32 status) cf->data[1 ] |=CAN_ERR_CRTL_RX_WARNING ;if ((errc &PCH_TEC ) >96 ) cf->data[1 ] |=CAN_ERR_CRTL_TX_WARNING ; -dev_warn (&ndev->dev, +netdev_dbg (ndev,"%s -> Error Counter is more than 96.\n" , __func__); }/* Error passive interrupt. */
@@ -540,7 +540,7 @@ static void pch_can_error(struct net_device *ndev, u32 status) cf->data[1 ] |=CAN_ERR_CRTL_RX_PASSIVE ;if ((errc &PCH_TEC ) >127 ) cf->data[1 ] |=CAN_ERR_CRTL_TX_PASSIVE ; -dev_err (&ndev->dev, +netdev_dbg (ndev,"%s -> CAN controller is ERROR PASSIVE .\n" , __func__); }
@@ -859,10 +859,10 @@ static int pch_can_open(struct net_device *ndev) retval =pci_enable_msi (priv->dev);if (retval) { -dev_info (&ndev->dev,"PCH CAN opened without MSI\n" ); +netdev_err (ndev,"PCH CAN opened without MSI\n" ); priv->use_msi =0 ; }else { -dev_info (&ndev->dev,"PCH CAN opened with MSI\n" ); +netdev_err (ndev,"PCH CAN opened with MSI\n" ); priv->use_msi =1 ; }
@@ -870,14 +870,14 @@ static int pch_can_open(struct net_device *ndev) retval =request_irq (priv->dev->irq, pch_can_interrupt,IRQF_SHARED , ndev->name, ndev);if (retval) { -dev_err (&ndev->dev,"request_irq failed.\n" ); +netdev_err (ndev,"request_irq failed.\n" ); goto req_irq_err; }/* Open common can device */ retval =open_candev (ndev);if (retval) { -dev_err (ndev->dev.parent,"open_candev() failed %d\n" , retval); +netdev_err (ndev,"open_candev() failed %d\n" , retval); goto err_open_candev; }
Signature · 1 line
1.6.0.6
PATCH v9 11/20 pch_can: Fix coding rule violation
Fix coding rule violation.
--- drivers/net/can/pch_can.c | 45 +++++++++++++++++++++------------------------ 1 files changed, 21 insertions(+), 24 deletions(-)
drivers/net/can/pch_can.c +21 -24
@@ -89,9 +89,11 @@#define PCH_CAN_CLK 50000000/* 50MHz */ -/* Define the number of message object. +/* +* Define the number of message object. * PCH CAN communications are done via Message RAM. -* The Message RAM consists of 32 message objects. */ +* The Message RAM consists of 32 message objects. +*/ #define PCH_RX_OBJ_NUM 26#define PCH_TX_OBJ_NUM 6#define PCH_RX_OBJ_START 1
@@ -126,7 +128,7 @@ enum pch_can_mode {PCH_CAN_ALL ,PCH_CAN_NONE ,PCH_CAN_STOP , -PCH_CAN_RUN + PCH_CAN_RUN, }; struct pch_can_if_regs {
@@ -290,21 +292,20 @@ static void pch_can_set_rxtx(struct pch_can_priv *priv, u32 buff_num,else ie =PCH_IF_MCONT_RXIE ; -/* Reading the receive buffer data from RAM to Interface1 registers */ +/* Reading the receive buffer data from RAM to Interface1/2 registers */ iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[dir].cmask);pch_can_rw_msg_obj (&priv->regs->ifregs[dir].creq, buff_num); -/* Setting the IF1MASK1 register to access MsgVal and RxIE bits */ +/* Setting the IF1/2MASK1 register to access MsgVal and RxIE bits */ iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_ARB |PCH_CMASK_CTRL , &priv->regs->ifregs[dir].cmask);if (set) { -/* Setting the MsgVal and RxIE bits */ +/* Setting the MsgVal and RxIE/TxIE bits */ pch_can_bit_set (&priv->regs->ifregs[dir].mcont, ie);pch_can_bit_set (&priv->regs->ifregs[dir].id2,PCH_ID_MSGVAL ); - }else { -/* Resetting the MsgVal and RxIE bits */ +/* Clearing the MsgVal and RxIE/TxIE bits */ pch_can_bit_clear (&priv->regs->ifregs[dir].mcont, ie);pch_can_bit_clear (&priv->regs->ifregs[dir].id2,PCH_ID_MSGVAL ); }
@@ -362,8 +363,7 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)int i;for (i =PCH_RX_OBJ_START ; i <=PCH_RX_OBJ_END ; i++) { -iowrite32 (PCH_CMASK_RX_TX_GET , - &priv->regs->ifregs[0 ].cmask); +iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[0 ].cmask);pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, i);iowrite32 (0x0 , &priv->regs->ifregs[0 ].id1);
@@ -385,16 +385,14 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv) 0x1fff | PCH_MASK2_MDIR_MXTD);/* Setting CMASK for writing */ -iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_MASK | -PCH_CMASK_ARB |PCH_CMASK_CTRL , - &priv->regs->ifregs[0 ].cmask); +iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_MASK |PCH_CMASK_ARB | +PCH_CMASK_CTRL , &priv->regs->ifregs[0 ].cmask);pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, i); }for (i =PCH_TX_OBJ_START ; i <=PCH_TX_OBJ_END ; i++) { -iowrite32 (PCH_CMASK_RX_TX_GET , - &priv->regs->ifregs[1 ].cmask); +iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[1 ].cmask);pch_can_rw_msg_obj (&priv->regs->ifregs[1 ].creq, i);/* Resetting DIR bit for reception */
@@ -409,9 +407,8 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)pch_can_bit_clear (&priv->regs->ifregs[1 ].mask2,0x1fff );/* Setting CMASK for writing */ -iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_MASK | -PCH_CMASK_ARB |PCH_CMASK_CTRL , - &priv->regs->ifregs[1 ].cmask); +iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_MASK |PCH_CMASK_ARB | +PCH_CMASK_CTRL , &priv->regs->ifregs[1 ].cmask);pch_can_rw_msg_obj (&priv->regs->ifregs[1 ].creq, i); }
@@ -470,8 +467,9 @@ static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)pch_can_rw_msg_obj (&priv->regs->ifregs[0 ].creq, mask); }else if ((mask >=PCH_TX_OBJ_START ) && (mask <=PCH_TX_OBJ_END )) { -/* Setting CMASK for clearing interrupts for -frame transmission. */ +/* +* Setting CMASK for clearing interrupts for frame transmission. +*/ iowrite32 (PCH_CMASK_RDWR |PCH_CMASK_CTRL |PCH_CMASK_ARB , &priv->regs->ifregs[1 ].cmask);
@@ -590,7 +588,6 @@ static irqreturn_t pch_can_interrupt(int irq, void *dev_id)struct pch_can_priv *priv =netdev_priv (ndev);pch_can_set_int_enables (priv,PCH_CAN_NONE ); -napi_schedule (&priv->napi);return IRQ_HANDLED ;
@@ -1031,11 +1028,11 @@ static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,pch_can_rw_msg_obj (&priv->regs->ifregs[dir].creq, buff_num);if (((ioread32 (&priv->regs->ifregs[dir].id2)) &PCH_ID_MSGVAL ) && - ((ioread32 (&priv->regs->ifregs[dir].mcont)) & ie)) { + ((ioread32 (&priv->regs->ifregs[dir].mcont)) & ie)) enable =1 ; - }else { +else enable =0 ; - } +return enable; }
Signature · 1 line
1.6.0.6
PATCH v9 12/20 pch_can: Delete unnecessary/redundant code
Delete unnecessary/redundant code
--- drivers/net/can/pch_can.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-)
drivers/net/can/pch_can.c +1 -12
@@ -447,11 +447,6 @@ static void pch_can_release(struct pch_can_priv *priv)/* This function clears interrupt(s) from the CAN device. */ static void pch_can_int_clr (struct pch_can_priv *priv,u32 mask) { -if (mask ==PCH_STATUS_INT ) { -ioread32 (&priv->regs->stat); -return ; - } -/* Clear interrupt for transmit object */ if ((mask >=PCH_RX_OBJ_START ) && (mask <=PCH_RX_OBJ_END )) {/* Setting CMASK for clearing the reception interrupts. */
@@ -512,8 +507,6 @@ static void pch_can_error(struct net_device *ndev, u32 status) state =CAN_STATE_BUS_OFF ; cf->can_id |=CAN_ERR_BUSOFF ;can_bus_off (ndev); -pch_can_set_run_mode (priv,PCH_CAN_RUN ); -dev_err (&ndev->dev,"%s -> Bus Off occurres.\n" , __func__); } errc =ioread32 (&priv->regs->errc);
@@ -747,7 +740,7 @@ static int pch_can_poll(struct napi_struct *napi, int quota)if (!int_stat) goto end; -if ((int_stat ==PCH_STATUS_INT ) && (quota >0 )) { +if (int_stat ==PCH_STATUS_INT ) { reg_stat =ioread32 (&priv->regs->stat);if (reg_stat & (PCH_BUS_OFF |PCH_LEC_ALL )) { if (reg_stat & PCH_BUS_OFF ||
@@ -933,10 +926,6 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev) priv->tx_obj++; } -/* Reading the Msg Obj from the Msg RAM to the Interface register. */ -iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[1 ].cmask); -pch_can_rw_msg_obj (&priv->regs->ifregs[1 ].creq, tx_obj_no); -/* Setting the CMASK register. */ pch_can_bit_set (&priv->regs->ifregs[1 ].cmask,PCH_CMASK_ALL );
Signature · 1 line
1.6.0.6
PATCH v9 13/20 pch_can: Fix bit timing calculation issue
Modify like use calculated value directly passed by CAN core module.
--- drivers/net/can/pch_can.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
drivers/net/can/pch_can.c +2 -4
@@ -786,17 +786,15 @@ static int pch_set_bittiming(struct net_device *ndev)const struct can_bittiming *bt = &priv->can.bittiming;u32 canbit;u32 bepe; -u32 brp;/* Setting the CCE bit for accessing the Can Timing register. */ pch_can_bit_set (&priv->regs->cont,PCH_CTRL_CCE ); - brp = (bt->tq) / (1000000000 /PCH_CAN_CLK ) -1 ; - canbit = brp &PCH_MSK_BITT_BRP ; + canbit = (bt->brp -1 ) &PCH_MSK_BITT_BRP ; canbit |= (bt->sjw -1 ) <<PCH_BIT_SJW_SHIFT ; canbit |= (bt->phase_seg1 + bt->prop_seg -1 ) <<PCH_BIT_TSEG1_SHIFT ; canbit |= (bt->phase_seg2 -1 ) <<PCH_BIT_TSEG2_SHIFT ; - bepe = (brp &PCH_MSK_BRPE_BRPE ) >>PCH_BIT_BRPE_BRPE_SHIFT ; + bepe = ((bt->brp -1 ) &PCH_MSK_BRPE_BRPE ) >>PCH_BIT_BRPE_BRPE_SHIFT ;iowrite32 (canbit, &priv->regs->bitt);iowrite32 (bepe, &priv->regs->brpe);pch_can_bit_clear (&priv->regs->cont,PCH_CTRL_CCE );
Signature · 1 line
1.6.0.6
PATCH v9 14/20 pch_can: Fix miss-setting status issue
Modify miss-setting status issue at suspend.
--- drivers/net/can/pch_can.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/can/pch_can.c +1 -1
@@ -1073,7 +1073,7 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)pch_can_set_run_mode (priv,PCH_CAN_STOP );/* Indicate that we are aboutto/in suspend */ - priv->can.state =CAN_STATE_SLEEPING ; + priv->can.state =CAN_STATE_STOPPED ;/* Waiting for all transmission to complete. */ while (counter) {
Signature · 1 line
1.6.0.6
PATCH v9 15/20 pch_can: Comment optimization
Comment optimization
--- drivers/net/can/pch_can.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/can/pch_can.c +7 -7
@@ -292,7 +292,7 @@ static void pch_can_set_rxtx(struct pch_can_priv *priv, u32 buff_num,else ie =PCH_IF_MCONT_RXIE ; -/* Reading the receive buffer data from RAM to Interface1/2 registers */ +/* Reading the Msg buffer from Message RAM to IF1/2 registers. */ iowrite32 (PCH_CMASK_RX_TX_GET , &priv->regs->ifregs[dir].cmask);pch_can_rw_msg_obj (&priv->regs->ifregs[dir].creq, buff_num);
@@ -854,7 +854,7 @@ static int pch_can_open(struct net_device *ndev) priv->use_msi =1 ; } -/* Regsitering the interrupt. */ +/* Regstering the interrupt. */ retval =request_irq (priv->dev->irq, pch_can_interrupt,IRQF_SHARED , ndev->name, ndev);if (retval) {
@@ -954,7 +954,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)can_put_echo_skb (skb, ndev, tx_obj_no -PCH_RX_OBJ_END -1 ); -/* Updating the size of the data. */ +/* Set the size of the data. Update if2_mcont */ iowrite32 (cf->can_dlc |PCH_IF_MCONT_NEWDAT |PCH_IF_MCONT_TXRQXT |PCH_IF_MCONT_TXIE , &priv->regs->ifregs[1 ].mcont);
@@ -1061,8 +1061,8 @@ static int pch_can_get_buffer_status(struct pch_can_priv *priv)static int pch_can_suspend (struct pci_dev *pdev,pm_message_t state) { -int i;/* Counter variable. */ -int retval;/* Return value. */ +int i; +int retval;u32 buf_stat;/* Variable for reading the transmit buffer status. */ int counter =PCH_COUNTER_LIMIT ;
@@ -1119,8 +1119,8 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)static int pch_can_resume (struct pci_dev *pdev) { -int i;/* Counter variable. */ -int retval;/* Return variable. */ +int i; +int retval;struct net_device *dev =pci_get_drvdata (pdev);struct pch_can_priv *priv =netdev_priv (dev);
Signature · 1 line
1.6.0.6
PATCH v9 16/20 pch_can: Move MSI processing to probe/remove processing
Currently, in case this driver is integrated as module, and when this module is re-installed, no interrupts is to be occurred. For the above issue, move MSI processing to open/release processing.
--- drivers/net/can/pch_can.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-)
drivers/net/can/pch_can.c +14 -15
@@ -845,15 +845,6 @@ static int pch_can_open(struct net_device *ndev)struct pch_can_priv *priv =netdev_priv (ndev);int retval; - retval =pci_enable_msi (priv->dev); -if (retval) { -netdev_err (ndev,"PCH CAN opened without MSI\n" ); - priv->use_msi =0 ; - }else { -netdev_err (ndev,"PCH CAN opened with MSI\n" ); - priv->use_msi =1 ; - } -/* Regstering the interrupt. */ retval =request_irq (priv->dev->irq, pch_can_interrupt,IRQF_SHARED , ndev->name, ndev);
@@ -879,9 +870,6 @@ static int pch_can_open(struct net_device *ndev) err_open_candev:free_irq (priv->dev->irq, ndev); req_irq_err: -if (priv->use_msi) -pci_disable_msi (priv->dev); -pch_can_release (priv);return retval;
@@ -895,8 +883,6 @@ static int pch_close(struct net_device *ndev)napi_disable (&priv->napi);pch_can_release (priv);free_irq (priv->dev->irq, ndev); -if (priv->use_msi) -pci_disable_msi (priv->dev);close_candev (ndev); priv->can.state =CAN_STATE_STOPPED ;return 0 ;
@@ -975,12 +961,14 @@ static void __devexit pch_can_remove(struct pci_dev *pdev)struct pch_can_priv *priv =netdev_priv (ndev);unregister_candev (priv->ndev); -free_candev (priv->ndev);pci_iounmap (pdev, priv->regs); +if (priv->use_msi) +pci_disable_msi (priv->dev);pci_release_regions (pdev);pci_disable_device (pdev);pci_set_drvdata (pdev,NULL );pch_can_reset (priv); +free_candev (priv->ndev); }#ifdef CONFIG_PM
@@ -1244,6 +1232,15 @@ static int __devinit pch_can_probe(struct pci_dev *pdev,netif_napi_add (ndev, &priv->napi, pch_can_poll,PCH_RX_OBJ_END ); + rc =pci_enable_msi (priv->dev); +if (rc) { +netdev_err (ndev,"PCH CAN opened without MSI\n" ); + priv->use_msi =0 ; + }else { +netdev_err (ndev,"PCH CAN opened with MSI\n" ); + priv->use_msi =1 ; + } + rc =register_candev (ndev);if (rc) {dev_err (&pdev->dev,"Failed register_candev %d\n" , rc);
@@ -1253,6 +1250,8 @@ static int __devinit pch_can_probe(struct pci_dev *pdev,return 0 ; probe_exit_reg_candev: +if (priv->use_msi) +pci_disable_msi (priv->dev);free_candev (ndev); probe_exit_alloc_candev:pci_iounmap (pdev, addr);
Signature · 1 line
1.6.0.6
PATCH v9 17/20 pch_can: Fix incorrect return processing
Fix incorrect return processing.
--- drivers/net/can/pch_can.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-)
drivers/net/can/pch_can.c +10 -9
@@ -580,9 +580,11 @@ static irqreturn_t pch_can_interrupt(int irq, void *dev_id)struct net_device *ndev = (struct net_device *)dev_id;struct pch_can_priv *priv =netdev_priv (ndev); +if (!pch_can_int_pending (priv)) +return IRQ_NONE ; +pch_can_set_int_enables (priv,PCH_CAN_NONE );napi_schedule (&priv->napi); -return IRQ_HANDLED ; }
@@ -671,8 +673,10 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota) } skb =alloc_can_skb (priv->ndev, &cf); -if (!skb) -return -ENOMEM ; +if (!skb) { +netdev_err (ndev,"alloc_can_skb Failed\n" ); +return rcv_pkts; + }/* Get Received data */ id2 =ioread32 (&priv->regs->ifregs[0 ].id2);
@@ -733,8 +737,8 @@ static int pch_can_poll(struct napi_struct *napi, int quota)struct net_device *ndev = napi->dev;struct pch_can_priv *priv =netdev_priv (ndev);u32 int_stat; -int rcv_pkts =0 ;u32 reg_stat; +int quota_save = quota; int_stat =pch_can_int_pending (priv);if (!int_stat)
@@ -763,10 +767,7 @@ static int pch_can_poll(struct napi_struct *napi, int quota) goto end;if ((int_stat >=PCH_RX_OBJ_START ) && (int_stat <=PCH_RX_OBJ_END )) { - rcv_pkts +=pch_can_rx_normal (ndev, int_stat, quota); - quota -= rcv_pkts; -if (quota <0 ) - goto end; + quota -=pch_can_rx_normal (ndev, int_stat, quota); }else if ((int_stat >=PCH_TX_OBJ_START ) && (int_stat <=PCH_TX_OBJ_END )) {/* Handle transmission interrupt */
@@ -777,7 +778,7 @@ end:napi_complete (napi);pch_can_set_int_enables (priv,PCH_CAN_ALL ); -return rcv_pkts; +return quota_save - quota; }static int pch_set_bittiming (struct net_device *ndev)
Signature · 1 line
1.6.0.6
PATCH v9 18/20 pch_can: Optimize "if" condition in rx/tx processing
For reduce "if" condition, easy to read/understand the code, optimize "if" condition in rx/tx processing.
--- drivers/net/can/pch_can.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-)
drivers/net/can/pch_can.c +10 -16
@@ -746,19 +746,16 @@ static int pch_can_poll(struct napi_struct *napi, int quota)if (int_stat ==PCH_STATUS_INT ) { reg_stat =ioread32 (&priv->regs->stat); -if (reg_stat & (PCH_BUS_OFF |PCH_LEC_ALL )) { -if (reg_stat &PCH_BUS_OFF || - (reg_stat &PCH_LEC_ALL ) !=PCH_LEC_ALL ) { -pch_can_error (ndev, reg_stat); - quota--; - } - } -if (reg_stat &PCH_TX_OK ) -pch_can_bit_clear (&priv->regs->stat,PCH_TX_OK ); +if ((reg_stat & (PCH_BUS_OFF |PCH_LEC_ALL )) && + ((reg_stat &PCH_LEC_ALL ) !=PCH_LEC_ALL )) { +pch_can_error (ndev, reg_stat); + quota--; + } -if (reg_stat &PCH_RX_OK ) -pch_can_bit_clear (&priv->regs->stat,PCH_RX_OK ); +if (reg_stat & (PCH_TX_OK |PCH_RX_OK )) +pch_can_bit_clear (&priv->regs->stat, + reg_stat & (PCH_TX_OK |PCH_RX_OK )); int_stat =pch_can_int_pending (priv); }
@@ -900,14 +897,13 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)if (can_dropped_invalid_skb (ndev, skb))return NETDEV_TX_OK ; + tx_obj_no = priv->tx_obj;if (priv->tx_obj ==PCH_TX_OBJ_END ) {if (ioread32 (&priv->regs->treq2) &PCH_TREQ2_TX_MASK )netif_stop_queue (ndev); - tx_obj_no = priv->tx_obj; priv->tx_obj =PCH_TX_OBJ_START ; }else { - tx_obj_no = priv->tx_obj; priv->tx_obj++; }
@@ -926,9 +922,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev) id2 |=PCH_ID_MSGVAL ;/* If remote frame has to be transmitted.. */ -if (cf->can_id &CAN_RTR_FLAG ) - id2 &= ~PCH_ID2_DIR ; -else +if (!(cf->can_id &CAN_RTR_FLAG )) id2 |=PCH_ID2_DIR ;iowrite32 (id2, &priv->regs->ifregs[1 ].id2);
Signature · 1 line
1.6.0.6
PATCH v9 19/20 pch_can: Add setting TEC/REC statistics processing
Add setting TEC/REC statistics processing.
--- drivers/net/can/pch_can.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/net/can/pch_can.c +3 -0
@@ -568,6 +568,9 @@ static void pch_can_error(struct net_device *ndev, u32 status)break ; } + cf->data[6 ] = errc &PCH_TEC ; + cf->data[7 ] = (errc &PCH_REC ) >>8 ; + priv->can.state = state;netif_rx (skb);
Signature · 1 line
1.6.0.6
PATCH v9 20/20 pch_can: Replace netif_rx to netif_receive_skb
Since this driver is implemented as NAPI,netif_receive_skb must be used not netif_rx.
--- drivers/net/can/pch_can.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/can/pch_can.c +1 -1
@@ -572,7 +572,7 @@ static void pch_can_error(struct net_device *ndev, u32 status) cf->data[7 ] = (errc &PCH_REC ) >>8 ; priv->can.state = state; -netif_rx (skb); +netif_receive_skb (skb); stats->rx_packets++; stats->rx_bytes += cf->can_dlc;
Signature · 1 line
1.6.0.6
Re: [PATCH net-next-2.6 v9 20/20] pch_can: Replace netif_rx to netif_receive_skb
From: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:26 +0900
Quoted 5 lines
Since this driver is implemented as NAPI,
netif_receive_skbmust be used notnetif_rx.Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 20/20] pch_can: Replace netif_rx to netif_receive_skb
Quoted 10 lines · David Miller
From: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:26 +0900Quoted 5 lines
Since this driver is implemented as NAPI,
netif_receive_skbmust be used notnetif_rx.Signed-off-by Tomoya MORINAGA <[email protected]>Applied.
Do you plan to push this huge patchset to Linus' 2.6.37-rc5 tree?
I wonder if the pch_can driver in linux-2.6 tree is already usable without these latest patches that have been applied only to net-next-2.6.
Regards,
Oliver
David Miller
maintainerRe: [PATCH net-next-2.6 v9 20/20] pch_can: Replace netif_rx to netif_receive_skb
From: Oliver Hartkopp <[email protected]>
Date: Mon, 13 Dec 2010 22:51:32 +0100
Quoted 10 lines · David Miller
Quoted 9 lines
From: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:26 +0900Quoted 5 lines
Since this driver is implemented as NAPI,
netif_receive_skbmust be used notnetif_rx.Signed-off-by Tomoya MORINAGA <[email protected]>
Quoted 6 lines
Quoted 1 line
Applied.
Do you plan to push this huge patchset to Linus' 2.6.37-rc5 tree?
I wonder if the
pch_candriver in linux-2.6 tree is already usable without these latest patches that have been applied only to net-next-2.6.
I'm happy to take the changes for a backport once all of this settles down which I don't believe it has yet.
Re: [PATCH net-next-2.6 v9 20/20] pch_can: Replace netif_rx to netif_receive_skb
In reply to David MillerHi David,
Thank you for your acceptance.
Quoted 1 line
Hi Marc and Wolfgang
Until now, thank you for your much help!
---
Tomoya MORINAGA
OKI SEMICONDUCTOR CO., LTD.
----- Original Message ----- From: "David Miller" <davem-fT/PcQaiUtIeIZ0/[email protected]>
To: <tomoya-linux-ECg8zkTtlr0C6LszWs/[email protected]>
Cc: <[email protected]>; <[email protected]>; <[email protected]>; <[email protected]>; <sameo-VuQAYsv1563Yd54FQh9/[email protected]>; <[email protected]>; <[email protected]>; <[email protected]>; <[email protected]>; <[email protected]>; <[email protected]>; <[email protected]>; <[email protected]>; <[email protected]>
Sent: Tuesday, December 14, 2010 5:28 AM
Subject: Re: [PATCH net-next-2.6 v9 20/20] pch_can: Replace netif_rx to netif_receive_skb
Quoted 11 lines
From: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/[email protected]>
Date: Mon, 13 Dec 2010 15:24:26 +0900Quoted 5 lines
Since this driver is implemented as NAPI,
netif_receive_skbmust be used notnetif_rx.Applied.
Re: [PATCH net-next-2.6 v9 19/20] pch_can: Add setting TEC/REC statistics processing
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:25 +0900
Quoted 3 lines
Add setting TEC/REC statistics processing.
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 18/20] pch_can: Optimize "if" condition in rx/tx processing
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:24 +0900
Quoted 5 lines
For reduce "if" condition, easy to read/understand the code, optimize "if" condition in rx/tx processing.
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 17/20] pch_can: Fix incorrect return processing
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:23 +0900
Quoted 3 lines
Fix incorrect return processing.
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 16/20] pch_can: Move MSI processing to probe/remove processing
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:22 +0900
Quoted 5 lines
Currently, in case this driver is integrated as module, and when this module is re-installed, no interrupts is to be occurred. For the above issue, move MSI processing to open/release processing.
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 15/20] pch_can: Comment optimization
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:21 +0900
Quoted 3 lines
Comment optimization
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 14/20] pch_can: Fix miss-setting status issue
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:20 +0900
Quoted 3 lines
Modify miss-setting status issue at suspend.
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 13/20] pch_can: Fix bit timing calculation issue
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:19 +0900
Quoted 4 lines
Modify like use calculated value directly passed by CAN core module.
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 12/20] pch_can: Delete unnecessary/redundant code
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:18 +0900
Quoted 3 lines
Delete unnecessary/redundant code
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 11/20] pch_can: Fix coding rule violation
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:17 +0900
Quoted 4 lines
Fix coding rule violation.
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 10/20] pch_can: Replace netdev_dbg instead of dev_dbg partly
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:16 +0900
Quoted 3 lines
For easy to readable, use
netdev_dbginstead ofdev_dbgpartlySigned-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 09/20] pch_can: Change Copyright and module description
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:15 +0900
Quoted 3 lines
Currently, Copyright and module description are not formal.
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 08/20] pch_can: Reduce register access
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:14 +0900
Quoted 3 lines
For improve tx/rx speed, reduce register access.
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 07/20] pch_can: Change functions type
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:13 +0900
Quoted 4 lines
Currently, these two functions spec(returned value) is unnatural. Thus, change the return value's spec
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 06/20] pch_can: Rename function/macro name
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:12 +0900
Quoted 3 lines
For easy to read/understand, Rename function/macro name.
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 05/20] pch_can: Fix warnings
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:11 +0900
Quoted 5 lines
Currently, in case
CONFIG_PMis disabled, compiler outputs warnings. Move six functions which are used onlyCONFIG_PMis enabled, into "#ifdefCONFIG_PM" area.Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 04/20] pch_can: Improve rx processing
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:10 +0900
Quoted 4 lines
Replace complex "goto" to "do~while".
For easy to read/understand, it divides a rx function into some functions.Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 03/20] pch_can: Fix endianness issue
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:09 +0900
Quoted 17 lines
there is endianness issue both Tx and Rx.
Currently, data is set like below.
Register:
MSB--LSB
x x D0 D1
x x D2 D3
x x D4 D5
x x D6 D7But Data to be sent must be set like below.
Register:
MSB--LSB
x x D1 D0
x x D3 D2
x x D5 D4
x x D7 D6 (x means reserved area.)
Quoted 1 line
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
Re: [PATCH net-next-2.6 v9 02/20] pch_can: Divide poll function
In reply to Tomoya MORINAGAFrom: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:08 +0900
Quoted 3 lines
To easy to read/understand, divide poll function into two sub-functions.
Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.
From: Tomoya MORINAGA <[email protected]>
Date: Mon, 13 Dec 2010 15:24:07 +0900
Quoted 7 lines
Currently, there is no flow control processing. Thus, Add flow control processing as
when there is no empty of tx buffer,netif_stop_queueis called.
When there is empty buffer,netif_wake_queueis called.Signed-off-by Tomoya MORINAGA <[email protected]>
Applied.