Commit c093e2b9 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'ibm-emac-more-cleanups' 

Rosen Penev says:

====================
ibm: emac: more cleanups

Tested on Cisco MX60W.

v2: fixed build errors. Also added extra commits to clean the driver up
further.
v3: Added tested message. Removed bad alloc_netdev_dummy commit.
v4: removed modules changes from patchset. Added fix for if MAC not
found.
v5: added of_find_matching_node commit.
v6: resend after net-next merge.
v7: removed of_find_matching_node commit. Adjusted mutex_init patch.
v8: removed patch removing custom init/exit. Needs more work.
====================

Link: https://patch.msgid.link/20241022002245.843242-1-rosenp@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents dd1b082f 707f1c4b

drivers/net/ethernet/ibm/emac/core.c

+22 −20
Original line number Diff line number Diff line
@@ -1727,6 +1727,7 @@ static inline int emac_rx_sg_append(struct emac_instance *dev, int slot) 
/* NAPI poll context */

static int emac_poll_rx(void *param, int budget)

{

	LIST_HEAD(rx_list);

	struct emac_instance *dev = param;

	int slot = dev->rx_slot, received = 0;
@@ -1783,8 +1784,7 @@ static int emac_poll_rx(void *param, int budget) 
		skb->protocol = eth_type_trans(skb, dev->ndev);

		emac_rx_csum(dev, skb, ctrl);



		if (unlikely(netif_receive_skb(skb) == NET_RX_DROP))

			++dev->estats.rx_dropped_stack;

		list_add_tail(&skb->list, &rx_list);

	next:

		++dev->stats.rx_packets;

	skip:
@@ -1828,6 +1828,8 @@ static int emac_poll_rx(void *param, int budget) 
		goto next;

	}



	netif_receive_skb_list(&rx_list);



	if (received) {

		DBG2(dev, "rx %d BDs" NL, received);

		dev->rx_slot = slot;
@@ -2935,9 +2937,12 @@ static int emac_init_config(struct emac_instance *dev) 


	/* Read MAC-address */

	err = of_get_ethdev_address(np, dev->ndev);

	if (err)

		return dev_err_probe(&dev->ofdev->dev, err,

				     "Can't get valid [local-]mac-address from OF !\n");

	if (err == -EPROBE_DEFER)

		return err;

	if (err) {

		dev_warn(&dev->ofdev->dev, "Can't get valid mac-address. Generating random.");

		eth_hw_addr_random(dev->ndev);

	}



	/* IAHT and GAHT filter parameterization */

	if (emac_has_feature(dev, EMAC_FTR_EMAC4SYNC)) {
@@ -3019,8 +3024,14 @@ static int emac_probe(struct platform_device *ofdev) 
	SET_NETDEV_DEV(ndev, &ofdev->dev);



	/* Initialize some embedded data structures */

	mutex_init(&dev->mdio_lock);

	mutex_init(&dev->link_lock);

	err = devm_mutex_init(&ofdev->dev, &dev->mdio_lock);

	if (err)

		goto err_gone;



	err = devm_mutex_init(&ofdev->dev, &dev->link_lock);

	if (err)

		goto err_gone;



	spin_lock_init(&dev->lock);

	INIT_WORK(&dev->reset_work, emac_reset_work);
@@ -3029,15 +3040,8 @@ static int emac_probe(struct platform_device *ofdev) 
	if (err)

		goto err_gone;



	/* Get interrupts. EMAC irq is mandatory */

	dev->emac_irq = irq_of_parse_and_map(np, 0);

	if (!dev->emac_irq) {

		printk(KERN_ERR "%pOF: Can't map main interrupt\n", np);

		err = -ENODEV;

		goto err_gone;

	}



	/* Setup error IRQ handler */

	dev->emac_irq = platform_get_irq(ofdev, 0);

	err = devm_request_irq(&ofdev->dev, dev->emac_irq, emac_irq, 0, "EMAC",

			       dev);

	if (err) {
@@ -3048,12 +3052,10 @@ static int emac_probe(struct platform_device *ofdev) 


	ndev->irq = dev->emac_irq;



	/* Map EMAC regs */

	// TODO : platform_get_resource() and devm_ioremap_resource()

	dev->emacp = devm_of_iomap(&ofdev->dev, np, 0, NULL);

	if (!dev->emacp) {

	dev->emacp = devm_platform_ioremap_resource(ofdev, 0);

	if (IS_ERR(dev->emacp)) {

		dev_err(&ofdev->dev, "can't map device registers");

		err = -ENOMEM;

		err = PTR_ERR(dev->emacp);

		goto err_gone;

	}