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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 D89A1C43217 for ; Wed, 22 Sep 2021 22:26:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C40FA611CA for ; Wed, 22 Sep 2021 22:26:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238291AbhIVW1o (ORCPT ); Wed, 22 Sep 2021 18:27:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238302AbhIVW1m (ORCPT ); Wed, 22 Sep 2021 18:27:42 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A99DC06175F; Wed, 22 Sep 2021 15:26:12 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id h3so4296171pgb.7; Wed, 22 Sep 2021 15:26:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G/zb0HSEtwt+TuMHQ23TE4WThN1tewxp8QdQarat10c=; b=IMGDv8ubtfUpAMuwcf3oxRLCRWUZ2KL/o71nRIj0mqJDBGor0+iBXo6iPgB68+3wPl G2ai7d1f/T0PH3JkT3cHSHTq/k9c+MPr+qq+WX0SSLgz+WdkVvB2IJPnFNgm3Ca3WZ8b Nsy61GteFFUOjko7X+TEsPIC7Bxz1EpPNJJg5Z1/P+8PZnWXyKMv/w7dEzYjkjnj/GaF i5CUhG9vGeLZNc/Jd3ByJbqysFz80Yw4bGAiZki3A/QKt6W2Tt0R+E+vvGArU0Xue0+q kEzC4InGpdfZfHr5NwK8z+Jh2cJm+POzCy+L/jrrwTFDc7firFRoAQQFOqoTh9C/oqII hyJg== 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=G/zb0HSEtwt+TuMHQ23TE4WThN1tewxp8QdQarat10c=; b=jMb5bFDF6lor0C78onRE+G0BXzubXk7PHMquMprKyRR7QmoFpzVfca4KIa5rCYEQZQ sBH6HVbBdQf1DX8eOWdGacGBuVPTs45VT5FNp5l8Ms/i43K07cL6JS8MIdC+UwGmxjrj XVl30G95dA/ZB/X0JSdYPteRVqmCSeEus2MuSjG1izTyQqnuVJ3OK2r7ImBMVxrHdpRh fX793TUcY7ZJKt82T2Axn8aFsLprm1P/MGEarUZgJ5jWavapL/mXbmaNROCECSvQ7uRF OwBQNjUdWhfcge+dXIRZeTb6CB1iitXOtWOe0dLcfgXXxKl1a+Xis2tfGHzE4hgKt2JQ FsEQ== X-Gm-Message-State: AOAM530mmnmQiEnX2Y9svBxPgGB+TQ3vHWv7DJm5JrrKBi5pGiOavMOB OfRKl7Ly1u1QZBEv+bkel+k= X-Google-Smtp-Source: ABdhPJyEaxrISg1ldQ3XTH74HWEYwS2LTHtSYOQ6mkIiBPEOwgUTxUANK6gqv131WSnaaXiHO1NVEw== X-Received: by 2002:a63:2b4b:: with SMTP id r72mr1120554pgr.57.1632349571580; Wed, 22 Sep 2021 15:26:11 -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 9sm7100234pjs.14.2021.09.22.15.26.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 15:26:10 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Rob Clark , Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Akhil P Oommen , Jonathan Marek , Sai Prakash Ranjan , Sharat Masetty , Douglas Anderson , Dave Airlie , Stephen Boyd , Konrad Dybcio , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/3] drm/msm: Show all smmu info for iova fault devcore dumps Date: Wed, 22 Sep 2021 15:30:22 -0700 Message-Id: <20210922223029.495772-3-robdclark@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210922223029.495772-1-robdclark@gmail.com> References: <20210922223029.495772-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Clark Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 25 +++++++++++++++++-------- drivers/gpu/drm/msm/msm_gpu.h | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 4ac652c35c43..f6a4dbef796b 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -1269,7 +1269,7 @@ static int a6xx_fault_handler(void *arg, unsigned long iova, int flags, void *da /* Turn off the hangcheck timer to keep it from bothering us */ del_timer(&gpu->hangcheck_timer); - gpu->fault_info.ttbr0 = info->ttbr0; + gpu->fault_info.smmu_info = *info; gpu->fault_info.iova = iova; gpu->fault_info.flags = flags; gpu->fault_info.type = type; diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 748665232d29..42e522a60623 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -685,19 +685,28 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state, adreno_gpu->rev.major, adreno_gpu->rev.minor, adreno_gpu->rev.patchid); /* - * If this is state collected due to iova fault, so fault related info + * If this is state collected due to iova fault, show fault related + * info * - * TTBR0 would not be zero, so this is a good way to distinguish + * TTBR0 would not be zero in this case, so this is a good way to + * distinguish */ - if (state->fault_info.ttbr0) { + if (state->fault_info.smmu_info.ttbr0) { const struct msm_gpu_fault_info *info = &state->fault_info; + const struct adreno_smmu_fault_info *smmu_info = &info->smmu_info; drm_puts(p, "fault-info:\n"); - drm_printf(p, " - ttbr0=%.16llx\n", info->ttbr0); - drm_printf(p, " - iova=%.16lx\n", info->iova); - drm_printf(p, " - dir=%s\n", info->flags & IOMMU_FAULT_WRITE ? "WRITE" : "READ"); - drm_printf(p, " - type=%s\n", info->type); - drm_printf(p, " - source=%s\n", info->block); + drm_printf(p, " - far: %.16llx\n", smmu_info->far); + drm_printf(p, " - ttbr0: %.16llx\n", smmu_info->ttbr0); + drm_printf(p, " - contextidr: %.8x\n", smmu_info->contextidr); + drm_printf(p, " - fsr: %.8x\n", smmu_info->fsr); + drm_printf(p, " - fsynr0: %.8x\n", smmu_info->fsynr0); + drm_printf(p, " - fsynr1: %.8x\n", smmu_info->fsynr1); + drm_printf(p, " - cbfrsynra: %.8x\n", smmu_info->cbfrsynra); + drm_printf(p, " - iova: %.16lx\n", info->iova); + drm_printf(p, " - dir: %s\n", info->flags & IOMMU_FAULT_WRITE ? "WRITE" : "READ"); + drm_printf(p, " - type: %s\n", info->type); + drm_printf(p, " - source: %s\n", info->block); } drm_printf(p, "rbbm-status: 0x%08x\n", state->rbbm_status); diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index e031c9b495ed..a7a5a53536a8 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -73,7 +73,7 @@ struct msm_gpu_funcs { /* Additional state for iommu faults: */ struct msm_gpu_fault_info { - u64 ttbr0; + struct adreno_smmu_fault_info smmu_info; unsigned long iova; int flags; const char *type; -- 2.31.1