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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D0D52C4345F for ; Tue, 23 Apr 2024 04:22:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 967D7113086; Tue, 23 Apr 2024 04:22:11 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Vg66yat9"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id E0D72113084; Tue, 23 Apr 2024 04:22:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713846131; x=1745382131; h=message-id:date:subject:to:cc:references:from: in-reply-to:mime-version; bh=CrWXjqlrByu7N+VJXwXQtLgSi1ffrZAJQ/CoL39FNd0=; b=Vg66yat9Soygzw1kLJJsmqQ043/C54KyR84XjXTcJavXVTnNOigzHoef Ok1W0Mbd2RpChb+OBjqgShIa6BPfgwAHk+G5j48d20pjKyTv/QvAx12et awS0+d4PvWPk9/MIT3MuOyplgzpyX7hU9uasFIBjGQh9VJlGAKvJ0fZ3M ClgrzSQvKbkfQa8egwVW+4E3r9uB21Ljrg075pWFSjSvl0fAj0+zK4L1p QScF823SLZMFofeEMeDKWv9VvyTSv5rAyIQ+O9RmYjN4VpA3P357yIDcF o1r6rr2AozO25JutupPm0Pc5LsbVJ+V4qhgnfmRUu4fM7SnqEg/tW1937 g==; X-CSE-ConnectionGUID: UnBUW/P8SBK1sxGljo6qCQ== X-CSE-MsgGUID: x58wElDKTmK8aMgq4phCpw== X-IronPort-AV: E=McAfee;i="6600,9927,11052"; a="20833719" X-IronPort-AV: E=Sophos;i="6.07,222,1708416000"; d="scan'208,217";a="20833719" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2024 21:22:10 -0700 X-CSE-ConnectionGUID: i0rk7dSnTbSwipsXPK6UlA== X-CSE-MsgGUID: OWph8eh/TkmMNjtkN6SbuA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,222,1708416000"; d="scan'208,217";a="24286528" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmviesa007.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 22 Apr 2024 21:22:09 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 22 Apr 2024 21:22:09 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Mon, 22 Apr 2024 21:22:09 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.168) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 22 Apr 2024 21:22:08 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fMvxmCrIPYct+IFp7Pvklk+PS7iecqtm9UP21SeFq5PuP8Sm7++CmLF9Ehg2sYuWu6fvtgDCP4RdEPzIqrZ2WcG+oty5rLFIvE/NrKktivF7r1cvGq9KsJ79qWBU/BjtbeiWfl7Y1kG/+geo46KJ1wxgnA3sFChHD+5HrozTSVpjFjaw+yq0eig8sa6S81B1SB76LreJBlwORHfy86d/rQxxaaOI+yAGbbWOL7QNcfsAGpROaXRtGyQshMSozA9L5XVf9BNp6++rsPhWI8rJYuVgNcWWkElAqtglbtyPZexjgKTAwi+TX8z+BX9PNPj1b1FOIleLfiXRo+kc2TMycA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BG1ZhVZsMzx8hokyKTVLJkmP55ZIlx4TjVldnm4GaTg=; b=XH9fRGVuU9mXbSlBPJ7OPkO4XKMWxJzlSTQ32yWvqtZ2H6dmA/AeA0YYfT9RLbF7nPrpJLKNf/bipQcKuIerlerU9x6wH8wI84NzkUsIZtJHSTM5ulhak0GXr+9ZrPcIujzs0agslaXEtncNnIYRYRiLnHRSYnn6Wm+eB1sVWHmHXCqpk5oYKVkeSn+t9GlWzq8g0mD/c1Jfd045z9jq4bR4jLy++Eg5E/qAy05lDroazExn1tvPgkO5zPheU2Eyc+DmqiIxLuNply5Hi0/HgXm6biVoU/6+jF4SCGwmdiExzQvH9/R9pNGUQQMRZRRA5p2Gw5XdaDwU83sxqfYF7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MW4PR11MB7056.namprd11.prod.outlook.com (2603:10b6:303:21a::12) by DM4PR11MB7327.namprd11.prod.outlook.com (2603:10b6:8:105::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7430.46; Tue, 23 Apr 2024 04:22:02 +0000 Received: from MW4PR11MB7056.namprd11.prod.outlook.com ([fe80::ff2a:1235:d1ba:4f93]) by MW4PR11MB7056.namprd11.prod.outlook.com ([fe80::ff2a:1235:d1ba:4f93%3]) with mapi id 15.20.7519.018; Tue, 23 Apr 2024 04:22:01 +0000 Content-Type: multipart/alternative; boundary="------------NoFmV84PK7RaEZQf3wRP6YzA" Message-ID: Date: Tue, 23 Apr 2024 09:51:54 +0530 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 3/4] drm/xe: Extract xe_gt_idle() helper To: Aravind Iddamsetty , , , , , , , CC: , Lucas De Marchi , Michal Wajdeczko References: <20240419085826.263743-1-aravind.iddamsetty@linux.intel.com> <20240419085826.263743-4-aravind.iddamsetty@linux.intel.com> Content-Language: en-US From: "Ghimiray, Himal Prasad" In-Reply-To: <20240419085826.263743-4-aravind.iddamsetty@linux.intel.com> X-ClientProxiedBy: PN2P287CA0012.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:21b::9) To MW4PR11MB7056.namprd11.prod.outlook.com (2603:10b6:303:21a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW4PR11MB7056:EE_|DM4PR11MB7327:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b77865e-bcd7-4bb8-38a0-08dc634cec77 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?utf-8?B?b25iZ0VxZXowc3NKb2YveE9qZHdRbzF6RVlHL3hhSGJZSGJnRVBuQWhFS0xC?= =?utf-8?B?NldvaEZxckJPb2pEUXZ5SE5YWlRTT3NFcktQK0tiY0VrOUJ2MDduQXBSQ3Yr?= =?utf-8?B?RWdNek0rb1N0V1JydHlsemNFVWloQi83cHAwZkZmQlUxVzFhNmNtM3AwZGdv?= =?utf-8?B?Ky9PSzN6QjJxaXAwOFdJRUVGL0V0RVJsK1JkZDAweGxITzFLZytTVXQ0Nkxi?= =?utf-8?B?T1Zmbk1UU1dJZXJBSmlLRGxxOXduWHdUQzJBaUU0UHZiT0UwRFEzV0dxRS9I?= =?utf-8?B?N3dGUW80Slk2YVlWanJwSGRmbmFlYUs1alFxZHRyY1FPVDlaS3k3NXg2SlAr?= =?utf-8?B?a1hTdjVnSzhHSFBjK3N6cVd5c3Vsd05hNVlkeU9VbmZRa1ZrWVVzYmNqcU5T?= =?utf-8?B?a0VYb2NjeHVOOXZUQjcvT2dROWdEcEJuU0tXWkxVOTZRNENsVlE4S09LbUxS?= =?utf-8?B?STRkdVduazF2eVlnL0tIRWhUTXZ1N2dVbGYzcGx2QnlzQUR6RDI2eklRZ3ds?= =?utf-8?B?U3JWMktBRHJZcnpSakJ6M1hlZGU0Q2NTQlF4cUx5SUJMQmQ1V1luQXZaeEdJ?= =?utf-8?B?NFVFRDRTSm5UVHhIQmROZ2NMSjRhNndIWjh3USttNmx5M2VPUktLbHlMT3FL?= =?utf-8?B?MW9DMmlKVHdERERrUlo1Nkp6MG1oWXh1L2F3WUsvMnNBNUM5OWx2Z3pXVVNN?= =?utf-8?B?VnNzVXBmTzEyU004NmtLQ1FDNkNxN21oRkZtYmFNRWk0NENJcmt6RWdyd3lP?= =?utf-8?B?RkE0RlNPN3JXVVJrVU5oRkNuaWJldnBjdFFlK2szR1hkTFVyV24vNlFIZGkv?= =?utf-8?B?a09VazlqUFpxODF0Smk5RzZGWlZLRDIvS3d0Ui8zbElURzZtZVhFNDBodGR3?= =?utf-8?B?MG5HNmNkZ2d3blBnZENIdGVmdjF6ZFo2TWxXQXpmQUdOTW5RK3hjcUdsc0hB?= =?utf-8?B?RE81V2FaSVdmUGRndEx5R1p2MmZxU0JVT0hOYjlEalFPbTlaRWdwUXBRc0x5?= =?utf-8?B?cUJRWlF5Vi9sMXcxdlhOTjMvLytINy95a2xxWU53WTZKRUptWFpHY09lZXl6?= =?utf-8?B?YUtFTzJveEpISkgwR3JaR1BXUExzNWNpaFNNWldlTlNlSG9vZ3J3NWc2WHhG?= =?utf-8?B?eTFMMm9qSmxkY25WM2p2b3Nmd2NoTFRPK1hlRVZ6YUpaU2ZCMHpxa1V6bFJY?= =?utf-8?B?V3lmZk05Q2hTQlN1NGZicnpMN2l3TkJ3UDdKY1dQNEp6enlTMjc2eWp3clVD?= =?utf-8?B?ME5iTm1GV2ZFVm03QlpwVm5KLzlKUDRiM0RJajdWM1JCMktlaGUzQzdHOXNo?= =?utf-8?B?ME9TV0JRdXNnSkNQbU1uejcwWC9yUFBLUVZ0SkwrbnByMGpWMk9BMmsxNlo4?= =?utf-8?B?T2w3R1gzUTVKeEtpb25CMFYzUVRSYjFXODEvb1dhVnNkNE5zZ3Npc0JCL09M?= =?utf-8?B?eXI2RDhIN3UxUk10eXdJTGFuVHowR28wZWMxMCsxVUJoWmdRTnBlcTlMUkNI?= =?utf-8?B?VHlQTFl6Snk3TFNKNnZoSHRiV0NlaWU3TkJ1ZlBwTm5XY1g4LzMvR0xiZElB?= =?utf-8?B?Tk0vOHVKL0hlT1JLbWp1NUZTMWpNbk5IbXA3Sit3bnJxb2RvZDY3VllHVUdi?= =?utf-8?B?OXFmSXRleVJCc2hBT1VFRTA3azdDbzRsM3JqSWV5SzIxWm9zbG5WY3pBQjQr?= =?utf-8?B?MDh5NlpZUGUxd3REZ21sWitJQUFEZGxyditUZ09jR2xRWGVTczk0b2VBPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MW4PR11MB7056.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366007)(1800799015)(376005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RFdZRTdweWtVOS9xWU1IQml3bFFweDQrc2VGRVVYMWZKT0xBZGdpaXZQY3ZV?= =?utf-8?B?NWhPbDZoRm5NVVJyekdHVERKNDhTNGpNSDJhaExZcWpGdmtvem9qMVh3Ukhu?= =?utf-8?B?TnNVZnU3UUp2SXduYlFHc051TlNKSlRscThpREY4Q2piY3RZRlhBcG90N1ZY?= =?utf-8?B?RFJUUWFUQlZnbzVKRjZ4UmhtbTBMNEdtWlVzb0tYMG5FRnAzZTJxUWR6dGl2?= =?utf-8?B?NXNYMENFMFBjVkJ4VlVEMnZ0TVNxZG5FT0dFNWhjT3R4cld5b3RoZUxDWDQ2?= =?utf-8?B?b0MyUnA2SFFKZm5SOGJHZGhNbWxnSVdoRjVsY2tOd3ZVTEQyL2pvdmsyUE5o?= =?utf-8?B?TzhSNDR4aVNkWTVnRmMxV0xsckltN3k1cTltRFZEVGlsS2dlZTU3WWFIdmNi?= =?utf-8?B?MnQ1Sldtdnc4a3pIemdTZGtsdGtHOFIrT3ZOMS9xZzNDZkE3NzdDUVZmSVJr?= =?utf-8?B?ZlFIb2p6U1l6Z2E5bUlTOUhqaXMrTFNHYkpveUZHUHVFZVlZd3lmV2tDdlhq?= =?utf-8?B?L0pBaHpFbVpCR2dYcGVKR3p6a0RpbU5rL1pDKzZTcXlNbjRJNDdYQmdUb0py?= =?utf-8?B?NDFPMFBhVC9weUdRYlYxa244VlFVbDJpeit2WUMzOWlqTDA4ejJTRGN5QlpS?= =?utf-8?B?T01GaXZvU2FyR1pQMGp1WU1rV1lLVnJtcURyR2xnQXpjUGFDZWNacUxiTG5X?= =?utf-8?B?eXNGQkNQRDJDWjFNUVJZV1YvUHE0QkIwdGZDb3VNSlUxYmtsRExhVitWK2xW?= =?utf-8?B?TFdkbjBkcEpubEMycjVzRDZHU1BrRVl4eEVxUkd3MWRCOHhwd0xsR3RMRjJj?= =?utf-8?B?RGpmWVB2WlRmUXdGU1FHWE1XS1ZMMWxHbDlhQUlEdXFLc2xndi80V0dRT05a?= =?utf-8?B?bXI4d2JuM1dqWlZPNVRHUW5GMXJZWkFvNm5SckxTS1pTWmJZRzYyV2dsd0dp?= =?utf-8?B?ZlYrL0kxWG5MTEhmR1FhSmdTTWRmMjZuZjU0bkQzeHFUYklvb0xXdUVBcFlw?= =?utf-8?B?WG4zK0hoTms2TjFtUjE1VDVjN2ZUTi9lRmM0bGkyWi9VT05WbnZvMVc5ZnVn?= =?utf-8?B?T1pTem95c3AwRzkrcjdaU0tTN0ZxVUcrZ3IvYW1sRHJMbDZIUGw4cEdza1Vr?= =?utf-8?B?eXcwMU1DRTVHMVB6RVV3L2dPK1FZZXpBWW1tQk1FeWxMcGJmMXFadFlRTUxD?= =?utf-8?B?SWplYk5yS00xRWhYREJNaVMxbnQ0Vzh5VGMwSXJpMzhZbXBOWE9NdEJ1d2dJ?= =?utf-8?B?c3BRMkM2TjNuSzlZZlBuM0dEWFNlSUlJZEF3dlN6L2JhaU5wVldFTlZzcjMy?= =?utf-8?B?ODkwclZtNHJtbHlSYTdpL3JkdHlqWUpWcXhodWRNYnYrSkxXRmsvekh6cTBX?= =?utf-8?B?VUZMcDNva3FWQ0FFRFdFall4cDkybVZ4cS9PdEhLN2VEY1phSENOMEx4cjRz?= =?utf-8?B?REFXL3o3S0lDbHkwVnZwamM0ZGpUV2NGNFpZTnlNd3hLbmRPQUlieU9RUzUy?= =?utf-8?B?ZDZZdXJ1cDlnaGF1ZTdPMWxZTlFqNC9GZG8xT0EzUlZUTFpqdFE2aS9XYTlV?= =?utf-8?B?ZGFnRFFDSVRvNUVodnZveGR3K1haYWxVYlVncU9jRTN6ajB2NTArTjg3d3ZT?= =?utf-8?B?dkd0MVA2Y1JWcDlJZ2N4akVHL3drWDkvcjhpa1hFOHdXMGhWNGxZdk5GRnJh?= =?utf-8?B?UEgrV1gwcGRyYjVzTlduSmMydzdJRlFsOU92a0Z4a2ZxMWtjT3lMUEJDekNt?= =?utf-8?B?bENaZk9HcDJPM21WSXFtSjR4QXlSL3NydGxOMWFEamhTTDduK0hRMWdwYU5a?= =?utf-8?B?MmlheXdaZEVsK05LSVhJeG1hbzRTbng0WkoydmFkVGNlTFl6V2d0TVhZdEow?= =?utf-8?B?V2xsYjdJYUd1a1liQTJYNUxZbWgwakFyRjdhaHNqMEtCYzFxdTAvWlU1OWN2?= =?utf-8?B?M1BRa0ljaVNXckpNRndaTk1oMVlmRnYwZkR3TmF1V1JRL2hpdlFaY2VNRk05?= =?utf-8?B?ODcvMjJ2b3dGNGhjMTJ5VU8wZzhXZlpqTWhzZDJGNVdMaEMxTmNWblBGSGlK?= =?utf-8?B?TVNsQ1haYWlsNEd5eWlBT255UUt2WHJxSXJoQ3p0SzEvY1YzYi9FTlJLYkZX?= =?utf-8?B?aHhvZ1UvNEZkUDZSNDVkRFROZ0FlaWF1V1FpbXNacW94eGdKanVzdUpQQW81?= =?utf-8?Q?O8OsAgP50d0CYxyDo5iD1Pc=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 9b77865e-bcd7-4bb8-38a0-08dc634cec77 X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB7056.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2024 04:22:01.9063 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yQRgVuPrWNrX1LderX5rN/JrEKLzTzZVK5Qlvd2Si8KEVNNHoSEiOjqPpo1qreSccKeNvBXiVwLNcYwYPAuIx3MUxDRVbwBL05am+XT/V6o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB7327 X-OriginatorOrg: intel.com X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" --------------NoFmV84PK7RaEZQf3wRP6YzA Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit On 19-04-2024 14:28, Aravind Iddamsetty wrote: > This would be used in other places outside of gt_reset path. > > v2: > 1. Add kernel doc for xe_gt_idle (Michal) > 2. fix return as no actual error is reported by xe_uc_stop (Himal) > > Cc: Lucas De Marchi > Cc: Michal Wajdeczko > Cc: Himal Prasad Ghimiray > > Reviewed-by: Rodrigo Vivi > Signed-off-by: Aravind Iddamsetty > --- > drivers/gpu/drm/xe/xe_gt.c | 28 ++++++++++++++++++---------- > drivers/gpu/drm/xe/xe_gt.h | 1 + > 2 files changed, 19 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c > index 491d0413de15..a24340219c30 100644 > --- a/drivers/gpu/drm/xe/xe_gt.c > +++ b/drivers/gpu/drm/xe/xe_gt.c > @@ -629,6 +629,23 @@ static int do_gt_restart(struct xe_gt *gt) > return 0; > } > > +/** > + * xe_gt_idle: Idle the GT. > + * @gt: The gt object > + * > + * Typically called before initiating any resets. > + * > + */ > +void xe_gt_idle(struct xe_gt *gt) > +{ > + xe_gt_sanitize(gt); > + xe_uc_gucrc_disable(>->uc); > + xe_uc_stop_prepare(>->uc); > + xe_gt_pagefault_reset(gt); > + xe_uc_stop(>->uc); The cleanup of xe_uc_stop to return void needs to be addressed independently of the patch. This patch LGTM Reviewed-by: Himal Prasad Ghimiray > + xe_gt_tlb_invalidation_reset(gt); > +} > + > static int gt_reset(struct xe_gt *gt) > { > int err; > @@ -645,21 +662,12 @@ static int gt_reset(struct xe_gt *gt) > } > > xe_pm_runtime_get(gt_to_xe(gt)); > - xe_gt_sanitize(gt); > > err = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL); > if (err) > goto err_msg; > > - xe_uc_gucrc_disable(>->uc); > - xe_uc_stop_prepare(>->uc); > - xe_gt_pagefault_reset(gt); > - > - err = xe_uc_stop(>->uc); > - if (err) > - goto err_out; > - > - xe_gt_tlb_invalidation_reset(gt); > + xe_gt_idle(gt); > > err = do_gt_reset(gt); > if (err) > diff --git a/drivers/gpu/drm/xe/xe_gt.h b/drivers/gpu/drm/xe/xe_gt.h > index ed6ea8057e35..dcc1023d20e8 100644 > --- a/drivers/gpu/drm/xe/xe_gt.h > +++ b/drivers/gpu/drm/xe/xe_gt.h > @@ -43,6 +43,7 @@ int xe_gt_resume(struct xe_gt *gt); > void xe_gt_reset_async(struct xe_gt *gt); > void xe_gt_sanitize(struct xe_gt *gt); > void xe_gt_remove(struct xe_gt *gt); > +void xe_gt_idle(struct xe_gt *gt); > > /** > * xe_gt_any_hw_engine_by_reset_domain - scan the list of engines and return the --------------NoFmV84PK7RaEZQf3wRP6YzA Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: 8bit


On 19-04-2024 14:28, Aravind Iddamsetty wrote:
This would be used in other places outside of gt_reset path.

v2:
1. Add kernel doc for xe_gt_idle (Michal)
2. fix return as no actual error is reported by xe_uc_stop (Himal)

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Aravind Iddamsetty <aravind.iddamsetty@linux.intel.com>
---
 drivers/gpu/drm/xe/xe_gt.c | 28 ++++++++++++++++++----------
 drivers/gpu/drm/xe/xe_gt.h |  1 +
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index 491d0413de15..a24340219c30 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -629,6 +629,23 @@ static int do_gt_restart(struct xe_gt *gt)
 	return 0;
 }
 
+/**
+ * xe_gt_idle: Idle the GT.
+ * @gt: The gt object
+ *
+ * Typically called before initiating any resets.
+ *
+ */
+void xe_gt_idle(struct xe_gt *gt)
+{
+	xe_gt_sanitize(gt);
+	xe_uc_gucrc_disable(&gt->uc);
+	xe_uc_stop_prepare(&gt->uc);
+	xe_gt_pagefault_reset(gt);
+	xe_uc_stop(&gt->uc);

The cleanup of xe_uc_stop to return void needs to be addressed independently of the patch.

This patch LGTM

Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>


+	xe_gt_tlb_invalidation_reset(gt);
+}
+
 static int gt_reset(struct xe_gt *gt)
 {
 	int err;
@@ -645,21 +662,12 @@ static int gt_reset(struct xe_gt *gt)
 	}
 
 	xe_pm_runtime_get(gt_to_xe(gt));
