From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5700606A323 for ; Fri, 30 Oct 2026 07:13:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=qPkSlyTK; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=RbwCFuAW DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Unsubscribe-Post:List-Owner; bh=nXilgdS7CLOmcdrjW/kYGIwI3BWhhi5w7jGBtQxBRhY=; b=qPkSlyTKBlvqFLA99qrcbtLDZA 9bvYMrorpwXfM8J7NV1Md6uwbocbbHpRjif/8B8zE9YatPW0K8jrQmrb8Zd5Goe8+Hrptn2dh4nNW DhOG6n3550laJTLD6DwyTFrRcYNBx+PkG37/mRSc/zZr0Oz7ifuMcwTHWfG40jSCR/U7uvV5/98mS UYX7UdpkakhEZqUkSc9C+mf0vcLZuQ1EyKzwk4zrIltc+CIjmG1yYhwc+2EIYld0ArXkAWDPf2DEH cpNyBJbSb9434D2V/6+0bLVRFiCQp1T/mk+YCNYaKuuAfPgBIIXW/Mk0RKRzgWVp0kaf92VMdNRYa 8rwrYIvg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xMgo6-0000000Aymm-2fE7; Fri, 30 Oct 2026 07:13:46 +0000 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xMgo4-0000000Aylj-16Kx for linux-arm-kernel@lists.infradead.org; Fri, 30 Oct 2026 07:13:45 +0000 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-48afbd2c386so158133f8f.3 for ; Fri, 30 Oct 2026 00:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793344421; x=1793949221; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=nXilgdS7CLOmcdrjW/kYGIwI3BWhhi5w7jGBtQxBRhY=; b=RbwCFuAWf7FugcuWl/dV7cFyFhGBbkf6hZkXS46utf8EKAgRRRf0vw66Cj02lBPSnU 6DfOWZRXK73OUBMcCeKtoRCpkceCkAebmdMFiWRNIAM4UkNuJV1eJDobMixImgWz/RLL QPbvu8iC1QtEmyYzw7SnjrqtZUUZTvsdoEYHYoUo/Ob2YAUbaQvXgU187R7uuTEsXkg5 3+9diZUc0yyr33GgLXyt/05IvyxGvUPXAi8F5MjsHmd+E9GSn0bPOzNA0prOp2V0Is0N R4q6azRakfn34W8BrI/vLBcm3hAqP+OzuDMdCqUpykYWqTuwV/Ez2cm/PTIUEalfv7DQ N9Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793344421; x=1793949221; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=nXilgdS7CLOmcdrjW/kYGIwI3BWhhi5w7jGBtQxBRhY=; b=HZRxK3el+n3mM/QjjrljCabSGVqQfHp9J7TRbsLp09ObyR6vWAK6NHf9P0gmAloZI5 lHoEXexzqxV1RDhm6t3cilzmWygsnEEF9rkPdrNg/ZLQmvsZ+nD25Fx4be3plvWGiDvp BJWLL412tGxa4yl+5+TmRRJQiq/fQMepq8BjbrSpgOQbPpYpwgQIr4MpPxr9sd7MkJ5W 9s0Rw9XVpdVDg8jmyywgg5pspVLFWGc7QIRR7vjGGYH6jCErAii6i3iKLvQzEK75b1GJ raIXJiEE44Lsn/g1cc9zfxWDDcJ25yXcT3Q8/QTH6Tokcss8kOsLRZMZpuY11csDfcFJ Jerw== X-Forwarded-Encrypted: i=1; AKwUvBy4qbO/V8syqVIeYITqHALAKMw9bRXw8bfPNt/d+NDmiEFGQhr3t+SvDu7Pp+pqYh6cARGbFuOe/a3eEHf+Xpc3@lists.infradead.org X-Gm-Message-State: AFq9FYIdJfcW1cR0WslVz76TgrpzD9I7xiqMCKg9b+SNjfGtnXWe9tsF n9+yQk/g/UNGLK81Ahj23+FHIABzF2hYNoSiCEk1NGadJuKF1K5Q4ZvL X-Gm-Gg: AYBFou3QeDYPJwPtpLgJQDK+RdnQbvNvNsllP8IxUbtkmEFSAfsJJ9NulScLgnxAL10 HQevFtAqtXZSXi8Tr36bpxZ2EsH2khGRAVLTar2kIKKbkcOAYhts8VMSgb1FMWoNy/fQ+J3ANyO +zdhPG75r9HIeweEFFk0moU1idl3+nbga2uMKGjrdsiRjAZ8O388dduaZw8BVCdCF92Y7Q2HZMG ZSWSYO2W9Yh+FVKCzQLoV2yhlzUxdM4o+CgXAQDBDyWJ1ltUkmq8RddYClPJ46asf2NSpOwMcor 9vGVv6S/pOWOMB4dAo//RzPPQnUjxlI+qsmM+cuDKc/4wQ/T0Z+x6F5YCF2VBVuyLNCn2Q3LJI7 eCfopV3KiNRDZRpClfji74KIxec0J/qdh7MQOxRsLr47lP8TDGNdwMesEDB0v8ys2G6wIKruh+S k9rVA34e44EuABYkA9RyDi455z7510dh6p2OSgw+TqpYH1KdbzcM4K/ZPqZLoPdI48aJmWACJpx kGqLa8nt1p1kzsg5XNPIvkmU6KLo5Ed2fE6wx3ftuAm5PYr1JNIps+CSkWPou54vTyZC3xyjv7U ekTW4AjvZ8l3X+/jJGuWIgJHeEP6SBTC0fZBugwDdaK6zpEG8zfvPDQ74TnDUpB2EeJLnP5vfNE D8jQRQUMTKpTsudwaDVw1VCGNNe0PVWNL7A== X-Received: by 2002:a05:6000:430d:b0:48e:25d7:d276 with SMTP id ffacd0b85a97d-48e6e2c3527mr3261224f8f.2.1793344420640; Fri, 30 Oct 2026 00:13:40 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (93-34-92-187.ip49.fastwebnet.it. [93.34.92.187]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-48e71b78c10sm1489936f8f.25.2026.10.30.00.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2026 00:13:40 -0700 (PDT) From: Christian Marangi To: Stefan Roese , Andi Shyti , Matthias Brugger , AngeloGioacchino Del Regno , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Christian Marangi Subject: [PATCH v4] i2c: mt7621: rework cmd/wait OPs to support atomic afer variant Date: Fri, 30 Oct 2026 08:13:23 +0100 Message-ID: <20261030071325.2678-1-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261030_001344_372455_99315603 X-CRM114-Status: GOOD ( 17.36 ) X-Spam-Score: -2.1 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 It was reported the need for atomic operation on some Airoha SoC that makes use of I2C bus. Rework the cmd/wait OPs to suppor the xfer_atomic variant. To support this it's needed to do the readl poll in atomic context and special handling for device_reset. Signed-off-by: Christian Marangi --- Changes v4: - Split to dedicated patch - Reduce timeout to 250ms - Disable device_reset in atomic context Changes v3..v2: - No related changes drivers/i2c/busses/i2c-mt7621.c | 75 ++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/drivers/i2c/busses/i2c-mt7621.c b/drivers/i2c/busses/i2c-mt7621.c index 9ea5e3f9a763..0283191ac518 100644 --- a/drivers/i2c/busses/i2c-mt7621.c +++ b/drivers/i2c/busses/i2c-mt7621.c @@ -67,27 +67,38 @@ struct mtk_i2c { struct clk *clk; }; -static int mtk_i2c_wait_idle(struct mtk_i2c *i2c) +static int mtk_i2c_wait_idle(struct mtk_i2c *i2c, bool atomic) { int ret; u32 val; - ret = readl_relaxed_poll_timeout(i2c->base + REG_SM0CTL1_REG, - val, !(val & SM0CTL1_TRI), - 10, TIMEOUT_MS * 1000); + if (atomic) + ret = readl_relaxed_poll_timeout_atomic(i2c->base + REG_SM0CTL1_REG, + val, !(val & SM0CTL1_TRI), + 10, TIMEOUT_MS * 250); + else + ret = readl_relaxed_poll_timeout(i2c->base + REG_SM0CTL1_REG, + val, !(val & SM0CTL1_TRI), + 10, TIMEOUT_MS * 1000); if (ret) dev_dbg(i2c->dev, "idle err(%d)\n", ret); return ret; } -static void mtk_i2c_reset(struct mtk_i2c *i2c) +static void mtk_i2c_reset(struct mtk_i2c *i2c, bool atomic) { int ret; - ret = device_reset(i2c->adap.dev.parent); - if (ret) - dev_err(i2c->dev, "I2C reset failed!\n"); + /* + * Skip device_reset in atomic context as it depends on the + * reset-controller correctly handling atomic operations. + */ + if (!atomic) { + ret = device_reset(i2c->adap.dev.parent); + if (ret) + dev_err(i2c->dev, "I2C reset failed!\n"); + } /* * Don't set SM0CTL0_ODRAIN as its bit meaning is inverted. To @@ -117,27 +128,28 @@ static int mtk_i2c_check_ack(struct mtk_i2c *i2c, u32 expected) return ((ack & ack_expected) == ack_expected) ? 0 : -ENXIO; } -static int mtk_i2c_start(struct mtk_i2c *i2c) +static int mtk_i2c_start(struct mtk_i2c *i2c, bool atomic) { iowrite32(SM0CTL1_START | SM0CTL1_TRI, i2c->base + REG_SM0CTL1_REG); - return mtk_i2c_wait_idle(i2c); + return mtk_i2c_wait_idle(i2c, atomic); } -static int mtk_i2c_stop(struct mtk_i2c *i2c) +static int mtk_i2c_stop(struct mtk_i2c *i2c, bool atomic) { iowrite32(SM0CTL1_STOP | SM0CTL1_TRI, i2c->base + REG_SM0CTL1_REG); - return mtk_i2c_wait_idle(i2c); + return mtk_i2c_wait_idle(i2c, atomic); } -static int mtk_i2c_cmd(struct mtk_i2c *i2c, u32 cmd, int page_len) +static int mtk_i2c_cmd(struct mtk_i2c *i2c, u32 cmd, int page_len, + bool atomic) { iowrite32(cmd | SM0CTL1_TRI | SM0CTL1_PGLEN(page_len), i2c->base + REG_SM0CTL1_REG); - return mtk_i2c_wait_idle(i2c); + return mtk_i2c_wait_idle(i2c, atomic); } -static int mtk_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, - int num) +static int mtk_i2c_xfer_common(struct i2c_adapter *adap, struct i2c_msg *msgs, + int num, bool atomic) { struct mtk_i2c *i2c; struct i2c_msg *pmsg; @@ -151,12 +163,12 @@ static int mtk_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, pmsg = &msgs[i]; /* wait hardware idle */ - ret = mtk_i2c_wait_idle(i2c); + ret = mtk_i2c_wait_idle(i2c, atomic); if (ret) goto err_timeout; /* start sequence */ - ret = mtk_i2c_start(i2c); + ret = mtk_i2c_start(i2c, atomic); if (ret) goto err_timeout; @@ -172,7 +184,8 @@ static int mtk_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, len = 1; } iowrite32(addr, i2c->base + REG_SM0D0_REG); - ret = mtk_i2c_cmd(i2c, SM0CTL1_WRITE, len); + ret = mtk_i2c_cmd(i2c, SM0CTL1_WRITE, len, + atomic); if (ret) goto err_timeout; @@ -200,7 +213,7 @@ static int mtk_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, cmd = SM0CTL1_WRITE; } - ret = mtk_i2c_cmd(i2c, cmd, page_len); + ret = mtk_i2c_cmd(i2c, cmd, page_len, atomic); if (ret) goto err_timeout; @@ -221,7 +234,7 @@ static int mtk_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, } } - ret = mtk_i2c_stop(i2c); + ret = mtk_i2c_stop(i2c, atomic); if (ret) goto err_timeout; @@ -229,17 +242,30 @@ static int mtk_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, return i; err_ack: - ret = mtk_i2c_stop(i2c); + ret = mtk_i2c_stop(i2c, atomic); if (ret) goto err_timeout; return -ENXIO; err_timeout: mtk_i2c_dump_reg(i2c); - mtk_i2c_reset(i2c); + mtk_i2c_reset(i2c, atomic); + return ret; } +static int mtk_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, + int num) +{ + return mtk_i2c_xfer_common(adap, msgs, num, false); +} + +static int mtk_i2c_xfer_atomic(struct i2c_adapter *adap, + struct i2c_msg *msgs, int num) +{ + return mtk_i2c_xfer_common(adap, msgs, num, true); +} + static u32 mtk_i2c_func(struct i2c_adapter *a) { return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_PROTOCOL_MANGLING; @@ -247,6 +273,7 @@ static u32 mtk_i2c_func(struct i2c_adapter *a) static const struct i2c_algorithm mtk_i2c_algo = { .xfer = mtk_i2c_xfer, + .xfer_atomic = mtk_i2c_xfer_atomic, .functionality = mtk_i2c_func, }; @@ -265,7 +292,7 @@ static void mtk_i2c_init(struct mtk_i2c *i2c) if (i2c->clk_div > SM0CTL0_CLK_DIV_MAX) i2c->clk_div = SM0CTL0_CLK_DIV_MAX; - mtk_i2c_reset(i2c); + mtk_i2c_reset(i2c, false); } static int mtk_i2c_probe(struct platform_device *pdev) -- 2.55.0