diff options
author | Joakim Zhang <qiangqing.zhang@nxp.com> | 2021-02-25 17:01:12 +0800 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-02-26 15:17:11 -0800 |
commit | bfaf91ca848e758ed7be99b61fd936d03819fa56 (patch) | |
tree | 4513cfedef7ad383df99a4c1ad15195ba980e71a /drivers/net/ethernet/stmicro/stmmac/hwif.h | |
parent | net: stmmac: fix watchdog timeout during suspend/resume stress test (diff) | |
download | linux-dev-bfaf91ca848e758ed7be99b61fd936d03819fa56.tar.xz linux-dev-bfaf91ca848e758ed7be99b61fd936d03819fa56.zip |
net: stmmac: fix dma physical address of descriptor when display ring
Driver uses dma_alloc_coherent to allocate dma memory for descriptors,
dma_alloc_coherent will return both the virtual address and physical
address. AFAIK, virt_to_phys could not convert virtual address to
physical address, for which memory is allocated by dma_alloc_coherent.
dwmac4_display_ring() function is broken for various descriptor, it only
support normal descriptor(struct dma_desc) now, this patch also extends to
support all descriptor types.
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/hwif.h')
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h index b40b2e0667bb..7417db31402f 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h @@ -78,7 +78,8 @@ struct stmmac_desc_ops { /* get rx timestamp status */ int (*get_rx_timestamp_status)(void *desc, void *next_desc, u32 ats); /* Display ring */ - void (*display_ring)(void *head, unsigned int size, bool rx); + void (*display_ring)(void *head, unsigned int size, bool rx, + dma_addr_t dma_rx_phy, unsigned int desc_size); /* set MSS via context descriptor */ void (*set_mss)(struct dma_desc *p, unsigned int mss); /* get descriptor skbuff address */ |