From patchwork Thu Jan 23 11:33:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Brzezinka X-Patchwork-Id: 13948154 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 3DF80C0218C for ; Thu, 23 Jan 2025 11:33:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C9EF610E7E3; Thu, 23 Jan 2025 11:33:15 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="htb2Gz1T"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 995EE10E7E4 for ; Thu, 23 Jan 2025 11:33:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1737631994; x=1769167994; h=date:from:to:cc:subject:message-id:mime-version; bh=Ht162+L7cSX9JmAsjBtzR9QZ67xtPrQPjM69E4mzoYY=; b=htb2Gz1TlUB1N2QhMzxJl99L+3Tgaxr5V+JYfo/jYhfZOWzcksPocALr jLS11dkotmbAqhoTzVKopVKHymAo6vVtR491vKxZRFAMnZRRx5kfw809l xbl7nMVuymfth3F/2X9VUyCx7TPi+8tQCaXXtjd8AThaBxXXM92YNhnE3 QOG3ktJnNytBD10RQGW0ZS3zagFU2GuSonK7mp4NKCF0gj08bZJKXjbhH FG2bYzBo5ovBNMJ8pHw5Ny79UL8cT8oiyUvzU60Zrj4CU1VBRLj3iJ+tf L8q/Zx3w17E0svXM4qsnC0UJ4xqknGtdB45fACJxwlUZdLkPBToN4lnN5 Q==; X-CSE-ConnectionGUID: QnHum/ZUSGmY95IoIsGqOg== X-CSE-MsgGUID: AIdKnhE0TVKD4bn5HF/J8g== X-IronPort-AV: E=McAfee;i="6700,10204,11324"; a="48714829" X-IronPort-AV: E=Sophos;i="6.13,228,1732608000"; d="scan'208";a="48714829" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2025 03:33:14 -0800 X-CSE-ConnectionGUID: ZiVvsiLUQL+RTz6Fzh4hwA== X-CSE-MsgGUID: r1nyNqPxRB+2r41H78GmJQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="138302871" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmviesa001.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 23 Jan 2025 03:33:14 -0800 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 23 Jan 2025 03:33:13 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx601.amr.corp.intel.com (10.22.229.14) 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, 23 Jan 2025 03:33:13 -0800 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.46) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Thu, 23 Jan 2025 03:33:13 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Wm6yhT82/1/bQQnaoRptFHrsri2Xzn2DjgSzd5PhUiV7SMS+wxdVxP76xaiYqFJKR79cpR0Z9yuqn12ZkmTbMVw61ytT52vuoBFeji7GQCzFSzV7kQAEwisuqSoe58FT4kJAuUteX+e7EM3673quT/P4UjKNXaCg02JC75FL6NIM+rhwfyd7JCth290D/1cjAIRll2K9yJeUfWmy423Zt3mhw1sWUTlclrZYSfJn73l3FB6mHGjO9c8m7G+B2AtmF6vDGBsebODIjA7rCK3fJLoPkMZtpHimWzX/990P/IIe6Y3k2Vx1BcP+vPyFhVLYHD/PkawmnvxRXVeAbmClwA== 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=jJw9ZMA5g+5JXDPFFiDpMPhxvWHMjNID38L//yffleU=; b=D3U4NkqTuNX1uSL4G0s90CfvGFmVp72wX6ElO/Z3abtqj51fQAKZaZB+nvqyaM8YqMHwBztKOnqz29vh0OnhSgFNBstHfLoUnIKh1w8f1+akmfAgR5WBTznvFfKbfi+z/51WWcgyYDSYnl/aaC66AEhScDdqHZKa4FYl3/GNG6xeX9u4G1D+bZiFz92gsJWAtBbNKc6mh+/4nBivPX8qgAa+LK+xCabdPcgWE0JW7NrgdelE+DNoniXgRzbUuD6rITdrJOyXiMu3g04cJSV6LVyS2/kDnMMIN1VGe5l1daTuLnd+gLBp/dlDea2pjJ9/qbLAgMEytWIrQc75Wv1GZA== 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 DM4PR11MB8202.namprd11.prod.outlook.com (2603:10b6:8:18b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8356.20; Thu, 23 Jan 2025 11:33:11 +0000 Received: from MW4PR11MB6909.namprd11.prod.outlook.com ([fe80::28da:9438:a3ef:19c0]) by MW4PR11MB6909.namprd11.prod.outlook.com ([fe80::28da:9438:a3ef:19c0%6]) with mapi id 15.20.8356.020; Thu, 23 Jan 2025 11:33:10 +0000 Date: Thu, 23 Jan 2025 11:33:00 +0000 From: Sebastian Brzezinka To: CC: , , Subject: [PATCH] Revert "drm/i915/gt: Log reason for setting TAINT_WARN at reset" Message-ID: Content-Disposition: inline X-ClientProxiedBy: DUZPR01CA0064.eurprd01.prod.exchangelabs.com (2603:10a6:10:3c2::17) To MW4PR11MB6909.namprd11.prod.outlook.com (2603:10b6:303:224::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW4PR11MB6909:EE_|DM4PR11MB8202:EE_ X-MS-Office365-Filtering-Correlation-Id: 14a807ce-ff38-429f-c075-08dd3ba1b72d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?q?RltiUVZ9/TvKjksxqEDz0JG9PX6N78H?= =?utf-8?q?458RJt0sI98WwOEHVdgdG0+uE20FMYxQkDYEweCkKIA9+HBR33nHorDf13xIva1qv?= =?utf-8?q?U3ValUo3A9X12St2u6bThobB0v8g3HahaQb7HTu7QYrnZtKp/wjLA67lywNn/TyNX?= =?utf-8?q?cZkB4HZLZVsG8W9cDaTA7KYnIOYYVpyKVVsCmCiDd1fMM6gXk7gT2uvSXoCh76GCB?= =?utf-8?q?1VXdpugoBA7ECwEcsPe73MIGhDusd4CAkjdTPMS40N8FBKBucq/HiAr49lqrbeBT6?= =?utf-8?q?5Q0cUZ/TIQTnd7nIG971mlX4k7VqerJejNMxZeChIf6jR+2gNRCh5yQqdgjmHRw2Z?= =?utf-8?q?cwto8j61ghcvhT2nh2TawZ1q3VjQYzSh+RhuoUePm84WC9EYUoaAYqE2vTKGz3vvG?= =?utf-8?q?qzGtijI4ief8z5KNNop2ETK9SeUK81dzVY18yat2GYaqHJ0P2ehqrsiK0Zfui/Q82?= =?utf-8?q?cPzrSIe+KcRQbJ43XPKEYczuXDsxxG28epcal2Ko+Co/sSU49k3VxZZwa8aIBflcG?= =?utf-8?q?TljAKGmGC7BXdMXl9waPRXQBzGqsFtVnxv+X5nCpkDujHHkDMkdWsfBU+ZH4Rk6r8?= =?utf-8?q?VoNrgjgRtsEnpA1DxePQi3qpHjEuhgBC5/LCAdOpA13VPX9iNfBQGKe8iOYPT2igF?= =?utf-8?q?g3s4x+Cc+bH93PqkZZp/e/F3NM759YCFK8bjX0uSfGCJku9GoJf4Inog6x9uKvNUH?= =?utf-8?q?3fwP2qoey9JUHKyKImdAqSy4Lr7jhBhHSKXSZfmntc2XdiBqD0x0fhYMkxVt4mHIE?= =?utf-8?q?A/h8+8iCa0uNsZWCjTW9Zir0z7ehXitk51jtfkf2yiGnDiZFQR9CVULi2dP0euNd5?= =?utf-8?q?h7BQWlAHUdiTcWLsIQHhLNES1vO3rlNCw4sKt72flmidhvtxPgf7UC0olUXUfSKEa?= =?utf-8?q?uT+DWlOIXjzQkgPOLLi8Zh19141CqyVG5vjqVb4bhIZt0nDURP4GlgFK7lIjcXklL?= =?utf-8?q?SDtFMPucdYRuYX51/wJHasfeETDRDreSsV5Szy1o6WUUYZOOgU5El8VuUjfkKANyl?= =?utf-8?q?aMYT3aXXcGwO/KzmUurYIaLecg3rpyhhC1AiJu9HUpXW0wO43Qe4LnUKNP+/6lgtn?= =?utf-8?q?yRWat7e0e3KrlHRFS40jhUiGNAINsKEpNugyP8Y89xypn5fvPBlfOFzrOiks2xXhh?= =?utf-8?q?+ar6+Ri3W5qvB+DmoAuwpWHGA/4zSmXreofZJYNAI0iYvS7+hqehPITx/WmbM7Q1M?= =?utf-8?q?FDfW0wh9C0Ylo2snKH6/i0UVcs2ZbZcwLynwvPrb9nm8bugB9JPn7eGpL8V2m+7Yp?= =?utf-8?q?TEZMmZmFpmmNF8LW6dOHuAocnaOW98iz6LqqZ9K2sBzqM+4sY/OSG0TUtq8le+DPh?= =?utf-8?q?EGpjH3v17aTX?= 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)(376014)(1800799024)(366016); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?+Zv+fe9o4gNpDchSdvlC5PbLgEib?= =?utf-8?q?9pcH0W7xIJVCj02+H0MDuZBgFotjSxcxiOrkCMCZ+gh8viLvM9s1oLXt9jBjU1r2s?= =?utf-8?q?7I6h9qy88LubNsx2PdfANfKCL8jiyYqBkFUQhQkxRxPWg7HhRx9MC22qaKgHd0gjW?= =?utf-8?q?6I4UZnJZnUrEFC7jLwisvC/DHTnUrz8xVfU/jJTWEethfpVA9OaSDg05kkviHdgZv?= =?utf-8?q?Vd9rKVwIejwCC++3BiQYoDBR57w0KOUf5IHZ1i5v47VYWLeh7vS1blZu8paM2ocMw?= =?utf-8?q?56+QyAzMiwnFCpaG830FfaqybovEPxJjkq4gEwvN9dneq3uZ4orIbh+tx6Dos3aKS?= =?utf-8?q?3c6I+NWYherfVJdPGhREJBXDxGxMiZxAWE381JxDUjI4lkaiTZIDguy2WFAcfYvES?= =?utf-8?q?X+VVc+VLHb4SkH+PKLdA5ppG3KmDwKJ1M7YcOTi0WgrlTvtqTvILkTUbO4XqZqyLt?= =?utf-8?q?0ExnrqsH9M9q1ByzLplFyIz9ZZOZjRHjBpSMCyGsizxDxXQBgw0UZ9qVKB9oW0Moz?= =?utf-8?q?grCcLQTkJLnC2LI8wqLZ6oXkvmlDGwlrWeia549YznyPWLSqy1vWhBnCbWqbmEjHj?= =?utf-8?q?VEBSDz4NOmw9XQfgw6K7pGtWO4pfYk/GEk/MTsj7Kct1VC7iDW9GR92i90WRMT3Uo?= =?utf-8?q?EeKAh0NpNoTfK9cFDpSQMPjcEEcUL0/731D4IYf9FJYrn71BN0dXtnuTLl8A/w5u+?= =?utf-8?q?V2ko/fqrvQd/A4Khr9IJEl/d1DbwHeZ3bWnCttaXnDjY9hzv0+c4ruDanurdpqAZa?= =?utf-8?q?RYKobedoqMhbGvEkoOhsNi1ivXkJvePL/CcwOgBsxqdn2Sv1DBWNm8bLfsen/q6YD?= =?utf-8?q?cKX84D3zTl5yOwBDW2v5D/q9n9a7NyJq64TDuj2czP6kQ9BaBjbyHYFOgEyuKOvXy?= =?utf-8?q?hemWYgVtYN9i7QB9zXdADVoqEIJyLkpj5p4tURLn4zOrdiOxEvHtqpL05KFcnNKoJ?= =?utf-8?q?1+mUGs14ygvxxCzvZUUAX8OV4TbT1IunmJhonlOl4zpGxIWJU3QC50kK6G1aTuFuC?= =?utf-8?q?JtBVPej4e5+VAthyuH1Ggwe3IYJimnIjEa7hlQ4ksTs+LcnRn2ROO+4cQb2UIrxdw?= =?utf-8?q?WBLc6HRoiv/PV5i756qraHB4KsNuG68OSadD61AWWnhsQ7Wm4XJugJnhpAIcW1tKx?= =?utf-8?q?REcFBqbMa3yZOTuqJqISPyTGhSdLXvQ0NRMeI6+nO+1fxiYT9hjnZ+0himhitt3aT?= =?utf-8?q?ZGvBDRMEIiOIDD9LXFoNZsKoqm+WQ2U42FDvDpRKMqe/B9bKkrL3ii6zra2Sl2V98?= =?utf-8?q?kjz63VB0sUZ3JBG04VZOW8RWDyH9qKSHGQKyxuVuSw1ReHmDdota7JfdEvRiIfAQA?= =?utf-8?q?UoQUwweGKQBE3zVqHFajEC/PUUtUcY2o7zD8xKyy85qu10RjiaSlG2ZEm0xQrsmdN?= =?utf-8?q?B52FKK3DjPiaewoFB236eLksC5UOZEUtKLjiDn55KOrYmvhIMMeUDHuNCULaz0nzz?= =?utf-8?q?m9MVTPN94h2QcXv6dxcGx9RKI2aN8i0kuisG8t+H378Kcxh8HGMvL+pD2txkvVqQ2?= =?utf-8?q?6+vfdbQHAXsR+PX4PP2uALjDrOHCDCg/tQ=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 14a807ce-ff38-429f-c075-08dd3ba1b72d X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB6909.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2025 11:33:10.7895 (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: l4DexzU39NYyw9fffM5j02Y8ighlCi/o9kuHj4KNb5UUIjxOGJxAuqFZWqD7dzbC62WNo7TxsiIvAcqElIXeX/YLfsl1BLqSzMGw+3OVn78= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB8202 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. Kernel taint information is present in dmesg already, and in the case of an unrecoverable error, the CI restarts the device accordingly. Raising an error causes intentional error injection to report an undesired error notification. Signed-off-by: Sebastian Brzezinka --- 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 aae5a081cb53..c2fe3fc78e76 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); }