sh_eth: fix SH7757 GEther initialization

Sergei Shtylyov · davem330 · commit 5133550296d4 · 2018-01-05T13:59:18.000-05:00
Renesas SH7757 has 2 Fast and 2 Gigabit Ether controllers, while the 'sh_eth' driver can only reset and initialize TSU of the first controller pair. Shimoda-san tried to solve that adding the 'needs_init' member to the 'struct sh_eth_plat_data', however the platform code still never sets this flag. I think that we can infer this information from the 'devno' variable (set to 'platform_device::id') and reset/init the Ether controller pair only for an even 'devno'; therefore 'sh_eth_plat_data::needs_init' can be removed... Fixes: 150647f ("net: sh_eth: change the condition of initialization") Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
@@ -3254,8 +3254,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 		ndev->features = NETIF_F_HW_VLAN_CTAG_FILTER;
 	}
 
-	/* initialize first or needed device */
-	if (!devno || pd->needs_init) {
+	/* Need to init only the first port of the two sharing a TSU */
+	if (devno % 2 == 0) {
 		if (mdp->cd->chip_reset)
 			mdp->cd->chip_reset(ndev);
 
diff --git a/include/linux/sh_eth.h b/include/linux/sh_eth.h
@@ -17,7 +17,6 @@ struct sh_eth_plat_data {
 	unsigned char mac_addr[ETH_ALEN];
 	unsigned no_ether_link:1;
 	unsigned ether_link_active_low:1;
-	unsigned needs_init:1;
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -3254,8 +3254,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)`
`3254`	`3254`	`ndev->features = NETIF_F_HW_VLAN_CTAG_FILTER;`
`3255`	`3255`	`}`
`3256`	`3256`
`3257`		`- /* initialize first or needed device */`
`3258`		`- if (!devno \|\| pd->needs_init) {`
	`3257`	`+ /* Need to init only the first port of the two sharing a TSU */`
	`3258`	`+ if (devno % 2 == 0) {`
`3259`	`3259`	`if (mdp->cd->chip_reset)`
`3260`	`3260`	`mdp->cd->chip_reset(ndev);`
`3261`	`3261`