Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5229d87e authored by Toshiharu Okada's avatar Toshiharu Okada Committed by David S. Miller
Browse files

pch_gbe: fixed the issue which receives an unnecessary packet. 



This patch fixed the issue which receives an unnecessary packet before link

When using PHY of GMII, an unnecessary packet is received,
And it becomes impossible to receive a packet after link up.

Signed-off-by: default avatarToshiharu Okada <toshiharu-linux@dsn.okisemi.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 483f97f8

drivers/net/pch_gbe/pch_gbe_main.c

+14 −7
Original line number Diff line number Diff line
@@ -717,13 +717,6 @@ static void pch_gbe_configure_rx(struct pch_gbe_adapter *adapter) 
	iowrite32(rdba, &hw->reg->RX_DSC_BASE);

	iowrite32(rdlen, &hw->reg->RX_DSC_SIZE);

	iowrite32((rdba + rdlen), &hw->reg->RX_DSC_SW_P);



	/* Enables Receive DMA */

	rxdma = ioread32(&hw->reg->DMA_CTRL);

	rxdma |= PCH_GBE_RX_DMA_EN;

	iowrite32(rxdma, &hw->reg->DMA_CTRL);

	/* Enables Receive */

	iowrite32(PCH_GBE_MRE_MAC_RX_EN, &hw->reg->MAC_RX_EN);

}



/**
@@ -1097,6 +1090,19 @@ void pch_gbe_update_stats(struct pch_gbe_adapter *adapter) 
	spin_unlock_irqrestore(&adapter->stats_lock, flags);

}



static void pch_gbe_start_receive(struct pch_gbe_hw *hw)

{

	u32 rxdma;



	/* Enables Receive DMA */

	rxdma = ioread32(&hw->reg->DMA_CTRL);

	rxdma |= PCH_GBE_RX_DMA_EN;

	iowrite32(rxdma, &hw->reg->DMA_CTRL);

	/* Enables Receive */

	iowrite32(PCH_GBE_MRE_MAC_RX_EN, &hw->reg->MAC_RX_EN);

	return;

}



/**

 * pch_gbe_intr - Interrupt Handler

 * @irq:   Interrupt number
@@ -1717,6 +1723,7 @@ int pch_gbe_up(struct pch_gbe_adapter *adapter) 
	pch_gbe_alloc_tx_buffers(adapter, tx_ring);

	pch_gbe_alloc_rx_buffers(adapter, rx_ring, rx_ring->count);

	adapter->tx_queue_len = netdev->tx_queue_len;

	pch_gbe_start_receive(&adapter->hw);



	mod_timer(&adapter->watchdog_timer, jiffies);