From nobody Thu Aug 3 16:12:05 2023 X-Original-To: dev-commits-src-main@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 4RGv4P69TMz3cP1Q; Thu, 3 Aug 2023 16:12:05 +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 4RGv4P5KMTz4WtQ; Thu, 3 Aug 2023 16:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079125; 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=Ay3RDEO14dloUAsZm8H+fXCsRuujVOEglAr3tcFRkIQ=; b=RN3hceIXSSx1p2ze7R7Gpc7KHCr/PN/TxJzm/K96kqZbmf17KuMGrIkTt6dWRLzrbtZnD8 SDEtGrg6QgcnQcTOUEWFblcYlnkbyIF/JZmqgCRz1khU+a8qUqOY4iCWjFw7QFXxxjXlxQ 4pKy6BFMzAKHEWVwiWQYUwfvMMOZTOqJIBixyhtdxxkjX294MjIK+P7PSQx+Ww6I4y7wi7 NQKP23psJGZR8lF6fDu/zU80NYOaWL69kLZ0ZGcdk+QExPylQdKrAvhk7BGR+a3IRNSBwa DhvO/5kIW2cV6G8k6fYP0SuOC/4Z0+PtpqW293savB6gdXFyx3As8q65mxFmlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079125; 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=Ay3RDEO14dloUAsZm8H+fXCsRuujVOEglAr3tcFRkIQ=; b=bLuA3APjs5vJU5qUax3BQlDv6H94VZU+qhaO4C7JRmck/G4oG4keH1ap1M/vMKPU3STkWc 1EY/tc8o26ejRN4QWG6gSrmzHEgV1v/LrxExT8wONH4204PHeIsEJ/mCWog+37PxpegQ6Y TBK3Zm6T9vhL8RvH+N0B6PrWJwcA+NkF6XvH8QlLNAYRrh5a2tS8UWbL50/qyZywt1BzES uDyw63HbCzwT3mDl0LpvgJbsbR+J8Wa/hese4AudnuaVOAI1Q2G1sFwjYtge85a7EARxSJ Gj8NlXLIyK8QjkfMSyCVpBMnND8FjZb7PDKQMAbfOGZdfQEx54Row9dDPL2MWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079125; a=rsa-sha256; cv=none; b=nGPH8CfyVBM/GsHh5pDrMuubORPjAHUWauvpcN4enJdwYAjneok8xKIVHaHhOlMJqB4FtT a0tLyWu+a+Yxm5RXjg3V1yznTB1VtekrAErrz8zpDQqjoSjFuNeAMNEMh3ZO8dJOuOlIWB SLhpdzPvXszCbKkqgluTiJqPFEX4wee9lCTTujAEcdTcbN58E/YrPr/uLwz5k+NtziE01B ZX23Ng79lcI4cyZ4RBC9RRckGNCjIORPyJi/6yGJpM4Q/4UDyDXOEizq3aXmy4i186qW8n KhXWWDZdvhYTbEn9A3pXew9k5ZxQyO6e8t+eCNsVs9aEGmfVMALSMtp2dyrwdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RGv4P4QnlzCS1; Thu, 3 Aug 2023 16:12:05 +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 373GC52b006148; Thu, 3 Aug 2023 16:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373GC5pK006147; Thu, 3 Aug 2023 16:12:05 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:12:05 GMT Message-Id: <202308031612.373GC5pK006147@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: 5adcec04b5ab - main - intelspi: Add support for ddb/kdb -compatible polled mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 5adcec04b5abd4971f1678d6ee1369cc9ecaa90d Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5adcec04b5abd4971f1678d6ee1369cc9ecaa90d commit 5adcec04b5abd4971f1678d6ee1369cc9ecaa90d Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:50 +0000 intelspi: Add support for ddb/kdb -compatible polled mode Required for Apple and Microsoft -compatible HID-over-SPI drivers. Most logic was already implemented in commit 3c0867343819 "spibus: extend API: add cs_delay ivar, KEEP_CS and NO_SLEEP flags". It dissallowed driver sleeps in the interrupt context. This commit extends this feature to handle ddb/kdb context with following: - Skip driver locking if SPI functions were called from kdb/ddb. - Reinitialize controller if kdb/ddb initiated SPI transfer has interrupted another already running one. Does not work very reliable yet. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41247 --- sys/dev/intel/spi.c | 57 ++++++++++++++++++++++++++++++++++++++--------------- sys/dev/intel/spi.h | 2 +- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/sys/dev/intel/spi.c b/sys/dev/intel/spi.c index 6dd063511e26..3bcbd8fbd4f4 100644 --- a/sys/dev/intel/spi.c +++ b/sys/dev/intel/spi.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -46,14 +47,27 @@ /** * Macros for driver mutex locking */ -#define INTELSPI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) -#define INTELSPI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) +#define INTELSPI_IN_POLLING_MODE() (SCHEDULER_STOPPED() || kdb_active) +#define INTELSPI_LOCK(_sc) do { \ + if(!INTELSPI_IN_POLLING_MODE()) \ + mtx_lock(&(_sc)->sc_mtx); \ +} while (0) +#define INTELSPI_UNLOCK(_sc) do { \ + if(!INTELSPI_IN_POLLING_MODE()) \ + mtx_unlock(&(_sc)->sc_mtx); \ +} while (0) #define INTELSPI_LOCK_INIT(_sc) \ mtx_init(&_sc->sc_mtx, device_get_nameunit((_sc)->sc_dev), \ "intelspi", MTX_DEF) #define INTELSPI_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx) -#define INTELSPI_ASSERT_LOCKED(_sc) mtx_assert(&(_sc)->sc_mtx, MA_OWNED) -#define INTELSPI_ASSERT_UNLOCKED(_sc) mtx_assert(&(_sc)->sc_mtx, MA_NOTOWNED) +#define INTELSPI_ASSERT_LOCKED(_sc) do { \ + if(!INTELSPI_IN_POLLING_MODE()) \ + mtx_assert(&(_sc)->sc_mtx, MA_OWNED); \ +} while (0) +#define INTELSPI_ASSERT_UNLOCKED(_sc) do { \ + if(!INTELSPI_IN_POLLING_MODE()) \ + mtx_assert(&(_sc)->sc_mtx, MA_NOTOWNED);\ +} while (0) #define INTELSPI_WRITE(_sc, _off, _val) \ bus_write_4((_sc)->sc_mem_res, (_off), (_val)) @@ -342,17 +356,26 @@ intelspi_transfer(device_t dev, device_t child, struct spi_command *cmd) INTELSPI_LOCK(sc); - /* 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) { - INTELSPI_UNLOCK(sc); - return (EBUSY); - } - err = mtx_sleep(dev, &sc->sc_mtx, 0, "intelspi", 0); - if (err == EINTR) { - INTELSPI_UNLOCK(sc); - return (err); + if (!INTELSPI_IN_POLLING_MODE()) { + /* If the controller is in use wait until it is available. */ + while (sc->sc_flags & INTELSPI_BUSY) { + if ((cmd->flags & SPI_FLAG_NO_SLEEP) != 0) { + INTELSPI_UNLOCK(sc); + return (EBUSY); + } + err = mtx_sleep(dev, &sc->sc_mtx, 0, "intelspi", 0); + if (err == EINTR) { + INTELSPI_UNLOCK(sc); + return (err); + } } + } else { + /* + * Now we are in the middle of other transfer. Try to reset + * controller state to get predictable context. + */ + if ((sc->sc_flags & INTELSPI_BUSY) != 0) + intelspi_init(sc); } /* Now we have control over SPI controller. */ @@ -411,7 +434,8 @@ intelspi_transfer(device_t dev, device_t child, struct spi_command *cmd) DELAY(cs_delay); /* Transfer as much as possible to FIFOs */ - if ((cmd->flags & SPI_FLAG_NO_SLEEP) == SPI_FLAG_NO_SLEEP) { + if ((cmd->flags & SPI_FLAG_NO_SLEEP) != 0 || + INTELSPI_IN_POLLING_MODE() || cold) { /* We cannot wait with mtx_sleep if we're called from e.g. an ithread */ poll_limit = 2000; while (!intelspi_transact(sc) && poll_limit-- > 0) @@ -449,7 +473,8 @@ intelspi_transfer(device_t dev, device_t child, struct spi_command *cmd) /* Release the controller and wakeup the next thread waiting for it. */ sc->sc_flags = 0; - wakeup_one(dev); + if (!INTELSPI_IN_POLLING_MODE()) + wakeup_one(dev); INTELSPI_UNLOCK(sc); /* diff --git a/sys/dev/intel/spi.h b/sys/dev/intel/spi.h index bd79ec1e812a..fa145f8f73d7 100644 --- a/sys/dev/intel/spi.h +++ b/sys/dev/intel/spi.h @@ -54,7 +54,7 @@ struct intelspi_softc { struct spi_command *sc_cmd; uint32_t sc_len; uint32_t sc_read; - uint32_t sc_flags; + volatile uint32_t sc_flags; uint32_t sc_written; uint32_t sc_clock; uint32_t sc_mode;