net: rtl8169: get rid of DMA_ADDRESS_BROKEN
PATCH 1/1 net: rtl8169: get rid of DMA_ADDRESS_BROKEN
Don't assume a 1:1 virt to phys mapping, but use the real physical address returned by the dma alloc function.
Signed-off-by Lucas Stach <[email protected]>
--- drivers/net/rtl8169.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/rtl8169.c +6 -4
@@ -51,10 +51,12 @@ struct rtl8169_priv {int chipset;volatile struct bufdesc *tx_desc; +dma_addr_t tx_desc_phys;void *tx_buf;unsigned int cur_tx;volatile struct bufdesc *rx_desc; +dma_addr_t rx_desc_phys;void *rx_buf;unsigned int cur_rx;
@@ -228,10 +230,10 @@ static void rtl8169_init_ring(struct rtl8169_priv *priv) priv->cur_rx = priv->cur_tx =0 ; priv->tx_desc =dma_alloc_coherent (NUM_TX_DESC * -sizeof (struct bufdesc ),DMA_ADDRESS_BROKEN ); +sizeof (struct bufdesc ), &priv->tx_desc_phys); priv->tx_buf =malloc (NUM_TX_DESC *PKT_BUF_SIZE ); priv->rx_desc =dma_alloc_coherent (NUM_RX_DESC * -sizeof (struct bufdesc ),DMA_ADDRESS_BROKEN ); +sizeof (struct bufdesc ), &priv->rx_desc_phys); priv->rx_buf =malloc (NUM_RX_DESC *PKT_BUF_SIZE );dma_sync_single_for_device ((unsigned long )priv->rx_buf,NUM_RX_DESC *PKT_BUF_SIZE ,DMA_FROM_DEVICE );
@@ -275,9 +277,9 @@ static void rtl8169_hw_start(struct rtl8169_priv *priv)/* Set DMA burst size and Interframe Gap Time */ RTL_W32 (priv, TxConfig, (6 << TxDMAShift) | (3 << TxInterFrameGapShift)); -RTL_W32 (priv, TxDescStartAddrLow,virt_to_phys (priv->tx_desc)); +RTL_W32 (priv, TxDescStartAddrLow, priv->tx_desc_phys);RTL_W32 (priv, TxDescStartAddrHigh,0 ); -RTL_W32 (priv, RxDescStartAddrLow,virt_to_phys (priv->rx_desc)); +RTL_W32 (priv, RxDescStartAddrLow, priv->rx_desc_phys);RTL_W32 (priv, RxDescStartAddrHigh,0 );/* RTL-8169sc/8110sc or later version */
Signature · 7 lines
2.5.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedQuoted 5 lines · Lucas Stach
Don't assume a 1:1 virt to phys mapping, but use the real physical address returned by the dma alloc function.
Signed-off-by Lucas Stach <[email protected]>---
Applied, thanks
Sascha
Quoted 54 lines
drivers/net/rtl8169.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/net/rtl8169.c +6
-4@@ -51,10 +51,12 @@ struct rtl8169_priv {int chipset;volatile struct bufdesc *tx_desc; +dma_addr_t tx_desc_phys;void *tx_buf;unsigned int cur_tx;volatile struct bufdesc *rx_desc; +dma_addr_t rx_desc_phys;void *rx_buf;unsigned int cur_rx;@@ -228,10 +230,10 @@ static void rtl8169_init_ring(struct rtl8169_priv *priv) priv->cur_rx = priv->cur_tx =0 ; priv->tx_desc =dma_alloc_coherent (NUM_TX_DESC * -sizeof (struct bufdesc ),DMA_ADDRESS_BROKEN ); +sizeof (struct bufdesc ), &priv->tx_desc_phys); priv->tx_buf =malloc (NUM_TX_DESC *PKT_BUF_SIZE ); priv->rx_desc =dma_alloc_coherent (NUM_RX_DESC * -sizeof (struct bufdesc ),DMA_ADDRESS_BROKEN ); +sizeof (struct bufdesc ), &priv->rx_desc_phys); priv->rx_buf =malloc (NUM_RX_DESC *PKT_BUF_SIZE );dma_sync_single_for_device ((unsigned long )priv->rx_buf,NUM_RX_DESC *PKT_BUF_SIZE ,DMA_FROM_DEVICE );@@ -275,9 +277,9 @@ static void rtl8169_hw_start(struct rtl8169_priv *priv)/* Set DMA burst size and Interframe Gap Time */ RTL_W32 (priv, TxConfig, (6 << TxDMAShift) | (3 << TxInterFrameGapShift)); -RTL_W32 (priv, TxDescStartAddrLow,virt_to_phys (priv->tx_desc)); +RTL_W32 (priv, TxDescStartAddrLow, priv->tx_desc_phys);RTL_W32 (priv, TxDescStartAddrHigh,0 ); -RTL_W32 (priv, RxDescStartAddrLow,virt_to_phys (priv->rx_desc)); +RTL_W32 (priv, RxDescStartAddrLow, priv->rx_desc_phys);RTL_W32 (priv, RxDescStartAddrHigh,0 );/* RTL-8169sc/8110sc or later version */ Signature · 7 lines
2.5.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox