Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Zhipeng Wang <zhipeng.wang_1@nxp.com>
To:     wsa@kernel.org
Cc:     linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] i2c: core: Disable i2c_generic_scl_recovery callback checks with CFI
Date:   Tue, 28 Jun 2022 10:41:55 +0800
Message-Id: <20220628024155.2135990-1-zhipeng.wang_1@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AL+wcdk4aJjXVLMKomHbE7c/zNYb3ugmicnDlFPeMbPnyh74mFjOWZo5FMov?=
 =?us-ascii?Q?wvfpQOewxaZ81D/cV70e9wL/v/mhhQInut6UBB+4wIiup2knPSz5SOQqI85y?=
 =?us-ascii?Q?RhWuShwAqQnO8BvBhG+xKSjcVZJOriQKu+y832HHHc1a8wJAmOOH1NFa1npx?=
 =?us-ascii?Q?RPqjxqBUJhrR3FXk8iHEXqhcBpOn3ZiNL+KubE9SNzcZ1NOLiwjhznPTN2AO?=
 =?us-ascii?Q?WBvhOZ/bwSOWcfI/7hke8jcB/odEtds+q3xLhHfd4MCfd1ufds1T6lY0yBHK?=
 =?us-ascii?Q?QW2rjVVOJArcODOzK/1oXfZ3r+sP+k4XhLFVZTzLcAeJL1+6oexJdXi17nHT?=
 =?us-ascii?Q?KsVYqCE2dc/40NiAdepahGj7wuKml0JL4h7gZnZVMBDVxVAIMLviFX3NSQkg?=
 =?us-ascii?Q?7QDcasaXP9PwWW7rKzYqQ5FAasGQr2wBSMOeKIq5b75tch4UXk70MyDuNKg0?=
 =?us-ascii?Q?87WsYIszV4g6CgLLeYB48XpEvy+MZuamgBljzlYXsdDheECu7t8ogf9Ex5FJ?=
 =?us-ascii?Q?CR8iFqffeWFWpuwfAc1yZ9GbDv6iFZ05aez1V405AkXyACDD5ZfFLANMaEBQ?=
 =?us-ascii?Q?c2iaDnO2tlwm78Zbr6+JToqgUwwTFDQK0MYZpupY0bmdqxYbflQdok1GWGbW?=
 =?us-ascii?Q?xrqHAdywVnkuE1j76GTuR1AwI/KIejyZ+Y7yMgubBIoN3O9SOGTRYSjImvLS?=
 =?us-ascii?Q?X7unOuFSu6WojixP259ABxm4SjofK0zXLy7P6SgEnvIYOo1ZZtwGmcCU7HAX?=
 =?us-ascii?Q?zbWrzLRSCImhpuKPWDHcCBcbb5/lYln0sBaJ1QFv8y8/djdT261r0mzOabvk?=
 =?us-ascii?Q?Z4TkJXiHAS+/WMHizlt1iqrqkOO+fBBR3fw4Hi+XWiDTpj0jaJcvedhBoNTI?=
 =?us-ascii?Q?eZLMsznsZ74EaMXAzAmYGgLYyUDKJeDmz5CtPrPcEgfbijUfKwOMMtxbwAaB?=
 =?us-ascii?Q?E7f9YnK21v0un+1gVBwcnCm8glKaHhehaqUPRwiQ+JZ0rqLeREInJTsrFw33?=
 =?us-ascii?Q?Nur6HTj9GD57XH2cJcO9O/lLI8oZUG/rkACWDSwHueLUXbMwpFfKyQ7KOX21?=
 =?us-ascii?Q?KTXatAj4WmbsaJdbvaEVa28VUjVtl9pX5F6gNeWWZZEfNYvc54Ft6Ec83s3q?=
 =?us-ascii?Q?Q/PKva5X2uiy6JdV0H6eNq/zeKr/mbHAFCDQSXZy0wBSbUPtLHbN3RB0EWgt?=
 =?us-ascii?Q?OvQWjSfdKSIfPMUvp4bOoGLXDr//PC6k/glnmi0AJwXaJuznrJn8tXo5SWbj?=
 =?us-ascii?Q?yeQjL/eOwphJvApyPFVGM5VH1D1ovPu1a6G+wDRe/+8pZlvtKT6jJsJ7LD6I?=
 =?us-ascii?Q?KHXxA8feCuv+bo6VUK0MRPTV22N5vZgh9H70GuIeVbk1zKFTUJN+CL2lfBch?=
 =?us-ascii?Q?8vgLsoQczNsjimDAXB/TJklxt2CEI5JC7BryefNawFLUvrCNRDWIrxWBwkvK?=
 =?us-ascii?Q?D0Tlg0NK/a1yT5eo2bls4pD3WPeDHJA2tDd3RNkEBWb2ALrFfYa0RQc5PYIf?=
 =?us-ascii?Q?zeTYpxEl9BVJWuHpE4AHhfik7Tc4bHgHCQ8XqKG96SYI46CYL6K2RX0Hn+se?=
 =?us-ascii?Q?W3F/Miahxa/JAM7kSFRmmiC+rBo8QEhCUM20/wsTMjGYkTeCyYVRKTFnoldE?=
 =?us-ascii?Q?Mw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5141d08f-b66a-4765-320d-08da58afcf50
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8304.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 02:42:14.9818
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: wpHGvmOu1onbG5yJFXuudSphI008MsVQ6b2xos9kpVIJh9w2WuMs8zonYlUMj6f+qtQ0sCcnaerBT4bVmXiGyg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6963
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

