From nobody Wed Apr 29 09:34:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE830C43334 for ; Sun, 12 Jun 2022 14:49:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233468AbiFLOtY (ORCPT ); Sun, 12 Jun 2022 10:49:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234786AbiFLOtT (ORCPT ); Sun, 12 Jun 2022 10:49:19 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B12830554 for ; Sun, 12 Jun 2022 07:49:17 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id d14so4212548eda.12 for ; Sun, 12 Jun 2022 07:49:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pqrs.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZZYegJLBLKIFYA6731P7rWnnXUer1l3FN0VMP5JguwY=; b=FPXLILWZPGq7+yE5oU94gYNFh96HzpsKl+xzWHN+uwWHd4VyxnXpwpo/mj4VuZBrtD Tvg7JahnzUPnuHNGsBIpXKvCXDzm/3Vp7SaM9xq49uRA4P1vbNCzJkK9chsIpN2uL1qM 01+U5br4Xj3mvf1+QtPT++Musa0/OhMj07HLU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZZYegJLBLKIFYA6731P7rWnnXUer1l3FN0VMP5JguwY=; b=5n2fsrYbZr23JPH+lNCD9j2bn3LI+UpWGpYH8565XI7lDdMF8bHqIkcUockZOTPkRa ewhYMZ94w5w6ftPAfxC7wxci2qU3XYilMgB8pbwqIGGTRmG3+WbetzZJYFTAe8JmkBK7 Dx71V0GyoEgvLyXNoQwdnvMcr0wnJqPrsyu76up7tVpXXN5Q4IhGGii0IDjhQJhn+XOB ggSTEeBppFLxmPyY9WgdOJRqH0QZptGkg/r7Kr+SzhM6kSd2K+Fp3aNYyWic7c62xcFv eAXU0Uop0lnDTm+CvRkIK6BNFhWUuV58tJIeEMcQjkY0pv0PX1+cx7fTQWBEpnhpHyOK 6cjQ== X-Gm-Message-State: AOAM532vpbdNYHcN3xuPCNQT8wl5H8X9uMsklpic8tlqpVjCIq7As7Om 74MIuQV6qtns0cIIy74uUwe00A== X-Google-Smtp-Source: ABdhPJwrwWudy5n1gSRNpA4pV8YgeBNu8lNs+Ynkn3H26f6GqvaWiOLkI+WUyJSGNv4YS8RPuMGgdg== X-Received: by 2002:a50:fb99:0:b0:42d:e4fd:c368 with SMTP id e25-20020a50fb99000000b0042de4fdc368mr60703009edq.138.1655045355718; Sun, 12 Jun 2022 07:49:15 -0700 (PDT) Received: from localhost.localdomain (80.71.142.18.ipv4.parknet.dk. [80.71.142.18]) by smtp.gmail.com with ESMTPSA id cm20-20020a0564020c9400b004316f94ec4esm3257076edb.66.2022.06.12.07.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jun 2022 07:49:15 -0700 (PDT) From: =?UTF-8?q?Alvin=20=C5=A0ipraga?= To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Hans Verkuil , Archit Taneja Cc: =?UTF-8?q?Alvin=20=C5=A0ipraga?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND 1/2] drm: bridge: adv7511: fix CEC power down control register offset Date: Sun, 12 Jun 2022 16:48:53 +0200 Message-Id: <20220612144854.2223873-2-alvin@pqrs.dk> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220612144854.2223873-1-alvin@pqrs.dk> References: <20220612144854.2223873-1-alvin@pqrs.dk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alvin =C5=A0ipraga The ADV7511_REG_CEC_CTRL =3D 0xE2 register is part of the main register map - not the CEC register map. As such, we shouldn't apply an offset to the register address. Doing so will cause us to address a bogus register for chips with a CEC register map offset (e.g. ADV7533). Fixes: 3b1b975003e4 ("drm: adv7511/33: add HDMI CEC support") Signed-off-by: Alvin =C5=A0ipraga Reviewed-by: Robert Foss --- drivers/gpu/drm/bridge/adv7511/adv7511.h | 5 +---- drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bri= dge/adv7511/adv7511.h index 9e3bb8a8ee40..46ae6c0d9aa5 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h @@ -406,10 +406,7 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, = unsigned int irq1); #else static inline int adv7511_cec_init(struct device *dev, struct adv7511 *adv= 7511) { - unsigned int offset =3D adv7511->type =3D=3D ADV7533 ? - ADV7533_REG_CEC_OFFSET : 0; - - regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset, + regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, ADV7511_CEC_CTRL_POWER_DOWN); return 0; } diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c b/drivers/gpu/drm= /bridge/adv7511/adv7511_cec.c index 399f625a50c8..6d067fa54bea 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c @@ -347,7 +347,7 @@ int adv7511_cec_init(struct device *dev, struct adv7511= *adv7511) goto err_cec_alloc; } =20 - regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset, 0); + regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, 0); /* cec soft reset */ regmap_write(adv7511->regmap_cec, ADV7511_REG_CEC_SOFT_RESET + offset, 0x01); @@ -374,7 +374,7 @@ int adv7511_cec_init(struct device *dev, struct adv7511= *adv7511) dev_info(dev, "Initializing CEC failed with error %d, disabling CEC\n", ret); err_cec_parse_dt: - regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset, + regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, ADV7511_CEC_CTRL_POWER_DOWN); return ret =3D=3D -EPROBE_DEFER ? ret : 0; } --=20 2.36.1 From nobody Wed Apr 29 09:34:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC0BDC43334 for ; Sun, 12 Jun 2022 14:49:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237276AbiFLOtf (ORCPT ); Sun, 12 Jun 2022 10:49:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236089AbiFLOtU (ORCPT ); Sun, 12 Jun 2022 10:49:20 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11DE534B85 for ; Sun, 12 Jun 2022 07:49:19 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id u12so6566896eja.8 for ; Sun, 12 Jun 2022 07:49:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pqrs.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jc9EKbluzjQbPf5iJBQyy57Za56oj94XsJi9//DUTBs=; b=QAe6zVMMuPfsOQVPhxjW7XQINSyvokcP1UXdDMRe3lQrtwNAX48p8aTaJq+fVtUi2W tdKGv1ukA3ximfBZb+wbyixuIibc+PNndOgm0dQmTnezjVki/HaSY3bW2E63Ce9htt6q OyI2DQuX5UQ6ukHBMmmH6YcQHHH2f0dbWFjOM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jc9EKbluzjQbPf5iJBQyy57Za56oj94XsJi9//DUTBs=; b=DW8pkoa0Y7ZOokLQYBun1qPvj39KsT0hsjriMop/cXE6GeCyIhbVw4NBNGwqVun0mN 89RMHduuQRt3n1oDHxTbu+6GIUg94a9lYCk4KwtFk0UftbBHOHjKp1rhYbdSc4EePCGt KmTxEvnV3WI80yOO1TXftzY/g1QH5IRF8v72jLYoXTxL50TvJBUfJffdH+uLXs5qYTa5 NrlB5aTJIzPFnGjqrNqXALnR2MMgn35Xz+yyemxSIk2eGx377xvLB+2EfL2RBDuF8uNK pF/uTrDLZdGP9txnCCJR120fvdXsfFmQGBTUseErid8vMsRN/jF+spJ5vJ+Ieu//towq Oxww== X-Gm-Message-State: AOAM531s1ylsB+yZjvgT04m3Eg6hUrSXjGCoWVBimlkSWCeYVowic1mv XATFLsHt2KMjWlymPcGrrIIbWQ== X-Google-Smtp-Source: ABdhPJyvv3bZy0x8EdZVGn713v6ewfo8zGpqATwhEb2GGbMj9l6HERl46xAPhCd2QbNHUwuDFardFg== X-Received: by 2002:a17:907:da2:b0:711:f408:f098 with SMTP id go34-20020a1709070da200b00711f408f098mr20945715ejc.208.1655045357616; Sun, 12 Jun 2022 07:49:17 -0700 (PDT) Received: from localhost.localdomain (80.71.142.18.ipv4.parknet.dk. [80.71.142.18]) by smtp.gmail.com with ESMTPSA id cm20-20020a0564020c9400b004316f94ec4esm3257076edb.66.2022.06.12.07.49.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jun 2022 07:49:17 -0700 (PDT) From: =?UTF-8?q?Alvin=20=C5=A0ipraga?= To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Archit Taneja , Hans Verkuil Cc: =?UTF-8?q?Alvin=20=C5=A0ipraga?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND 2/2] drm: bridge: adv7511: unregister cec i2c device after cec adapter Date: Sun, 12 Jun 2022 16:48:54 +0200 Message-Id: <20220612144854.2223873-3-alvin@pqrs.dk> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220612144854.2223873-1-alvin@pqrs.dk> References: <20220612144854.2223873-1-alvin@pqrs.dk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alvin =C5=A0ipraga cec_unregister_adapter() assumes that the underlying adapter ops are callable. For example, if the CEC adapter currently has a valid physical address, then the unregistration procedure will invalidate the physical address by setting it to f.f.f.f. Whence the following kernel oops observed after removing the adv7511 module: Unable to handle kernel execution of user memory at virtual address 000= 0000000000000 Internal error: Oops: 86000004 [#1] PREEMPT_RT SMP Call trace: 0x0 adv7511_cec_adap_log_addr+0x1ac/0x1c8 [adv7511] cec_adap_unconfigure+0x44/0x90 [cec] __cec_s_phys_addr.part.0+0x68/0x230 [cec] __cec_s_phys_addr+0x40/0x50 [cec] cec_unregister_adapter+0xb4/0x118 [cec] adv7511_remove+0x60/0x90 [adv7511] i2c_device_remove+0x34/0xe0 device_release_driver_internal+0x114/0x1f0 driver_detach+0x54/0xe0 bus_remove_driver+0x60/0xd8 driver_unregister+0x34/0x60 i2c_del_driver+0x2c/0x68 adv7511_exit+0x1c/0x67c [adv7511] __arm64_sys_delete_module+0x154/0x288 invoke_syscall+0x48/0x100 el0_svc_common.constprop.0+0x48/0xe8 do_el0_svc+0x28/0x88 el0_svc+0x1c/0x50 el0t_64_sync_handler+0xa8/0xb0 el0t_64_sync+0x15c/0x160 Code: bad PC value ---[ end trace 0000000000000000 ]--- Protect against this scenario by unregistering i2c_cec after unregistering the CEC adapter. Duly disable the CEC clock afterwards too. Fixes: 3b1b975003e4 ("drm: adv7511/33: add HDMI CEC support") Signed-off-by: Alvin =C5=A0ipraga Reviewed-by: Robert Foss --- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm= /bridge/adv7511/adv7511_drv.c index 5bb9300040dd..023c0ad132e0 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -1339,9 +1339,6 @@ static int adv7511_remove(struct i2c_client *i2c) { struct adv7511 *adv7511 =3D i2c_get_clientdata(i2c); =20 - i2c_unregister_device(adv7511->i2c_cec); - clk_disable_unprepare(adv7511->cec_clk); - adv7511_uninit_regulators(adv7511); =20 drm_bridge_remove(&adv7511->bridge); @@ -1349,6 +1346,8 @@ static int adv7511_remove(struct i2c_client *i2c) adv7511_audio_exit(adv7511); =20 cec_unregister_adapter(adv7511->cec_adap); + i2c_unregister_device(adv7511->i2c_cec); + clk_disable_unprepare(adv7511->cec_clk); =20 i2c_unregister_device(adv7511->i2c_packet); i2c_unregister_device(adv7511->i2c_edid); --=20 2.36.1