From patchwork Thu Jan 30 11:35:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Brzezinka X-Patchwork-Id: 13954512 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 A377AC0218A for ; Thu, 30 Jan 2025 11:35:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4B61B10E939; Thu, 30 Jan 2025 11:35:23 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="bu7OUMYR"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id D3A8C10E939 for ; Thu, 30 Jan 2025 11:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738236922; x=1769772922; h=date:from:to:cc:subject:message-id:mime-version; bh=Gd3DkQbJiru60tKpRh3DYe1TcONS3f6MxknMAOhx1aU=; b=bu7OUMYRHyDVWIP4HWzlxF6+smQsA3EclSgdJgsxCzrXLvj5UiJw/ZXw wJbcZuSX1FjbcaTGbgncSt/l3l4YFv1FVik6V1Ko0lwtkIa90f++6d6do O7ic0y3MCDRVc0f8RBC1Dr9RYB+UCrKQTKPJ9MGBNmt0QblsgIe0ZyBQd HNl3RFHH6+1GXy6p0alI612VUz92krYdrH73Atz4AGTvSmoHcM5xcKhjV YEHTb0+PDbWpLnNSpMAUZ3+fFrKzXoQyaCMSw8awgIH9g86+/XXr6+kGp 8NJ1gxgMUvswrA8bfbn3YfqLbcVwUjcPogH+W0orog0Z6TohcKZZotL8t Q==; X-CSE-ConnectionGUID: 3Gz1IhumR4WOxG8H+6HP8Q== X-CSE-MsgGUID: eu+9MgbvQ8OrCG0Y7R0bww== X-IronPort-AV: E=McAfee;i="6700,10204,11331"; a="41609482" X-IronPort-AV: E=Sophos;i="6.13,245,1732608000"; d="scan'208";a="41609482" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2025 03:35:21 -0800 X-CSE-ConnectionGUID: 3sBffTKJRiScVlWCli6SvQ== X-CSE-MsgGUID: o2T1k3iiTG6jqqde/spF4g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="132574553" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmviesa002.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 30 Jan 2025 03:35:21 -0800 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 30 Jan 2025 03:35:20 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44 via Frontend Transport; Thu, 30 Jan 2025 03:35:20 -0800 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.173) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Thu, 30 Jan 2025 03:35:20 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=e00cJzGEn4NUXvNGjVoc7NfHgZg9uvrt2hKwbmKrvCZRudqe+p2/P8bqyUBnsqk0G1Km6aKgi2cFvBHg6NrKbuB2HeluAHNfbJnFqusC7PFQB5C5cSqcMn2jSCEbMeklPaEKNkThHpuZ8qV/srPQv4btSG/sxjRePEiOdvURHFsOWp8eg494lIXxEcgnbYW5b1elLk85cWNJWXXMFpESgoZH7UWA+UnuebTmhlcLQVgx9ztn1vdevwrdpmxOTzv805bMfY0R7Yh8U5EuwHKHzLmBbdiD4LoVS06kkh2sq8et3Orxf8nylGv7S46L8IMplcSrZMCFLQ950/WCBBZCXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=CeiN+7+2CiagvacIiPLaPotX5fRPhiBReOTiqfsLsgM=; b=RxWgeDUSuUnDOCUWkj6jjq6icGV0Q8J7DXOGw1DuoYYmZQRpYDFHQdxLyohUFmaCyOmpC4nuW7i9WMaNGPui47fbQc5x1OghI99FcPPyMVAU+9ScMJP6ckW+X2Vv9v7ncF1eC6bJQsWknZr6mqNLeC4Xc0dsol1pY6Jt9eP/xZ3aH1bJiGqCQ2fnLLzvKi4MfLs4xVt2bBdOCOW02hIeteyJaH1FKxdu5GhVlfyFzVROs2HE5Pq4eyswVia1J+pFaF8zDLwYW6cALqK76bSFzg2l5nVDahdDjeTd8Xuhyf7418HF41J3CfzfqZRl3befWLOdeAGe2Y+KlGSTgztoHQ== 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 MW4PR11MB6909.namprd11.prod.outlook.com (2603:10b6:303:224::12) by SJ0PR11MB5183.namprd11.prod.outlook.com (2603:10b6:a03:2d9::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.18; Thu, 30 Jan 2025 11:35:13 +0000 Received: from MW4PR11MB6909.namprd11.prod.outlook.com ([fe80::28da:9438:a3ef:19c0]) by MW4PR11MB6909.namprd11.prod.outlook.com ([fe80::28da:9438:a3ef:19c0%5]) with mapi id 15.20.8398.014; Thu, 30 Jan 2025 11:35:13 +0000 Date: Thu, 30 Jan 2025 11:35:08 +0000 From: Sebastian Brzezinka To: CC: , , Subject: [PATCH v3] Revert "drm/i915/gt: Log reason for setting TAINT_WARN at reset" Message-ID: Content-Disposition: inline X-ClientProxiedBy: DU2PR04CA0195.eurprd04.prod.outlook.com (2603:10a6:10:28d::20) To MW4PR11MB6909.namprd11.prod.outlook.com (2603:10b6:303:224::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW4PR11MB6909:EE_|SJ0PR11MB5183:EE_ X-MS-Office365-Filtering-Correlation-Id: b241af3a-ad5a-4158-27d7-08dd41222906 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?aufSeODCsiOP7+odb5V6d1EaO6iMSHd?= =?utf-8?q?/3alvh4ZC3C0R2pDbJjstCq7WWzGM0LH1cftvFOc7VqqjJWIntAJiss4v/VoZu+45?= =?utf-8?q?/DNRIuLWBq2sGXnzYXk9S9AIaDR72PX2cDkY9MxGNJyaBaoHRK8ZcJO89SnhD5+ao?= =?utf-8?q?IXMz9mPkdGPLKpEfuXzkNqmDpprsd+NbvtMxIfFZnVKzVjVsWlx+1QKHd9NErA1qA?= =?utf-8?q?LXBqDG9DoM0l+ZfbKbEDpx4PZLws+8eWT+DzQYcG+1yQUe+9x05gGyhMlYokQk4KX?= =?utf-8?q?dLXnuLpX5KcaJMJCyRivr2tungngmd7CwLQNKcoLURzHPHGRUTaAlFuklzp5iwNW2?= =?utf-8?q?77UCqaupLgJd5APTA4Q6Q5qDIPSFYHrG3xmbn446dvEkpUtHwRiYtV1gfAH8jTpw4?= =?utf-8?q?6zwX3/7yYAaFlLxTxyT/wqWYUDidRjMuPBPxzZHrodabViKVHZLz7UFc9WY7vhbF2?= =?utf-8?q?6DWTPoXXDu5fX6NcoaxDnTjePBFDox3MKnaf8r3q8wEUT/2kxoNSFya0hBHIIyK5A?= =?utf-8?q?h2Bok8Gz0Cjk21ZRVd1rw0q/UJj9Vx/bY8E98sv+GhQSkvhi6iDdrZgq66EG5xIDg?= =?utf-8?q?dwIka1CgVzu4QtG+O2GogRG9f7hMcaGa2TjLF5e8a9zcMuF31UBOWM9wGeu0mhBPG?= =?utf-8?q?NevW36TsAKBiopqTAy5Q61cpAZf0lUkyV1/HLZSCci1EDJiSS7ncu6A/0zhy7YFaa?= =?utf-8?q?INTG9DCbDwtnsRGgc5+nxUb1vrEz+1Ljb73UCMlgOw+KDA0P3pMPc+STpC7fVx1MH?= =?utf-8?q?8YyQz+DCanZR6ztFZRvNrpPOLltUzyarA4s9QU12x9T0lxAhXyBAzU203HiP7aw2x?= =?utf-8?q?JIb4qZhv/0fCT2z8VxfkI3erdyNrzUc3xTD5fgLEbTXryBa0eJP9vmLBiIvjCCTNQ?= =?utf-8?q?R/4AWAXORD1Ix7HpyfkmQ7LWoWsKf6t1c4kSv3qTkG27jjuksqI3PR4EuDyizSWvQ?= =?utf-8?q?PVTVpC4ehmpZPnYo7Dj5rTiNGh5PIVnELlqJeiGAz7uycWjOzExbOTLTg8hcuaNr6?= =?utf-8?q?DLCXyL9OKAEEbtfQNjpSNVS2KC0tQ5lb84bUQ3Dd3Jg8S2P87nkESW0acKEz5lC3/?= =?utf-8?q?0YQoelY+hx8DZVGKe3XyrWfeKVmHnhE9H4oAufBqO1BmRNj+F5a+eAqLXXJMp0Yaz?= =?utf-8?q?HlNDKb5gqknQk1LB4x2sTvNru5xOgjD5g6eFQOaQz/knlcONWdoYQ1Rz9iJ0sHE60?= =?utf-8?q?bQbREqXbuv5oIphrloLlTdh3kHhblNQ3v7G5tdf8gLLfQy/nXhCzKOImfFQ7jMHMj?= =?utf-8?q?wUQb/wPvgz4VfIKNRoRwjTXyoID9akPRGYHSfQDmOeT6VbPfpnv5m0TPkRlCcKeYu?= =?utf-8?q?rJXqt3dd/Khs?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MW4PR11MB6909.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?w4lG1eh/fgq0c3jGCOsa9/eTeT+N?= =?utf-8?q?/6BMEyJZp3AO0AmL5W+N7iXkdwtJP2THQSBRLlJa407AAomHicgyKzUzjivvS97Kj?= =?utf-8?q?AetWzo/ygptD62UCDrY/i41LwRyY/quiHURAgcSXRhfVQj6tt9GES49nwuMeCgiWd?= =?utf-8?q?l9u8Pk9X5Jj30300KDDkS2dNEhq7IQNWg4QyLhdcX+thImVl4bTixys1smbWM6SOi?= =?utf-8?q?2tu41w5a7ffD0ipxR6nckf4YkCS30RABnS5jwydb/GNJ6jMqH2Riim9ABNcTLJGNa?= =?utf-8?q?hPFMA1/kNyaYNpMT+2/GLlqSIvH5zdGh/DwBR/QNu8B+6Sn5uqefrGDXbZQRBtBQ7?= =?utf-8?q?yjKDqaWIwatbsmPg4yYAZyGmcXmIdPlEIRIfyX4uPV6qq2pq2mGMmt00uxs6S9qlY?= =?utf-8?q?Th33IQggOqHwjcoQf7RBkp93YGqcHi54CmC15SszG+O/t/43LlRasfTkuBdZ+M8kF?= =?utf-8?q?9JC/Grw2MGIZ+/rh7q+Cl4JyRvEEVVdB2apSmKQzkMIGVLOUR82BkiSRCK2jtzxHU?= =?utf-8?q?nBk90Vzc4wGcxEl7D24xcORv1qRQDoxDM+wkoB01m1Y0k9Syfr896Tn2DEVT4Fbyu?= =?utf-8?q?q1gruWhoDBusKswTl3N7xQHkD0JlUE+PUEcZbXhHLWNJXHdL5QvgivkMXZ+ry3mAG?= =?utf-8?q?779Aygl1Aun/rWj82XTsDHykvrPUrUb4bpc2C8v4/M3wkOf7WTwBGAbjc9Vulbkh1?= =?utf-8?q?W8QmEw4+CEgJ76n6lhl4VboY9NWOCEhWKPDfFHs4W9/89gmqwO6PmJuhv601wCOTY?= =?utf-8?q?JwAWZNk5HbbYPJs3oqXxCY7WKmn0uBq0GuND2ZX0JFybgJYdTigQFAiiKAD9B8JrG?= =?utf-8?q?Qs0OEfrDbuClMnvsfTHiIg8YufTMzKnMuDMRf7wINNvFxkg/9WEGBEw+/ixLnm75m?= =?utf-8?q?NMV6bObYGKG+1rSOKVsSloAdX6hpJyvK3WT+LukvcpplarEq5Oi13fXy9Q+YGUo78?= =?utf-8?q?05rnu2vFEW/yojV3xDW4XJMN3wqlF82AfBtjXvzY1CZWdl0sPqItto4F3sGeDqAVz?= =?utf-8?q?pdwpeiedVNVbfTcKHLsX1gZ4mtPaFI8KgudvG60OtZcIY1U8/g3iWdwrpay6B+5i5?= =?utf-8?q?lqN/o1rR0hsoOR6CtBugG2lS3nDX23D7TV21IFg0u0tUgKwZmv5thpDlh38M3MaVu?= =?utf-8?q?tLYkvkYHWCOUMk3PJMKuyjFbC25LuTgN3cvOcfzAkzgR+doNbBfUI+vsPALklBOe6?= =?utf-8?q?Bt2eC90/kR2rndImmIOpMIkDpXXY8GVSlm2eu3mDUCtYawha9dPGYtmvcH6qYcvHR?= =?utf-8?q?fIK+L1sxWXs20jh6vXzEPm/t4UTEAmy2BQmsVW4y38lkS9Qkhkhxjzdi7fbvK+7Mf?= =?utf-8?q?epKZiSZuHn7cGweYzFLsQXFjguOGhjqmqAh/jDPaLrkXBEIzbxqM5ZXSnH4AuwISe?= =?utf-8?q?PFgy/jgwvsCuj13YZYzd0UFfKby+al1H1JioHmfS66t8ZI9U1oF3eYWVUbkup+adv?= =?utf-8?q?c9zxvvHNmh/FDi+NBZ+1IrYA+/k8HzTyLX6I170v2F7OVdtkCpSNDaJFLCAlXC4yK?= =?utf-8?q?0cPNJg7mOs7PeVfx2DjmkbtsAo1UzhTZcg=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: b241af3a-ad5a-4158-27d7-08dd41222906 X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB6909.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2025 11:35:13.1599 (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: iS1SXpDZieqKR+HF+GZLHtmRkt1AzE7aVDnhHZwfKAnspO7+vHj1pgEiiPqb9DqOuttRZr/SFeHZz3GXA/68Kiu3Qqx7kqc7d69TWbo6XZA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5183 X-OriginatorOrg: intel.com X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" This reverts commit 835443da6f50d9516b58bba5a4fdf9e563d961c7. Logging with gt_err() causes CI to detect an error even in cases of intentional error injection. Since real errors are already correctly reported by CI, this additional message is unnecessary. Furthermore, a GT wedge is already being logged elsewhere, so instead of adjusting the log level, revert the above mentioned commit to prevent redundant error reporting Signed-off-by: Sebastian Brzezinka --- v2 -> v3: - rephrase commit message again --- drivers/gpu/drm/i915/gt/intel_reset.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index 5a625518d1a9..33b55c581552 100644 --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c @@ -1113,7 +1113,6 @@ static bool __intel_gt_unset_wedged(struct intel_gt *gt) * Warn CI about the unrecoverable wedged condition. * Time for a reboot. */ - gt_err(gt, "Unrecoverable wedged condition\n"); add_taint_for_CI(gt->i915, TAINT_WARN); return false; } @@ -1265,10 +1264,8 @@ void intel_gt_reset(struct intel_gt *gt, } ret = resume(gt); - if (ret) { - gt_err(gt, "Failed to resume (%d)\n", ret); + if (ret) goto taint; - } finish: reset_finish(gt, awake); @@ -1611,7 +1608,6 @@ void intel_gt_set_wedged_on_init(struct intel_gt *gt) set_bit(I915_WEDGED_ON_INIT, >->reset.flags); /* Wedged on init is non-recoverable */ - gt_err(gt, "Non-recoverable wedged on init\n"); add_taint_for_CI(gt->i915, TAINT_WARN); }