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: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
483f97f8b2
commit
5229d87edc
1 changed files with 14 additions and 7 deletions
|
@ -717,13 +717,6 @@ static void pch_gbe_configure_rx(struct pch_gbe_adapter *adapter)
|
||||||
iowrite32(rdba, &hw->reg->RX_DSC_BASE);
|
iowrite32(rdba, &hw->reg->RX_DSC_BASE);
|
||||||
iowrite32(rdlen, &hw->reg->RX_DSC_SIZE);
|
iowrite32(rdlen, &hw->reg->RX_DSC_SIZE);
|
||||||
iowrite32((rdba + rdlen), &hw->reg->RX_DSC_SW_P);
|
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);
|
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
|
* pch_gbe_intr - Interrupt Handler
|
||||||
* @irq: Interrupt number
|
* @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_tx_buffers(adapter, tx_ring);
|
||||||
pch_gbe_alloc_rx_buffers(adapter, rx_ring, rx_ring->count);
|
pch_gbe_alloc_rx_buffers(adapter, rx_ring, rx_ring->count);
|
||||||
adapter->tx_queue_len = netdev->tx_queue_len;
|
adapter->tx_queue_len = netdev->tx_queue_len;
|
||||||
|
pch_gbe_start_receive(&adapter->hw);
|
||||||
|
|
||||||
mod_timer(&adapter->watchdog_timer, jiffies);
|
mod_timer(&adapter->watchdog_timer, jiffies);
|
||||||
|
|
||||||
|
|
Reference in a new issue