From owner-svn-src-all@freebsd.org Fri Jan 10 01:24:49 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D68141FEF64; Fri, 10 Jan 2020 01:24:49 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47v4z55GnBz40f6; Fri, 10 Jan 2020 01:24:49 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABF47A40D; Fri, 10 Jan 2020 01:24:49 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00A1Ona4040988; Fri, 10 Jan 2020 01:24:49 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00A1OnkW040987; Fri, 10 Jan 2020 01:24:49 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <202001100124.00A1OnkW040987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 10 Jan 2020 01:24:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356590 - head/sys/powerpc/powernv X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/powernv X-SVN-Commit-Revision: 356590 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jan 2020 01:24:49 -0000 Author: jhibbits Date: Fri Jan 10 01:24:49 2020 New Revision: 356590 URL: https://svnweb.freebsd.org/changeset/base/356590 Log: powerpc/powernv: Un-Giant-ify opal_nvram driver It may be possible to make this completely lock free, but for now it's using a statically allocated bounce buffer in the softc, so it needs to be guarded. Modified: head/sys/powerpc/powernv/opal_nvram.c Modified: head/sys/powerpc/powernv/opal_nvram.c ============================================================================== --- head/sys/powerpc/powernv/opal_nvram.c Fri Jan 10 00:55:37 2020 (r356589) +++ head/sys/powerpc/powernv/opal_nvram.c Fri Jan 10 01:24:49 2020 (r356590) @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -56,6 +57,7 @@ struct opal_nvram_softc { device_t sc_dev; + struct mtx sc_mtx; uint32_t sc_size; uint8_t *sc_buf; vm_paddr_t sc_buf_phys; @@ -64,6 +66,9 @@ struct opal_nvram_softc { int sc_isopen; }; +#define NVRAM_LOCK(sc) mtx_lock(&sc->sc_mtx) +#define NVRAM_UNLOCK(sc) mtx_unlock(&sc->sc_mtx) + /* * Device interface. */ @@ -105,7 +110,6 @@ static d_ioctl_t opal_nvram_ioctl; static struct cdevsw opal_nvram_cdevsw = { .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, .d_open = opal_nvram_open, .d_close = opal_nvram_close, .d_read = opal_nvram_read, @@ -153,6 +157,8 @@ opal_nvram_attach(device_t dev) sc->sc_cdev = make_dev(&opal_nvram_cdevsw, 0, 0, 0, 0600, "nvram"); sc->sc_cdev->si_drv1 = sc; + + mtx_init(&sc->sc_mtx, "opal_nvram", 0, MTX_DEF); return (0); } @@ -168,6 +174,8 @@ opal_nvram_detach(device_t dev) destroy_dev(sc->sc_cdev); if (sc->sc_buf != NULL) contigfree(sc->sc_buf, NVRAM_BUFSIZE, M_DEVBUF); + + mtx_destroy(&sc->sc_mtx); return (0); } @@ -176,11 +184,18 @@ static int opal_nvram_open(struct cdev *dev, int flags, int fmt, struct thread *td) { struct opal_nvram_softc *sc = dev->si_drv1; + int err; + err = 0; + + NVRAM_LOCK(sc); if (sc->sc_isopen) - return EBUSY; - sc->sc_isopen = 1; - return (0); + err = EBUSY; + else + sc->sc_isopen = 1; + NVRAM_UNLOCK(sc); + + return (err); } static int @@ -188,7 +203,10 @@ opal_nvram_close(struct cdev *dev, int fflag, int devt { struct opal_nvram_softc *sc = dev->si_drv1; + NVRAM_LOCK(sc); sc->sc_isopen = 0; + NVRAM_UNLOCK(sc); + return (0); } @@ -199,6 +217,8 @@ opal_nvram_read(struct cdev *dev, struct uio *uio, int int rv, amnt; rv = 0; + + NVRAM_LOCK(sc); while (uio->uio_resid > 0) { amnt = MIN(uio->uio_resid, sc->sc_size - uio->uio_offset); amnt = MIN(amnt, NVRAM_BUFSIZE); @@ -222,6 +242,8 @@ opal_nvram_read(struct cdev *dev, struct uio *uio, int if (rv != 0) break; } + NVRAM_UNLOCK(sc); + return (rv); } @@ -233,6 +255,8 @@ opal_nvram_write(struct cdev *dev, struct uio *uio, in struct opal_nvram_softc *sc = dev->si_drv1; rv = 0; + + NVRAM_LOCK(sc); while (uio->uio_resid > 0) { amnt = MIN(uio->uio_resid, sc->sc_size - uio->uio_offset); amnt = MIN(amnt, NVRAM_BUFSIZE); @@ -258,6 +282,9 @@ opal_nvram_write(struct cdev *dev, struct uio *uio, in break; } } + + NVRAM_UNLOCK(sc); + return (rv); }