From 367d1856185550772dea53c4a129883b49e10441 Mon Sep 17 00:00:00 2001 From: purplerain Date: Mon, 4 Mar 2024 20:47:42 +0000 Subject: [PATCH] sync with OpenBSD -current --- regress/lib/libm/msun/Makefile | 97 +++++++++++++++++++++++----------- sys/dev/ic/dwqe.c | 4 +- 2 files changed, 68 insertions(+), 33 deletions(-) diff --git a/regress/lib/libm/msun/Makefile b/regress/lib/libm/msun/Makefile index 45c3f0dc3..9bb5cfb41 100644 --- a/regress/lib/libm/msun/Makefile +++ b/regress/lib/libm/msun/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2024/03/03 11:15:38 miod Exp $ +# $OpenBSD: Makefile,v 1.16 2024/03/04 19:35:13 miod Exp $ # Copyright (c) 2021 Moritz Buhl # @@ -47,24 +47,37 @@ PROGS+= trig_test # failing tests FAILING = run-cexp_test-{2,3,4} run-csqrt_test-{1,2,3} \ - run-ctrig_test-{2,3,4,6} run-fma_test-7 \ + run-ctrig_test-{2,3,6} run-fma_test-7 \ run-invctrig_test-{1,2,3,4} run-invtrig_test-{1,2,3,5,6} \ - run-logarithm_test-1 run-lround_test-1 run-nan_test-1 \ - run-next_test-5 run-rem_test-3 + run-lround_test-1 run-nan_test-1 run-next_test-5 run-rem_test-3 -. if ${MACHINE} == amd64 +. if ${MACHINE} == alpha +FAILING+= run-conj_test-1 +FAILING+= run-ctrig_test-{4,5} +FAILING+= run-exponential_test-1 +FAILING+= run-fenv_test-{2,3,4,6,7,8} +FAILING+= run-fma_test-{1,2,4,5,6} +FAILING+= run-fmaxmin_test-{7,11} +FAILING+= run-invtrig_test-{4,7} +FAILING+= run-lrint_test-1 +FAILING+= run-nearbyint_test-1 +FAILING+= run-next_test-{1,4} +FAILING+= run-rem_test-1 +FAILING+= run-trig_test-2 +. elif ${MACHINE} == amd64 FAILING+= run-cexp_test-{1,7} -FAILING+= run-ctrig_test-1 -FAILING+= run-exponential_test-1 +FAILING+= run-ctrig_test-{1,4} +FAILING+= run-exponential_test-1 FAILING+= run-invtrig_test-7 +FAILING+= run-logarithm_test-1 FAILING+= run-next_test-{1,2,4} . elif ${MACHINE} == arm64 FAILING+= run-cexp_test-{1,7} -FAILING+= run-ctrig_test-{1,5} -FAILING+= run-exponential_test-1 +FAILING+= run-ctrig_test-{1,4,5} +FAILING+= run-exponential_test-1 FAILING+= run-fma_test-{1,2,4,5,6,7} FAILING+= run-invtrig_test-7 -FAILING+= run-logarithm_test-5 +FAILING+= run-logarithm_test-{1,5} FAILING+= run-lrint_test-1 FAILING+= run-nearbyint_test-1 FAILING+= run-next_test-{1,2,4} @@ -72,62 +85,84 @@ FAILING+= run-rem_test-{1,2} FAILING+= run-trig_test-1 . elif ${MACHINE} == armv7 FAILING+= run-cexp_test-7 -FAILING+= run-ctrig_test-{1,5} -FAILING+= run-exponential_test-1 +FAILING+= run-ctrig_test-{1,4,5} +FAILING+= run-exponential_test-1 FAILING+= run-invtrig_test-7 +FAILING+= run-logarithm_test-1 FAILING+= run-lrint_test-1 FAILING+= run-nearbyint_test-1 FAILING+= run-trig_test-1 +. elif ${MACHINE} == hppa +FAILING+= run-ctrig_test-{4,5} +FAILING+= run-exponential_test-1 +FAILING+= run-fmaxmin_test-11 +FAILING+= run-invtrig_test-7 +FAILING+= run-lrint_test-1 +FAILING+= run-next_test-4 +FAILING+= run-trig_test-3 . elif ${MACHINE} == i386 FAILING+= run-cexp_test-{1,7} -FAILING+= run-ctrig_test-{1,5} +FAILING+= run-ctrig_test-{1,4,5} FAILING+= run-fma_test-{1,6} FAILING+= run-invtrig_test-4 -FAILING+= run-logarithm_test-3 +FAILING+= run-logarithm_test-{1,3} FAILING+= run-lrint_test-1 FAILING+= run-nearbyint_test-1 FAILING+= run-next_test-{1,2,4} . elif ${MACHINE_ARCH} == m88k FAILING+= run-cexp_test-7 -FAILING+= run-ctrig_test-{1,5} -FAILING+= run-exponential_test-1 +FAILING+= run-ctrig_test-{1,4,5} +FAILING+= run-exponential_test-1 FAILING+= run-fma_test-{1,3,6} FAILING+= run-fmaxmin_test-{1,12} FAILING+= run-invtrig_test-7 -FAILING+= run-logarithm_test-3 +FAILING+= run-logarithm_test-{1,3} FAILING+= run-lrint_test-1 FAILING+= run-nearbyint_test-1 FAILING+= run-next_test-4 . elif ${MACHINE} == powerpc64 FAILING+= run-cexp_test-7 -FAILING+= run-ctrig_test-{1,5} -FAILING+= run-exponential_test-1 +FAILING+= run-ctrig_test-{1,4,5} +FAILING+= run-exponential_test-1 FAILING+= run-invtrig_test-7 +FAILING+= run-logarithm_test-1 . elif ${MACHINE} == macppc FAILING+= run-cexp_test-7 -FAILING+= run-ctrig_test-{1,5} -FAILING+= run-exponential_test-1 +FAILING+= run-ctrig_test-{1,4,5} +FAILING+= run-exponential_test-1 FAILING+= run-fenv_test-{7,8} FAILING+= run-invtrig_test-7 -FAILING+= run-logarithm_test-3 +FAILING+= run-logarithm_test-{1,3} FAILING+= run-lrint_test-1 -. elif ${MACHINE} == sparc64 +. elif ${MACHINE_ARCH} == sh FAILING+= run-ctrig_test-5 -FAILING+= run-exponential_test-1 +FAILING+= run-exponential_test-{1,2,4} +FAILING+= run-fenv_test-{1,2,3,4,5,6,7,8} +FAILING+= run-fma_test-{1,3,4,5,6} +FAILING+= run-invtrig_test-{4,7} +FAILING+= run-logarithm_test-1 +FAILING+= run-lrint_test-1 +FAILING+= run-nearbyint_test-1 +FAILING+= run-next_test-{1,3,4} +FAILING+= run-rem_test-1 +FAILING+= run-trig_test-{1,2} +. elif ${MACHINE} == sparc64 +FAILING+= run-ctrig_test-{4,5} +FAILING+= run-exponential_test-1 FAILING+= run-fma_test-{1,2,4,5,6} FAILING+= run-invtrig_test-{4,7} -FAILING+= run-logarithm_test-5 +FAILING+= run-logarithm_test-{1,5} FAILING+= run-lrint_test-1 FAILING+= run-next_test-{1,2,4} FAILING+= run-rem_test-{1,2} FAILING+= run-trig_test-{1,2} . elif ${MACHINE} == octeon FAILING+= run-cexp_test-7 -FAILING+= run-ctrig_test-{1,5} -FAILING+= run-exponential_test-1 +FAILING+= run-ctrig_test-{1,4,5} +FAILING+= run-exponential_test-1 FAILING+= run-fma_test-{1,2,3,4,5,6} FAILING+= run-invtrig_test-{4,7} -FAILING+= run-logarithm_test-5 +FAILING+= run-logarithm_test-{1,5} FAILING+= run-lrint_test-1 FAILING+= run-nearbyint_test-1 FAILING+= run-next_test-{1,2,3,4} @@ -135,12 +170,12 @@ FAILING+= run-rem_test-{1,2} FAILING+= run-trig_test-{1,2} . elif ${MACHINE} == riscv64 FAILING+= run-cexp_test-7 -FAILING+= run-ctrig_test-{1,5} -FAILING+= run-exponential_test-1 +FAILING+= run-ctrig_test-{1,4,5} +FAILING+= run-exponential_test-1 FAILING+= run-fma_test-{1,2,4,5,6} FAILING+= run-ilogb_test-3 FAILING+= run-invtrig_test-{4,7} -FAILING+= run-logarithm_test-5 +FAILING+= run-logarithm_test-{1,5} FAILING+= run-lrint_test-1 FAILING+= run-nearbyint_test-1 FAILING+= run-next_test-{1,2,4} diff --git a/sys/dev/ic/dwqe.c b/sys/dev/ic/dwqe.c index c3fdf6099..c17e4eab6 100644 --- a/sys/dev/ic/dwqe.c +++ b/sys/dev/ic/dwqe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dwqe.c,v 1.16 2023/12/28 14:30:28 uwe Exp $ */ +/* $OpenBSD: dwqe.c,v 1.17 2024/03/04 23:50:20 bluhm Exp $ */ /* * Copyright (c) 2008, 2019 Mark Kettenis * Copyright (c) 2017, 2022 Patrick Wildt @@ -754,7 +754,7 @@ dwqe_up(struct dwqe_softc *sc) rxb->tb_m = NULL; } - if_rxr_init(&sc->sc_rx_ring, 2, DWQE_NRXDESC); + if_rxr_init(&sc->sc_rx_ring, 2, DWQE_NRXDESC - 1); dwqe_write(sc, GMAC_CHAN_RX_BASE_ADDR_HI(0), DWQE_DMA_DVA(sc->sc_rxring) >> 32); dwqe_write(sc, GMAC_CHAN_RX_BASE_ADDR(0), DWQE_DMA_DVA(sc->sc_rxring));