From nobody Thu May 15 18:17:48 2025 X-Original-To: dev-commits-src-branches@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 4Zyz304FqSz5whhV; Thu, 15 May 2025 18:17:48 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zyz302fVqz3FMN; Thu, 15 May 2025 18:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333068; 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=M6dsfvNVO8/5TelRxTlclCewgRIKzgARrqrRZX13jdc=; b=VX/s6Mg8UxInFWpSeHRKw/qvXHPpFW37wSIcbzN78O8//Im61bGBM5sTD+wGF8Rvw8CtBu ajFv1b+QiSQcMwgf6tTViipPdXo/pn3+ixHmDLlCPXDl9M4t4dA1cEe1WhESOv/3coLDQy jCAzUqGYhf/sxNpZ2LuKBjPTGqlcALAy/i9nzLzbvkXJnWp82np+NBoL3jvVkJAVworRk3 SyCVhumr7PSSR1lkeaQWXRX8lKeeH5eNtSOCpFCw/5QyEPRZFZ+FOOowT8gc+l5oDl5RPk HWD34FEERHsKHvRE6lJFvCa9zS1sKhCLI+TLcVx63yVlFlkY+2clXzYQVJPxSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747333068; 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=M6dsfvNVO8/5TelRxTlclCewgRIKzgARrqrRZX13jdc=; b=tBmn+dDbWFvNxd5f2wx8+sbHU88qekwjdu0LRcW0CDBNMhwQ1HNXvczkyz83RbwIKhlQCO l1RiQwS54iHaeI3qANkvSyA4fpL9llGQpIoU6/9KnxFuCIKDyEij2PQ2kt/sn/44sgUaWv TOdBfbhY2w3P8kPDbZFblUw/SFRfVbkPtR33iiOlPuh6nHgH9BE5By0Bdmjc7TeYKiqv+7 BoTRAHk/MvxX9gIqzrF/LhW3tReFAgbMd4yVN+Quz1vAku65XTy6xUKmNpvwtibrL27uz8 4yzcEXjm6LwtwRXD5HM+uydmnXK0i3JsBrS8gGivP1NW36hfn5nTpdhkLlEoJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747333068; a=rsa-sha256; cv=none; b=eN7YvtN1ooRwmvUt6CWmk6MuiRLFHO4dr2EgMu+EyV+ovjf8mMCvl3JnhzZtaHw1knDtu2 F6nOldAMIX16GcmTOdDQ4HfI4Kl/W0FG25wbxbhVNyHbDGmLLbK5P/4EQ/F+suk9ol5Nj+ WipkTAzIDaUecRvHT5HPHWG0p/T873SMr9NOuQgvEOnri9zSjA0VDic6x26CSlM3wAfFrH kfzZYH8FTyPO86BPRRIoyggx20FZ1j3ar7+Y1hCcLAlcle8HGf2MIP6eChaZN67p8HX/Fv NjUT3HUSfodi/5PrEIUlaqRGRdK50b8osqw/3C6VD48reEccM5U5OM1iI7hpBg== 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 4Zyz3029KszD0p; Thu, 15 May 2025 18:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54FIHmqf090163; Thu, 15 May 2025 18:17:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FIHm4l090160; Thu, 15 May 2025 18:17:48 GMT (envelope-from git) Date: Thu, 15 May 2025 18:17:48 GMT Message-Id: <202505151817.54FIHm4l090160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: c58c931e2004 - stable/14 - ig4_iic: Allow sleeping if called from iichid interrupt handler. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: c58c931e20045a6e254df5901e0321b537337440 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=c58c931e20045a6e254df5901e0321b537337440 commit c58c931e20045a6e254df5901e0321b537337440 Author: Vladimir Kondratyev AuthorDate: 2025-03-07 06:26:51 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-05-15 18:11:55 +0000 ig4_iic: Allow sleeping if called from iichid interrupt handler. This replaces 50 ms busy loop with mtx_sleep for the same duration thus saving CPU time when iichid is driven with interrupts. Sponsored by: Future Crew, LLC MFC after: 2 month Differential Revision: https://reviews.freebsd.org/D48956 (cherry picked from commit c7225a3ede3cf99c538158962f4d65dee435bbcd) --- sys/dev/ichiic/ig4_iic.c | 5 +---- sys/dev/ichiic/ig4_var.h | 1 - sys/dev/iicbus/iichid.c | 3 +++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/ichiic/ig4_iic.c b/sys/dev/ichiic/ig4_iic.c index 749a39e25117..31b097fd68bb 100644 --- a/sys/dev/ichiic/ig4_iic.c +++ b/sys/dev/ichiic/ig4_iic.c @@ -72,7 +72,7 @@ #include #include -#define DO_POLL(sc) (cold || kdb_active || SCHEDULER_STOPPED() || sc->poll) +#define DO_POLL(sc) (cold || kdb_active || SCHEDULER_STOPPED()) /* * tLOW, tHIGH periods of the SCL clock and maximal falling time of both @@ -713,14 +713,11 @@ ig4iic_callback(device_t dev, int index, caddr_t data) if ((how & IIC_WAIT) == 0) { if (sx_try_xlock(&sc->call_lock) == 0) error = IIC_EBUSBSY; - else - sc->poll = true; } else sx_xlock(&sc->call_lock); break; case IIC_RELEASE_BUS: - sc->poll = false; sx_unlock(&sc->call_lock); break; diff --git a/sys/dev/ichiic/ig4_var.h b/sys/dev/ichiic/ig4_var.h index 964a610e7408..cb44a1e7cd58 100644 --- a/sys/dev/ichiic/ig4_var.h +++ b/sys/dev/ichiic/ig4_var.h @@ -92,7 +92,6 @@ struct ig4iic_softc { bool platform_attached : 1; bool use_10bit : 1; bool slave_valid : 1; - bool poll: 1; /* * Locking semantics: diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index e99facdb06bb..fd544e82b2fc 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -602,7 +603,9 @@ iichid_intr(void *context) * acknowledge interrupts we fetch only length header and discard it. */ maxlen = sc->power_on ? sc->intr_bufsize : 0; + THREAD_SLEEPING_OK(); error = iichid_cmd_read(sc, sc->intr_buf, maxlen, &actual); + THREAD_NO_SLEEPING(); if (error == 0) { if (sc->power_on) { if (actual != 0)