Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp2969886rdb; Mon, 4 Dec 2023 12:36:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IGVhOgMWGy8kk4Lg67XRu0WmHcHCS9/M3lrWNlPT3u7esVJHMGkhdCVc/ueRf21YSUdo4ew X-Received: by 2002:a17:90b:214:b0:286:6cc0:b926 with SMTP id fy20-20020a17090b021400b002866cc0b926mr143219pjb.93.1701722174246; Mon, 04 Dec 2023 12:36:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701722174; cv=none; d=google.com; s=arc-20160816; b=RCG6wEvBEVWvDgT8IO9/yVP8Z+MTu8/bb2jwmYD9ttEBeRHnlxCzDbf59PHCL10W5I n3tfDU8hs0w97BZ1W9Ewxl4yvTZt7lNfvk+/tRHD4GPs+LEsBI2U53k5hf0ZerbAjGUC UgWr0YSWlWPte0x1+lpS9Mljz6HS4zFxhxOA2s+EaxMooxS1iEaUR7KeY2762KkVZOhO kWT973YICoYtT2JdeftKBsP8w9+iaIL4mJzmSDwK+wcMaDmUKXstHn/rH/HpjxgwDgtn vbROgYahWZQ8fK78AXcN4JSQ4kFivTqiWpaPACDUTscsmPdcYv8+OLk2FemaoUYZdeyG 967Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8y679AI7GMQaaZ0OjifAI/zSxvRR+jlaYul4eNCeWGU=; fh=Hq4HwciEh+OudeBHHn9KqJFuPhziLZrWYpMIiJJiFIE=; b=IeIAQxfcQybmGlNr/PqoZ9vf+RHjMo1f8twbl9/P0vkEXHcYmuIEe0U9jsRlzMbmii Rn/M5m9l1l7BH3CUcebUPMdfjzR3PGZGvZTWyePBZE5Mg6v5aBRgyt89QQ/qF/qghHvg myPiqJrvshonI8MDRJ8sZ/gYHc9JS3onmGeRIgx5R2+9fFAM37T3DXc2MgFCfnsrN8xa SaNmUyRQHIfXvLcWupYU0LaqEg6SLzwZ+fGOrX8qw7QtcUIBdDWRuoC6lCzI8gMcwgXB +DUm3q2NzmBgIRIqYGxYIiDwGnOXcolKXFbDBU/Z67j6dbJ/JJFeWWj9BYoNnYN6RA5r 32sA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uDlYXIPH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id sm2-20020a17090b2e4200b00283a18d5662si8858807pjb.80.2023.12.04.12.36.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 12:36:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uDlYXIPH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id D001E805CDA6; Mon, 4 Dec 2023 12:36:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345875AbjLDUfy (ORCPT + 99 others); Mon, 4 Dec 2023 15:35:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229741AbjLDUfd (ORCPT ); Mon, 4 Dec 2023 15:35:33 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9942B2133 for ; Mon, 4 Dec 2023 12:34:27 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 175EEC433CA; Mon, 4 Dec 2023 20:34:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701722066; bh=cq6q6SprEF7TJmOidVjn7rV5ZJdddDKd2dLoRMiSmoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uDlYXIPH9DbNeq9VNJJD0VyE1rVxcOQ2qb7hrlojgSvYw6RuQdVIyx7+yag1i629i 5tfkVwFZtFe/iP8n+Panfat4rI5wYcv3M6SRF06IFZq/hBI2H/Be2prtisLUukh2Ji XYfBQhV84rWs6qoknLbsuvh2T82K1dWv/xa2+qecdtYbWjL2Y/CvV/fNOGOgVsxzIw LB3BvCqHGiN7mqPFuCL+YGzYDbYSqzT+HLpKSOBxSKJky17WuVp6IqDidK9wObwwx+ 323DflnPy6vug4u1yGQXRfiIqvTZiDyUM73YM8UIYmNM6dXtuiZOD7Tq0mDsNbC85/ Dgn/DUfKCCWxg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hawking Zhang , Stanley Yang , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, lijo.lazar@amd.com, le.ma@amd.com, Felix.Kuehling@amd.com, James.Zhu@amd.com, tao.zhou1@amd.com, asad.kamal@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.6 23/32] drm/amdgpu: Do not issue gpu reset from nbio v7_9 bif interrupt Date: Mon, 4 Dec 2023 15:32:43 -0500 Message-ID: <20231204203317.2092321-23-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231204203317.2092321-1-sashal@kernel.org> References: <20231204203317.2092321-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.4 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 04 Dec 2023 12:36:12 -0800 (PST) From: Hawking Zhang [ Upstream commit 884e9b0827e889a8742e203ccd052101fb0b945d ] In nbio v7_9, host driver should not issu gpu reset Signed-off-by: Hawking Zhang Reviewed-by: Stanley Yang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c index f85eec05d2181..ae45656eb8779 100644 --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c @@ -604,11 +604,6 @@ static void nbio_v7_9_handle_ras_controller_intr_no_bifring(struct amdgpu_device dev_info(adev->dev, "RAS controller interrupt triggered " "by NBIF error\n"); - - /* ras_controller_int is dedicated for nbif ras error, - * not the global interrupt for sync flood - */ - amdgpu_ras_reset_gpu(adev); } } -- 2.42.0