-	xe_gt_sanitize(gt);
 
 	err = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
 	if (err)
 		goto err_msg;
 
-	xe_uc_gucrc_disable(&gt->uc);
-	xe_uc_stop_prepare(&gt->uc);
-	xe_gt_pagefault_reset(gt);
-
-	err = xe_uc_stop(&gt->uc);
-	if (err)
-		goto err_out;
-
-	xe_gt_tlb_invalidation_reset(gt);
+	xe_gt_idle(gt);
 
 	err = do_gt_reset(gt);
 	if (err)
diff --git a/drivers/gpu/drm/xe/xe_gt.h b/drivers/gpu/drm/xe/xe_gt.h
index ed6ea8057e35..dcc1023d20e8 100644
--- a/drivers/gpu/drm/xe/xe_gt.h
+++ b/drivers/gpu/drm/xe/xe_gt.h
@@ -43,6 +43,7 @@ int xe_gt_resume(struct xe_gt *gt);
 void xe_gt_reset_async(struct xe_gt *gt);
 void xe_gt_sanitize(struct xe_gt *gt);
 void xe_gt_remove(struct xe_gt *gt);
+void xe_gt_idle(struct xe_gt *gt);
 
 /**
  * xe_gt_any_hw_engine_by_reset_domain - scan the list of engines and return the
--------------NoFmV84PK7RaEZQf3wRP6YzA--