From patchwork Mon Apr 21 05:36:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Mitchell X-Patchwork-Id: 882928 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CFA8E4A3C; Mon, 21 Apr 2025 05:36:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745213818; cv=none; b=C7spUz186TCcGSx/7Cux25EMxZhVWAIZpzgvhINSZjA3WaawgUiUPS4gpR8sLe8LuM7vnAsZAhUGOCzoQvR7z6wwxvT7sybwJ5wINPKzigD+3BIwGUYD9muxgUaPGOOFaGCc4//fea3U4fH9bg3haVCcrKjOUF8Gv2+pKOjZZs4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745213818; c=relaxed/simple; bh=Set1fjuf1biaf2SuWAgg0znD5Dkrjnd4oyOs91sYddk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XymFWpNoO7HdojP150tcYZ2FsWffbzJiEAyt0XCABiety4ArX+jyfm4YsKl14L+wggBSwwg3EOR6fVYW8Y14HoFxSaETnvsIHyCxQLj1/kQO+2nnMYG2NcJBj76x/v5Hcz/evK0qiqS3sYI+zVBfl3skzYgnYShP3KVFnyLmPgo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TtBAQvnX; arc=none smtp.client-ip=209.85.214.193 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TtBAQvnX" Received: by mail-pl1-f193.google.com with SMTP id d9443c01a7336-224100e9a5cso42275575ad.2; Sun, 20 Apr 2025 22:36:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745213816; x=1745818616; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=sSA5b1FEsUGzIuKxMEGaepPxh4bbazOZcDDU8ZWSGNA=; b=TtBAQvnXww+Z3hxoriXA2iNYLXKR04h3K+VoXZ3oBp/mXMFjNjh6I3nwE+r1viOi8S bevDLOP84ZhQx4LMC86A9Wzznhy/g9U8wr7KowOAmJKYSmrG4Ujj0ZTOlJYCuk8EEwSj DEKUuSMLMA1rBCka7ziT14Is9iriTrqImO7p4Y5nh5VPuXBKc8gCvKXX9UqqYovH/LIT ZemS2g3iUz38bE2I3UEf4mpHtoWs7kgD9l9rXxf/6DZDdRyTLMmxQSmDPORlGjdlz/wj sruDVHeWGMdb75nggAU+xDdCUmizOS6GQNj/jcAdhSgW2lKA+ZD5Dd4hgXY+/r2acOjW ZdYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745213816; x=1745818616; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sSA5b1FEsUGzIuKxMEGaepPxh4bbazOZcDDU8ZWSGNA=; b=EzsMo9Pda6e7+nnSqjVWk6CJfdiYGR72T2i5rKnvvE/u+1yZPu2nRNvoeMjFVc5Hiw CLfCP2OT440MmHp2t7lbt3mP4SxCTASflfZAWki1lG/AQFW1NYmhN1sr9vd9otl3CDcc zSgIUqbLtLeiU/YhIW5aKrnLizFlZDIqo43+URhyvlbNEvtUuZz03IXIvishG19M6mm+ YwG+Q5vQfrkiF9CSt3AvhlBd9ZNHbnwG/lYJ1sH6mjtRnAY26VVlN1X+fSAEpQdx4n04 S/YOii+nq0b/RCYNvH/PlTw8JiS7QiUmRkejvDcDMbprGyneicbaXN6wVwb+YnI6/sZx GxjQ== X-Forwarded-Encrypted: i=1; AJvYcCUsGq9voTadQ5sQxEoa3VLc4rXf/E8qQTvZNJB/sMs9sQV0b38c3r0Zy7ppKk6q53NEnzvw/qSHF+deBJ4=@vger.kernel.org X-Gm-Message-State: AOJu0Yyr9t5ryU+xpjxFqdFRZ5haUvkGf7JyQmab7xfcCBGk3hZ/kv91 2vYlYw//h7rV1sk/CseTPMr6nX1+KnyFOtvkItAQvR7fjbeW2/ew X-Gm-Gg: ASbGncuDY4i4S4Z3r7opHB30OYgQIO/Imx0oDW0jtyU1qmVbSVJb072x3lbmLPWKag+ F3Q6nnkbjWl9MIsjzoTJZ0EsqyhsGc9fIhL/zRRo2Re79p0x2wg/vjY2BtxftC2eJR54cjAcDZU WSDwzuIPMWZFFcvdG6wiasAO/m0LMbM00XWZ8MQVI3cQCmWkoXzd0Xhec9sbG3+OvYVgGheAO5y WWPOlR2MfbMGeSyrQ3KP3aGGbhCEfjUCmznd6WVomoJXKKimPukGFti1JoQM+uLfgb9E5zFm1QW uTu/Hcq8whG/vpV5MhcFaDhVbGVYaKp+NAA= X-Google-Smtp-Source: AGHT+IFdvPVdGt6bGKOTEAZd0BvJShuSbJm+7EE2v5LaJ6enDyDnKAh0CiwtMffaCxTIlWx67pF8CQ== X-Received: by 2002:a17:902:cf07:b0:220:f140:f7be with SMTP id d9443c01a7336-22c53601243mr174775625ad.41.1745213815840; Sun, 20 Apr 2025 22:36:55 -0700 (PDT) Received: from [127.0.1.1] ([2a0d:2683:c100::bf]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73dbf8beaf2sm5634270b3a.5.2025.04.20.22.36.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Apr 2025 22:36:55 -0700 (PDT) From: Troy Mitchell Date: Mon, 21 Apr 2025 13:36:38 +0800 Subject: [PATCH 1/2] i2c: imx: use guard to take spinlock Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250421-i2c-imx-update-v1-1-1137f1f353d5@gmail.com> References: <20250421-i2c-imx-update-v1-0-1137f1f353d5@gmail.com> In-Reply-To: <20250421-i2c-imx-update-v1-0-1137f1f353d5@gmail.com> To: Oleksij Rempel , Pengutronix Kernel Team , Andi Shyti , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: linux-i2c@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Troy Mitchell , Yongchao Jia X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745213806; l=2404; i=troymitchell988@gmail.com; h=from:subject:message-id; bh=Set1fjuf1biaf2SuWAgg0znD5Dkrjnd4oyOs91sYddk=; b=tEP6aUtRbhbNcn6p9VRzN+spiIyigQUd5XmgAGlJJju83zFNFwP1FbHiog/EELaoE+7jIMtv1 HzZyFy6JtjXCJNVtNJGJRHL3XnOMgmh10UhQYJf2EgpnP3gz+4xhOf0 X-Developer-Key: i=troymitchell988@gmail.com; a=ed25519; pk=2spEMGBd/Wkpd36N1aD9KFWOk0aHrhVxZQt+jxLXVC0= Use guard to automatically release the lock after going out of scope instead of calling it manually. Co-developed-by: Yongchao Jia Signed-off-by: Yongchao Jia Signed-off-by: Troy Mitchell Reviewed-by: Frank Li --- drivers/i2c/busses/i2c-imx.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 9e5d454d8318..cb96a57df4a0 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -891,13 +892,13 @@ static enum hrtimer_restart i2c_imx_slave_timeout(struct hrtimer *t) struct imx_i2c_struct *i2c_imx = container_of(t, struct imx_i2c_struct, slave_timer); unsigned int ctl, status; - unsigned long flags; - spin_lock_irqsave(&i2c_imx->slave_lock, flags); + guard(spinlock_irqsave)(&i2c_imx->slave_lock); + status = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR); ctl = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR); i2c_imx_slave_handle(i2c_imx, status, ctl); - spin_unlock_irqrestore(&i2c_imx->slave_lock, flags); + return HRTIMER_NORESTART; } @@ -1125,30 +1126,27 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id) { struct imx_i2c_struct *i2c_imx = dev_id; unsigned int ctl, status; - unsigned long flags; - spin_lock_irqsave(&i2c_imx->slave_lock, flags); + guard(spinlock_irqsave)(&i2c_imx->slave_lock); + status = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR); ctl = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR); if (status & I2SR_IIF) { i2c_imx_clear_irq(i2c_imx, I2SR_IIF); + if (i2c_imx->slave) { if (!(ctl & I2CR_MSTA)) { irqreturn_t ret; - ret = i2c_imx_slave_handle(i2c_imx, - status, ctl); - spin_unlock_irqrestore(&i2c_imx->slave_lock, - flags); - return ret; + return i2c_imx_slave_handle(i2c_imx, + status, ctl); } i2c_imx_slave_finish_op(i2c_imx); } - spin_unlock_irqrestore(&i2c_imx->slave_lock, flags); + return i2c_imx_master_isr(i2c_imx, status); } - spin_unlock_irqrestore(&i2c_imx->slave_lock, flags); return IRQ_NONE; } From patchwork Mon Apr 21 05:36:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Mitchell X-Patchwork-Id: 885184 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40814258CC1; Mon, 21 Apr 2025 05:37:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745213822; cv=none; b=JNWaZG/NY80fVaTo2HYl5G8nH4yP4vDJueL451FdDsSDEuKdQemCUmR766rWqql/ql5bF/PrEYyOUtd+7niXKnnZJ5SISyQVPC73FMmCqY5TbsB8kZnSCo7LVB5uqwn70yL448IyeMEzBYi7JMLOK5+Oy5ohC8jwwNtwv3uHY6Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745213822; c=relaxed/simple; bh=qnDuboyg3uC3ZM73XxREV7nSTfV+BWdos5WixRH5ZSc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=e7aIDkSahPIZ86MxwPkIHoqWPQKEwoWhBXDYgXomw7Z47vvj2MKrjQUhmhvhKZzg5LDK1Z1+zpPqcTr7jK2ki5345MnCWflrcW7zf67SmMSOuuRB1COwKn/+eaFb/C44GbpRQFF7ukiUTZqJOp/rysY8OLgiPr2HwPJrzYlRgXw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gaJGJt7y; arc=none smtp.client-ip=209.85.210.196 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gaJGJt7y" Received: by mail-pf1-f196.google.com with SMTP id d2e1a72fcca58-7398d65476eso2885279b3a.1; Sun, 20 Apr 2025 22:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745213820; x=1745818620; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=qP16P958gYh46YoBLSFtpJ/M9EjZ/0g/N+HcV5FZKJ8=; b=gaJGJt7y8X/z8rpC6BxHyhsyLvydjfGPzoGZ5Tk89A+hYH01l7RYYj6lT6wkN0F0jN faYXo6cniHhG05/I8ELaZ0XVT7WaLT4+NzYTA6BLt57tor30Da2lYFA+4Mh/65SnIi8P dne8Jl703UCfxqaWSiLp/SsBPZUkG59IGxAosn2mA0wNzhp3YB86vC5tHkHXEgPfwaGh XB5soOkMmwJnGHB0Mk00fQrhkMuOqisHXWqFp4lAQhEyxqENfctt6LTCuyzILDJWLOoo +CAdFsb+QJGLGT/mSH3h79Aj/23G1i39yayqddtBuGnzM5BSNZdr+zu36D2OvmD+p/cN IBew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745213820; x=1745818620; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qP16P958gYh46YoBLSFtpJ/M9EjZ/0g/N+HcV5FZKJ8=; b=Juf6LKAOEPkZYD4s0xJf4JSRiVBxZwoqYIakYC9t+jmDFNEko/n9X5uZuWrMb/DnWK ZavquooIpCJzxm8nMYB7BHVXW636VzXK64vjqudwvkX8gOon54g+V923+xgCyX6lqA4z d250xn1/rOZ77u6cCRZZvSTQ+cSWy2lMGu6bnTaDd0P/WlLfLTVQ7i9dBjQCz6xo6ZR3 q7f+IygJs749t+tlifoSOE4J/gTc5TCAwsA0fkXLUqkw0g0vYIx7aSqdzBWFn0zfgVE1 H3/x8oPskcrDzFgbDkZTad+x4HeYM7p8Zy2tLA4+AbiZnX0XtJFXdnHYOKT1Kl1GMjA9 Xdag== X-Forwarded-Encrypted: i=1; AJvYcCWtf8r0EseWL0Qp4zNgIUM+5j7in8Fy5VI6bg/5+17VvWxSv4oIz1O9/c0TeydC25Imj6yxzeqlz50Ro28=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4jlt5vqB4xNtrvJZUvB+YgSM68hi4FpxRnZ2PafN8VGCbpE8q TLLNSy+X4uL0i90i5fGxoVQax3Hw9qu6zvkLVVkP/3TUxt9LGLkR X-Gm-Gg: ASbGncsXe+FCIvgX/UyBAegtANG0dH6660nRNMi+t+pthNoqm8emALklCd1DL+5Godf fbCwmSf5KfISasnc3hgYApquj5qTHef7GAo3yjpk/q84MOQry/plRgB2YwpFJBudlu7HhIBU6KQ bk5y6eJr0epIRvRbM478JeJCvNx6/QzJR+y6Y/2twr72VUNmo9c89cg1SdAGMJB3W29AEzB1Lk8 5HYdi4zpw4Ie02O8GPZeKuhPugTa5ydIILzH0SSHAy3SljbsqDNOhDqxXUrwFPrzdmjqlHXegh0 L4Q3J6BbpXfJjksDVWvtdfM/sOPvef7gLow= X-Google-Smtp-Source: AGHT+IGaq1j44bIV9U9aAP6Lw87+CebUioUl2IXpzgU4JKDPc1gVaozyiEZcGrmNCAOWX4YZqafxgA== X-Received: by 2002:a05:6a00:3905:b0:736:9f2e:1357 with SMTP id d2e1a72fcca58-73dc1b7d92cmr16890178b3a.12.1745213820426; Sun, 20 Apr 2025 22:37:00 -0700 (PDT) Received: from [127.0.1.1] ([2a0d:2683:c100::bf]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73dbf8beaf2sm5634270b3a.5.2025.04.20.22.36.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Apr 2025 22:37:00 -0700 (PDT) From: Troy Mitchell Date: Mon, 21 Apr 2025 13:36:39 +0800 Subject: [PATCH 2/2] i2c: imx: drop master prefix Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250421-i2c-imx-update-v1-2-1137f1f353d5@gmail.com> References: <20250421-i2c-imx-update-v1-0-1137f1f353d5@gmail.com> In-Reply-To: <20250421-i2c-imx-update-v1-0-1137f1f353d5@gmail.com> To: Oleksij Rempel , Pengutronix Kernel Team , Andi Shyti , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: linux-i2c@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Troy Mitchell , Yongchao Jia X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745213806; l=820; i=troymitchell988@gmail.com; h=from:subject:message-id; bh=qnDuboyg3uC3ZM73XxREV7nSTfV+BWdos5WixRH5ZSc=; b=9uDtFJOoouBVDqMeSweTMN8B5tBnbcf6uzO7/1YWRkgpM8iHl97fMt3EJ7tOaMIeXYzCFS9LS xyWr9Pns8uVDLFXmqfUey18aE+a/BSO9hELI++WhIAvbX4BdBLxZoq9 X-Developer-Key: i=troymitchell988@gmail.com; a=ed25519; pk=2spEMGBd/Wkpd36N1aD9KFWOk0aHrhVxZQt+jxLXVC0= In light of the recent updates to the i2c subsystem, drop master prefix. Signed-off-by: Troy Mitchell --- drivers/i2c/busses/i2c-imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index cb96a57df4a0..dd07fde79632 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -1690,8 +1690,8 @@ static u32 i2c_imx_func(struct i2c_adapter *adapter) } static const struct i2c_algorithm i2c_imx_algo = { - .master_xfer = i2c_imx_xfer, - .master_xfer_atomic = i2c_imx_xfer_atomic, + .xfer = i2c_imx_xfer, + .xfer_atomic = i2c_imx_xfer_atomic, .functionality = i2c_imx_func, .reg_slave = i2c_imx_reg_slave, .unreg_slave = i2c_imx_unreg_slave,