* [PATCH] sh_eth: fix garbled TX error message
@ 2014-01-10 23:41 ` Sergei Shtylyov
0 siblings, 0 replies; 14+ messages in thread
From: Sergei Shtylyov @ 2014-01-10 22:41 UTC (permalink / raw)
To: netdev; +Cc: linux-sh
sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
calls with the first string not finished by '\n', so that the resulting message
would inevitably come out garbled, with something like "3net eth0: " inserted
in the middle. Avoid that by merging 2 calls into one.
While at it, insert an empty line after the nearby declaration.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
Although being a fix, this patch is against the 'net-next.git' repo as it's does
not seem important enough at this time in the release cycle. Please consider it
for the stable kernel though...
drivers/net/ethernet/renesas/sh_eth.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: net-next/drivers/net/ethernet/renesas/sh_eth.c
=================================--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c
+++ net-next/drivers/net/ethernet/renesas/sh_eth.c
@@ -1513,11 +1513,11 @@ ignore_link:
if (intr_status & mask) {
/* Tx error */
u32 edtrr = sh_eth_read(ndev, EDTRR);
+
/* dmesg */
- dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x ",
- intr_status, mdp->cur_tx);
- dev_err(&ndev->dev, "dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
- mdp->dirty_tx, (u32) ndev->state, edtrr);
+ dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
+ intr_status, mdp->cur_tx, mdp->dirty_tx,
+ (u32)ndev->state, edtrr);
/* dirty buffer free */
sh_eth_txfree(ndev);
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] sh_eth: fix garbled TX error message
@ 2014-01-10 23:41 ` Sergei Shtylyov
0 siblings, 0 replies; 14+ messages in thread
From: Sergei Shtylyov @ 2014-01-10 23:41 UTC (permalink / raw)
To: netdev; +Cc: linux-sh
sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
calls with the first string not finished by '\n', so that the resulting message
would inevitably come out garbled, with something like "3net eth0: " inserted
in the middle. Avoid that by merging 2 calls into one.
While at it, insert an empty line after the nearby declaration.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
Although being a fix, this patch is against the 'net-next.git' repo as it's does
not seem important enough at this time in the release cycle. Please consider it
for the stable kernel though...
drivers/net/ethernet/renesas/sh_eth.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: net-next/drivers/net/ethernet/renesas/sh_eth.c
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c
+++ net-next/drivers/net/ethernet/renesas/sh_eth.c
@@ -1513,11 +1513,11 @@ ignore_link:
if (intr_status & mask) {
/* Tx error */
u32 edtrr = sh_eth_read(ndev, EDTRR);
+
/* dmesg */
- dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x ",
- intr_status, mdp->cur_tx);
- dev_err(&ndev->dev, "dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
- mdp->dirty_tx, (u32) ndev->state, edtrr);
+ dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
+ intr_status, mdp->cur_tx, mdp->dirty_tx,
+ (u32)ndev->state, edtrr);
/* dirty buffer free */
sh_eth_txfree(ndev);
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] sh_eth: fix garbled TX error message
2014-01-10 23:41 ` Sergei Shtylyov
@ 2014-01-13 0:45 ` Simon Horman
-1 siblings, 0 replies; 14+ messages in thread
From: Simon Horman @ 2014-01-13 0:45 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: netdev, linux-sh
On Sat, Jan 11, 2014 at 02:41:49AM +0300, Sergei Shtylyov wrote:
> sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
> calls with the first string not finished by '\n', so that the resulting message
> would inevitably come out garbled, with something like "3net eth0: " inserted
> in the middle. Avoid that by merging 2 calls into one.
>
> While at it, insert an empty line after the nearby declaration.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
>
> ---
> Although being a fix, this patch is against the 'net-next.git' repo as it's does
> not seem important enough at this time in the release cycle. Please consider it
> for the stable kernel though...
>
> drivers/net/ethernet/renesas/sh_eth.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> Index: net-next/drivers/net/ethernet/renesas/sh_eth.c
> =================================> --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c
> +++ net-next/drivers/net/ethernet/renesas/sh_eth.c
> @@ -1513,11 +1513,11 @@ ignore_link:
> if (intr_status & mask) {
> /* Tx error */
> u32 edtrr = sh_eth_read(ndev, EDTRR);
> +
> /* dmesg */
> - dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x ",
> - intr_status, mdp->cur_tx);
> - dev_err(&ndev->dev, "dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
> - mdp->dirty_tx, (u32) ndev->state, edtrr);
> + dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
> + intr_status, mdp->cur_tx, mdp->dirty_tx,
> + (u32)ndev->state, edtrr);
> /* dirty buffer free */
> sh_eth_txfree(ndev);
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] sh_eth: fix garbled TX error message
@ 2014-01-13 0:45 ` Simon Horman
0 siblings, 0 replies; 14+ messages in thread
From: Simon Horman @ 2014-01-13 0:45 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: netdev, linux-sh
On Sat, Jan 11, 2014 at 02:41:49AM +0300, Sergei Shtylyov wrote:
> sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
> calls with the first string not finished by '\n', so that the resulting message
> would inevitably come out garbled, with something like "3net eth0: " inserted
> in the middle. Avoid that by merging 2 calls into one.
>
> While at it, insert an empty line after the nearby declaration.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
>
> ---
> Although being a fix, this patch is against the 'net-next.git' repo as it's does
> not seem important enough at this time in the release cycle. Please consider it
> for the stable kernel though...
>
> drivers/net/ethernet/renesas/sh_eth.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> Index: net-next/drivers/net/ethernet/renesas/sh_eth.c
> ===================================================================
> --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c
> +++ net-next/drivers/net/ethernet/renesas/sh_eth.c
> @@ -1513,11 +1513,11 @@ ignore_link:
> if (intr_status & mask) {
> /* Tx error */
> u32 edtrr = sh_eth_read(ndev, EDTRR);
> +
> /* dmesg */
> - dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x ",
> - intr_status, mdp->cur_tx);
> - dev_err(&ndev->dev, "dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
> - mdp->dirty_tx, (u32) ndev->state, edtrr);
> + dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
> + intr_status, mdp->cur_tx, mdp->dirty_tx,
> + (u32)ndev->state, edtrr);
> /* dirty buffer free */
> sh_eth_txfree(ndev);
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] sh_eth: fix garbled TX error message
2014-01-13 0:45 ` Simon Horman
@ 2014-01-13 1:24 ` Joe Perches
-1 siblings, 0 replies; 14+ messages in thread
From: Joe Perches @ 2014-01-13 1:24 UTC (permalink / raw)
To: Simon Horman; +Cc: Sergei Shtylyov, netdev, linux-sh
On Mon, 2014-01-13 at 09:45 +0900, Simon Horman wrote:
> On Sat, Jan 11, 2014 at 02:41:49AM +0300, Sergei Shtylyov wrote:
> > sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
> > calls with the first string not finished by '\n', so that the resulting message
> > would inevitably come out garbled, with something like "3net eth0: " inserted
> > in the middle. Avoid that by merging 2 calls into one.
I believe this interleaving should not happen since
commit e28d713704117bca0820c732210df6075b09f13b
(2.6.31 days)
Perhaps it'd be better to use netdev_<level> and
netif_<level> instead of dev_<level> and pr_<level>.
uncompiled/untested...
---
drivers/net/ethernet/renesas/sh_eth.c | 63 ++++++++++++++++-------------------
1 file changed, 28 insertions(+), 35 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 8884107..6baad48 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -334,7 +334,7 @@ static void sh_eth_select_mii(struct net_device *ndev)
value = 0x0;
break;
default:
- pr_warn("PHY interface mode was not setup. Set to MII.\n");
+ netdev_warn(ndev, "PHY interface mode was not setup. Set to MII.\n");
value = 0x1;
break;
}
@@ -756,7 +756,7 @@ static int sh_eth_check_reset(struct net_device *ndev)
cnt--;
}
if (cnt <= 0) {
- pr_err("Device reset failed\n");
+ netdev_err(ndev, "Device reset failed\n");
ret = -ETIMEDOUT;
}
return ret;
@@ -1456,8 +1456,7 @@ ignore_link:
/* Unused write back interrupt */
if (intr_status & EESR_TABT) { /* Transmit Abort int */
ndev->stats.tx_aborted_errors++;
- if (netif_msg_tx_err(mdp))
- dev_err(&ndev->dev, "Transmit Abort\n");
+ netif_err(mdp, tx_err, ndev, "Transmit Abort\n");
}
}
@@ -1466,45 +1465,38 @@ ignore_link:
if (intr_status & EESR_RFRMER) {
/* Receive Frame Overflow int */
ndev->stats.rx_frame_errors++;
- if (netif_msg_rx_err(mdp))
- dev_err(&ndev->dev, "Receive Abort\n");
+ netif_err(mdp, rx_err, ndev, "Receive Abort\n");
}
}
if (intr_status & EESR_TDE) {
/* Transmit Descriptor Empty int */
ndev->stats.tx_fifo_errors++;
- if (netif_msg_tx_err(mdp))
- dev_err(&ndev->dev, "Transmit Descriptor Empty\n");
+ netif_err(mdp, tx_err, ndev, "Transmit Descriptor Empty\n");
}
if (intr_status & EESR_TFE) {
/* FIFO under flow */
ndev->stats.tx_fifo_errors++;
- if (netif_msg_tx_err(mdp))
- dev_err(&ndev->dev, "Transmit FIFO Under flow\n");
+ netif_err(mdp, tx_err, ndev, "Transmit FIFO Under flow\n");
}
if (intr_status & EESR_RDE) {
/* Receive Descriptor Empty int */
ndev->stats.rx_over_errors++;
-
- if (netif_msg_rx_err(mdp))
- dev_err(&ndev->dev, "Receive Descriptor Empty\n");
+ netif_err(mdp, rx_err, ndev, "Receive Descriptor Empty\n");
}
if (intr_status & EESR_RFE) {
/* Receive FIFO Overflow int */
ndev->stats.rx_fifo_errors++;
- if (netif_msg_rx_err(mdp))
- dev_err(&ndev->dev, "Receive FIFO Overflow\n");
+ netif_err(mdp, rx_err, ndev, "Receive FIFO Overflow\n");
}
if (!mdp->cd->no_ade && (intr_status & EESR_ADE)) {
/* Address Error */
ndev->stats.tx_fifo_errors++;
- if (netif_msg_tx_err(mdp))
- dev_err(&ndev->dev, "Address Error\n");
+ netif_err(mdp, tx_err, ndev, "Address Error\n");
}
mask = EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE;
@@ -1514,10 +1506,9 @@ ignore_link:
/* Tx error */
u32 edtrr = sh_eth_read(ndev, EDTRR);
/* dmesg */
- dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x ",
- intr_status, mdp->cur_tx);
- dev_err(&ndev->dev, "dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
- mdp->dirty_tx, (u32) ndev->state, edtrr);
+ netdev_err(ndev, "TX error. status=%08x cur_tx=%08x dirty_tx=%08x state=%08x EDTRR=%08x\n",
+ intr_status, mdp->cur_tx, mdp->dirty_tx,
+ (u32)ndev->state, edtrr);
/* dirty buffer free */
sh_eth_txfree(ndev);
@@ -1678,7 +1669,7 @@ static int sh_eth_phy_init(struct net_device *ndev)
phydev = phy_connect(ndev, phy_id, sh_eth_adjust_link,
mdp->phy_interface);
if (IS_ERR(phydev)) {
- dev_err(&ndev->dev, "phy_connect failed\n");
+ netdev_err(ndev, "phy_connect failed\n");
return PTR_ERR(phydev);
}
@@ -1864,12 +1855,12 @@ static int sh_eth_set_ringparam(struct net_device *ndev,
ret = sh_eth_ring_init(ndev);
if (ret < 0) {
- dev_err(&ndev->dev, "%s: sh_eth_ring_init failed.\n", __func__);
+ netdev_err(ndev, "%s: sh_eth_ring_init failed\n", __func__);
return ret;
}
ret = sh_eth_dev_init(ndev, false);
if (ret < 0) {
- dev_err(&ndev->dev, "%s: sh_eth_dev_init failed.\n", __func__);
+ netdev_err(ndev, "%s: sh_eth_dev_init failed\n", __func__);
return ret;
}
@@ -1910,7 +1901,7 @@ static int sh_eth_open(struct net_device *ndev)
ret = request_irq(ndev->irq, sh_eth_interrupt,
mdp->cd->irq_flags, ndev->name, ndev);
if (ret) {
- dev_err(&ndev->dev, "Can not assign IRQ number\n");
+ netdev_err(ndev, "Can not assign IRQ number\n");
goto out_napi_off;
}
@@ -1948,10 +1939,8 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
netif_stop_queue(ndev);
- if (netif_msg_timer(mdp)) {
- dev_err(&ndev->dev, "%s: transmit timed out, status %8.8x, resetting...\n",
- ndev->name, (int)sh_eth_read(ndev, EESR));
- }
+ netif_err(mdp, timer, ndev, "transmit timed out, status %08x, resetting...\n",
+ (int)sh_eth_read(ndev, EESR));
/* tx_errors count up */
ndev->stats.tx_errors++;
@@ -2154,7 +2143,7 @@ static int sh_eth_tsu_busy(struct net_device *ndev)
udelay(10);
timeout--;
if (timeout <= 0) {
- dev_err(&ndev->dev, "%s: timeout\n", __func__);
+ netdev_err(ndev, "%s: timeout\n", __func__);
return -ETIMEDOUT;
}
}
@@ -2571,7 +2560,6 @@ static const u16 *sh_eth_get_register_offset(int register_type)
reg_offset = sh_eth_offset_fast_sh3_sh2;
break;
default:
- pr_err("Unknown register type (%d)\n", register_type);
break;
}
@@ -2675,6 +2663,10 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
/* set cpu data */
mdp->cd = (struct sh_eth_cpu_data *)id->driver_data;
mdp->reg_offset = sh_eth_get_register_offset(mdp->cd->register_type);
+ if (!mdp->reg_offset)
+ dev_err(&pdev->dev, "Unknown register type (%d)\n",
+ mdp->cd->register_type);
+
sh_eth_set_default_cpu_data(mdp->cd);
/* set function */
@@ -2691,9 +2683,10 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
/* read and set MAC address */
read_mac_address(ndev, pd->mac_addr);
if (!is_valid_ether_addr(ndev->dev_addr)) {
- dev_warn(&pdev->dev,
- "no valid MAC address supplied, using a random one.\n");
eth_hw_addr_random(ndev);
+ dev_warn(&pdev->dev,
+ "no valid MAC address supplied, using random %pM\n",
+ ndev->dev_addr);
}
/* ioremap the TSU registers */
@@ -2733,8 +2726,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
goto out_unregister;
/* print device information */
- pr_info("Base address at 0x%x, %pM, IRQ %d.\n",
- (u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
+ netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d\n",
+ (u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
platform_set_drvdata(pdev, ndev);
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] sh_eth: fix garbled TX error message
@ 2014-01-13 1:24 ` Joe Perches
0 siblings, 0 replies; 14+ messages in thread
From: Joe Perches @ 2014-01-13 1:24 UTC (permalink / raw)
To: Simon Horman; +Cc: Sergei Shtylyov, netdev, linux-sh
On Mon, 2014-01-13 at 09:45 +0900, Simon Horman wrote:
> On Sat, Jan 11, 2014 at 02:41:49AM +0300, Sergei Shtylyov wrote:
> > sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
> > calls with the first string not finished by '\n', so that the resulting message
> > would inevitably come out garbled, with something like "3net eth0: " inserted
> > in the middle. Avoid that by merging 2 calls into one.
I believe this interleaving should not happen since
commit e28d713704117bca0820c732210df6075b09f13b
(2.6.31 days)
Perhaps it'd be better to use netdev_<level> and
netif_<level> instead of dev_<level> and pr_<level>.
uncompiled/untested...
---
drivers/net/ethernet/renesas/sh_eth.c | 63 ++++++++++++++++-------------------
1 file changed, 28 insertions(+), 35 deletions(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 8884107..6baad48 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -334,7 +334,7 @@ static void sh_eth_select_mii(struct net_device *ndev)
value = 0x0;
break;
default:
- pr_warn("PHY interface mode was not setup. Set to MII.\n");
+ netdev_warn(ndev, "PHY interface mode was not setup. Set to MII.\n");
value = 0x1;
break;
}
@@ -756,7 +756,7 @@ static int sh_eth_check_reset(struct net_device *ndev)
cnt--;
}
if (cnt <= 0) {
- pr_err("Device reset failed\n");
+ netdev_err(ndev, "Device reset failed\n");
ret = -ETIMEDOUT;
}
return ret;
@@ -1456,8 +1456,7 @@ ignore_link:
/* Unused write back interrupt */
if (intr_status & EESR_TABT) { /* Transmit Abort int */
ndev->stats.tx_aborted_errors++;
- if (netif_msg_tx_err(mdp))
- dev_err(&ndev->dev, "Transmit Abort\n");
+ netif_err(mdp, tx_err, ndev, "Transmit Abort\n");
}
}
@@ -1466,45 +1465,38 @@ ignore_link:
if (intr_status & EESR_RFRMER) {
/* Receive Frame Overflow int */
ndev->stats.rx_frame_errors++;
- if (netif_msg_rx_err(mdp))
- dev_err(&ndev->dev, "Receive Abort\n");
+ netif_err(mdp, rx_err, ndev, "Receive Abort\n");
}
}
if (intr_status & EESR_TDE) {
/* Transmit Descriptor Empty int */
ndev->stats.tx_fifo_errors++;
- if (netif_msg_tx_err(mdp))
- dev_err(&ndev->dev, "Transmit Descriptor Empty\n");
+ netif_err(mdp, tx_err, ndev, "Transmit Descriptor Empty\n");
}
if (intr_status & EESR_TFE) {
/* FIFO under flow */
ndev->stats.tx_fifo_errors++;
- if (netif_msg_tx_err(mdp))
- dev_err(&ndev->dev, "Transmit FIFO Under flow\n");
+ netif_err(mdp, tx_err, ndev, "Transmit FIFO Under flow\n");
}
if (intr_status & EESR_RDE) {
/* Receive Descriptor Empty int */
ndev->stats.rx_over_errors++;
-
- if (netif_msg_rx_err(mdp))
- dev_err(&ndev->dev, "Receive Descriptor Empty\n");
+ netif_err(mdp, rx_err, ndev, "Receive Descriptor Empty\n");
}
if (intr_status & EESR_RFE) {
/* Receive FIFO Overflow int */
ndev->stats.rx_fifo_errors++;
- if (netif_msg_rx_err(mdp))
- dev_err(&ndev->dev, "Receive FIFO Overflow\n");
+ netif_err(mdp, rx_err, ndev, "Receive FIFO Overflow\n");
}
if (!mdp->cd->no_ade && (intr_status & EESR_ADE)) {
/* Address Error */
ndev->stats.tx_fifo_errors++;
- if (netif_msg_tx_err(mdp))
- dev_err(&ndev->dev, "Address Error\n");
+ netif_err(mdp, tx_err, ndev, "Address Error\n");
}
mask = EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE;
@@ -1514,10 +1506,9 @@ ignore_link:
/* Tx error */
u32 edtrr = sh_eth_read(ndev, EDTRR);
/* dmesg */
- dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x ",
- intr_status, mdp->cur_tx);
- dev_err(&ndev->dev, "dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
- mdp->dirty_tx, (u32) ndev->state, edtrr);
+ netdev_err(ndev, "TX error. status=%08x cur_tx=%08x dirty_tx=%08x state=%08x EDTRR=%08x\n",
+ intr_status, mdp->cur_tx, mdp->dirty_tx,
+ (u32)ndev->state, edtrr);
/* dirty buffer free */
sh_eth_txfree(ndev);
@@ -1678,7 +1669,7 @@ static int sh_eth_phy_init(struct net_device *ndev)
phydev = phy_connect(ndev, phy_id, sh_eth_adjust_link,
mdp->phy_interface);
if (IS_ERR(phydev)) {
- dev_err(&ndev->dev, "phy_connect failed\n");
+ netdev_err(ndev, "phy_connect failed\n");
return PTR_ERR(phydev);
}
@@ -1864,12 +1855,12 @@ static int sh_eth_set_ringparam(struct net_device *ndev,
ret = sh_eth_ring_init(ndev);
if (ret < 0) {
- dev_err(&ndev->dev, "%s: sh_eth_ring_init failed.\n", __func__);
+ netdev_err(ndev, "%s: sh_eth_ring_init failed\n", __func__);
return ret;
}
ret = sh_eth_dev_init(ndev, false);
if (ret < 0) {
- dev_err(&ndev->dev, "%s: sh_eth_dev_init failed.\n", __func__);
+ netdev_err(ndev, "%s: sh_eth_dev_init failed\n", __func__);
return ret;
}
@@ -1910,7 +1901,7 @@ static int sh_eth_open(struct net_device *ndev)
ret = request_irq(ndev->irq, sh_eth_interrupt,
mdp->cd->irq_flags, ndev->name, ndev);
if (ret) {
- dev_err(&ndev->dev, "Can not assign IRQ number\n");
+ netdev_err(ndev, "Can not assign IRQ number\n");
goto out_napi_off;
}
@@ -1948,10 +1939,8 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
netif_stop_queue(ndev);
- if (netif_msg_timer(mdp)) {
- dev_err(&ndev->dev, "%s: transmit timed out, status %8.8x, resetting...\n",
- ndev->name, (int)sh_eth_read(ndev, EESR));
- }
+ netif_err(mdp, timer, ndev, "transmit timed out, status %08x, resetting...\n",
+ (int)sh_eth_read(ndev, EESR));
/* tx_errors count up */
ndev->stats.tx_errors++;
@@ -2154,7 +2143,7 @@ static int sh_eth_tsu_busy(struct net_device *ndev)
udelay(10);
timeout--;
if (timeout <= 0) {
- dev_err(&ndev->dev, "%s: timeout\n", __func__);
+ netdev_err(ndev, "%s: timeout\n", __func__);
return -ETIMEDOUT;
}
}
@@ -2571,7 +2560,6 @@ static const u16 *sh_eth_get_register_offset(int register_type)
reg_offset = sh_eth_offset_fast_sh3_sh2;
break;
default:
- pr_err("Unknown register type (%d)\n", register_type);
break;
}
@@ -2675,6 +2663,10 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
/* set cpu data */
mdp->cd = (struct sh_eth_cpu_data *)id->driver_data;
mdp->reg_offset = sh_eth_get_register_offset(mdp->cd->register_type);
+ if (!mdp->reg_offset)
+ dev_err(&pdev->dev, "Unknown register type (%d)\n",
+ mdp->cd->register_type);
+
sh_eth_set_default_cpu_data(mdp->cd);
/* set function */
@@ -2691,9 +2683,10 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
/* read and set MAC address */
read_mac_address(ndev, pd->mac_addr);
if (!is_valid_ether_addr(ndev->dev_addr)) {
- dev_warn(&pdev->dev,
- "no valid MAC address supplied, using a random one.\n");
eth_hw_addr_random(ndev);
+ dev_warn(&pdev->dev,
+ "no valid MAC address supplied, using random %pM\n",
+ ndev->dev_addr);
}
/* ioremap the TSU registers */
@@ -2733,8 +2726,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
goto out_unregister;
/* print device information */
- pr_info("Base address at 0x%x, %pM, IRQ %d.\n",
- (u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
+ netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d\n",
+ (u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
platform_set_drvdata(pdev, ndev);
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] sh_eth: fix garbled TX error message
2014-01-13 1:24 ` Joe Perches
@ 2014-01-13 16:15 ` Sergei Shtylyov
-1 siblings, 0 replies; 14+ messages in thread
From: Sergei Shtylyov @ 2014-01-13 16:15 UTC (permalink / raw)
To: Joe Perches, Simon Horman; +Cc: netdev, linux-sh
Hello.
On 13-012014 5:24, Joe Perches wrote:
>>> sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
>>> calls with the first string not finished by '\n', so that the resulting message
>>> would inevitably come out garbled, with something like "3net eth0: " inserted
>>> in the middle. Avoid that by merging 2 calls into one.
> I believe this interleaving should not happen since
> commit e28d713704117bca0820c732210df6075b09f13b
> (2.6.31 days)
I believe you have given me the wrong commit, which has nothing to do the
the newline problem per se. It just adds KERN_DEFAULT. I was able to find the
correct commit though: it's the parent of the commit you cited,
5fd29d6ccbc98884569d6f3105aeca70858b3e0f -- so you're probably right, and I
should have tested my assumption beforehand... (I'd like to merge these
dev_err() calls still though).
> Perhaps it'd be better to use netdev_<level> and
> netif_<level> instead of dev_<level> and pr_<level>.
Thank you, I got it the first time you suggested it, I just haven't had
time to implement it yet.
> uncompiled/untested...
Thanks for the patch. I don't agree with all of it though...
> ---
>
> drivers/net/ethernet/renesas/sh_eth.c | 63 ++++++++++++++++-------------------
> 1 file changed, 28 insertions(+), 35 deletions(-)
> diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
> index 8884107..6baad48 100644
> --- a/drivers/net/ethernet/renesas/sh_eth.c
> +++ b/drivers/net/ethernet/renesas/sh_eth.c
[...]
> @@ -2691,9 +2683,10 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
> /* read and set MAC address */
> read_mac_address(ndev, pd->mac_addr);
> if (!is_valid_ether_addr(ndev->dev_addr)) {
> - dev_warn(&pdev->dev,
> - "no valid MAC address supplied, using a random one.\n");
> eth_hw_addr_random(ndev);
> + dev_warn(&pdev->dev,
> + "no valid MAC address supplied, using random %pM\n",
> + ndev->dev_addr);
There's no need to print random MAC address twice. It's already printed
right below.
WBR, Sergei
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] sh_eth: fix garbled TX error message
@ 2014-01-13 16:15 ` Sergei Shtylyov
0 siblings, 0 replies; 14+ messages in thread
From: Sergei Shtylyov @ 2014-01-13 16:15 UTC (permalink / raw)
To: Joe Perches, Simon Horman; +Cc: netdev, linux-sh
Hello.
On 13-012014 5:24, Joe Perches wrote:
>>> sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
>>> calls with the first string not finished by '\n', so that the resulting message
>>> would inevitably come out garbled, with something like "3net eth0: " inserted
>>> in the middle. Avoid that by merging 2 calls into one.
> I believe this interleaving should not happen since
> commit e28d713704117bca0820c732210df6075b09f13b
> (2.6.31 days)
I believe you have given me the wrong commit, which has nothing to do the
the newline problem per se. It just adds KERN_DEFAULT. I was able to find the
correct commit though: it's the parent of the commit you cited,
5fd29d6ccbc98884569d6f3105aeca70858b3e0f -- so you're probably right, and I
should have tested my assumption beforehand... (I'd like to merge these
dev_err() calls still though).
> Perhaps it'd be better to use netdev_<level> and
> netif_<level> instead of dev_<level> and pr_<level>.
Thank you, I got it the first time you suggested it, I just haven't had
time to implement it yet.
> uncompiled/untested...
Thanks for the patch. I don't agree with all of it though...
> ---
>
> drivers/net/ethernet/renesas/sh_eth.c | 63 ++++++++++++++++-------------------
> 1 file changed, 28 insertions(+), 35 deletions(-)
> diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
> index 8884107..6baad48 100644
> --- a/drivers/net/ethernet/renesas/sh_eth.c
> +++ b/drivers/net/ethernet/renesas/sh_eth.c
[...]
> @@ -2691,9 +2683,10 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
> /* read and set MAC address */
> read_mac_address(ndev, pd->mac_addr);
> if (!is_valid_ether_addr(ndev->dev_addr)) {
> - dev_warn(&pdev->dev,
> - "no valid MAC address supplied, using a random one.\n");
> eth_hw_addr_random(ndev);
> + dev_warn(&pdev->dev,
> + "no valid MAC address supplied, using random %pM\n",
> + ndev->dev_addr);
There's no need to print random MAC address twice. It's already printed
right below.
WBR, Sergei
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] sh_eth: fix garbled TX error message
2014-01-13 16:15 ` Sergei Shtylyov
@ 2014-01-13 16:51 ` Joe Perches
-1 siblings, 0 replies; 14+ messages in thread
From: Joe Perches @ 2014-01-13 16:51 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: Simon Horman, netdev, linux-sh
On Mon, 2014-01-13 at 20:15 +0400, Sergei Shtylyov wrote:
> On 13-012014 5:24, Joe Perches wrote:
> >>> sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
> >>> calls with the first string not finished by '\n', so that the resulting message
> >>> would inevitably come out garbled, with something like "3net eth0: " inserted
> >>> in the middle. Avoid that by merging 2 calls into one.
>
> > I believe this interleaving should not happen since
> > commit e28d713704117bca0820c732210df6075b09f13b
> > (2.6.31 days)
>
> I believe you have given me the wrong commit, which has nothing to do the
> the newline problem per se. It just adds KERN_DEFAULT. I was able to find the
> correct commit though: it's the parent of the commit you cited,
Yeah, I was just scanning the printk commit logs
and looked for the first one that said something
like force newline.
> I should have tested my assumption beforehand...
Always a good thing.
> (I'd like to merge these
> dev_err() calls still though).
Yes, the dev_err calls should be merged.
About the other stuff, what/when ever...
cheers, Joe
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] sh_eth: fix garbled TX error message
@ 2014-01-13 16:51 ` Joe Perches
0 siblings, 0 replies; 14+ messages in thread
From: Joe Perches @ 2014-01-13 16:51 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: Simon Horman, netdev, linux-sh
On Mon, 2014-01-13 at 20:15 +0400, Sergei Shtylyov wrote:
> On 13-012014 5:24, Joe Perches wrote:
> >>> sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
> >>> calls with the first string not finished by '\n', so that the resulting message
> >>> would inevitably come out garbled, with something like "3net eth0: " inserted
> >>> in the middle. Avoid that by merging 2 calls into one.
>
> > I believe this interleaving should not happen since
> > commit e28d713704117bca0820c732210df6075b09f13b
> > (2.6.31 days)
>
> I believe you have given me the wrong commit, which has nothing to do the
> the newline problem per se. It just adds KERN_DEFAULT. I was able to find the
> correct commit though: it's the parent of the commit you cited,
Yeah, I was just scanning the printk commit logs
and looked for the first one that said something
like force newline.
> I should have tested my assumption beforehand...
Always a good thing.
> (I'd like to merge these
> dev_err() calls still though).
Yes, the dev_err calls should be merged.
About the other stuff, what/when ever...
cheers, Joe
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] sh_eth: fix garbled TX error message
2014-01-10 23:41 ` Sergei Shtylyov
@ 2014-01-14 7:29 ` David Miller
-1 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2014-01-14 7:29 UTC (permalink / raw)
To: sergei.shtylyov; +Cc: netdev, linux-sh
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date: Sat, 11 Jan 2014 02:41:49 +0300
> sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
> calls with the first string not finished by '\n', so that the resulting message
> would inevitably come out garbled, with something like "3net eth0: " inserted
> in the middle. Avoid that by merging 2 calls into one.
>
> While at it, insert an empty line after the nearby declaration.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Applied, thanks.
I don't think this is really -stable material, sorry.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] sh_eth: fix garbled TX error message
@ 2014-01-14 7:29 ` David Miller
0 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2014-01-14 7:29 UTC (permalink / raw)
To: sergei.shtylyov; +Cc: netdev, linux-sh
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date: Sat, 11 Jan 2014 02:41:49 +0300
> sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
> calls with the first string not finished by '\n', so that the resulting message
> would inevitably come out garbled, with something like "3net eth0: " inserted
> in the middle. Avoid that by merging 2 calls into one.
>
> While at it, insert an empty line after the nearby declaration.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Applied, thanks.
I don't think this is really -stable material, sorry.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] sh_eth: fix garbled TX error message
2014-01-14 7:29 ` David Miller
@ 2014-01-14 11:49 ` Sergei Shtylyov
-1 siblings, 0 replies; 14+ messages in thread
From: Sergei Shtylyov @ 2014-01-14 11:49 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-sh
Hello.
On 14-01-2014 11:29, David Miller wrote:
>> sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
>> calls with the first string not finished by '\n', so that the resulting message
>> would inevitably come out garbled, with something like "3net eth0: " inserted
>> in the middle. Avoid that by merging 2 calls into one.
>> While at it, insert an empty line after the nearby declaration.
>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Applied, thanks.
> I don't think this is really -stable material, sorry.
Right, this is not even a fix anymore, at least not from 2.6.31 times (if
Joe's estimate was correct), and I was going to resubmit it as a cleanup.
Should have warned you not to apply yet but didn't, sorry.
WBR, Sergei
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] sh_eth: fix garbled TX error message
@ 2014-01-14 11:49 ` Sergei Shtylyov
0 siblings, 0 replies; 14+ messages in thread
From: Sergei Shtylyov @ 2014-01-14 11:49 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-sh
Hello.
On 14-01-2014 11:29, David Miller wrote:
>> sh_eth_error() in case of a TX error tries to print a message using 2 dev_err()
>> calls with the first string not finished by '\n', so that the resulting message
>> would inevitably come out garbled, with something like "3net eth0: " inserted
>> in the middle. Avoid that by merging 2 calls into one.
>> While at it, insert an empty line after the nearby declaration.
>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Applied, thanks.
> I don't think this is really -stable material, sorry.
Right, this is not even a fix anymore, at least not from 2.6.31 times (if
Joe's estimate was correct), and I was going to resubmit it as a cleanup.
Should have warned you not to apply yet but didn't, sorry.
WBR, Sergei
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-01-14 11:49 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-10 22:41 [PATCH] sh_eth: fix garbled TX error message Sergei Shtylyov
2014-01-10 23:41 ` Sergei Shtylyov
2014-01-13 0:45 ` Simon Horman
2014-01-13 0:45 ` Simon Horman
2014-01-13 1:24 ` Joe Perches
2014-01-13 1:24 ` Joe Perches
2014-01-13 16:15 ` Sergei Shtylyov
2014-01-13 16:15 ` Sergei Shtylyov
2014-01-13 16:51 ` Joe Perches
2014-01-13 16:51 ` Joe Perches
2014-01-14 7:29 ` David Miller
2014-01-14 7:29 ` David Miller
2014-01-14 11:49 ` Sergei Shtylyov
2014-01-14 11:49 ` Sergei Shtylyov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.