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 7A439EB64DA for ; Wed, 5 Jul 2023 21:10:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231794AbjGEVKB (ORCPT ); Wed, 5 Jul 2023 17:10:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231694AbjGEVKA (ORCPT ); Wed, 5 Jul 2023 17:10:00 -0400 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CD1419A0 for ; Wed, 5 Jul 2023 14:09:58 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2b6f97c7115so33920171fa.2 for ; Wed, 05 Jul 2023 14:09:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688591396; x=1691183396; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=qQvSSNt+Oh9F71EOb0ZIzoQjr8jzl5LvdL4NgPYdROE=; b=FfgCevcbp376tnzSeOaUWq6rR8mZnQmlTg9MfYlDSvMPEsBQ7aXwf3NgMCcfCof18e Gzx8436yJDkNHL2cTaLzFfOS9po7DLgXUXz4vxBQGDf4KYpk1gWtZpv/0kiPWSDOGesJ Qr/1VWRzuxad55xYWQybshEJkn7bGgVNW8Ok0eDNzy+dMRus7GyaP2LRuEaLHgV7IlWo KnNcDhBv0R1DgiZqYB/cn1FM0AHXyITZPSfCKymeMGpi/r4Mpzr6kMxQQ6TjHpR4lHE0 b0xEi0OwrdOmBT2+xUpH5+oGwzzhnNDyMHcbhaXHfUsyhOSARqkmC5+ZeHb6KSkHyXfR fmAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688591397; x=1691183397; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qQvSSNt+Oh9F71EOb0ZIzoQjr8jzl5LvdL4NgPYdROE=; b=LEnGGdkcXYKv6snZVUJJXvdkHrtv3iGKvACs8Pp2+UkrwutLFkUa7j+6Eawc6M/cRm tOnmCKCojRM+6B99rHo0gQIU3rtXnRCi5Bt+Q+5dfob53UmYJ9qpCml5bFjAeRUMYz18 HBZxftuz8A+jDIBbURntGCtfKbZ62urB8Joo25Vqtk2HWhxSRVq4lOH/0iXOljNZhQuT z2r2zJCD81slwT70LENBKjmI6WnGSAsKQzoP4SGIiNgjCQizTz+kO5lfFIc3K8MlaiCu Rx6cmsBVamn2quTaP5/cxyKsHfmobvHWLMj5z3cyPfFYe+yMdEXV+B7XfudvZ4Xaa/tD KXoQ== X-Gm-Message-State: ABy/qLZId7/Z0iCFnq8ZKs2hH5MzUYAa98t9EIP9Vx0bVwsNYTH+UgqB oZ7vqpIYAiF7bwQiYEZSCoCOng== X-Google-Smtp-Source: APBJJlGNBgGQU4a9Jb2/Cio7G2gxMhV4THrlVtwlL1698VOTPu2BShDNsT4cxxiDCK10+5vwELXZ4w== X-Received: by 2002:a2e:9c4a:0:b0:2b6:e958:5700 with SMTP id t10-20020a2e9c4a000000b002b6e9585700mr7383991ljj.4.1688591396568; Wed, 05 Jul 2023 14:09:56 -0700 (PDT) Received: from ?IPV6:2001:14ba:a0db:1f00::8a5? (dzdqv0yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::8a5]) by smtp.gmail.com with ESMTPSA id x19-20020a2e7c13000000b002b6d89fb6basm3224164ljc.109.2023.07.05.14.09.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Jul 2023 14:09:55 -0700 (PDT) Message-ID: Date: Thu, 6 Jul 2023 00:09:55 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v2 5/5] drm/msm/dpu: Update dev core dump to dump registers of sub-blocks Content-Language: en-GB To: Ryan McCann , Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter Cc: Rob Clark , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, quic_jesszhan@quicinc.com References: <20230622-devcoredump_patch-v2-0-9e90a87d393f@quicinc.com> <20230622-devcoredump_patch-v2-5-9e90a87d393f@quicinc.com> <857503f4-c828-3816-1bb0-5ee3567d63e0@quicinc.com> From: Dmitry Baryshkov In-Reply-To: <857503f4-c828-3816-1bb0-5ee3567d63e0@quicinc.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 05/07/2023 23:39, Ryan McCann wrote: > > > On 7/5/2023 1:22 PM, Dmitry Baryshkov wrote: >> On 05/07/2023 22:30, Ryan McCann wrote: >>> Currently, the device core dump mechanism does not dump registers of >>> sub-blocks within the DSPP, SSPP, DSC, and PINGPONG blocks. Edit >>> dpu_kms_mdp_snapshot function to account for sub-blocks. >>> >>> Signed-off-by: Ryan McCann >>> --- >>>   drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 106 >>> ++++++++++++++++++++++++-------- >>>   1 file changed, 82 insertions(+), 24 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >>> index aa8499de1b9f..c83f5d79e5c5 100644 >>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c >>> @@ -890,62 +890,120 @@ static void dpu_kms_mdp_snapshot(struct >>> msm_disp_state *disp_state, struct msm_k >>>       int i; >>>       struct dpu_kms *dpu_kms; >>>       const struct dpu_mdss_cfg *cat; >>> +    void __iomem *mmio; >>> +    u32 base; >>>       dpu_kms = to_dpu_kms(kms); >>>       cat = dpu_kms->catalog; >>> +    mmio = dpu_kms->mmio; >>>       pm_runtime_get_sync(&dpu_kms->pdev->dev); >>>       /* dump CTL sub-blocks HW regs info */ >>>       for (i = 0; i < cat->ctl_count; i++) >>> -        msm_disp_snapshot_add_block(disp_state, cat->ctl[i].len, >>> -                dpu_kms->mmio + cat->ctl[i].base, "ctl_%d", i); >>> +        msm_disp_snapshot_add_block(disp_state, cat->ctl[i].len, >>> mmio + cat->ctl[i].base, >>> +                        "%s", cat->ctl[i].name); >> >> This is not relevant to sub-blocks. If you wish to refactor the main >> block printing, please split it to a separate commit. > > Ok. I will split this commit into changes pertaining to sub-blocks and > changes to how the name of main blocks are printed. I would like to > print main block names as they appear in the catalog. Yes, please. >> >> Also, please note that `msm_disp_snapshot_add_block(...., "%s", >> block->name)` is redundant. We do not expect formatting characters in >> block names. So, "%s" can be dropped. > > Here, "%s" is used in order to print the the name of the main block from > the catalog. As mentioned above I can implement this in another commit. Dropping the extra "%s" will get the same result. >> >>>       /* dump DSPP sub-blocks HW regs info */ >>> -    for (i = 0; i < cat->dspp_count; i++) >>> -        msm_disp_snapshot_add_block(disp_state, cat->dspp[i].len, >>> -                dpu_kms->mmio + cat->dspp[i].base, "dspp_%d", i); >>> +    for (i = 0; i < cat->dspp_count; i++) { >>> +        base = cat->dspp[i].base; >>> +        msm_disp_snapshot_add_block(disp_state, cat->dspp[i].len, >>> mmio + base, "%s", >>> +                        cat->dspp[i].name); >>> + >>> +        if (cat->dspp[i].sblk && cat->dspp[i].sblk->pcc.len > 0) >>> +            msm_disp_snapshot_add_block(disp_state, >>> cat->dspp[i].sblk->pcc.len, >>> +                            mmio + base + cat->dspp[i].sblk->pcc.base, >>> +                            "%s_%s", cat->dspp[i].name, >>> +                            cat->dspp[i].sblk->pcc.name); >>> +    } >>> + >>>       /* dump INTF sub-blocks HW regs info */ >>>       for (i = 0; i < cat->intf_count; i++) >>> -        msm_disp_snapshot_add_block(disp_state, cat->intf[i].len, >>> -                dpu_kms->mmio + cat->intf[i].base, "intf_%d", i); >>> +        msm_disp_snapshot_add_block(disp_state, cat->intf[i].len, >>> mmio + cat->intf[i].base, >>> +                        "%s", cat->intf[i].name); >>>       /* dump PP sub-blocks HW regs info */ >>> -    for (i = 0; i < cat->pingpong_count; i++) >>> -        msm_disp_snapshot_add_block(disp_state, cat->pingpong[i].len, >>> -                dpu_kms->mmio + cat->pingpong[i].base, >>> "pingpong_%d", i); >>> +    for (i = 0; i < cat->pingpong_count; i++) { >>> +        base = cat->pingpong[i].base; >>> +        msm_disp_snapshot_add_block(disp_state, >>> cat->pingpong[i].len, mmio + base, "%s", >>> +                        cat->pingpong[i].name); >>> + >>> +        /* TE2 block has length of 0, so will not print it */ >>> + >>> +        if (cat->pingpong[i].sblk && >>> cat->pingpong[i].sblk->dither.len > 0) >>> +            msm_disp_snapshot_add_block(disp_state, >>> cat->pingpong[i].sblk->dither.len, >>> +                            mmio + base + >>> cat->pingpong[i].sblk->dither.base, >>> +                            "%s_%s", cat->pingpong[i].name, >>> +                            cat->pingpong[i].sblk->dither.name); >>> +    } >>>       /* dump SSPP sub-blocks HW regs info */ >>> -    for (i = 0; i < cat->sspp_count; i++) >>> -        msm_disp_snapshot_add_block(disp_state, cat->sspp[i].len, >>> -                dpu_kms->mmio + cat->sspp[i].base, "sspp_%d", i); >>> +    for (i = 0; i < cat->sspp_count; i++) { >>> +        base = cat->sspp[i].base; >>> +        msm_disp_snapshot_add_block(disp_state, cat->sspp[i].len, >>> mmio + cat->sspp[i].base, >>> +                        "%s", cat->sspp[i].name); >>> + >>> +        if (cat->sspp[i].sblk && cat->sspp[i].sblk->scaler_blk.len > 0) >>> +            msm_disp_snapshot_add_block(disp_state, >>> cat->sspp[i].sblk->scaler_blk.len, >>> +                            mmio + base + >>> cat->sspp[i].sblk->scaler_blk.base, >>> +                            "%s_%s", cat->sspp[i].name, >>> +                            cat->sspp[i].sblk->scaler_blk.name); >>> + >>> +        if (cat->sspp[i].sblk && cat->sspp[i].sblk->csc_blk.len > 0) >>> +            msm_disp_snapshot_add_block(disp_state, >>> cat->sspp[i].sblk->csc_blk.len, >>> +                            mmio + base + >>> cat->sspp[i].sblk->csc_blk.base, >>> +                            "%s_%s", cat->sspp[i].name, >>> +                            cat->sspp[i].sblk->csc_blk.name); >>> +    } >>>       /* dump LM sub-blocks HW regs info */ >>>       for (i = 0; i < cat->mixer_count; i++) >>>           msm_disp_snapshot_add_block(disp_state, cat->mixer[i].len, >>> -                dpu_kms->mmio + cat->mixer[i].base, "lm_%d", i); >>> +                        mmio + cat->mixer[i].base, >>> +                        "%s", cat->mixer[i].name); >>>       /* dump WB sub-blocks HW regs info */ >>>       for (i = 0; i < cat->wb_count; i++) >>> -        msm_disp_snapshot_add_block(disp_state, cat->wb[i].len, >>> -                dpu_kms->mmio + cat->wb[i].base, "wb_%d", i); >>> +        msm_disp_snapshot_add_block(disp_state, cat->wb[i].len, mmio >>> + cat->wb[i].base, >>> +                        "%s", cat->wb[i].name); >>>       if (cat->mdp[0].features & BIT(DPU_MDP_PERIPH_0_REMOVED)) { >>> -        msm_disp_snapshot_add_block(disp_state, MDP_PERIPH_TOP0, >>> -                dpu_kms->mmio + cat->mdp[0].base, "top"); >>> +        msm_disp_snapshot_add_block(disp_state, MDP_PERIPH_TOP0, >>> mmio + cat->mdp[0].base, >>> +                        "top"); >>>           msm_disp_snapshot_add_block(disp_state, cat->mdp[0].len - >>> MDP_PERIPH_TOP0_END, >>> -                dpu_kms->mmio + cat->mdp[0].base + >>> MDP_PERIPH_TOP0_END, "top_2"); >>> +                        mmio + cat->mdp[0].base + MDP_PERIPH_TOP0_END, >>> +                        "top_2"); >>>       } else { >>> -        msm_disp_snapshot_add_block(disp_state, cat->mdp[0].len, >>> -                dpu_kms->mmio + cat->mdp[0].base, "top"); >>> +        msm_disp_snapshot_add_block(disp_state, cat->mdp[0].len, >>> mmio + cat->mdp[0].base, >>> +                        "top"); >>>       } >>>       /* dump DSC sub-blocks HW regs info */ >>> -    for (i = 0; i < cat->dsc_count; i++) >>> -        msm_disp_snapshot_add_block(disp_state, cat->dsc[i].len, >>> -                dpu_kms->mmio + cat->dsc[i].base, "dsc_%d", i); >>> +    for (i = 0; i < cat->dsc_count; i++) { >>> +        base = cat->dsc[i].base; >>> + >>> +        if (cat->dsc[i].features & BIT(DPU_DSC_HW_REV_1_2)) { >>> +            struct dpu_dsc_blk enc = cat->dsc[i].sblk->enc; >>> +            struct dpu_dsc_blk ctl = cat->dsc[i].sblk->ctl; >>> + >>> +            /* For now, pass in a length of 0 because the DSC_BLK >>> register space >>> +             * overlaps with the sblks' register space. >>> +             * >>> +             * TODO: Pass in a length of 0 t0 DSC_BLK_1_2 in the HW >>> catalog where >>> +             * applicable. >>> +             */ >>> +            msm_disp_snapshot_add_block(disp_state, 0, mmio + base, >>> "%s", cat->dsc[i].name); >>> +            msm_disp_snapshot_add_block(disp_state, enc.len, mmio + >>> base + enc.base, >>> +                            "%s_%s", cat->dsc[i].name, enc.name); >>> +            msm_disp_snapshot_add_block(disp_state, ctl.len, mmio + >>> base + ctl.base, >>> +                            "%s_%s", cat->dsc[i].name, ctl.name); >>> +        } else { >>> +            msm_disp_snapshot_add_block(disp_state, cat->dsc[i].len, >>> mmio + base, "%s", >>> +                            cat->dsc[i].name); >>> +        } >>> +    } >>>       pm_runtime_put_sync(&dpu_kms->pdev->dev); >>>   } >>> >> -- With best wishes Dmitry