From nobody Mon Jun 22 16:54:42 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 8B71EC433EF for ; Sat, 19 Mar 2022 15:09:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243394AbiCSPBN (ORCPT ); Sat, 19 Mar 2022 11:01:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235541AbiCSPBI (ORCPT ); Sat, 19 Mar 2022 11:01:08 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C3263F899 for ; Sat, 19 Mar 2022 07:59:47 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id pv16so22172375ejb.0 for ; Sat, 19 Mar 2022 07:59:46 -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=WEyYaX3ss9r/kr8FOOJcJqvmK49fnSer+w8wsSytnGc=; b=PH5S2GGLYXu8h65gw2tBfffBCVYm+EawPOnQKKB7cfw6gbdSnGBzcw0pBegBMS2jH8 pcTVrj15bEBoiDGLHOFeYNSv/qpvtBWx3Fo75MGP2yHVL++9QrhvPcCkpkD7tZgPdLJH BVulMoBVp1n4k5DfEu4eZiyoJStVTE5ghlhE0= 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=WEyYaX3ss9r/kr8FOOJcJqvmK49fnSer+w8wsSytnGc=; b=O6KSXf2BvEO4YI+cXlULC/SDnMYWchFwp5VdbazLq1hYWuatrMAw88gp3KhmPMzB2a Iu8sxi/X4EBrfpQbmisMx9ChfNO2/oyXv5pkJ8daf6OIGbxFeMOIcjMqfEwKvlYhi6pA fsm7bZ1zQj65C8iKxxcWXtqmyW7764bl5fokEcx6m/2oHSBE1g9fJgwQ0X+LR0PT8xYB FsGHxIrxn/a0Bu45mwsURwfM4/6lxtBwUvdrG2Q8vPcodctwQSXJ/b2ejbYSIe8EfO2V 9uKjVadiY3nErYanfpPSF2NpdPGvgz90w/NskPCL7xwSyV1tsfWQQCPLW+aILJT3AUrY 8PfQ== X-Gm-Message-State: AOAM533pkGoHuBH1yYzkDV4UevB1ntbE0SrIE+8GJ1LBXfgAEiyp5xCO fRXp3Eshqcp5bAn2gniQV/UXMg== X-Google-Smtp-Source: ABdhPJyAIRg+IHtOqAPn/Pvh3MaMvaYOEtrnwfOy+2azy5QQsr5c3FRifBkBizPn4h+pBjijahzpzA== X-Received: by 2002:a17:906:2991:b0:6cf:1fd4:39a3 with SMTP id x17-20020a170906299100b006cf1fd439a3mr13474185eje.21.1647701985578; Sat, 19 Mar 2022 07:59:45 -0700 (PDT) Received: from capella.. (80.71.142.18.ipv4.parknet.dk. [80.71.142.18]) by smtp.gmail.com with ESMTPSA id m25-20020a170906161900b006d43be5b95fsm4923329ejd.118.2022.03.19.07.59.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Mar 2022 07:59:45 -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 1/2] drm: bridge: adv7511: fix CEC power down control register offset Date: Sat, 19 Mar 2022 15:59:38 +0100 Message-Id: <20220319145939.978087-2-alvin@pqrs.dk> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220319145939.978087-1-alvin@pqrs.dk> References: <20220319145939.978087-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 --- 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 592ecfcf00ca..4e7cbaa9204f 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h @@ -386,10 +386,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 28d9becc939c..4ee7f2e911e3 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c @@ -303,7 +303,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); @@ -330,7 +330,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.35.1 From nobody Mon Jun 22 16:54:42 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 D2574C433FE for ; Sat, 19 Mar 2022 15:09:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243395AbiCSPBW (ORCPT ); Sat, 19 Mar 2022 11:01:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243388AbiCSPBK (ORCPT ); Sat, 19 Mar 2022 11:01:10 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80DBD3F8A1 for ; Sat, 19 Mar 2022 07:59:48 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id dr20so21732524ejc.6 for ; Sat, 19 Mar 2022 07:59:48 -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=fg/FC7rTkSBrpQLeEoI/22vMYZ74Ut8FqExEBGhMe9Y=; b=jNHQwy6T1MJqw1pnEKQGKmThOQZ60DjOWNlyf2lzM1k3ATrWmoJqUZbCUu7PWTfMLP Qk6RnFpKf0XnUKm8EQcW9WvgSYsMmYPv8/V07Ao9hAUIESJF0IazhDQ08Pn9OQayr0+h /wfBlhRjZ6Ft8eydGPCG19LCQSBRqf/m76b1Y= 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=fg/FC7rTkSBrpQLeEoI/22vMYZ74Ut8FqExEBGhMe9Y=; b=xMrh4MTbOozFl2WfcM2XBxpYyd114hR4eGL1FldDIX3S+4aac5Sbsb+fuoiaueGTTE JJKC89Y+m2k4Gtw2UwJEQ2QxRPijdTKIyf38H566xEhwpmizG56Dilmfhh080qUZUTE7 zyhxwEeDfORCg5FCY2VrMav0fgpsK1tKJn3TMWbeT/YGyIAolbQ26zgjaj11pQymy1Gm 2zPnihtXaKBUppY4kC8G6PVIraGFzxIkKlVUHA4Ikx8Yavw55jDmcyk6DqAgA1Gv9yEU 9K9noR40mwO8CIbq9qlsbS7qgVxwgq9U0JbDjx1CtBBk840rWYUg7hQg6W4YvDBGCBHS UivQ== X-Gm-Message-State: AOAM533+x5QZnOvo06mHkq9IOSxS+wl+riPFQrhm2qGyDjvD/Go/Ymxj QuP4PN1d7grARs6u7paLNfBctQ== X-Google-Smtp-Source: ABdhPJw1OKd8XArVKjZ70vpOivrILPfucl/uc2q1zTPldcqHTPSgvBV2RBifAceRfRUp0Y2kO2kQ8w== X-Received: by 2002:a17:906:c04d:b0:6b9:252:c51c with SMTP id bm13-20020a170906c04d00b006b90252c51cmr13431644ejb.470.1647701987008; Sat, 19 Mar 2022 07:59:47 -0700 (PDT) Received: from capella.. (80.71.142.18.ipv4.parknet.dk. [80.71.142.18]) by smtp.gmail.com with ESMTPSA id m25-20020a170906161900b006d43be5b95fsm4923329ejd.118.2022.03.19.07.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Mar 2022 07:59:46 -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 2/2] drm: bridge: adv7511: unregister cec i2c device after cec adapter Date: Sat, 19 Mar 2022 15:59:39 +0100 Message-Id: <20220319145939.978087-3-alvin@pqrs.dk> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220319145939.978087-1-alvin@pqrs.dk> References: <20220319145939.978087-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 --- 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 f8e5da148599..2628f1abe413 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -1314,9 +1314,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); @@ -1324,6 +1321,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.35.1