CONFIG_CFI_CLANG breaks cross-module function address equality, which
breaks i2c_generic_scl_recovery as it compares a locally taken function
address to a one passed from a different module. Remove these sanity
checks for now.

Trigger I2C recovery through SCL connection LOW.

[    2.452853] Kernel panic - not syncing: CFI failure (target: 0x0)
[    2.476964] Call trace:
[    2.480104] dump_backtrace.cfi_jt+0x0/0x8
[    2.484909] dump_stack_lvl+0x80/0xb8
[    2.489273] panic+0x180/0x444
[    2.489282] find_check_fn+0x0/0x218
[    2.500079] i2c_generic_scl_recovery+0x390/0x400
[    2.509573] i2c_recover_bus+0x3c/0x84
[    2.509582] i2c_imx_xfer_common+0x60/0xd50 [i2c_imx]
[    2.521005] i2c_imx_xfer+0x1ac/0x3ec [i2c_imx]
[    2.531196] __i2c_transfer+0x2b8/0x910
[    2.531208] i2c_transfer+0xd8/0x1cc
[    2.531216] regmap_i2c_write+0x54/0xa4

Signed-off-by: Zhipeng Wang <zhipeng.wang_1@nxp.com>
---
 drivers/i2c/i2c-core-base.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index d43db2c3876e..87bca6d8514b 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -334,7 +334,8 @@ static int i2c_gpio_init_generic_recovery(struct i2c_adapter *adap)
 	 * don't touch the recovery information if the driver is not using
 	 * generic SCL recovery
 	 */
-	if (bri->recover_bus && bri->recover_bus != i2c_generic_scl_recovery)
+	if (bri->recover_bus && bri->recover_bus != i2c_generic_scl_recovery &&
+	    !(IS_ENABLED(CONFIG_CFI_CLANG) && IS_ENABLED(CONFIG_MODULES)))
 		return 0;
 
 	/*
@@ -415,7 +416,8 @@ static int i2c_init_recovery(struct i2c_adapter *adap)
 		goto err;
 	}
 
-	if (bri->scl_gpiod && bri->recover_bus == i2c_generic_scl_recovery) {
+	if (bri->scl_gpiod && (bri->recover_bus == i2c_generic_scl_recovery ||
+	    (IS_ENABLED(CONFIG_CFI_CLANG) && IS_ENABLED(CONFIG_MODULES)))) {
 		bri->get_scl = get_scl_gpio_value;
 		bri->set_scl = set_scl_gpio_value;
 		if (bri->sda_gpiod) {
@@ -424,7 +426,8 @@ static int i2c_init_recovery(struct i2c_adapter *adap)
 			if (gpiod_get_direction(bri->sda_gpiod) == 0)
 				bri->set_sda = set_sda_gpio_value;
 		}
-	} else if (bri->recover_bus == i2c_generic_scl_recovery) {
+	} else if (bri->recover_bus == i2c_generic_scl_recovery ||
+	    (IS_ENABLED(CONFIG_CFI_CLANG) && IS_ENABLED(CONFIG_MODULES))) {
 		/* Generic SCL recovery */
 		if (!bri->set_scl || !bri->get_scl) {
 			err_str = "no {get|set}_scl() found";
-- 
2.25.1