From nobody Mon Jul 31 14:30:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RF0zH0SQqz4qBJ6; Mon, 31 Jul 2023 14:30:59 +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 4RF0z701C5z47yB; Mon, 31 Jul 2023 14:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690813859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGsxYFa5D56zHdcUm33tAY8ARuFvEAuNyFZXEy13d2U=; b=ar9qf1sHuBUwU9WdaCT1lO2ZyU1rQqZ/A4yYJ11DVwa2SfJPRayRwFyePVXPhiUrC3Ph1s JvHjYq2fVnZ+a7BQV24aBWzkEj39ePtDLUzpqOvVbjhSUapQHFMLNw6iaz4PIiJ6PCPgc7 8uI09Burfp6oioaj9MB/3vDJY531+Qf50WV4UQQ0DnYtO5UPszPmNkTQgKaC6sLnKjl1eN Wy78HTNQkr81xLIdMvCdjer9oNrrMj98zT8KJaril4l82lqp9QuCEO+EjeomUkp4hgocBn zPTJU4wLVqgq6Btgn/PHvzBjFS50p6f/Oc96R9xbj9MGjxes5aV2a5/vCEYWWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690813859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGsxYFa5D56zHdcUm33tAY8ARuFvEAuNyFZXEy13d2U=; b=Yjq1d4ITEciMW+evaQ7DMv6Zf9o2+VMJNrf1cj7wMnvsoVlipd/A+3+xaSYFP+uBsewUhl U0ikfMfsB4U/2nDslbq0mwdZirn0yP24sDD6W9ppO4b+t2QS5kciGFa2UPiQaC4LbSna6D eNkYMnDB0PupD0b1oJM5/dskgPuO1ofd5B4Ctys72N3uxCq9YS6M1fOcT03vKw3Ft42vXV htLBDWq98cnR2R0lHPe8+B488nsrrD5pLkPRc5qo+PVRzPXJQicyNx96JaV5h+0Ljx78WJ nXxKpNxRAIZsBeebe7isFRBpe51hDpmtwL8wu0Z0/Gc0mN4IXTjBOz0nYgpqbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690813859; a=rsa-sha256; cv=none; b=WEDbi5g1YhWAnl3FWkNBrJcLcTcPe+AU1YXZq6Gm/twK4B+TtFImAk0PokIIydRkGO1eZV aLWoJnMj5VeqFsY4RlBmyebBzDghs65ngARsR5/einAwl6ov9sCuweRKADQA4JEg5EYbAJ gyxqQBdJ4ibn5AMxc9ZL5DP3CTjNkdBTFIcB1qxvH0jXNcj2b0bmJyc4zLmXgn/Tc0+0az GGU5zgYRcrwPEL4v8oSaJFLzfWiXk4OSBE9g4axCBHnlfNvx+r/58n9J1k22ZxngSzJ/Bn /eXm1V46ZgWBqtg/OxtCreplHGnJov0BsqpZpfGd+MeMvE6tOvv+3f9UpTnPSQ== 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 4RF0z65dYgz10DH; Mon, 31 Jul 2023 14:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36VEUwat053122; Mon, 31 Jul 2023 14:30:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VEUwpK053121; Mon, 31 Jul 2023 14:30:58 GMT (envelope-from git) Date: Mon, 31 Jul 2023 14:30:58 GMT Message-Id: <202307311430.36VEUwpK053121@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: d101156ec69d - main - intelspi(4): Add missing driver mutex unlock in NO_SLEEP mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d101156ec69d4c51d626034419a48634d3827f23 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d101156ec69d4c51d626034419a48634d3827f23 commit d101156ec69d4c51d626034419a48634d3827f23 Author: Vladimir Kondratyev AuthorDate: 2023-07-31 14:30:24 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-07-31 14:30:24 +0000 intelspi(4): Add missing driver mutex unlock in NO_SLEEP mode Fixes: 1f40866feb21 ("intelspi: add PCI attachment (Lynx/Wildcat/Sunrise Point)") MFC after: 1 week --- sys/dev/intel/spi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/intel/spi.c b/sys/dev/intel/spi.c index 497c2606a1c9..0ac7a3b5e9bb 100644 --- a/sys/dev/intel/spi.c +++ b/sys/dev/intel/spi.c @@ -317,8 +317,10 @@ intelspi_transfer(device_t dev, device_t child, struct spi_command *cmd) /* If the controller is in use wait until it is available. */ while (sc->sc_flags & INTELSPI_BUSY) { - if ((cmd->flags & SPI_FLAG_NO_SLEEP) == SPI_FLAG_NO_SLEEP) + if ((cmd->flags & SPI_FLAG_NO_SLEEP) == SPI_FLAG_NO_SLEEP) { + INTELSPI_UNLOCK(sc); return (EBUSY); + } err = mtx_sleep(dev, &sc->sc_mtx, 0, "intelspi", 0); if (err == EINTR) { INTELSPI_UNLOCK(sc);