* [PATCH v2 0/2] Xilinx axi ethernet bug fixes
@ 2014-02-13 7:10 Michal Simek
2014-02-13 7:10 ` [PATCH v2 1/2] net: axienet: Fix compilation error Michal Simek
2014-02-13 7:10 ` [PATCH v2 2/2] net: axienet: Fix compilation warnings Michal Simek
0 siblings, 2 replies; 5+ messages in thread
From: Michal Simek @ 2014-02-13 7:10 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Based on our discussion I am sending 2 bug fixes for axi ethernet
driver against your net tree.
Thanks,
Michal
Changes in v2:
- Separate bug fixes from features and cleanups
Michal Simek (2):
net: axienet: Fix compilation error
net: axienet: Fix compilation warnings
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
--
1.8.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140213/f8f12a4c/attachment-0001.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] net: axienet: Fix compilation error
2014-02-13 7:10 [PATCH v2 0/2] Xilinx axi ethernet bug fixes Michal Simek
@ 2014-02-13 7:10 ` Michal Simek
2014-02-13 23:08 ` David Miller
2014-02-13 7:10 ` [PATCH v2 2/2] net: axienet: Fix compilation warnings Michal Simek
1 sibling, 1 reply; 5+ messages in thread
From: Michal Simek @ 2014-02-13 7:10 UTC (permalink / raw)
To: linux-arm-kernel
Add missing header to fix compilation error.
drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1575:22:
error: undefined identifier 'irq_of_parse_and_map'
drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1576:22:
error: undefined identifier 'irq_of_parse_and_map'
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v2: None
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 1ec65fe..9fb8ab2 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -26,6 +26,7 @@
#include <linux/netdevice.h>
#include <linux/of_mdio.h>
#include <linux/of_platform.h>
+#include <linux/of_irq.h>
#include <linux/of_address.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
--
1.8.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140213/d1311498/attachment.sig>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] net: axienet: Fix compilation warnings
2014-02-13 7:10 [PATCH v2 0/2] Xilinx axi ethernet bug fixes Michal Simek
2014-02-13 7:10 ` [PATCH v2 1/2] net: axienet: Fix compilation error Michal Simek
@ 2014-02-13 7:10 ` Michal Simek
2014-02-13 23:08 ` David Miller
1 sibling, 1 reply; 5+ messages in thread
From: Michal Simek @ 2014-02-13 7:10 UTC (permalink / raw)
To: linux-arm-kernel
Warning log:
xilinx_axienet_main.c: In function 'axienet_start_xmit_done':
xilinx_axienet_main.c:617:16: warning: operation on 'lp->tx_bd_ci' may be undefined [-Wsequence-point]
xilinx_axienet_main.c: In function 'axienet_start_xmit':
xilinx_axienet_main.c:703:18: warning: operation on 'lp->tx_bd_tail' may be undefined [-Wsequence-point]
xilinx_axienet_main.c:719:17: warning: operation on 'lp->tx_bd_tail' may be undefined [-Wsequence-point]
xilinx_axienet_main.c: In function 'axienet_recv':
xilinx_axienet_main.c:792:16: warning: operation on 'lp->rx_bd_ci' may be undefined [-Wsequence-point]
xilinx_axienet_main.c: In function 'axienet_of_probe':
xilinx_axienet_main.c:1501:21: warning: unused variable 'rc' [-Wunused-variable]
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v2:
- Separate bug fixes from features and cleanups
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 9fb8ab2..4bfdf8c 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -601,7 +601,8 @@ static void axienet_start_xmit_done(struct net_device *ndev)
size += status & XAXIDMA_BD_STS_ACTUAL_LEN_MASK;
packets++;
- lp->tx_bd_ci = ++lp->tx_bd_ci % TX_BD_NUM;
+ ++lp->tx_bd_ci;
+ lp->tx_bd_ci %= TX_BD_NUM;
cur_p = &lp->tx_bd_v[lp->tx_bd_ci];
status = cur_p->status;
}
@@ -687,7 +688,8 @@ static int axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
skb_headlen(skb), DMA_TO_DEVICE);
for (ii = 0; ii < num_frag; ii++) {
- lp->tx_bd_tail = ++lp->tx_bd_tail % TX_BD_NUM;
+ ++lp->tx_bd_tail;
+ lp->tx_bd_tail %= TX_BD_NUM;
cur_p = &lp->tx_bd_v[lp->tx_bd_tail];
frag = &skb_shinfo(skb)->frags[ii];
cur_p->phys = dma_map_single(ndev->dev.parent,
@@ -703,7 +705,8 @@ static int axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
tail_p = lp->tx_bd_p + sizeof(*lp->tx_bd_v) * lp->tx_bd_tail;
/* Start the transfer */
axienet_dma_out32(lp, XAXIDMA_TX_TDESC_OFFSET, tail_p);
- lp->tx_bd_tail = ++lp->tx_bd_tail % TX_BD_NUM;
+ ++lp->tx_bd_tail;
+ lp->tx_bd_tail %= TX_BD_NUM;
return NETDEV_TX_OK;
}
@@ -775,7 +778,8 @@ static void axienet_recv(struct net_device *ndev)
cur_p->status = 0;
cur_p->sw_id_offset = (u32) new_skb;
- lp->rx_bd_ci = ++lp->rx_bd_ci % RX_BD_NUM;
+ ++lp->rx_bd_ci;
+ lp->rx_bd_ci %= RX_BD_NUM;
cur_p = &lp->rx_bd_v[lp->rx_bd_ci];
}
--
1.8.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140213/57a09d0d/attachment.sig>
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 2/2] net: axienet: Fix compilation warnings
2014-02-13 7:10 ` [PATCH v2 2/2] net: axienet: Fix compilation warnings Michal Simek
@ 2014-02-13 23:08 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2014-02-13 23:08 UTC (permalink / raw)
To: linux-arm-kernel
From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 13 Feb 2014 08:10:43 +0100
> Warning log:
> xilinx_axienet_main.c: In function 'axienet_start_xmit_done':
> xilinx_axienet_main.c:617:16: warning: operation on 'lp->tx_bd_ci' may be undefined [-Wsequence-point]
> xilinx_axienet_main.c: In function 'axienet_start_xmit':
> xilinx_axienet_main.c:703:18: warning: operation on 'lp->tx_bd_tail' may be undefined [-Wsequence-point]
> xilinx_axienet_main.c:719:17: warning: operation on 'lp->tx_bd_tail' may be undefined [-Wsequence-point]
> xilinx_axienet_main.c: In function 'axienet_recv':
> xilinx_axienet_main.c:792:16: warning: operation on 'lp->rx_bd_ci' may be undefined [-Wsequence-point]
> xilinx_axienet_main.c: In function 'axienet_of_probe':
> xilinx_axienet_main.c:1501:21: warning: unused variable 'rc' [-Wunused-variable]
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-02-13 23:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-13 7:10 [PATCH v2 0/2] Xilinx axi ethernet bug fixes Michal Simek
2014-02-13 7:10 ` [PATCH v2 1/2] net: axienet: Fix compilation error Michal Simek
2014-02-13 23:08 ` David Miller
2014-02-13 7:10 ` [PATCH v2 2/2] net: axienet: Fix compilation warnings Michal Simek
2014-02-13 23:08 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).