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 X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFE2BC47083 for ; Wed, 2 Jun 2021 16:49:27 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 774A061A36 for ; Wed, 2 Jun 2021 16:49:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 774A061A36 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E40406E0A6; Wed, 2 Jun 2021 16:49:26 +0000 (UTC) Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2F4B6E0A6; Wed, 2 Jun 2021 16:49:25 +0000 (UTC) Received: by mail-pj1-x1032.google.com with SMTP id l23-20020a17090a0717b029016ae774f973so1495824pjl.1; Wed, 02 Jun 2021 09:49:25 -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=y93PyBWiX9T4fVaYbqL1PL4Vs5/tKflWEP5FMSYoi74=; b=KCn3ESFyQZHxobIfkg3xhpJSrDW16XjKJ/fDxGo7guGgZUjCdanOaRHsGOtW91LUIK WIGz6UW/OhhNgue+Yf0Xdp1LK5EJm16MMd+yr+ZMP+PY2uAqumY+th6XSQqBfqpyUGT/ ogb7vcJ2wOeUxau+ZAIQdPkPKjdAinIVFHvcjDzGVOnZsZsmZx7YuEr2xhV5xn3vmSv4 vhN6XgmZR8QsIDVmbeQKpzmtbeMvXY87brGKKXx2jIYg4rYvaPtAu+MHU4PWeIMzJ6SN BcblGy7n0VeJ9Dgd6B8qs5zwHZxfKbsDgGsDjyFgojiwXKig/Da61u/sZW4MZy/soZPY CXuA== 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=y93PyBWiX9T4fVaYbqL1PL4Vs5/tKflWEP5FMSYoi74=; b=Sf9CrtibzeVZhUVqL+2rdz/1ZcOX9NbPdKyraNj9tEEJWShzzXp/PmQQGQyyPzHEaO DTt2IKF0VbsV+/8YZVJvhjovZh6GfVH7qOmPpqCqflI6Q9/kJptXsnFrkdFcj/7Js67h rCZZ8ZQMUrRl9fxlDckU49LCH4uMQYcwvWtmW3v0FGncxOOY8NO4VU9VmH7mXzSe0WVG V2oFqz4CbGiQJPFg8O7SpwfrCnaCUoEBXlZXNedMJDqaDYhp6KaehhThhsk9f+r3NdkQ Y5tk2U3SoW+cktA5xH16flB+aLIfAg5FfPC/qHFHymQ7DBdpT3E1l5t3ZLNI1+4b0Gc1 0uGA== X-Gm-Message-State: AOAM532dWtFc9PjQKD/tRuCKstsJr/cBUR3v7e1zsOY4FLzwQIEeCSQr /kQovKk0RO8Js7rrhKlU/CAvElC+a+Mv5fzR X-Google-Smtp-Source: ABdhPJxfv0BXHqo8MWWsEtUhi2Oy1PldNa2hrafNv/QLMkM2vfMSO20e1U11gvjznblyTVjICttw+A== X-Received: by 2002:a17:90a:fa95:: with SMTP id cu21mr292230pjb.210.1622652564566; Wed, 02 Jun 2021 09:49:24 -0700 (PDT) Received: from localhost (c-73-25-156-94.hsd1.or.comcast.net. [73.25.156.94]) by smtp.gmail.com with ESMTPSA id x193sm166388pfd.54.2021.06.02.09.49.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 09:49:23 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [RESEND PATCH v4 0/6] iommu/arm-smmu: adreno-smmu page fault handling Date: Wed, 2 Jun 2021 09:52:43 -0700 Message-Id: <20210602165313.553291-1-robdclark@gmail.com> X-Mailer: git-send-email 2.31.1 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: Konrad Dybcio , Akhil P Oommen , open list , Iskren Chernev , AngeloGioacchino Del Regno , Marijn Suijten , Lee Jones , Rob Clark , Sai Prakash Ranjan , Jonathan Marek , Will Deacon , Zhenzhong Duan , Joerg Roedel , linux-arm-msm@vger.kernel.org, Sharat Masetty , Krishna Reddy , Bjorn Andersson , "moderated list:ARM SMMU DRIVERS" , Jordan Crouse , Robin Murphy , Douglas Anderson , "open list:IOMMU DRIVERS" , "Kristian H. Kristensen" , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Rob Clark (Resend, first attempt seems to not have entirely shown up in patchwork and had a random already merged patch tagging along because 00*patch picks up things I forgot to delete) This picks up an earlier series[1] from Jordan, and adds additional support needed to generate GPU devcore dumps on iova faults. Original description: This is a stack to add an Adreno GPU specific handler for pagefaults. The first patch starts by wiring up report_iommu_fault for arm-smmu. The next patch adds a adreno-smmu-priv function hook to capture a handful of important debugging registers such as TTBR0, CONTEXTIDR, FSYNR0 and others. This is used by the third patch to print more detailed information on page fault such as the TTBR0 for the pagetable that caused the fault and the source of the fault as determined by a combination of the FSYNR1 register and an internal GPU register. This code provides a solid base that we can expand on later for even more extensive GPU side page fault debugging capabilities. v4: [Rob] Add support to stall SMMU on fault, and let the GPU driver resume translation after it has had a chance to snapshot the GPUs state v3: Always clear FSR even if the target driver is going to handle resume v2: Fix comment wording and function pointer check per Rob Clark [1] https://lore.kernel.org/dri-devel/20210225175135.91922-1-jcrouse@codeaurora.org/ Jordan Crouse (3): iommu/arm-smmu: Add support for driver IOMMU fault handlers iommu/arm-smmu-qcom: Add an adreno-smmu-priv callback to get pagefault info drm/msm: Improve the a6xx page fault handler Rob Clark (3): iommu/arm-smmu-qcom: Add stall support drm/msm: Add crashdump support for stalled SMMU drm/msm: devcoredump iommu fault support drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 9 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 101 +++++++++++++++++++- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 43 +++++++-- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 15 +++ drivers/gpu/drm/msm/msm_debugfs.c | 2 +- drivers/gpu/drm/msm/msm_gem.h | 1 + drivers/gpu/drm/msm/msm_gem_submit.c | 1 + drivers/gpu/drm/msm/msm_gpu.c | 55 ++++++++++- drivers/gpu/drm/msm/msm_gpu.h | 19 +++- drivers/gpu/drm/msm/msm_gpummu.c | 5 + drivers/gpu/drm/msm/msm_iommu.c | 22 ++++- drivers/gpu/drm/msm/msm_mmu.h | 5 +- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 50 ++++++++++ drivers/iommu/arm/arm-smmu/arm-smmu.c | 9 +- drivers/iommu/arm/arm-smmu/arm-smmu.h | 2 + include/linux/adreno-smmu-priv.h | 38 +++++++- 20 files changed, 354 insertions(+), 31 deletions(-) -- 2.31.1