From patchwork Fri Mar 19 16:23:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 404820 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1519145jai; Fri, 19 Mar 2021 09:23:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyB4m/AlrJ87QtEW/N6VK71zQPkw2/YKsI3SJVUF1IluuBV1voDi/2+62wCu/g8MKENG8x X-Received: by 2002:a17:902:f547:b029:e4:6dbc:6593 with SMTP id h7-20020a170902f547b02900e46dbc6593mr14851423plf.4.1616171032102; Fri, 19 Mar 2021 09:23:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616171032; cv=none; d=google.com; s=arc-20160816; b=ZLaIYwO5xkCB+fYE9XI2P96F9/FAWajB+1u4nhhTaYWyTyQAkGaMwr6W0EGUzT7cN2 L4Mxy+hmczRz7SXSfFLsBqm4TppZDOQT+9JD0RjHlplDBYywp5sydRvSvCRw4lhlIHxs 3mKEOIOVBUSXe0xFPNDaB6phaaJIhz8T2+kVmjA7caUoj/3AP7Qe/F7Re1nbA99rbWtF 7ARv1x5SHDB0ItZvr3KvoJDe0WtHedHXRp/+68z9pcC7Xq0OXQyPSAXVTQsfiR3fsLVC 29jN4OrEqkCjjlFtNBaTxZZ3m6pnFXmJiwgnTORhkCCohBRzeES0uag8NORLheZFbg/I cGAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=di5dXlWluQPMCk8Oi0FFzccOYMs+5OKKZ3rKh5N+660=; b=V8k9ctAyGncXnH6CpSxTCTwXtU4rnNwO4R8Cb0LXFs2K1YVSICmuq4v3TA39msAjU/ P7MM3ComwklHuH0pdR1LDG2mM3zruL4MyOygjYP18cDKCoYHU7Z7bX1ca5sHhb09UXcz f5PwBgOLhSyNERAoekvVOlubtoXNPv03NSZ70fWzam3fGRX0nVSfP8BWwduixofW5TF/ N5lAY8CXga1g8p28ANr1ROycSP8C2orOyEaRUqHca+OxS/nS/zV8NGW5vSb4dU5kOrJY 8GaAnll0kBNc4fSf6oDJgYTCsqtBsbs+VRFYCEfduvoWVeEjmnMi0y0X5qKSz/3K4Ymw Vnvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HR6xOX9f; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id u11si6651831pgh.277.2021.03.19.09.23.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 09:23:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HR6xOX9f; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C714D6EA4B; Fri, 19 Mar 2021 16:23:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B6FD6EA4B for ; Fri, 19 Mar 2021 16:23:49 +0000 (UTC) Received: by mail-qt1-x835.google.com with SMTP id 94so7165616qtc.0 for ; Fri, 19 Mar 2021 09:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aszUJC90CIYB1lH8sFdFWvXkj7Wq32WHk+qZyraeSZM=; b=HR6xOX9fGemRQxWoRDxgJ6mcJfrXayVE3Ps/RATA85oL2vvG/0y5WPpIO9KdMlI5Yo 8dyiCnV+W2c/no9+cuGIvX4PDG4nk0d1JL8UHDor0/aAfiptlWCdH2jz5z0nm1uAGkaJ nKqf2E28mvrXR3sDTCeU3wt4IofN+vZorVVC70X4pzl5FJFHAvIns3mXww8nfegyTUxa xQkD03+0qe/rvSmuv+RixuCJdYC/RreKL0VGpE+cXP3LQp7gyWypD6Fqty2zTrhCn8XT Kuoo5lrigB2i4CF9tGZm5gBhIWyBJJ7VVIK4laQHiDQ+pIuBBtDTavcUnBUDZLtwHdgZ ybJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aszUJC90CIYB1lH8sFdFWvXkj7Wq32WHk+qZyraeSZM=; b=X516RY3rUAPcrDcwol4/bBF/EayqDC6JrogKKy1TCYQpsKk1EzZxIRJgO8eHZcF5pa +NrPr9+r4k1yT1oBEyF+ziydcEP7I8sSWLiUF6kSqGBRoIQW14SrCwEEIyc4BCciE02Y JZkqXONp0JPwz/NbsrJenCXZ2zDvfNAnYiZkUyAyuxSbx0lLbUvPlhYc9PjMoVL6fZY/ 41qKkcd9MndVVKCXrbhvahAJSQzwdJXuVQUHndzRgpd9qidhDLP8i/kYTKN/wyMU+cfM 7OsBgw7Yh3dFa8vSpWXXJmhBY6elMoTWC1RszPfJEqZcw/D9ssAxU9ImvBe6HsYf/O9D RtxA== X-Gm-Message-State: AOAM532FuCe6Dz93alLjdwrlYJJktH/OP3WvWJME60rMulmounmVFL2f nawkaEOqwjkANwOZHrRa0JI= X-Received: by 2002:ac8:7d42:: with SMTP id h2mr864558qtb.182.1616171028139; Fri, 19 Mar 2021 09:23:48 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:482:919:c165:89a3:1374:f96a]) by smtp.gmail.com with ESMTPSA id q65sm4722903qkb.51.2021.03.19.09.23.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 09:23:47 -0700 (PDT) From: Fabio Estevam To: robdclark@gmail.com Subject: [PATCH 1/2] drm/msm: fix shutdown hook in case GPU components failed to bind Date: Fri, 19 Mar 2021 13:23:32 -0300 Message-Id: <20210319162333.160421-1-festevam@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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: dmitry.baryshkov@linaro.org, sean@poorly.run, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Dmitry Baryshkov If GPU components have failed to bind, shutdown callback would fail with the following backtrace. Add safeguard check to stop that oops from happening and allow the board to reboot. [ 66.617046] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 [ 66.626066] Mem abort info: [ 66.628939] ESR = 0x96000006 [ 66.632088] EC = 0x25: DABT (current EL), IL = 32 bits [ 66.637542] SET = 0, FnV = 0 [ 66.640688] EA = 0, S1PTW = 0 [ 66.643924] Data abort info: [ 66.646889] ISV = 0, ISS = 0x00000006 [ 66.650832] CM = 0, WnR = 0 [ 66.653890] user pgtable: 4k pages, 48-bit VAs, pgdp=0000000107f81000 [ 66.660505] [0000000000000000] pgd=0000000100bb2003, p4d=0000000100bb2003, pud=0000000100897003, pmd=0000000000000000 [ 66.671398] Internal error: Oops: 96000006 [#1] PREEMPT SMP [ 66.677115] Modules linked in: [ 66.680261] CPU: 6 PID: 352 Comm: reboot Not tainted 5.11.0-rc2-00309-g79e3faa756b2 #38 [ 66.688473] Hardware name: Qualcomm Technologies, Inc. Robotics RB5 (DT) [ 66.695347] pstate: 60400005 (nZCv daif +PAN -UAO -TCO BTYPE=--) [ 66.701507] pc : msm_atomic_commit_tail+0x78/0x4e0 [ 66.706437] lr : commit_tail+0xa4/0x184 [ 66.710381] sp : ffff8000108f3af0 [ 66.713791] x29: ffff8000108f3af0 x28: ffff418c44337000 [ 66.719242] x27: 0000000000000000 x26: ffff418c40a24490 [ 66.724693] x25: ffffd3a842a4f1a0 x24: 0000000000000008 [ 66.730146] x23: ffffd3a84313f030 x22: ffff418c444ce000 [ 66.735598] x21: ffff418c408a4980 x20: 0000000000000000 [ 66.741049] x19: 0000000000000000 x18: ffff800010710fbc [ 66.746500] x17: 000000000000000c x16: 0000000000000001 [ 66.751954] x15: 0000000000010008 x14: 0000000000000068 [ 66.757405] x13: 0000000000000001 x12: 0000000000000000 [ 66.762855] x11: 0000000000000001 x10: 00000000000009b0 [ 66.768306] x9 : ffffd3a843192000 x8 : ffff418c44337000 [ 66.773757] x7 : 0000000000000000 x6 : 00000000a401b34e [ 66.779210] x5 : 00ffffffffffffff x4 : 0000000000000000 [ 66.784660] x3 : 0000000000000000 x2 : ffff418c444ce000 [ 66.790111] x1 : ffffd3a841dce530 x0 : ffff418c444cf000 [ 66.795563] Call trace: [ 66.798075] msm_atomic_commit_tail+0x78/0x4e0 [ 66.802633] commit_tail+0xa4/0x184 [ 66.806217] drm_atomic_helper_commit+0x160/0x390 [ 66.811051] drm_atomic_commit+0x4c/0x60 [ 66.815082] drm_atomic_helper_disable_all+0x1f4/0x210 [ 66.820355] drm_atomic_helper_shutdown+0x80/0x130 [ 66.825276] msm_pdev_shutdown+0x14/0x20 [ 66.829303] platform_shutdown+0x28/0x40 [ 66.833330] device_shutdown+0x158/0x330 [ 66.837357] kernel_restart+0x40/0xa0 [ 66.841122] __do_sys_reboot+0x228/0x250 [ 66.845148] __arm64_sys_reboot+0x28/0x34 [ 66.849264] el0_svc_common.constprop.0+0x74/0x190 [ 66.854187] do_el0_svc+0x24/0x90 [ 66.857595] el0_svc+0x14/0x20 [ 66.860739] el0_sync_handler+0x1a4/0x1b0 [ 66.864858] el0_sync+0x174/0x180 [ 66.868269] Code: 1ac020a0 2a000273 eb02007f 54ffff01 (f9400285) [ 66.874525] ---[ end trace 20dedb2a3229fec8 ]--- Fixes: 9d5cbf5fe46e ("drm/msm: add shutdown support for display platform_driver") Signed-off-by: Dmitry Baryshkov Signed-off-by: Fabio Estevam --- drivers/gpu/drm/msm/msm_drv.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.25.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 94525ac76d4e..fd2ac54caf9f 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1311,6 +1311,10 @@ static int msm_pdev_remove(struct platform_device *pdev) static void msm_pdev_shutdown(struct platform_device *pdev) { struct drm_device *drm = platform_get_drvdata(pdev); + struct msm_drm_private *priv = drm ? drm->dev_private : NULL; + + if (!priv || !priv->kms) + return; drm_atomic_helper_shutdown(drm); }