d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simple_mfd: switch to controllable locking for syscon provider.

Browse Source 
MFC after	3 weeks
This commit is contained in:
Michal Meloun 2021-03-04 15:09:32 +01:00
parent 5e6989ba4f
commit f97f57b518
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/dev/fdt/simple_mfd.c
View File

@ -73,9 +73,9 @@ static int simple_mfd_syscon_modify_4(struct syscon *syscon, bus_size_t offset,
#define SYSCON_ASSERT_UNLOCKED(_sc) mtx_assert(&(_sc)->mtx, MA_NOTOWNED); #define SYSCON_ASSERT_UNLOCKED(_sc) mtx_assert(&(_sc)->mtx, MA_NOTOWNED);
static syscon_method_t simple_mfd_syscon_methods[] = { static syscon_method_t simple_mfd_syscon_methods[] = {
SYSCONMETHOD(syscon_read_4, simple_mfd_syscon_read_4), SYSCONMETHOD(syscon_unlocked_read_4, simple_mfd_syscon_read_4),
SYSCONMETHOD(syscon_write_4, simple_mfd_syscon_write_4), SYSCONMETHOD(syscon_unlocked_write_4, simple_mfd_syscon_write_4),
SYSCONMETHOD(syscon_modify_4, simple_mfd_syscon_modify_4), SYSCONMETHOD(syscon_unlocked_modify_4, simple_mfd_syscon_modify_4),
SYSCONMETHOD_END SYSCONMETHOD_END
}; };
@ -89,10 +89,8 @@ simple_mfd_syscon_read_4(struct syscon *syscon, bus_size_t offset)
uint32_t val; uint32_t val;
sc = device_get_softc(syscon->pdev); sc = device_get_softc(syscon->pdev);
SYSCON_ASSERT_LOCKED(sc);;
SYSCON_LOCK(sc);
val = bus_read_4(sc->mem_res, offset); val = bus_read_4(sc->mem_res, offset);
SYSCON_UNLOCK(sc);
return (val); return (val);
} }
@ -103,10 +101,8 @@ simple_mfd_syscon_write_4(struct syscon *syscon, bus_size_t offset,
struct simple_mfd_softc *sc; struct simple_mfd_softc *sc;
sc = device_get_softc(syscon->pdev); sc = device_get_softc(syscon->pdev);
SYSCON_ASSERT_LOCKED(sc);
SYSCON_LOCK(sc);
bus_write_4(sc->mem_res, offset, val); bus_write_4(sc->mem_res, offset, val);
SYSCON_UNLOCK(sc);
return (0); return (0);
} }
@ -118,15 +114,14 @@ simple_mfd_syscon_modify_4(struct syscon *syscon, bus_size_t offset,
uint32_t val; uint32_t val;
sc = device_get_softc(syscon->pdev); sc = device_get_softc(syscon->pdev);
SYSCON_ASSERT_LOCKED(sc);
SYSCON_LOCK(sc);
val = bus_read_4(sc->mem_res, offset); val = bus_read_4(sc->mem_res, offset);
val &= ~clear_bits; val &= ~clear_bits;
val |= set_bits; val |= set_bits;
bus_write_4(sc->mem_res, offset, val); bus_write_4(sc->mem_res, offset, val);
SYSCON_UNLOCK(sc);
return (0); return (0);
} }
static int static int
simple_mfd_syscon_get_handle(device_t dev, struct syscon **syscon) simple_mfd_syscon_get_handle(device_t dev, struct syscon **syscon)
{ {
@ -139,6 +134,24 @@ simple_mfd_syscon_get_handle(device_t dev, struct syscon **syscon)
return (0); return (0);
} }
static void
simple_mfd_syscon_lock(device_t dev)
{
struct simple_mfd_softc *sc;
sc = device_get_softc(dev);
SYSCON_LOCK(sc);
}
static void
simple_mfd_syscon_unlock(device_t dev)
{
struct simple_mfd_softc *sc;
sc = device_get_softc(dev);
SYSCON_UNLOCK(sc);
}
static int static int
simple_mfd_probe(device_t dev) simple_mfd_probe(device_t dev)
{ {
@ -293,6 +306,9 @@ simple_mfd_add_device(device_t dev, phandle_t node, u_int order,
static device_method_t simple_mfd_methods[] = { static device_method_t simple_mfd_methods[] = {
/* syscon interface */ /* syscon interface */
DEVMETHOD(syscon_get_handle, simple_mfd_syscon_get_handle), DEVMETHOD(syscon_get_handle, simple_mfd_syscon_get_handle),
DEVMETHOD(syscon_device_lock, simple_mfd_syscon_lock),
DEVMETHOD(syscon_device_unlock, simple_mfd_syscon_unlock),
/* Device interface */ /* Device interface */
DEVMETHOD(device_probe, simple_mfd_probe), DEVMETHOD(device_probe, simple_mfd_probe),
DEVMETHOD(device_attach, simple_mfd_attach), DEVMETHOD(device_attach, simple_mfd_attach),