Date: Sat, 31 Oct 2020 17:18:18 +0000 (UTC) From: Michal Meloun <mmel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r367226 - stable/12/sys/dev/extres/syscon Message-ID: <202010311718.09VHIIvp068317@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmel Date: Sat Oct 31 17:18:18 2020 New Revision: 367226 URL: https://svnweb.freebsd.org/changeset/base/367226 Log: MFC r366312: Fix the inverted condition in mtx_asserts. Mutex should be owned in affected functions. Modified: stable/12/sys/dev/extres/syscon/syscon_generic.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/extres/syscon/syscon_generic.c ============================================================================== --- stable/12/sys/dev/extres/syscon/syscon_generic.c Sat Oct 31 17:10:55 2020 (r367225) +++ stable/12/sys/dev/extres/syscon/syscon_generic.c Sat Oct 31 17:18:18 2020 (r367226) @@ -94,7 +94,7 @@ syscon_generic_unlocked_read_4(struct syscon *syscon, uint32_t val; sc = device_get_softc(syscon->pdev); - SYSCON_ASSERT_UNLOCKED(sc); + SYSCON_ASSERT_LOCKED(sc); val = bus_read_4(sc->mem_res, offset); return (val); } @@ -105,7 +105,7 @@ syscon_generic_unlocked_write_4(struct syscon *syscon, struct syscon_generic_softc *sc; sc = device_get_softc(syscon->pdev); - SYSCON_ASSERT_UNLOCKED(sc); + SYSCON_ASSERT_LOCKED(sc); bus_write_4(sc->mem_res, offset, val); return (0); } @@ -118,7 +118,7 @@ syscon_generic_unlocked_modify_4(struct syscon *syscon uint32_t val; sc = device_get_softc(syscon->pdev); - SYSCON_ASSERT_UNLOCKED(sc); + SYSCON_ASSERT_LOCKED(sc); val = bus_read_4(sc->mem_res, offset); val &= ~clear_bits; val |= set_bits;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010311718.09VHIIvp068317>