Commit d7e2c827 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ucc_geth-fixes' 

Rasmus Villemoes says:

====================
ucc_geth fixes

This is three bug fixes that fell out of a series of cleanups of the
ucc_geth driver.
====================

Link: https://lore.kernel.org/r/20201218105538.30563-1-rasmus.villemoes@prevas.dk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 54ddbdb0 e925e0cd

drivers/net/ethernet/freescale/ucc_geth.c

+2 −1
Original line number Diff line number Diff line
@@ -3889,6 +3889,7 @@ static int ucc_geth_probe(struct platform_device* ofdev) 
	INIT_WORK(&ugeth->timeout_work, ucc_geth_timeout_work);

	netif_napi_add(dev, &ugeth->napi, ucc_geth_poll, 64);

	dev->mtu = 1500;

	dev->max_mtu = 1518;



	ugeth->msg_enable = netif_msg_init(debug.msg_enable, UGETH_MSG_DEFAULT);

	ugeth->phy_interface = phy_interface;
@@ -3934,12 +3935,12 @@ static int ucc_geth_remove(struct platform_device* ofdev) 
	struct device_node *np = ofdev->dev.of_node;



	unregister_netdev(dev);

	free_netdev(dev);

	ucc_geth_memclean(ugeth);

	if (of_phy_is_fixed_link(np))

		of_phy_deregister_fixed_link(np);

	of_node_put(ugeth->ug_info->tbi_node);

	of_node_put(ugeth->ug_info->phy_node);

	free_netdev(dev);



	return 0;

}

drivers/net/ethernet/freescale/ucc_geth.h

+8 −1
Original line number Diff line number Diff line
@@ -575,7 +575,14 @@ struct ucc_geth_tx_global_pram { 
	u32 vtagtable[0x8];	/* 8 4-byte VLAN tags */

	u32 tqptr;		/* a base pointer to the Tx Queues Memory

				   Region */

	u8 res2[0x80 - 0x74];

	u8 res2[0x78 - 0x74];

	u64 snums_en;

	u32 l2l3baseptr;	/* top byte consists of a few other bit fields */



	u16 mtu[8];

	u8 res3[0xa8 - 0x94];

	u32 wrrtablebase;	/* top byte is reserved */

	u8 res4[0xc0 - 0xac];

} __packed;



/* structure representing Extended Filtering Global Parameters in PRAM */