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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Merge in late fixes to prepare for the 6.16 net-next PR.

No conflicts nor adjacent changes.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents acea6b13 57a92d14

drivers/net/ethernet/airoha/airoha_eth.c

+9 −1
Original line number Diff line number Diff line
@@ -2883,7 +2883,15 @@ static int airoha_alloc_gdm_port(struct airoha_eth *eth, 
	if (err)

		return err;



	return register_netdev(dev);

	err = register_netdev(dev);

	if (err)

		goto free_metadata_dst;



	return 0;



free_metadata_dst:

	airoha_metadata_dst_free(port);

	return err;

}



static int airoha_probe(struct platform_device *pdev)

drivers/net/ethernet/cadence/macb_main.c

+5 −1
Original line number Diff line number Diff line
@@ -5283,7 +5283,11 @@ static int macb_probe(struct platform_device *pdev) 


#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT

	if (GEM_BFEXT(DAW64, gem_readl(bp, DCFG6))) {

		dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(44));

		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(44));

		if (err) {

			dev_err(&pdev->dev, "failed to set DMA mask\n");

			goto err_out_free_netdev;

		}

		bp->hw_dma_cap |= HW_DMA_CAP_64B;

	}

#endif

drivers/net/ethernet/marvell/octeontx2/af/mcs_rvu_if.c

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ static int mcs_notify_pfvf(struct mcs_intr_event *event, struct rvu *rvu) 


	otx2_mbox_msg_send_up(&rvu->afpf_wq_info.mbox_up, pf);



	otx2_mbox_wait_for_rsp(&rvu->afpf_wq_info.mbox_up, pf);



	mutex_unlock(&rvu->mbox_lock);



	return 0;

drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c

+2 −0
Original line number Diff line number Diff line
@@ -272,6 +272,8 @@ static void cgx_notify_pfs(struct cgx_link_event *event, struct rvu *rvu) 


		otx2_mbox_msg_send_up(&rvu->afpf_wq_info.mbox_up, pfid);



		otx2_mbox_wait_for_rsp(&rvu->afpf_wq_info.mbox_up, pfid);



		mutex_unlock(&rvu->mbox_lock);

	} while (pfmap);

}

drivers/net/ethernet/marvell/octeontx2/af/rvu_rep.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ static int rvu_rep_up_notify(struct rvu *rvu, struct rep_event *event) 


	otx2_mbox_msg_send_up(&rvu->afpf_wq_info.mbox_up, pf);



	otx2_mbox_wait_for_rsp(&rvu->afpf_wq_info.mbox_up, pf);



	mutex_unlock(&rvu->mbox_lock);

	return 0;

}