Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp1225731imw; Fri, 8 Jul 2022 23:03:21 -0700 (PDT) X-Google-Smtp-Source: AGRyM1scUJLSk3rvKTaq9/0elc7ffc2q6JqCLdYvZEPwWdF2YabwpZD23ZySTTl+hrIxEuF5UY/f X-Received: by 2002:a17:906:2086:b0:715:7983:a277 with SMTP id 6-20020a170906208600b007157983a277mr7255484ejq.386.1657346601088; Fri, 08 Jul 2022 23:03:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657346601; cv=none; d=google.com; s=arc-20160816; b=twqAy+/pdfgyz7sMQQJ6Bt1xA+bWg+x8wZoy8zUILlFRlNHukzB9QdDDpJCbOsaUS/ jwIvasHZgHKnpekI4d8LlOvHda7OnR1jM3I3Qb3CoWI0tHnCKAwoqvxW9XBxib73dbci +IRkOJXwwO3ywtFEwoU2BMC8R9VWCyQ/6+dBmDUEzZt+bsuGFh7PtLI9JdEKwKCZ6x+Y NbWasdP3u6bIoEA9+EQsK6A/T5hW2ugHLnNDVYh78d1/UjPElYRjLokNb9jPqc19IXYa 8BjvsO0hIH10GOFvqrN04mq/aGDRZ6TcQyiHVPcEgMp3vcHqmndvYPsAI822LT1Dr7o6 DdEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from :dkim-signature; bh=cG91PKDYaCd256B46xmBvw0NNT7YMphG4vcv7jLZDuE=; b=YsgAfocI2Hf9F7wTetSw6uLHPewQtbo37vkj+9ZLuxHHDqVX4tD4iyTFqD7JAbPvAe l1p9cuaUYPBXGMzE06jU8pzoOlF+I/PQMyUq6snPuo+yY2gyXhv2DYV4ovoopQSARoOk 1L3ikBT2Ine3SE9v2MoFhyGyM7l+wsJ0v6+nVeBIZ/sFWCq6AbYT8j3iOYMaodWcxCzt o/4UJjf4ubF+XPs+5rwTqAS/XVCNkHDAHLMA0dCejUqQQQ3+gD0Zd7DZyngDr5USb2X/ D2iiLjkb1epn8lY1du5XgbR/WwY01fTG/JMzAEFcx/c9VoQEx8++UG5CuQpgZI+VbZsh ow7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcdkim header.b=g0k77lRO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f15-20020a0564021e8f00b0042bdec87b25si1242684edf.291.2022.07.08.23.02.49; Fri, 08 Jul 2022 23:03:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcdkim header.b=g0k77lRO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229571AbiGIGAG (ORCPT + 99 others); Sat, 9 Jul 2022 02:00:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbiGIGAF (ORCPT ); Sat, 9 Jul 2022 02:00:05 -0400 Received: from alexa-out-sd-02.qualcomm.com (alexa-out-sd-02.qualcomm.com [199.106.114.39]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DED474E86C; Fri, 8 Jul 2022 23:00:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1657346403; x=1688882403; h=from:to:cc:subject:date:message-id:mime-version; bh=cG91PKDYaCd256B46xmBvw0NNT7YMphG4vcv7jLZDuE=; b=g0k77lRO3euhfoiegYjMqUQ4HFPAJGowJwQJXAoSlxR/EaCVXjsn+JSm gWFrmA7YM74pHshRwV96mjmpK5drlUA8EIMadG/MwuxbCMtZAFsN095D6 GUP6arIGxtj3/J6R7dgly/hCHDfu4x8NflB/BN9OvUSnBfOLDUH4GbCav M=; Received: from unknown (HELO ironmsg04-sd.qualcomm.com) ([10.53.140.144]) by alexa-out-sd-02.qualcomm.com with ESMTP; 08 Jul 2022 23:00:03 -0700 X-QCInternal: smtphost Received: from nasanex01c.na.qualcomm.com ([10.47.97.222]) by ironmsg04-sd.qualcomm.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 23:00:02 -0700 Received: from nalasex01a.na.qualcomm.com (10.47.209.196) by nasanex01c.na.qualcomm.com (10.47.97.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Fri, 8 Jul 2022 23:00:01 -0700 Received: from hyd-lnxbld559.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Fri, 8 Jul 2022 22:59:54 -0700 From: Akhil P Oommen To: freedreno , , , Rob Clark , Bjorn Andersson CC: Jonathan Marek , Jordan Crouse , Matthias Kaehlcke , "Douglas Anderson" , Akhil P Oommen , Abhinav Kumar , Andy Gross , Chia-I Wu , =?UTF-8?q?Christian=20K=C3=B6nig?= , Daniel Vetter , David Airlie , Dmitry Baryshkov , "Geert Uytterhoeven" , Konrad Dybcio , Krzysztof Kozlowski , Rob Herring , "Sean Paul" , Stephen Boyd , Wang Qing , , Subject: [PATCH v2 0/7] Improve GPU Recovery Date: Sat, 9 Jul 2022 11:29:28 +0530 Message-ID: <1657346375-1461-1-git-send-email-quic_akhilpo@quicinc.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Recently, I debugged a few device crashes which occured during recovery after a hangcheck timeout. It looks like there are a few things we can do to improve our chance at a successful gpu recovery. First one is to ensure that CX GDSC collapses which clears the internal states in gpu's CX domain. First 5 patches tries to handle this. Rest of the patches are to ensure that few internal blocks like CP, GMU and GBIF are halted properly before proceeding for a snapshot followed by recovery. Also, handle 'prepare slumber' hfi failure correctly. These are A6x specific improvements. Changes in v2: - Rebased on msm-next tip Akhil P Oommen (7): drm/msm: Remove unnecessary pm_runtime_get/put drm/msm: Correct pm_runtime votes in recover worker drm/msm: Fix cx collapse issue during recovery drm/msm: Ensure cx gdsc collapse during recovery arm64: dts: qcom: sc7280: Update gpu register list drm/msm/a6xx: Improve gpu recovery sequence drm/msm/a6xx: Handle GMU prepare-slumber hfi failure arch/arm64/boot/dts/qcom/sc7280.dtsi | 6 ++- drivers/gpu/drm/msm/adreno/a6xx.xml.h | 4 ++ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 83 ++++++++++++++++++++++------------- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 36 +++++++++++++-- drivers/gpu/drm/msm/msm_gpu.c | 9 ++-- drivers/gpu/drm/msm/msm_gpu.h | 1 + drivers/gpu/drm/msm/msm_ringbuffer.c | 4 -- 7 files changed, 100 insertions(+), 43 deletions(-) -- 2.7.4