aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
blob: 46a1ba1d965ea9f285e8b98c97fc3a7416882e8c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2650,6 +2650,9 @@ static int mv88e6xxx_setup_port(struct m
 	if (dsa_is_cpu_port(ds, port))
 		reg = 0;
 
+	/* Disable ATU member violation interrupt */
+	reg |= MV88E6XXX_PORT_ASSOC_VECTOR_IGNORE_WRONG;
+
 	err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_ASSOC_VECTOR,
 				   reg);
 	if (err)
ame.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
From c00adb2a1ac75eaef1e71cd9819636b86eabebd9 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Sat, 11 May 2013 23:40:19 +0200
Subject: [PATCH 70/79] NET: multi phy support

Signed-off-by: John Crispin <blogic@openwrt.org>
---
 drivers/net/phy/phy.c |    9 ++++++---
 include/linux/phy.h   |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index ef9ea92..27f9b45 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -800,7 +800,8 @@ void phy_state_machine(struct work_struct *work)
 			 * negotiation for now */
 			if (!phydev->link) {
 				phydev->state = PHY_NOLINK;
-				netif_carrier_off(phydev->attached_dev);
+				if (!phydev->no_auto_carrier_off)
+					netif_carrier_off(phydev->attached_dev);
 				phydev->adjust_link(phydev->attached_dev);
 				break;
 			}
@@ -891,7 +892,8 @@ void phy_state_machine(struct work_struct *work)
 				netif_carrier_on(phydev->attached_dev);
 			} else {
 				phydev->state = PHY_NOLINK;
-				netif_carrier_off(phydev->attached_dev);
+				if (!phydev->no_auto_carrier_off)
+					netif_carrier_off(phydev->attached_dev);
 			}
 
 			phydev->adjust_link(phydev->attached_dev);
@@ -903,7 +905,8 @@ void phy_state_machine(struct work_struct *work)
 		case PHY_HALTED:
 			if (phydev->link) {
 				phydev->link = 0;
-				netif_carrier_off(phydev->attached_dev);
+				if (!phydev->no_auto_carrier_off)
+					netif_carrier_off(phydev->attached_dev);
 				phydev->adjust_link(phydev->attached_dev);
 			}
 			break;
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 93b3cf7..c09b4ad 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -298,7 +298,7 @@ struct phy_device {
 
 	struct phy_c45_device_ids c45_ids;
 	bool is_c45;
-
+	bool no_auto_carrier_off;
 	enum phy_state state;
 
 	u32 dev_flags;
-- 
1.7.10.4