Unverified Commit f0f9fd5a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9560 net: systemport: Add global locking for descriptor lifecycle 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yi Yang <yiyang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LPYCO5O3A3RY5XZ7VYY52HHCLFRKXZWU/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA7805 
 
Link:https://gitee.com/openeuler/kernel/pulls/9560

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 4fe13a2d f58f7b49

drivers/net/ethernet/broadcom/bcmsysport.c

+5 −0
Original line number Diff line number Diff line
@@ -120,9 +120,13 @@ static inline void tdma_port_write_desc_addr(struct bcm_sysport_priv *priv, 
					     struct dma_desc *desc,

					     unsigned int port)

{

	unsigned long desc_flags;



	/* Ports are latched, so write upper address first */

	spin_lock_irqsave(&priv->desc_lock, desc_flags);

	tdma_writel(priv, desc->addr_status_len, TDMA_WRITE_PORT_HI(port));

	tdma_writel(priv, desc->addr_lo, TDMA_WRITE_PORT_LO(port));

	spin_unlock_irqrestore(&priv->desc_lock, desc_flags);

}



/* Ethtool operations */
@@ -2002,6 +2006,7 @@ static int bcm_sysport_open(struct net_device *dev) 
	}



	/* Initialize both hardware and software ring */

	spin_lock_init(&priv->desc_lock);

	for (i = 0; i < dev->num_tx_queues; i++) {

		ret = bcm_sysport_init_tx_ring(priv, i);

		if (ret) {

drivers/net/ethernet/broadcom/bcmsysport.h

+1 −0
Original line number Diff line number Diff line
@@ -751,6 +751,7 @@ struct bcm_sysport_priv { 
	int			wol_irq;



	/* Transmit rings */

	spinlock_t		desc_lock;

	struct bcm_sysport_tx_ring *tx_rings;



	/* Receive queue */