[PATCH net 0/4] via-rhine: Resume fix and other maintenance work

[PATCH net 0/4] via-rhine: Resume fix and other maintenance work

[Kevin Brace]

I use via-rhine based Ethernet regularly, and the Ethernet dying
after resume was really annoying me.  I decided to take the
matter into my own hands, and came up with a fix for the Ethernet
disappearing after resume.  I will also want to take over the code
maintenance work for via-rhine.  The patches apply to the latest
code, but they should be backported to older kernels as well.
--

Kevin Brace (4):
  via-rhine: Fix for the hardware having a reset failure after resume
  via-rhine: VTunknown1 device is really VT8251 South Bridge
  via-rhine: New device driver maintainer
  via-rhine: Version bumped to 1.5.2

 MAINTAINERS                          |  3 ++-
 drivers/net/ethernet/via/via-rhine.c | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

--
2.17.1

[PATCH net 1/4] via-rhine: Fix for the hardware having a reset failure after resume

[Kevin Brace]

From: Kevin Brace <kevinbrace@bracecomputerlab.com>

In rhine_resume() and rhine_suspend(), the code calls netif_running()
to see if the network interface is down or not.  If it is down (i.e.,
netif_running() returning false), they will skip any housekeeping work
within the function relating to the hardware.  This becomes a problem
when the hardware resumes from a standby since it is counting on
rhine_resume() to map its MMIO and power up rest of the hardware.
Not getting its MMIO remapped and rest of the hardware powered
up lead to a soft reset failure and hardware disappearance.  The
solution is to map its MMIO and power up rest of the hardware inside
rhine_open() before soft reset is to be performed.  This solution was
verified on ASUS P5V800-VM mainboard's integrated Rhine-II Ethernet
MAC inside VIA Technologies VT8251 South Bridge.

Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
---
 drivers/net/ethernet/via/via-rhine.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index 803247d51fe9..a20492da3407 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -1706,6 +1706,8 @@ static int rhine_open(struct net_device *dev)
 		goto out_free_ring;

 	alloc_tbufs(dev);
+	enable_mmio(rp->pioaddr, rp->quirks);
+	rhine_power_init(dev);
 	rhine_chip_reset(dev);
 	rhine_task_enable(rp);
 	init_registers(dev);
--
2.17.1

[PATCH net 2/4] via-rhine: VTunknown1 device is really VT8251 South Bridge

[Kevin Brace]

From: Kevin Brace <kevinbrace@bracecomputerlab.com>

The VIA Technologies VT8251 South Bridge's integrated Rhine-II
Ethernet MAC comes has a PCI revision value of 0x7c.  This was
verified on ASUS P5V800-VM mainboard.

Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
---
 drivers/net/ethernet/via/via-rhine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index a20492da3407..d3a2be2e75d0 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -243,7 +243,7 @@ enum rhine_revs {
 	VT8233		= 0x60,	/* Integrated MAC */
 	VT8235		= 0x74,	/* Integrated MAC */
 	VT8237		= 0x78,	/* Integrated MAC */
-	VTunknown1	= 0x7C,
+	VT8251		= 0x7C,	/* Integrated MAC */
 	VT6105		= 0x80,
 	VT6105_B0	= 0x83,
 	VT6105L		= 0x8A,
--
2.17.1

[PATCH net 3/4] via-rhine: New device driver maintainer

[Kevin Brace]

From: Kevin Brace <kevinbrace@bracecomputerlab.com>

Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
---
 MAINTAINERS                          | 3 ++-
 drivers/net/ethernet/via/via-rhine.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 153f7b3419c8..3e5ae3185847 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -18058,7 +18058,8 @@ F:	drivers/gpu/vga/vga_switcheroo.c
 F:	include/linux/vga_switcheroo.h

 VIA RHINE NETWORK DRIVER
-S:	Orphan
+S:	Maintained
+M:	Kevin Brace <kevinbrace@bracecomputerlab.com>
 F:	drivers/net/ethernet/via/via-rhine.c

 VIA SD/MMC CARD CONTROLLER DRIVER
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index d3a2be2e75d0..f2ac55172b09 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -2,7 +2,7 @@
 /*
 	Written 1998-2001 by Donald Becker.

-	Current Maintainer: Roger Luethi <rl@hellgate.ch>
+	Current Maintainer: Kevin Brace <kevinbrace@bracecomputerlab.com>

 	This software may be used and distributed according to the terms of
 	the GNU General Public License (GPL), incorporated herein by reference.
--
2.17.1

[PATCH net 4/4] via-rhine: Version bumped to 1.5.2

[Kevin Brace]

From: Kevin Brace <kevinbrace@bracecomputerlab.com>

via-rhine Version 1.5.2 contains a fix for reset failure and hardware
disappearance after resume.  I am taking over code maintenance work
for via-rhine.

Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
---
 drivers/net/ethernet/via/via-rhine.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index f2ac55172b09..9e2af4bf2f0e 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -32,8 +32,8 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

 #define DRV_NAME	"via-rhine"
-#define DRV_VERSION	"1.5.1"
-#define DRV_RELDATE	"2010-10-09"
+#define DRV_VERSION	"1.5.2"
+#define DRV_RELDATE	"2020-09-18"

 #include <linux/types.h>

--
2.17.1

Re: [PATCH net 4/4] via-rhine: Version bumped to 1.5.2

[David Miller]

From: Kevin Brace <kevinbrace@gmx.com>
Date: Mon, 28 Sep 2020 15:00:41 -0700

> @@ -32,8 +32,8 @@
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> 
>  #define DRV_NAME	"via-rhine"
> -#define DRV_VERSION	"1.5.1"
> -#define DRV_RELDATE	"2010-10-09"
> +#define DRV_VERSION	"1.5.2"
> +#define DRV_RELDATE	"2020-09-18"

Driver versions like this are deprecated and we are removing them
from every driver.

Please remove, rather than update, such values.

Thank you.

Re: [PATCH net 4/4] via-rhine: Version bumped to 1.5.2

[Kevin Brace]

Hi David,

I sent the v2 patches to netdev mailing list.
I hope they meet your standards.

Regards,

Kevin Brace
Brace Computer Laboratory blog
https://bracecomputerlab.com

> Sent: Monday, September 28, 2020 at 6:50 PM
> From: "David Miller" <davem@davemloft.net>
> To: kevinbrace@gmx.com
> Cc: netdev@vger.kernel.org, kevinbrace@bracecomputerlab.com
> Subject: Re: [PATCH net 4/4] via-rhine: Version bumped to 1.5.2
>
> From: Kevin Brace Date: Mon, 28 Sep 2020 15:00:41 -0700 > @@ -32,8 +32,8 @@ > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > #define DRV_NAME	"via-rhine" > -#define DRV_VERSION	"1.5.1" > -#define DRV_RELDATE	"2010-10-09" > +#define DRV_VERSION	"1.5.2" > +#define DRV_RELDATE	"2020-09-18" Driver versions like this are deprecated and we are removing them from every driver. Please remove, rather than update, such values. Thank you.