diff options
author | Brandon Bergren <bdragon@FreeBSD.org> | 2020-06-19 18:36:10 +0000 |
---|---|---|
committer | Brandon Bergren <bdragon@FreeBSD.org> | 2020-06-19 18:36:10 +0000 |
commit | 37f530582dc5c6ffa83607fdab730a8506c7f466 (patch) | |
tree | cababc57d09bd75cb79c4c965799f2dde92d0a4b /sys/dev/powermac_nvram | |
parent | 188aee740fb5146f1616253deeb9cd0e9bb7f713 (diff) | |
download | src-37f530582dc5c6ffa83607fdab730a8506c7f466.tar.gz src-37f530582dc5c6ffa83607fdab730a8506c7f466.zip |
[PowerPC] De-giant powermac_nvram, update documentation
* Remove the giant lock requirement from powermac_nvram.
* Update manual pages to reflect current state.
Reviewed by: bcr (manpages), jhibbits
Sponsored by: Tag1 Consulting, Inc.
Differential Revision: https://reviews.freebsd.org/D24812
Notes
Notes:
svn path=/head/; revision=362406
Diffstat (limited to 'sys/dev/powermac_nvram')
-rw-r--r-- | sys/dev/powermac_nvram/powermac_nvram.c | 33 | ||||
-rw-r--r-- | sys/dev/powermac_nvram/powermac_nvramvar.h | 1 |
2 files changed, 31 insertions, 3 deletions
diff --git a/sys/dev/powermac_nvram/powermac_nvram.c b/sys/dev/powermac_nvram/powermac_nvram.c index 2402933326a5..2c121b31b6c6 100644 --- a/sys/dev/powermac_nvram/powermac_nvram.c +++ b/sys/dev/powermac_nvram/powermac_nvram.c @@ -34,6 +34,8 @@ #include <sys/bus.h> #include <sys/conf.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/sx.h> #include <sys/uio.h> #include <dev/ofw/openfirm.h> @@ -99,7 +101,6 @@ static d_write_t powermac_nvram_write; static struct cdevsw powermac_nvram_cdevsw = { .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, .d_open = powermac_nvram_open, .d_close = powermac_nvram_close, .d_read = powermac_nvram_read, @@ -180,6 +181,8 @@ powermac_nvram_attach(device_t dev) "powermac_nvram"); sc->sc_cdev->si_drv1 = sc; + sx_init(&sc->sc_lock, "powermac_nvram"); + return 0; } @@ -195,6 +198,8 @@ powermac_nvram_detach(device_t dev) if (sc->sc_cdev != NULL) destroy_dev(sc->sc_cdev); + + sx_destroy(&sc->sc_lock); return 0; } @@ -203,11 +208,17 @@ static int powermac_nvram_open(struct cdev *dev, int flags, int fmt, struct thread *td) { struct powermac_nvram_softc *sc = dev->si_drv1; + int err; + err = 0; + sx_xlock(&sc->sc_lock); if (sc->sc_isopen) - return EBUSY; - sc->sc_isopen = 1; + err = EBUSY; + else + sc->sc_isopen = 1; sc->sc_rpos = sc->sc_wpos = 0; + sx_xunlock(&sc->sc_lock); + return 0; } @@ -218,10 +229,12 @@ powermac_nvram_close(struct cdev *dev, int fflag, int devtype, struct thread *td struct core99_header *header; vm_offset_t bank; + sx_xlock(&sc->sc_lock); if (sc->sc_wpos != sizeof(sc->sc_data)) { /* Short write, restore in-memory copy */ bcopy((void *)sc->sc_bank, (void *)sc->sc_data, NVRAM_SIZE); sc->sc_isopen = 0; + sx_xunlock(&sc->sc_lock); return 0; } @@ -242,10 +255,12 @@ powermac_nvram_close(struct cdev *dev, int fflag, int devtype, struct thread *td if (erase_bank(sc->sc_dev, (uint8_t *)bank) != 0 || write_bank(sc->sc_dev, (uint8_t *)bank, sc->sc_data) != 0) { sc->sc_isopen = 0; + sx_xunlock(&sc->sc_lock); return ENOSPC; } sc->sc_bank = bank; sc->sc_isopen = 0; + sx_xunlock(&sc->sc_lock); return 0; } @@ -256,6 +271,8 @@ powermac_nvram_read(struct cdev *dev, struct uio *uio, int ioflag) struct powermac_nvram_softc *sc = dev->si_drv1; rv = 0; + + sx_xlock(&sc->sc_lock); while (uio->uio_resid > 0) { data_available = sizeof(sc->sc_data) - sc->sc_rpos; if (data_available > 0) { @@ -269,6 +286,8 @@ powermac_nvram_read(struct cdev *dev, struct uio *uio, int ioflag) break; } } + sx_xunlock(&sc->sc_lock); + return rv; } @@ -282,6 +301,8 @@ powermac_nvram_write(struct cdev *dev, struct uio *uio, int ioflag) return EINVAL; rv = 0; + + sx_xlock(&sc->sc_lock); while (uio->uio_resid > 0) { data_available = sizeof(sc->sc_data) - sc->sc_wpos; if (data_available > 0) { @@ -295,6 +316,8 @@ powermac_nvram_write(struct cdev *dev, struct uio *uio, int ioflag) break; } } + sx_xunlock(&sc->sc_lock); + return rv; } @@ -500,6 +523,8 @@ erase_bank(device_t dev, uint8_t *bank) struct powermac_nvram_softc *sc; sc = device_get_softc(dev); + + sx_assert(&sc->sc_lock, SA_XLOCKED); if (sc->sc_type == FLASH_TYPE_AMD) return (erase_bank_amd(dev, bank)); else @@ -512,6 +537,8 @@ write_bank(device_t dev, uint8_t *bank, uint8_t *data) struct powermac_nvram_softc *sc; sc = device_get_softc(dev); + + sx_assert(&sc->sc_lock, SA_XLOCKED); if (sc->sc_type == FLASH_TYPE_AMD) return (write_bank_amd(dev, bank, data)); else diff --git a/sys/dev/powermac_nvram/powermac_nvramvar.h b/sys/dev/powermac_nvram/powermac_nvramvar.h index 1073e50242e7..abc514357531 100644 --- a/sys/dev/powermac_nvram/powermac_nvramvar.h +++ b/sys/dev/powermac_nvram/powermac_nvramvar.h @@ -49,6 +49,7 @@ struct powermac_nvram_softc { device_t sc_dev; + struct sx sc_lock; phandle_t sc_node; vm_offset_t sc_bank; vm_offset_t sc_bank0; |