stmmac: move hw init in the probe (v2)

This patch moves the MAC HW initialization and the HW feature verification from the open to the probe function as D. Miller suggested. So the patch actually reorganizes and tidies-up some parts of the driver and indeed fixes some problem when tune its HW features. These can be overwritten by looking at the HW cap register at run-time and that generated problems.

Giuseppe CAVALLARO committed 14 years ago

Commit cf3f0471 parent 7a13f8f4 files · +105 −116Browse files

Unified · Split

4 files

drivers/net/ethernet/stmicro/stmmac/stmmac.h +2 −1
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +91 −98
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +2 −4
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +10 −13

drivers/net/ethernet/stmicro/stmmac/stmmac.h+2−1

@@ -97,4 +97,5 @@ int stmmac_resume(struct net_device *ndev); · 96 unmodified lines
97	int stmmac_suspend(struct net_device *ndev);	97	int stmmac_suspend(struct net_device *ndev);
98	int stmmac_dvr_remove(struct net_device *ndev);	98	int stmmac_dvr_remove(struct net_device *ndev);
99	struct stmmac_priv stmmac_dvr_probe(struct device device,	99	struct stmmac_priv stmmac_dvr_probe(struct device device,
100	struct plat_stmmacenet_data *plat_dat);	100	struct plat_stmmacenet_data *plat_dat,
		101	void __iomem *addr);

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c+91−98

 			case 1000:
 				if (likely(priv->plat->has_gmac))
 					ctrl &= ~priv->hw->link.port;
-				stmmac_hw_fix_mac_speed(priv);
+					stmmac_hw_fix_mac_speed(priv);
 				break;
 			case 100:
 			case 10:
 		u32 uid = ((hwid & 0x0000ff00) >> 8);
 		u32 synid = (hwid & 0x000000ff);
-		pr_info("STMMAC - user ID: 0x%x, Synopsys ID: 0x%x\n",
+		pr_info("stmmac - user ID: 0x%x, Synopsys ID: 0x%x\n",
 			uid, synid);
 		return synid;
 	return hw_cap;
 }
