diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2020-11-08 00:49:42 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2020-11-08 00:49:42 +0000 |
| commit | 276bdb2dba66e54229fc57e8fcca5df5d9d13bac (patch) | |
| tree | 0672e464202ea8cd55fc93d3df1364d688489b48 /sys/dev | |
| parent | 2e8a35c65ba55084210dd35696a94a106295e03c (diff) | |
U-Boot might not have cleaned its pools. The pool needs to be empty
before we fill it, otherwise our packets are written to wherever U-Boot
allocated memory. Cleaning it up ourselves is worrying as well, since
the BM's pages are probably in our own memory. Best we can do is stop
the BM, set new memory and drain the pool. Tests show that this still
returns U-Boot's entries. Now, where have those been stored... in HW
or in memory?
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/fdt/if_mvpp.c | 25 | ||||
| -rw-r--r-- | sys/dev/fdt/if_mvppreg.h | 4 |
2 files changed, 25 insertions, 4 deletions
diff --git a/sys/dev/fdt/if_mvpp.c b/sys/dev/fdt/if_mvpp.c index 1a74455410e..f210580131e 100644 --- a/sys/dev/fdt/if_mvpp.c +++ b/sys/dev/fdt/if_mvpp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mvpp.c,v 1.31 2020/11/08 00:46:40 patrick Exp $ */ +/* $OpenBSD: if_mvpp.c,v 1.32 2020/11/08 00:49:41 patrick Exp $ */ /* * Copyright (c) 2008, 2019 Mark Kettenis <kettenis@openbsd.org> * Copyright (c) 2017, 2020 Patrick Wildt <patrick@blueri.se> @@ -563,7 +563,7 @@ mvpp2_bm_pool_init(struct mvpp2_softc *sc) struct mvpp2_bm_pool *bm; struct mvpp2_buf *rxb; uint64_t phys, virt; - int i, j; + int i, j, inuse; for (i = 0; i < MVPP2_BM_POOLS_NUM; i++) { mvpp2_write(sc, MVPP2_BM_INTR_MASK_REG(i), 0); @@ -586,6 +586,10 @@ mvpp2_bm_pool_init(struct mvpp2_softc *sc) MVPP2_DMA_LEN(bm->bm_mem), BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + mvpp2_write(sc, MVPP2_BM_POOL_CTRL_REG(i), + mvpp2_read(sc, MVPP2_BM_POOL_CTRL_REG(i)) | + MVPP2_BM_STOP_MASK); + mvpp2_write(sc, MVPP2_BM_POOL_BASE_REG(i), (uint64_t)MVPP2_DMA_DVA(bm->bm_mem) & 0xffffffff); mvpp2_write(sc, MVPP22_BM_POOL_BASE_HIGH_REG, @@ -598,6 +602,23 @@ mvpp2_bm_pool_init(struct mvpp2_softc *sc) mvpp2_read(sc, MVPP2_BM_POOL_CTRL_REG(i)) | MVPP2_BM_START_MASK); + /* + * U-Boot might not have cleaned its pools. The pool needs + * to be empty before we fill it, otherwise our packets are + * written to wherever U-Boot allocated memory. Cleaning it + * up ourselves is worrying as well, since the BM's pages are + * probably in our own memory. Best we can do is stop the BM, + * set new memory and drain the pool. + */ + inuse = mvpp2_read(sc, MVPP2_BM_POOL_PTRS_NUM_REG(i)) & + MVPP2_BM_POOL_PTRS_NUM_MASK; + inuse += mvpp2_read(sc, MVPP2_BM_BPPI_PTRS_NUM_REG(i)) & + MVPP2_BM_BPPI_PTRS_NUM_MASK; + if (inuse) + inuse++; + for (j = 0; j < inuse; j++) + mvpp2_read(sc, MVPP2_BM_PHY_ALLOC_REG(i)); + mvpp2_write(sc, MVPP2_POOL_BUF_SIZE_REG(i), roundup(MCLBYTES, 1 << MVPP2_POOL_BUF_SIZE_OFFSET)); diff --git a/sys/dev/fdt/if_mvppreg.h b/sys/dev/fdt/if_mvppreg.h index c5fc41cabb1..d50b927a825 100644 --- a/sys/dev/fdt/if_mvppreg.h +++ b/sys/dev/fdt/if_mvppreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mvppreg.h,v 1.14 2020/11/03 21:46:14 patrick Exp $ */ +/* $OpenBSD: if_mvppreg.h,v 1.15 2020/11/08 00:49:41 patrick Exp $ */ /* * Copyright (c) 2008, 2019 Mark Kettenis <kettenis@openbsd.org> * Copyright (c) 2017, 2020 Patrick Wildt <patrick@blueri.se> @@ -257,7 +257,7 @@ #define MVPP2_BM_POOL_PTRS_NUM_MASK 0xfff8 #define MVPP2_BM_BPPI_READ_PTR_REG(pool) (0x6100 + ((pool) * 4)) #define MVPP2_BM_BPPI_PTRS_NUM_REG(pool) (0x6140 + ((pool) * 4)) -#define MVPP2_BM_BPPI_PTR_NUM_MASK 0x7ff +#define MVPP2_BM_BPPI_PTRS_NUM_MASK 0x7ff #define MVPP2_BM_BPPI_PREFETCH_FULL_MASK BIT(16) #define MVPP2_BM_POOL_CTRL_REG(pool) (0x6200 + ((pool) * 4)) #define MVPP2_BM_START_MASK BIT(0) |