kernel/wr_nic: set-up VLANs registers during driver loading

Set-up VLAN related registers during driver load instead of during opening (bringing up) interfaces. From now VLANs can be configured after loading the driver, but before bringing up of interfaces. By this no switching is done without VLANs beeing configured. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

kernel/wr_nic: set-up VLANs registers during driver loading
Set-up VLAN related registers during driver load instead of during opening (bringing up) interfaces. From now VLANs can be configured after loading the driver, but before bringing up of interfaces. By this no switching is done without VLANs beeing configured. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
e0e30e8b · Adam Wujek · Miguel Jimenez Lopez · cca2d4f2 · e0e30e8b
Commit e0e30e8b authored Jan 06, 2016 by Adam Wujek 💬 Committed by Miguel Jimenez Lopez Sep 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 13 deletions

endpoint.c kernel/wr_nic/endpoint.c +15 -13

No files found.
--- a/kernel/wr_nic/endpoint.c
+++ b/kernel/wr_nic/endpoint.c
@@ -176,7 +176,6 @@ int wrn_ep_open(struct net_device *dev)
 {
 	struct wrn_ep *ep = netdev_priv(dev);
 	unsigned long timerarg = (unsigned long)dev;
-	int prio, prio_map;

 	if (WR_IS_NODE) {
 		netif_carrier_on(dev);
@@ -184,18 +183,6 @@ int wrn_ep_open(struct net_device *dev)
 	}

 	/* Prepare hardware registers: first config, then bring up */
-	writel(0
-	       | EP_VCR0_QMODE_W(0x3)		/* unqualified port */
-	       | EP_VCR0_PRIO_VAL_W(4),		/* some mid priority */
-		&ep->ep_regs->VCR0);
-
-	/* Write default 802.1Q tag priority to traffic class mapping */
-	prio_map = 0;
-	for(prio=0; prio<8; ++prio) {
-		prio_map |= (0x7 & prio) << (prio*3);
-	}
-	writel(prio_map, &ep->ep_regs->TCAR);
-

 	/*
 	 * enable RX timestamping (it has no impact on performance)
@@ -255,6 +242,7 @@ int wrn_endpoint_probe(struct net_device *dev)
 	struct wrn_ep *ep = netdev_priv(dev);
 	static u8 wraddr[6];
 	int err;
+	int prio, prio_map;
 	u32 val;

 	if (is_zero_ether_addr(wraddr)) {
@@ -319,6 +307,20 @@ int wrn_endpoint_probe(struct net_device *dev)
 	ep->mii.advertising = ADVERTISE_1000XFULL;
 	ep->mii.full_duplex = 1;

+	/* set-up VLAN related registers during driver loading not during
+	 * opening device */
+	writel(0
+	       | EP_VCR0_QMODE_W(0x3)		/* unqualified port */
+	       | EP_VCR0_PRIO_VAL_W(4),		/* some mid priority */
+		&ep->ep_regs->VCR0);
+
+	/* Write default 802.1Q tag priority to traffic class mapping */
+	prio_map = 0;
+	for (prio = 0; prio < 8; ++prio) {
+		prio_map |= (0x7 & prio) << (prio * 3);
+	}
+	writel(prio_map, &ep->ep_regs->TCAR);
+
 	/* Finally, register and succeed, or fail and undo */
 	err = register_netdev(dev);