Skip to content

Commit 6b9b0f0

Browse files
committed
Use device_getprop_{bool,uint}().
1 parent cd7b8b6 commit 6b9b0f0

1 file changed

Lines changed: 15 additions & 10 deletions

File tree

sys/dev/ic/dwc_eqos.c

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: dwc_eqos.c,v 1.42 2025/10/04 04:44:20 thorpej Exp $ */
1+
/* $NetBSD: dwc_eqos.c,v 1.43 2025/10/15 02:26:48 thorpej Exp $ */
22

33
/*-
44
* Copyright (c) 2022 Jared McNeill <jmcneill@invisible.ca>
@@ -36,7 +36,7 @@
3636
*/
3737

3838
#include <sys/cdefs.h>
39-
__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.42 2025/10/04 04:44:20 thorpej Exp $");
39+
__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.43 2025/10/15 02:26:48 thorpej Exp $");
4040

4141
#include <sys/param.h>
4242
#include <sys/bus.h>
@@ -1322,31 +1322,36 @@ eqos_get_dma_pbl(struct eqos_softc *sc)
13221322
static void
13231323
eqos_axi_configure(struct eqos_softc *sc)
13241324
{
1325-
prop_dictionary_t prop = device_properties(sc->sc_dev);
13261325
uint32_t val;
13271326
u_int uival;
1328-
bool bval;
13291327

13301328
val = RD4(sc, GMAC_DMA_SYSBUS_MODE);
1331-
if (prop_dictionary_get_bool(prop, "snps,mixed-burst", &bval) && bval) {
1329+
1330+
/* XXX are MB and FB mutually-exclusive? XXX */
1331+
if (device_getprop_bool(sc->sc_dev, "snps,mixed-burst")) {
13321332
val |= GMAC_DMA_SYSBUS_MODE_MB;
13331333
}
1334-
if (prop_dictionary_get_bool(prop, "snps,fixed-burst", &bval) && bval) {
1334+
if (device_getprop_bool(sc->sc_dev, "snps,fixed-burst")) {
13351335
val |= GMAC_DMA_SYSBUS_MODE_FB;
13361336
}
1337-
if (prop_dictionary_get_uint(prop, "snps,wr_osr_lmt", &uival)) {
1337+
if (device_getprop_uint(sc->sc_dev, "snps,wr_osr_lmt", &uival)) {
13381338
val &= ~GMAC_DMA_SYSBUS_MODE_WR_OSR_LMT_MASK;
1339-
val |= uival << GMAC_DMA_SYSBUS_MODE_WR_OSR_LMT_SHIFT;
1339+
val |= (uival << GMAC_DMA_SYSBUS_MODE_WR_OSR_LMT_SHIFT) &
1340+
GMAC_DMA_SYSBUS_MODE_WR_OSR_LMT_MASK;
13401341
}
1341-
if (prop_dictionary_get_uint(prop, "snps,rd_osr_lmt", &uival)) {
1342+
if (device_getprop_uint(sc->sc_dev, "snps,rd_osr_lmt", &uival)) {
13421343
val &= ~GMAC_DMA_SYSBUS_MODE_RD_OSR_LMT_MASK;
1343-
val |= uival << GMAC_DMA_SYSBUS_MODE_RD_OSR_LMT_SHIFT;
1344+
val |= (uival << GMAC_DMA_SYSBUS_MODE_RD_OSR_LMT_SHIFT) &
1345+
GMAC_DMA_SYSBUS_MODE_RD_OSR_LMT_MASK;
13441346
}
13451347

13461348
if (!EQOS_HW_FEATURE_ADDR64_32BIT(sc)) {
13471349
val |= GMAC_DMA_SYSBUS_MODE_EAME;
13481350
}
13491351

1352+
/* XXX snps,kbbe XXX */
1353+
/* XXX snps,blen XXX */
1354+
13501355
/* XXX */
13511356
val |= GMAC_DMA_SYSBUS_MODE_BLEN16;
13521357
val |= GMAC_DMA_SYSBUS_MODE_BLEN8;

0 commit comments

Comments
 (0)