From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 808E3C433F5 for ; Thu, 25 Nov 2021 18:01:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D2E86E4B3; Thu, 25 Nov 2021 18:01:28 +0000 (UTC) Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by gabe.freedesktop.org (Postfix) with ESMTPS id 973416E47E for ; Thu, 25 Nov 2021 18:01:26 +0000 (UTC) Received: by mail-lf1-x12c.google.com with SMTP id u3so18203904lfl.2 for ; Thu, 25 Nov 2021 10:01:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SFDYhbUXRUnl8RVLcdnDyb/qQg3YCf4mUE9v2IePhnw=; b=f7j4BJ72YuuZychwEiGmKO/m7G3mDjsdgrIuuofBYW3MaP2ZjzXVQolXyqBTVnNVMQ u3yBOGY/VSgjC11xOb74ddG2UZcSOyIKKmPQqj+vkJv/pEOZcfAxpfIPIZEj37e67RmZ D4ag/PnG8s+ifpQPStx7HjYS+OCpFpqrkTnpuy1PLLx0GfUlN2yYaAlJt/4ycYrmnfRf NZMBwzIThYMFyNe2/J3vKU1b9Jfemf2HWSXJ9IacmckedKcR9DBXcYRGecMyPm2wzzqV 9Vs0AArLU8WsER4YXyqjtEgSedcih9jaCMZBTAWXnxobEdODowweYceynD6+cMLDP66E z/Qw== 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:mime-version :content-transfer-encoding; bh=SFDYhbUXRUnl8RVLcdnDyb/qQg3YCf4mUE9v2IePhnw=; b=bubPHiQAJq/h26K8b+Gze2MUixS4g0QHSVEv2RktjiJbd/7CquDgQuFWLERnoNVtPe lyX1WL/26ZrBL7vTwkyMKCKKTT43ruCpxhnC8NmMw8n606ddsQMrcH8T+rFG8VXZC+Ve CpwjNGN5S20HSpcqTRjZCIPk36uAkUhDB0lZO7yiDbI6wEkv5cyWPNux8DDxdnRoBo81 h7HNcu5ksIt/os16lMzVQBJFb+CZJFOV6TVKUunbup95qS8JmkpUva1+kUv+2XKhMjBE nQ1+hMKMWicDSNBW0U/qb8gdF+B/44/NJj4GLJJJymvPPX9rj+YOhEGnx32VpzYRA3HL aaOA== X-Gm-Message-State: AOAM531yj1v8vjn0Mc4RS/QZGaLl9R12cTvk75Kh6uwZV3lVu7HFdzdZ V6cEDXqpXksd6XqPYra8AVdbEw== X-Google-Smtp-Source: ABdhPJyRuckOwtMrSjq9tBl3kD1pENn39rAf7gD2GpUQfZ02pkJanj+ft+iPWuiZn0AAMy8mGdvPfA== X-Received: by 2002:ac2:5091:: with SMTP id f17mr25393236lfm.206.1637863284691; Thu, 25 Nov 2021 10:01:24 -0800 (PST) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id t22sm286111ljg.83.2021.11.25.10.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 10:01:24 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Subject: [PATCH] drm/msm/dpu: fix exception in error path Date: Thu, 25 Nov 2021 21:01:23 +0300 Message-Id: <20211125180123.561305-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" In case of DPU probe failure, prevent the following NULL pointer exception: [ 3.976112] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000030 [ 3.984983] Mem abort info: [ 3.987800] ESR = 0x96000004 [ 3.990891] EC = 0x25: DABT (current EL), IL = 32 bits [ 3.996251] SET = 0, FnV = 0 [ 3.996254] EA = 0, S1PTW = 0 [ 3.996257] FSC = 0x04: level 0 translation fault [ 3.996260] Data abort info: [ 3.996262] ISV = 0, ISS = 0x00000004 [ 4.005229] CM = 0, WnR = 0 [ 4.028893] [0000000000000030] user address but active_mm is swapper [ 4.035305] Internal error: Oops: 96000004 [#1] SMP [ 4.040223] Modules linked in: [ 4.043317] CPU: 1 PID: 50 Comm: kworker/u16:2 Not tainted 5.16.0-rc1-00036-g6d4bafcbb015-dirty #166 [ 4.052518] Hardware name: Thundercomm Dragonboard 845c (DT) [ 4.058224] Workqueue: events_unbound deferred_probe_work_func [ 4.064105] pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 4.071124] pc : dpu_core_irq_uninstall+0x28/0x100 [ 4.075960] lr : dpu_core_irq_uninstall+0x24/0x100 [ 4.080793] sp : ffff80001057b990 [ 4.084138] x29: ffff80001057b990 x28: ffff7653c0a41c00 x27: ffff7653c0926480 [ 4.091330] x26: ffffb90d5d262ad0 x25: ffff7653c4b2e980 x24: ffff7653c0046080 [ 4.098520] x23: ffff7653c099a810 x22: ffff7653c5a65800 x21: ffff7653c5a65080 [ 4.105711] x20: ffff7653c5a65800 x19: ffff7653c0046080 x18: 0000000000000034 [ 4.112902] x17: 0000000000000038 x16: 0000000000000005 x15: 000000000000000c [ 4.120095] x14: 000000000000024c x13: ffff7653c2f90358 x12: 0000000000000000 [ 4.127287] x11: ffff7653c2f903b0 x10: 00000000000009c0 x9 : ffff80001057b180 [ 4.134477] x8 : ffff80001057b404 x7 : 0000000000000000 x6 : ffff7653c5a5f190 [ 4.141669] x5 : ffff80001057b890 x4 : 0000000000000000 x3 : ffff7653c5a5f0f4 [ 4.148859] x2 : ffff7653c2f50000 x1 : 0000000000000000 x0 : 0000000000000000 [ 4.156052] Call trace: [ 4.158525] dpu_core_irq_uninstall+0x28/0x100 [ 4.163004] dpu_irq_uninstall+0x10/0x20 [ 4.166963] msm_drm_uninit.isra.0+0xe0/0x1b0 [ 4.171353] msm_drm_bind+0x278/0x5f0 [ 4.175043] try_to_bring_up_master+0x164/0x1d0 [ 4.179610] __component_add+0xa0/0x170 [ 4.183482] component_add+0x14/0x20 [ 4.187086] dsi_dev_probe+0x1c/0x30 [ 4.190691] platform_probe+0x68/0xe0 [ 4.194382] really_probe.part.0+0x9c/0x30c [ 4.198601] __driver_probe_device+0x98/0x144 [ 4.202990] driver_probe_device+0x44/0x15c [ 4.207208] __device_attach_driver+0xb4/0x120 [ 4.211685] bus_for_each_drv+0x78/0xd0 [ 4.215549] __device_attach+0xdc/0x184 [ 4.219412] device_initial_probe+0x14/0x20 [ 4.223630] bus_probe_device+0x9c/0xa4 [ 4.227503] deferred_probe_work_func+0x88/0xc0 [ 4.232075] process_one_work+0x1e8/0x380 [ 4.236126] worker_thread+0x280/0x520 [ 4.239902] kthread+0x168/0x174 [ 4.243166] ret_from_fork+0x10/0x20 [ 4.246778] Code: f9442400 91004000 940188b9 f9430660 (b9403001) [ 4.252925] ---[ end trace b470a50cd7b5e606 ]--- Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c index d2b6dca487e3..fc1b6c47c93d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c @@ -575,6 +575,9 @@ void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms) { int i; + if (!dpu_kms->hw_intr) + return; + pm_runtime_get_sync(&dpu_kms->pdev->dev); for (i = 0; i < dpu_kms->hw_intr->total_irqs; i++) if (!list_empty(&dpu_kms->hw_intr->irq_cb_tbl[i])) -- 2.33.0 From mboxrd@z Thu Jan 1 00:00:00 1970 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 150D9C433F5 for ; Thu, 25 Nov 2021 18:07:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231387AbhKYSKm (ORCPT ); Thu, 25 Nov 2021 13:10:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347878AbhKYSIl (ORCPT ); Thu, 25 Nov 2021 13:08:41 -0500 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ED37C0613B7 for ; Thu, 25 Nov 2021 10:01:26 -0800 (PST) Received: by mail-lf1-x12b.google.com with SMTP id b40so18165061lfv.10 for ; Thu, 25 Nov 2021 10:01:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SFDYhbUXRUnl8RVLcdnDyb/qQg3YCf4mUE9v2IePhnw=; b=f7j4BJ72YuuZychwEiGmKO/m7G3mDjsdgrIuuofBYW3MaP2ZjzXVQolXyqBTVnNVMQ u3yBOGY/VSgjC11xOb74ddG2UZcSOyIKKmPQqj+vkJv/pEOZcfAxpfIPIZEj37e67RmZ D4ag/PnG8s+ifpQPStx7HjYS+OCpFpqrkTnpuy1PLLx0GfUlN2yYaAlJt/4ycYrmnfRf NZMBwzIThYMFyNe2/J3vKU1b9Jfemf2HWSXJ9IacmckedKcR9DBXcYRGecMyPm2wzzqV 9Vs0AArLU8WsER4YXyqjtEgSedcih9jaCMZBTAWXnxobEdODowweYceynD6+cMLDP66E z/Qw== 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:mime-version :content-transfer-encoding; bh=SFDYhbUXRUnl8RVLcdnDyb/qQg3YCf4mUE9v2IePhnw=; b=RfkuZgN8Pwp9397hrIqHlKazye7q80OdgKYO8sEd4CgCfxmmyMzENxGcOSKLASudIO xpr0+yKyacZx4Fsu+GYlqEq8Yz8RHH424p3ZiHUoo4FR0DNzjULxXRPJkIiUxV1UU9Gz NUe35jjpQ6Tkn8tgwxi2gijs9UE/0EUbkGmQgiiQyQvr36jX9890FbnQLsmLM0/fAvYf 1oP4SZ95I95DWbbgD5hYq35YOUJmOprUg3moc+pyZHORne/bclt7GkFHQ7xGz3QP0Ljx lx5Zag+59G4CUKSrVPGDE5kbBz+NZPQu3OIyMaNUa75x1hCfI1mjkEwJ5Qu8TYSRmLIO pfhw== X-Gm-Message-State: AOAM5318jZXkrfkf1KHg17RViwrA3EfXdR4p7gciM0L4MbowhQgNRcB/ z0Kq23j99Le9t/3yINUoe5asgg== X-Google-Smtp-Source: ABdhPJyRuckOwtMrSjq9tBl3kD1pENn39rAf7gD2GpUQfZ02pkJanj+ft+iPWuiZn0AAMy8mGdvPfA== X-Received: by 2002:ac2:5091:: with SMTP id f17mr25393236lfm.206.1637863284691; Thu, 25 Nov 2021 10:01:24 -0800 (PST) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id t22sm286111ljg.83.2021.11.25.10.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 10:01:24 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar Cc: Stephen Boyd , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH] drm/msm/dpu: fix exception in error path Date: Thu, 25 Nov 2021 21:01:23 +0300 Message-Id: <20211125180123.561305-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org In case of DPU probe failure, prevent the following NULL pointer exception: [ 3.976112] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000030 [ 3.984983] Mem abort info: [ 3.987800] ESR = 0x96000004 [ 3.990891] EC = 0x25: DABT (current EL), IL = 32 bits [ 3.996251] SET = 0, FnV = 0 [ 3.996254] EA = 0, S1PTW = 0 [ 3.996257] FSC = 0x04: level 0 translation fault [ 3.996260] Data abort info: [ 3.996262] ISV = 0, ISS = 0x00000004 [ 4.005229] CM = 0, WnR = 0 [ 4.028893] [0000000000000030] user address but active_mm is swapper [ 4.035305] Internal error: Oops: 96000004 [#1] SMP [ 4.040223] Modules linked in: [ 4.043317] CPU: 1 PID: 50 Comm: kworker/u16:2 Not tainted 5.16.0-rc1-00036-g6d4bafcbb015-dirty #166 [ 4.052518] Hardware name: Thundercomm Dragonboard 845c (DT) [ 4.058224] Workqueue: events_unbound deferred_probe_work_func [ 4.064105] pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 4.071124] pc : dpu_core_irq_uninstall+0x28/0x100 [ 4.075960] lr : dpu_core_irq_uninstall+0x24/0x100 [ 4.080793] sp : ffff80001057b990 [ 4.084138] x29: ffff80001057b990 x28: ffff7653c0a41c00 x27: ffff7653c0926480 [ 4.091330] x26: ffffb90d5d262ad0 x25: ffff7653c4b2e980 x24: ffff7653c0046080 [ 4.098520] x23: ffff7653c099a810 x22: ffff7653c5a65800 x21: ffff7653c5a65080 [ 4.105711] x20: ffff7653c5a65800 x19: ffff7653c0046080 x18: 0000000000000034 [ 4.112902] x17: 0000000000000038 x16: 0000000000000005 x15: 000000000000000c [ 4.120095] x14: 000000000000024c x13: ffff7653c2f90358 x12: 0000000000000000 [ 4.127287] x11: ffff7653c2f903b0 x10: 00000000000009c0 x9 : ffff80001057b180 [ 4.134477] x8 : ffff80001057b404 x7 : 0000000000000000 x6 : ffff7653c5a5f190 [ 4.141669] x5 : ffff80001057b890 x4 : 0000000000000000 x3 : ffff7653c5a5f0f4 [ 4.148859] x2 : ffff7653c2f50000 x1 : 0000000000000000 x0 : 0000000000000000 [ 4.156052] Call trace: [ 4.158525] dpu_core_irq_uninstall+0x28/0x100 [ 4.163004] dpu_irq_uninstall+0x10/0x20 [ 4.166963] msm_drm_uninit.isra.0+0xe0/0x1b0 [ 4.171353] msm_drm_bind+0x278/0x5f0 [ 4.175043] try_to_bring_up_master+0x164/0x1d0 [ 4.179610] __component_add+0xa0/0x170 [ 4.183482] component_add+0x14/0x20 [ 4.187086] dsi_dev_probe+0x1c/0x30 [ 4.190691] platform_probe+0x68/0xe0 [ 4.194382] really_probe.part.0+0x9c/0x30c [ 4.198601] __driver_probe_device+0x98/0x144 [ 4.202990] driver_probe_device+0x44/0x15c [ 4.207208] __device_attach_driver+0xb4/0x120 [ 4.211685] bus_for_each_drv+0x78/0xd0 [ 4.215549] __device_attach+0xdc/0x184 [ 4.219412] device_initial_probe+0x14/0x20 [ 4.223630] bus_probe_device+0x9c/0xa4 [ 4.227503] deferred_probe_work_func+0x88/0xc0 [ 4.232075] process_one_work+0x1e8/0x380 [ 4.236126] worker_thread+0x280/0x520 [ 4.239902] kthread+0x168/0x174 [ 4.243166] ret_from_fork+0x10/0x20 [ 4.246778] Code: f9442400 91004000 940188b9 f9430660 (b9403001) [ 4.252925] ---[ end trace b470a50cd7b5e606 ]--- Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c index d2b6dca487e3..fc1b6c47c93d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c @@ -575,6 +575,9 @@ void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms) { int i; + if (!dpu_kms->hw_intr) + return; + pm_runtime_get_sync(&dpu_kms->pdev->dev); for (i = 0; i < dpu_kms->hw_intr->total_irqs; i++) if (!list_empty(&dpu_kms->hw_intr->irq_cb_tbl[i])) -- 2.33.0