From owner-dev-commits-src-all@freebsd.org Tue Aug 10 22:47:13 2021 Return-Path: Delivered-To: dev-commits-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 957BF670185; Tue, 10 Aug 2021 22:47:13 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Gkp413k2kz3Cxg; Tue, 10 Aug 2021 22:47:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67C9D24183; Tue, 10 Aug 2021 22:47:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17AMlDiF027032; Tue, 10 Aug 2021 22:47:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17AMlDd5027031; Tue, 10 Aug 2021 22:47:13 GMT (envelope-from git) Date: Tue, 10 Aug 2021 22:47:13 GMT Message-Id: <202108102247.17AMlDd5027031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Scott Long Subject: git: bd9e461cf7f7 - main - Address the reported mmc serialization issue. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: scottl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd9e461cf7f70f2a9b3bd566122bbf4e420d7e17 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2021 22:47:13 -0000 The branch main has been updated by scottl: URL: https://cgit.FreeBSD.org/src/commit/?id=bd9e461cf7f70f2a9b3bd566122bbf4e420d7e17 commit bd9e461cf7f70f2a9b3bd566122bbf4e420d7e17 Author: Scott Long AuthorDate: 2021-08-10 22:41:23 +0000 Commit: Scott Long CommitDate: 2021-08-10 22:41:23 +0000 Address the reported mmc serialization issue. Reset the mmc owner before calling the bridge release host callback. Some people are hitting the "mmc: host bridge didn't serialize us." panic as the bridge is released before the mmc owner is reset. Submitted by: luiz Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/dev/mmc/mmc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/dev/mmc/mmc.c b/sys/dev/mmc/mmc.c index 29b3645beadd..74d0549ca491 100644 --- a/sys/dev/mmc/mmc.c +++ b/sys/dev/mmc/mmc.c @@ -412,7 +412,6 @@ static int mmc_release_bus(device_t busdev, device_t dev) { struct mmc_softc *sc; - int err; sc = device_get_softc(busdev); @@ -421,14 +420,9 @@ mmc_release_bus(device_t busdev, device_t dev) panic("mmc: releasing unowned bus."); if (sc->owner != dev) panic("mmc: you don't own the bus. game over."); - MMC_UNLOCK(sc); - err = MMCBR_RELEASE_HOST(device_get_parent(busdev), busdev); - if (err) - return (err); - MMC_LOCK(sc); sc->owner = NULL; MMC_UNLOCK(sc); - return (0); + return (MMCBR_RELEASE_HOST(device_get_parent(busdev), busdev)); } static uint32_t