From nobody Fri Mar 7 06:28:02 2025 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 4Z8GYt2h9Gzt3xh; Fri, 07 Mar 2025 06:28:02 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z8GYt24PTz3MpV; Fri, 07 Mar 2025 06:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741328882; 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=Vyg6w2e5JFSxLr1tI7vPtWI4/I2OVPCKbgjqyj8sgPs=; b=bLKw77mrt6cmGuTtVtxi/VgRezXHg694u0AKPoAtlTsNNBDuQANW7jxFf66eCkVih+np4r mHQ8wLOn4Jp/u2Y1ZZJG0y13hyuawCW/t0LDnfgOJBapoEnmG8qcypauD7BRspwOwp6TSC 1m/MYhsSo+o5DjplpsTzkVqePKEVZurBxpJaWV7PncPwcVNx9pKxbva6fGSCh3uzpy18ny ymCo01Es8FZ7g5HXe4Bqu9n81yxHWf4XJ/mJg8fpxbTPspDZZR7gO7LYy6shoYKv0TuLWO C7LDSP7cnShwLUqDxCM/Q26KOCloB87pQe8JZzOxMsqf7sTw6ajtsdv32g3xMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741328882; a=rsa-sha256; cv=none; b=SBePn7diNUhPtPba1q+tAZVgkLtPWqkxJ8C77maXTxP34fHn0fkbPJ9+xO7fdfxhbKX0iC z5wAKhZQgBOPLSbZnPNpeYhvC/u5PDT6CelJZxBHM2KC2YNNYs9I2+fOEeTXV+ZoeDWUeT N3KwlHLcRWuvZZ0/qGL5nFJyAQLEv27moJsAjR1b/tgbjzm52mAuXgmG3gbnVm2RaDQ4lV ES7ImrgfshlKZj4YjHtl8tf4Xg47lj6tur7ezSknmht6DQPnIrF7yc9XBMXcvjjoLLf2iC s6fP0jnCoHDCWn85ptUYsc9xlTNQHnyf17QKCuaXu8JM2OIvajurnoKOWmMocA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741328882; 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=Vyg6w2e5JFSxLr1tI7vPtWI4/I2OVPCKbgjqyj8sgPs=; b=Nn2+ULT/sZvn0cvt0Mkl9g4Xcop3Ao12MH4f0OUFCjtjzN8z1qlXU6YQvoGPKIysL9zMwe HDS5LI3zl5l2Eb7S5TpDNFv3835iUamcj44C8bQPlN4ExtGl5r1IwnbAHnWkp6uBTS58tn K1RvHF/8rHAmEwA5RnPaj6ksedw4D5Tv/0t2+n7aUn6OIQcThLulgOlpPmY2mhMEpA4kiT DRoV8mp0ARXI8HHQydSOiB99dpFCw3ulqcLTzmmf0WeG6synxkF8u6na7TQwGal1Y72d+/ HMcxAuSFD6WkC1YqsFgA4LXkNP7mzaZP9i32oZHsQt2rlXgt4brzn8rZXZB6mA== 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 4Z8GYt1bzrz9Qg; Fri, 07 Mar 2025 06:28:02 +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 5276S24o092975; Fri, 7 Mar 2025 06:28:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5276S2mX092972; Fri, 7 Mar 2025 06:28:02 GMT (envelope-from git) Date: Fri, 7 Mar 2025 06:28:02 GMT Message-Id: <202503070628.5276S2mX092972@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: c7225a3ede3c - main - ig4_iic: Allow sleeping if called from iichid interrupt handler. 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: c7225a3ede3cf99c538158962f4d65dee435bbcd Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=c7225a3ede3cf99c538158962f4d65dee435bbcd commit c7225a3ede3cf99c538158962f4d65dee435bbcd Author: Vladimir Kondratyev AuthorDate: 2025-03-07 06:26:51 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-07 06:26:51 +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 --- 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 c9346ff12350..cd88b28a2d52 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 @@ -720,14 +720,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 989cf23779a2..0d000ab34c1d 100644 --- a/sys/dev/ichiic/ig4_var.h +++ b/sys/dev/ichiic/ig4_var.h @@ -93,7 +93,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 346d432a74b5..fb6e8606adae 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)