* [PATCH] staging: octeon: repair "fixed-link" support
@ 2020-10-09 9:46 Alexander A Sverdlin
2020-10-09 9:46 ` [PATCH] stating: octeon: Drop on uncorrectable alignment or FCS error Alexander A Sverdlin
0 siblings, 1 reply; 4+ messages in thread
From: Alexander A Sverdlin @ 2020-10-09 9:46 UTC (permalink / raw)
To: devel
Cc: Aaro Koskinen, netdev, Ralf Baechle, Alexander Sverdlin,
Alexander Sverdlin, Greg Kroah-Hartman, David S. Miller
From: Alexander Sverdlin <alexander.sverdlin@nsn.com>
The PHYs must be registered once in device probe function, not in device
open callback because it's only possible to register them once.
Fixes: a25e278020 ("staging: octeon: support fixed-link phys")
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
---
drivers/staging/octeon/ethernet-mdio.c | 6 ------
drivers/staging/octeon/ethernet.c | 10 ++++++++++
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c
index cfb673a..0bf54584 100644
--- a/drivers/staging/octeon/ethernet-mdio.c
+++ b/drivers/staging/octeon/ethernet-mdio.c
@@ -147,12 +147,6 @@ int cvm_oct_phy_setup_device(struct net_device *dev)
phy_node = of_parse_phandle(priv->of_node, "phy-handle", 0);
if (!phy_node && of_phy_is_fixed_link(priv->of_node)) {
- int rc;
-
- rc = of_phy_register_fixed_link(priv->of_node);
- if (rc)
- return rc;
-
phy_node = of_node_get(priv->of_node);
}
if (!phy_node)
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 204f0b1..2b0d05d 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -13,6 +13,7 @@
#include <linux/phy.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
+#include <linux/of_mdio.h>
#include <linux/of_net.h>
#include <linux/if_ether.h>
#include <linux/if_vlan.h>
@@ -892,6 +893,15 @@ static int cvm_oct_probe(struct platform_device *pdev)
break;
}
+ if (priv->of_node && of_phy_is_fixed_link(priv->of_node)) {
+ r = of_phy_register_fixed_link(priv->of_node);
+ if (r) {
+ netdev_err(dev, "Failed to register fixed link for interface %d, port %d\n",
+ interface, priv->ipd_port);
+ dev->netdev_ops = NULL;
+ }
+ }
+
if (!dev->netdev_ops) {
free_netdev(dev);
} else if (register_netdev(dev) < 0) {
--
2.10.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] stating: octeon: Drop on uncorrectable alignment or FCS error
2020-10-09 9:46 [PATCH] staging: octeon: repair "fixed-link" support Alexander A Sverdlin
@ 2020-10-09 9:46 ` Alexander A Sverdlin
2020-10-09 12:24 ` Dan Carpenter
0 siblings, 1 reply; 4+ messages in thread
From: Alexander A Sverdlin @ 2020-10-09 9:46 UTC (permalink / raw)
To: devel
Cc: Aaro Koskinen, Greg Kroah-Hartman, Ralf Baechle,
Alexander Sverdlin, netdev, David S. Miller
From: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Currently in case of alignment or FCS error if the packet cannot be
corrected it's still not dropped. Report the error properly and drop the
packet while making the code around a little bit more readable.
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Fixes: 80ff0fd3ab ("Staging: Add octeon-ethernet driver files.")
Change-Id: Ie1fadcc57cb5e221cf3e83c169b53a5533b8edff
---
drivers/staging/octeon/ethernet-rx.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
index 2c16230..b22f7be 100644
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
@@ -69,14 +69,16 @@ static inline int cvm_oct_check_rcv_error(struct cvmx_wqe *work)
else
port = work->word1.cn38xx.ipprt;
- if ((work->word2.snoip.err_code == 10) && (work->word1.len <= 64)) {
+ if ((work->word2.snoip.err_code == 10) && (work->word1.len <= 64))
/*
* Ignore length errors on min size packets. Some
* equipment incorrectly pads packets to 64+4FCS
* instead of 60+4FCS. Note these packets still get
* counted as frame errors.
*/
- } else if (work->word2.snoip.err_code == 5 ||
+ return 0;
+
+ if (work->word2.snoip.err_code == 5 ||
work->word2.snoip.err_code == 7) {
/*
* We received a packet with either an alignment error
@@ -125,14 +127,12 @@ static inline int cvm_oct_check_rcv_error(struct cvmx_wqe *work)
return 1;
}
}
- } else {
- printk_ratelimited("Port %d receive error code %d, packet dropped\n",
- port, work->word2.snoip.err_code);
- cvm_oct_free_work(work);
- return 1;
}
- return 0;
+ printk_ratelimited("Port %d receive error code %d, packet dropped\n",
+ port, work->word2.snoip.err_code);
+ cvm_oct_free_work(work);
+ return 1;
}
static void copy_segments_to_skb(struct cvmx_wqe *work, struct sk_buff *skb)
--
2.10.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] stating: octeon: Drop on uncorrectable alignment or FCS error
2020-10-09 9:46 ` [PATCH] stating: octeon: Drop on uncorrectable alignment or FCS error Alexander A Sverdlin
@ 2020-10-09 12:24 ` Dan Carpenter
2020-10-12 12:23 ` Alexander Sverdlin
0 siblings, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2020-10-09 12:24 UTC (permalink / raw)
To: Alexander A Sverdlin
Cc: devel, Aaro Koskinen, Greg Kroah-Hartman, Ralf Baechle, netdev,
David S. Miller
On Fri, Oct 09, 2020 at 11:46:05AM +0200, Alexander A Sverdlin wrote:
> --- a/drivers/staging/octeon/ethernet-rx.c
> +++ b/drivers/staging/octeon/ethernet-rx.c
> @@ -69,14 +69,16 @@ static inline int cvm_oct_check_rcv_error(struct cvmx_wqe *work)
> else
> port = work->word1.cn38xx.ipprt;
>
> - if ((work->word2.snoip.err_code == 10) && (work->word1.len <= 64)) {
> + if ((work->word2.snoip.err_code == 10) && (work->word1.len <= 64))
> /*
> * Ignore length errors on min size packets. Some
> * equipment incorrectly pads packets to 64+4FCS
> * instead of 60+4FCS. Note these packets still get
> * counted as frame errors.
> */
> - } else if (work->word2.snoip.err_code == 5 ||
> + return 0;
> +
> + if (work->word2.snoip.err_code == 5 ||
> work->word2.snoip.err_code == 7) {
This line is indented to match the old code and it no longer matches.
(Please update the whitespace).
> /*
> * We received a packet with either an alignment error
regards,
dan carpenter
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] stating: octeon: Drop on uncorrectable alignment or FCS error
2020-10-09 12:24 ` Dan Carpenter
@ 2020-10-12 12:23 ` Alexander Sverdlin
0 siblings, 0 replies; 4+ messages in thread
From: Alexander Sverdlin @ 2020-10-12 12:23 UTC (permalink / raw)
To: Dan Carpenter
Cc: devel, Aaro Koskinen, Greg Kroah-Hartman, Ralf Baechle, netdev,
David S. Miller
Hello Dan,
On 09/10/2020 14:24, Dan Carpenter wrote:
> On Fri, Oct 09, 2020 at 11:46:05AM +0200, Alexander A Sverdlin wrote:
>> --- a/drivers/staging/octeon/ethernet-rx.c
>> +++ b/drivers/staging/octeon/ethernet-rx.c
>> @@ -69,14 +69,16 @@ static inline int cvm_oct_check_rcv_error(struct cvmx_wqe *work)
>> else
>> port = work->word1.cn38xx.ipprt;
>>
>> - if ((work->word2.snoip.err_code == 10) && (work->word1.len <= 64)) {
>> + if ((work->word2.snoip.err_code == 10) && (work->word1.len <= 64))
>> /*
>> * Ignore length errors on min size packets. Some
>> * equipment incorrectly pads packets to 64+4FCS
>> * instead of 60+4FCS. Note these packets still get
>> * counted as frame errors.
>> */
>> - } else if (work->word2.snoip.err_code == 5 ||
>> + return 0;
>> +
>> + if (work->word2.snoip.err_code == 5 ||
>> work->word2.snoip.err_code == 7) {
> This line is indented to match the old code and it no longer matches.
> (Please update the whitespace).
thanks to your comment I took a fresh look onto the patch and found a logic error
in the change. Please ignore the whole patch for now.
>> /*
>> * We received a packet with either an alignment error
--
Best regards,
Alexander Sverdlin.
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-12 12:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-09 9:46 [PATCH] staging: octeon: repair "fixed-link" support Alexander A Sverdlin
2020-10-09 9:46 ` [PATCH] stating: octeon: Drop on uncorrectable alignment or FCS error Alexander A Sverdlin
2020-10-09 12:24 ` Dan Carpenter
2020-10-12 12:23 ` Alexander Sverdlin
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).