[U-Boot] [PATCH] net: ftmac100: remove unncessary volatiles
From: Po-Yu Chuang ratbert@faraday-tech.com
This patch also update get_timer() usage.
Signed-off-by: Po-Yu Chuang ratbert@faraday-tech.com --- drivers/net/ftmac100.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 2328cb5..787d69b 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -30,8 +30,8 @@ #define ETH_ZLEN 60
struct ftmac100_data { - volatile struct ftmac100_txdes txdes[1]; - volatile struct ftmac100_rxdes rxdes[PKTBUFSRX]; + struct ftmac100_txdes txdes[1]; + struct ftmac100_rxdes rxdes[PKTBUFSRX]; int rx_index; };
@@ -88,8 +88,8 @@ static int ftmac100_init (struct eth_device *dev, bd_t *bd) { struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase; struct ftmac100_data *priv = dev->priv; - volatile struct ftmac100_txdes *txdes = priv->txdes; - volatile struct ftmac100_rxdes *rxdes = priv->rxdes; + struct ftmac100_txdes *txdes = priv->txdes; + struct ftmac100_rxdes *rxdes = priv->rxdes; unsigned int maccr; int i;
@@ -153,7 +153,7 @@ static int ftmac100_init (struct eth_device *dev, bd_t *bd) static int ftmac100_recv (struct eth_device *dev) { struct ftmac100_data *priv = dev->priv; - volatile struct ftmac100_rxdes *curr_des; + struct ftmac100_rxdes *curr_des; unsigned short rxlen;
curr_des = &priv->rxdes[priv->rx_index]; @@ -195,8 +195,8 @@ ftmac100_send (struct eth_device *dev, volatile void *packet, int length) { struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase; struct ftmac100_data *priv = dev->priv; - volatile struct ftmac100_txdes *curr_des = priv->txdes; - int tmo; + struct ftmac100_txdes *curr_des = priv->txdes; + ulong start;
if (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) { debug ("%s(): no TX descriptor available\n", __func__); @@ -219,14 +219,12 @@ ftmac100_send (struct eth_device *dev, volatile void *packet, int length) curr_des->txdes0 = FTMAC100_TXDES0_TXDMA_OWN;
/* start transmit */ - writel (1, &ftmac100->txpd);
/* wait for transfer to succeed */ - - tmo = get_timer (0) + 5 * CONFIG_SYS_HZ; + start = get_timer (0); while (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) { - if (get_timer (0) >= tmo) { + if (get_timer (start) >= 5) { debug ("%s(): timed out\n", __func__); return -1; }
Hello.
Po-Yu Chuang wrote:
From: Po-Yu Chuang ratbert@faraday-tech.com
This patch also update get_timer() usage.
This seems like a material for a separate patch.
Signed-off-by: Po-Yu Chuang ratbert@faraday-tech.com
drivers/net/ftmac100.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 2328cb5..787d69b 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c
[...]
@@ -219,14 +219,12 @@ ftmac100_send (struct eth_device *dev, volatile void *packet, int length) curr_des->txdes0 = FTMAC100_TXDES0_TXDMA_OWN;
/* start transmit */
writel (1, &ftmac100->txpd);
/* wait for transfer to succeed */
tmo = get_timer (0) + 5 * CONFIG_SYS_HZ;
- start = get_timer (0); while (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) {
if (get_timer (0) >= tmo) {
if (get_timer (start) >= 5) {
I'm not sure this is equivalent to the old code...
debug ("%s(): timed out\n", __func__); return -1; }
checkpatch.pl says:
WARNING: space prohibited between function name and open parenthesis '(' #66: FILE: drivers/net/ftmac100.c:225: + start = get_timer (0);
WARNING: space prohibited between function name and open parenthesis '(' #69: FILE: drivers/net/ftmac100.c:227: + if (get_timer (start) >= 5) {
I know you're only modifying the existing code, but it's time to fix the style of it as well...
WBR, Sergei
Hi Sergei,
On Thu, Jan 20, 2011 at 11:38 PM, Sergei Shtylyov sshtylyov@mvista.com wrote:
Hello.
Po-Yu Chuang wrote:
From: Po-Yu Chuang ratbert@faraday-tech.com
This patch also update get_timer() usage.
This seems like a material for a separate patch.
OK, I will split this to 2 patches later.
[...]
@@ -219,14 +219,12 @@ ftmac100_send (struct eth_device *dev, volatile void *packet, int length) curr_des->txdes0 = FTMAC100_TXDES0_TXDMA_OWN; /* start transmit */
writel (1, &ftmac100->txpd); /* wait for transfer to succeed */
- tmo = get_timer (0) + 5 * CONFIG_SYS_HZ;
- start = get_timer (0);
while (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) {
- if (get_timer (0) >= tmo) {
- if (get_timer (start) >= 5) {
I'm not sure this is equivalent to the old code...
The original code waits unnecessarily long. This change refers to the way the newer driver does - drivers/net/ftgmac100.c.
debug ("%s(): timed out\n", __func__); return -1; }
checkpatch.pl says:
WARNING: space prohibited between function name and open parenthesis '(' #66: FILE: drivers/net/ftmac100.c:225:
- start = get_timer (0);
WARNING: space prohibited between function name and open parenthesis '(' #69: FILE: drivers/net/ftmac100.c:227:
- if (get_timer (start) >= 5) {
I know you're only modifying the existing code, but it's time to fix the style of it as well...
OK, I'll fix it.
Thanks, Po-Yu Chuang
From: Po-Yu Chuang ratbert@faraday-tech.com
Signed-off-by: Po-Yu Chuang ratbert@faraday-tech.com --- v2: split get_timer() changes to a seperate patch
drivers/net/ftmac100.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 2328cb5..27381a3 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -30,8 +30,8 @@ #define ETH_ZLEN 60
struct ftmac100_data { - volatile struct ftmac100_txdes txdes[1]; - volatile struct ftmac100_rxdes rxdes[PKTBUFSRX]; + struct ftmac100_txdes txdes[1]; + struct ftmac100_rxdes rxdes[PKTBUFSRX]; int rx_index; };
@@ -88,8 +88,8 @@ static int ftmac100_init (struct eth_device *dev, bd_t *bd) { struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase; struct ftmac100_data *priv = dev->priv; - volatile struct ftmac100_txdes *txdes = priv->txdes; - volatile struct ftmac100_rxdes *rxdes = priv->rxdes; + struct ftmac100_txdes *txdes = priv->txdes; + struct ftmac100_rxdes *rxdes = priv->rxdes; unsigned int maccr; int i;
@@ -153,7 +153,7 @@ static int ftmac100_init (struct eth_device *dev, bd_t *bd) static int ftmac100_recv (struct eth_device *dev) { struct ftmac100_data *priv = dev->priv; - volatile struct ftmac100_rxdes *curr_des; + struct ftmac100_rxdes *curr_des; unsigned short rxlen;
curr_des = &priv->rxdes[priv->rx_index]; @@ -195,8 +195,8 @@ ftmac100_send (struct eth_device *dev, volatile void *packet, int length) { struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase; struct ftmac100_data *priv = dev->priv; - volatile struct ftmac100_txdes *curr_des = priv->txdes; int tmo; + struct ftmac100_txdes *curr_des = priv->txdes;
if (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) { debug ("%s(): no TX descriptor available\n", __func__);
Dear Po-Yu Chuang,
In message 1295596237-1658-1-git-send-email-ratbert.chuang@gmail.com you wrote:
From: Po-Yu Chuang ratbert@faraday-tech.com
Signed-off-by: Po-Yu Chuang ratbert@faraday-tech.com
v2: split get_timer() changes to a seperate patch
drivers/net/ftmac100.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
From: Po-Yu Chuang ratbert@faraday-tech.com
Use get_timer() the same way as drivers/net/ftgmac100.c
Signed-off-by: Po-Yu Chuang ratbert@faraday-tech.com --- v2: this patch is splitted from "net: ftmac100: remove unncessary volatiles"
drivers/net/ftmac100.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 27381a3..94dc6d9 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -195,8 +195,8 @@ ftmac100_send (struct eth_device *dev, volatile void *packet, int length) { struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase; struct ftmac100_data *priv = dev->priv; - int tmo; struct ftmac100_txdes *curr_des = priv->txdes; + ulong start;
if (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) { debug ("%s(): no TX descriptor available\n", __func__); @@ -224,9 +224,9 @@ ftmac100_send (struct eth_device *dev, volatile void *packet, int length)
/* wait for transfer to succeed */
- tmo = get_timer (0) + 5 * CONFIG_SYS_HZ; + start = get_timer(0); while (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) { - if (get_timer (0) >= tmo) { + if (get_timer(start) >= 5) { debug ("%s(): timed out\n", __func__); return -1; }
Hi Ben,
2011/1/21 Po-Yu Chuang ratbert.chuang@gmail.com:
From: Po-Yu Chuang ratbert@faraday-tech.com
Use get_timer() the same way as drivers/net/ftgmac100.c
Signed-off-by: Po-Yu Chuang ratbert@faraday-tech.com
v2: this patch is splitted from "net: ftmac100: remove unncessary volatiles"
Just remind you please remember to review this patch as http://patchwork.ozlabs.org/patch/79802/ in patchwork.
Reviewed-by: Macpaul Lin macpaul@gmail.com Tested-by: Macpaul Lin macpaul@gmail.com
Hi Ben,
2011/2/25 Macpaul Lin macpaul@gmail.com:
Hi Ben,
2011/1/21 Po-Yu Chuang ratbert.chuang@gmail.com:
From: Po-Yu Chuang ratbert@faraday-tech.com
Use get_timer() the same way as drivers/net/ftgmac100.c
Signed-off-by: Po-Yu Chuang ratbert@faraday-tech.com
v2: this patch is splitted from "net: ftmac100: remove unncessary volatiles"
Just remind you please remember to review this patch as http://patchwork.ozlabs.org/patch/79802/ in patchwork.
Reviewed-by: Macpaul Lin macpaul@gmail.com Tested-by: Macpaul Lin macpaul@gmail.com
Just remind you please "also" remember to review the patch "net: ftmac100: update get_timer() usages" as http://patchwork.ozlabs.org/patch/79803/ in patchwork.
I've lost the patch "79803" in my mailbox, however I've downloaded it from patchwork.
Reviewed-by: Macpaul Lin macpaul@gmail.com Tested-by: Macpaul Lin macpaul@gmail.com
Dear Po-Yu Chuang,
In message 1295596285-1690-1-git-send-email-ratbert.chuang@gmail.com you wrote:
From: Po-Yu Chuang ratbert@faraday-tech.com
Use get_timer() the same way as drivers/net/ftgmac100.c
Signed-off-by: Po-Yu Chuang ratbert@faraday-tech.com
v2: this patch is splitted from "net: ftmac100: remove unncessary volatiles"
drivers/net/ftmac100.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (4)
-
Macpaul Lin -
Po-Yu Chuang -
Sergei Shtylyov -
Wolfgang Denk