Am Montag, den 13.01.2020, 08:29 +0100 schrieb Oleksij Rempel:
> Hm... how was it working before? We was just lucky to have physical address equal to
> virtual. I would say, it is not really MIPS only fix.
Yes, drivers using DMA_ADDRESS_BROKEN don't work on any
architecture/SoC that doesn't have a 1:1 CPU to DMA address mapping.
The name of that define might give a slight hint to that fact. ;)
Regards,
Lucas
> Reviewed-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>
>
> On 09.01.20 08:28, Antony Pavlov wrote:
> > Signed-off-by: Antony Pavlov <antonynpavlov@xxxxxxxxx>
> > ---
> > drivers/net/e1000/e1000.h | 2 ++
> > drivers/net/e1000/main.c | 8 ++++----
> > 2 files changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
> > index 52ad3d4cdb..d26e6dcc02 100644
> > --- a/drivers/net/e1000/e1000.h
> > +++ b/drivers/net/e1000/e1000.h
> > @@ -2180,7 +2180,9 @@ struct e1000_hw {
> > struct mii_bus miibus;
> >
> > struct e1000_tx_desc *tx_base;
> > + dma_addr_t tx_base_phys;
> > struct e1000_rx_desc *rx_base;
> > + dma_addr_t rx_base_phys;
> > unsigned char *packet;
> > dma_addr_t packet_dma;
> >
> > diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c
> > index f67c5d867b..69b1516640 100644
> > --- a/drivers/net/e1000/main.c
> > +++ b/drivers/net/e1000/main.c
> > @@ -3232,7 +3232,7 @@ static void e1000_configure_tx(struct
> > e1000_hw *hw)
> > unsigned long tctl;
> > unsigned long tipg, tarc;
> > uint32_t ipgr1, ipgr2;
> > - const unsigned long tx_base = (unsigned long)hw->tx_base;
> > + const unsigned long tx_base = (unsigned long)hw->tx_base_phys;
> >
> > e1000_write_reg(hw, E1000_TDBAL, lower_32_bits(tx_base));
> > e1000_write_reg(hw, E1000_TDBAH, upper_32_bits(tx_base));
> > @@ -3351,7 +3351,7 @@ static void e1000_setup_rctl(struct e1000_hw
> > *hw)
> > static void e1000_configure_rx(struct e1000_hw *hw)
> > {
> > unsigned long rctl, ctrl_ext;
> > - const unsigned long rx_base = (unsigned long)hw->rx_base;
> > + const unsigned long rx_base = (unsigned long)hw->rx_base_phys;
> >
> > hw->rx_tail = 0;
> > /* make sure receives are disabled while setting up the
> > descriptors */
> > @@ -3564,8 +3564,8 @@ static int e1000_probe(struct pci_dev *pdev,
> > const struct pci_device_id *id)
> >
> > hw = xzalloc(sizeof(*hw));
> >
> > - hw->tx_base = dma_alloc_coherent(16 * sizeof(*hw->tx_base),
> > DMA_ADDRESS_BROKEN);
> > - hw->rx_base = dma_alloc_coherent(16 * sizeof(*hw->rx_base),
> > DMA_ADDRESS_BROKEN);
> > + hw->tx_base = dma_alloc_coherent(16 * sizeof(*hw->tx_base),
> > &hw->tx_base_phys);
> > + hw->rx_base = dma_alloc_coherent(16 * sizeof(*hw->rx_base),
> > &hw->rx_base_phys);
> >
> > edev = &hw->edev;
> >
> >
>
> Kind regards,
> Oleksij Rempel
>
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