-/**
- * stmmac_mac_device_setup
- * @dev : device pointer
- * Description: this is to attach the GMAC or MAC 10/100
- * main core structures that will be completed during the
- * open step.
- */
-static int stmmac_mac_device_setup(struct net_device *dev)
-{
-	struct stmmac_priv *priv = netdev_priv(dev);
-	struct mac_device_info *device;
-	if (priv->plat->has_gmac)
-		device = dwmac1000_setup(priv->ioaddr);
-	else
-		device = dwmac100_setup(priv->ioaddr);
-	if (!device)
-		return -ENOMEM;
-	priv->hw = device;
-	priv->hw->ring = &ring_mode_ops;
-	if (device_can_wakeup(priv->device)) {
-		priv->wolopts = WAKE_MAGIC; /* Magic Frame as default */
-		enable_irq_wake(priv->wol_irq);
-	}
-	return 0;
-}
 static void stmmac_check_ether_addr(struct stmmac_priv *priv)
 {
 	/* verify if the MAC address is valid, in case of failures it
 	struct stmmac_priv *priv = netdev_priv(dev);
 	int ret;
-	/* MAC HW device setup */
-	ret = stmmac_mac_device_setup(dev);
-	if (ret < 0)
-		return ret;
 	stmmac_check_ether_addr(priv);
-	stmmac_verify_args();
-	/* Override with kernel parameters if supplied XXX CRS XXX
-	 * this needs to have multiple instances */
-	if ((phyaddr >= 0) && (phyaddr <= 31))
-		priv->plat->phy_addr = phyaddr;
 	/* MDIO bus Registration */
 	ret = stmmac_mdio_register(dev);
 	if (ret < 0) {
 		goto open_error;
 	}
-	stmmac_get_synopsys_id(priv);
-	priv->hw_cap_support = stmmac_get_hw_features(priv);
-	if (priv->hw_cap_support) {
-		pr_info(" Support DMA HW capability register");
-		/* We can override some gmac/dma configuration fields: e.g.
-		 * enh_desc, tx_coe (e.g. that are passed through the
-		 * platform) with the values from the HW capability
-		 * register (if supported).
-		 */
-		priv->plat->enh_desc = priv->dma_cap.enh_desc;
-		priv->plat->tx_coe = priv->dma_cap.tx_coe;
-		priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up;
-		/* By default disable wol on magic frame if not supported */
-		if (!priv->dma_cap.pmt_magic_frame)
-			priv->wolopts &= ~WAKE_MAGIC;
-	} else
-		pr_info(" No HW DMA feature register supported");
-	/* Select the enhnaced/normal descriptor structures */
-	stmmac_selec_desc_mode(priv);
-	/* PMT module is not integrated in all the MAC devices. */
-	if (priv->plat->pmt) {
-		pr_info(" Remote wake-up capable\n");
-		device_set_wakeup_capable(priv->device, 1);
-	}
-	priv->rx_coe = priv->hw->mac->rx_coe(priv->ioaddr);
-	if (priv->rx_coe)
-		pr_info(" Checksum Offload Engine supported\n");
-	if (priv->plat->tx_coe)
-		pr_info(" Checksum insertion supported\n");
 	/* Create and initialize the TX/RX descriptors chains. */
 	priv->dma_tx_size = STMMAC_ALIGN(dma_txsize);
 	priv->dma_rx_size = STMMAC_ALIGN(dma_rxsize);
 	/* Copy the MAC addr into the HW  */
 	priv->hw->mac->set_umac_addr(priv->ioaddr, dev->dev_addr, 0);
 	/* If required, perform hw setup of the bus. */
 	if (priv->plat->bus_setup)
 		priv->plat->bus_setup(priv->ioaddr);
 	/* Initialize the MAC Core */
 	priv->hw->mac->core_init(priv->ioaddr);
-	netdev_update_features(dev);
 	/* Request the IRQ lines */
 	ret = request_irq(dev->irq, stmmac_interrupt,
 			 IRQF_SHARED, dev->name, dev);
 #ifdef CONFIG_STMMAC_DEBUG_FS
 	ret = stmmac_init_fs(dev);
 	if (ret < 0)
-		pr_warning("\tFailed debugFS registration");
+		pr_warning("%s: failed debugFS registration\n", __func__);
 #endif
 	/* Start the ball rolling... */
 	DBG(probe, DEBUG, "%s: DMA RX/TX processes started...\n", dev->name);
 #ifdef CONFIG_STMMAC_TIMER
 	priv->tm->timer_start(tmrate);
 #endif
 	/* Dump DMA/MAC registers */
 	if (netif_msg_hw(priv)) {
 		priv->hw->mac->dump_regs(priv->ioaddr);
 	.ndo_set_mac_address = eth_mac_addr,
 };
+/**
+ *  stmmac_hw_init - Init the MAC device
+ *  @priv : pointer to the private device structure.
+ *  Description: this function detects which MAC device
+ *  (GMAC/MAC10-100) has to attached, checks the HW capability
+ *  (if supported) and sets the driver's features (for example
+ *  to use the ring or chaine mode or support the normal/enh
+ *  descriptor structure).
+ */
+static int stmmac_hw_init(struct stmmac_priv *priv)
+{
+	int ret = 0;
+	struct mac_device_info *mac;
+	/* Identify the MAC HW device */
+	if (priv->plat->has_gmac)
+		mac = dwmac1000_setup(priv->ioaddr);
+	else
+		mac = dwmac100_setup(priv->ioaddr);
+	if (!mac)
+		return -ENOMEM;
+	priv->hw = mac;
+	/* To use the chained or ring mode */
+	priv->hw->ring = &ring_mode_ops;
+	/* Get and dump the chip ID */
+	stmmac_get_synopsys_id(priv);
+	/* Get the HW capability (new GMAC newer than 3.50a) */
+	priv->hw_cap_support = stmmac_get_hw_features(priv);
+	if (priv->hw_cap_support) {
+		pr_info(" DMA HW capability register supported");
+		/* We can override some gmac/dma configuration fields: e.g.
+		 * enh_desc, tx_coe (e.g. that are passed through the
+		 * platform) with the values from the HW capability
+		 * register (if supported).
+		 */
+		priv->plat->enh_desc = priv->dma_cap.enh_desc;
+		priv->plat->tx_coe = priv->dma_cap.tx_coe;
+		priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up;
+	} else
+		pr_info(" No HW DMA feature register supported");
+	/* Select the enhnaced/normal descriptor structures */
+	stmmac_selec_desc_mode(priv);
+	priv->rx_coe = priv->hw->mac->rx_coe(priv->ioaddr);
+	if (priv->rx_coe)
+		pr_info(" RX Checksum Offload Engine supported\n");
+	if (priv->plat->tx_coe)
+		pr_info(" TX Checksum insertion supported\n");
+	if (priv->plat->pmt) {
+		pr_info(" Wake-Up On Lan supported\n");
+		device_set_wakeup_capable(priv->device, 1);
+	}
+	return ret;
+}
 /**
  * stmmac_dvr_probe
  * @device: device pointer
  * call the alloc_etherdev, allocate the priv structure.
  */
 struct stmmac_priv *stmmac_dvr_probe(struct device *device,
-					struct plat_stmmacenet_data *plat_dat)
+				     struct plat_stmmacenet_data *plat_dat,
+				     void __iomem *addr)
 {
 	int ret = 0;
 	struct net_device *ndev = NULL;
 	ether_setup(ndev);
-	ndev->netdev_ops = &stmmac_netdev_ops;
 	stmmac_set_ethtool_ops(ndev);
+	priv->pause = pause;
+	priv->plat = plat_dat;
+	priv->ioaddr = addr;
+	priv->dev->base_addr = (unsigned long)addr;
+	/* Verify driver arguments */
+	stmmac_verify_args();
-	ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
+	/* Override with kernel parameters if supplied XXX CRS XXX
+	 * this needs to have multiple instances */
+	if ((phyaddr >= 0) && (phyaddr <= 31))
+		priv->plat->phy_addr = phyaddr;
+	/* Init MAC and get the capabilities */
+	stmmac_hw_init(priv);
+	ndev->netdev_ops = &stmmac_netdev_ops;
+	ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
+			    NETIF_F_RXCSUM;
 	ndev->features |= ndev->hw_features | NETIF_F_HIGHDMA;
 	ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
 #ifdef STMMAC_VLAN_TAG_USED
 	if (flow_ctrl)
 		priv->flow_ctrl = FLOW_AUTO;	/* RX/TX pause on */
-	priv->pause = pause;
-	priv->plat = plat_dat;
 	netif_napi_add(ndev, &priv->napi, stmmac_poll, 64);
 	spin_lock_init(&priv->lock);
 	ret = register_netdev(ndev);
 	if (ret) {
-		pr_err("%s: ERROR %i registering the device\n",
+		pr_err("%s: ERROR %i registering the device\n", __func__, ret);
-		       __func__, ret);
 		goto error;
 	}
-	DBG(probe, DEBUG, "%s: Scatter/Gather: %s - HW checksums: %s\n",
-	    ndev->name, (ndev->features & NETIF_F_SG) ? "on" : "off",
-	    (ndev->features & NETIF_F_IP_CSUM) ? "on" : "off");
 	return priv;
 error:

drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c+2−4

 	stmmac_default_data();
-	priv = stmmac_dvr_probe(&(pdev->dev), &plat_dat);
+	priv = stmmac_dvr_probe(&(pdev->dev), &plat_dat, addr);
 	if (!priv) {
-		pr_err("%s: main drivr probe failed", __func__);
+		pr_err("%s: main driver probe failed", __func__);
 		goto err_out;
 	}
-	priv->ioaddr = addr;
-	priv->dev->base_addr = (unsigned long)addr;
 	priv->dev->irq = pdev->irq;
 	priv->wol_irq = pdev->irq;

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c+10−13

@@ -59,16 +59,20 @@ static int stmmac_pltfr_probe(struct platform_device *pdev) · 58 unmodified lines
59	goto out_release_region;	59	goto out_release_region;
60	}	60	}
61	plat_dat = pdev->dev.platform_data;	61	plat_dat = pdev->dev.platform_data;
62	priv = stmmac_dvr_probe(&(pdev->dev), plat_dat);	62
		63	/* Custom initialisation (if needed)*/
		64	if (plat_dat->init) {
		65	ret = plat_dat->init(pdev);
		66	if (unlikely(ret))
		67	goto out_unmap;
		68	}
		69
		70	priv = stmmac_dvr_probe(&(pdev->dev), plat_dat, addr);
63	if (!priv) {	71	if (!priv) {
64	pr_err("%s: main drivr probe failed", __func__);	72	pr_err("%s: main driver probe failed", __func__);
65	goto out_unmap;	73	goto out_unmap;
66	}	74	}
67		75
68	priv->ioaddr = addr;
69	/* Set the I/O base addr */
70	priv->dev->base_addr = (unsigned long)addr;
71
72	/* Get the MAC information */	76	/* Get the MAC information */
73	priv->dev->irq = platform_get_irq_byname(pdev, "macirq");	77	priv->dev->irq = platform_get_irq_byname(pdev, "macirq");
74	if (priv->dev->irq == -ENXIO) {	78	if (priv->dev->irq == -ENXIO) {
@@ -92,13 +96,6 @@ static int stmmac_pltfr_probe(struct platform_device *pdev) · 17 unmodified lines
92		96
93	platform_set_drvdata(pdev, priv->dev);	97	platform_set_drvdata(pdev, priv->dev);
94		98
95	/* Custom initialisation */
96	if (priv->plat->init) {
97	ret = priv->plat->init(pdev);
98	if (unlikely(ret))
99	goto out_unmap;
100	}
101
102	pr_debug("STMMAC platform driver registration completed");	99	pr_debug("STMMAC platform driver registration completed");
103		100
104	return 0;	101	return 0;