Message ID | 1599072130-10043-7-git-send-email-andrey.grodzovsky@amd.com |
---|---|
State | New |
Headers | show
Return-Path: <linux-pci-owner@vger.kernel.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-amdcloud-onmicrosoft-com header.b=1gN3IpQx; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BhXr124T3z9sSP for <incoming@patchwork.ozlabs.org>; Thu, 3 Sep 2020 04:42:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726858AbgIBSmx (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Wed, 2 Sep 2020 14:42:53 -0400 Received: from mail-eopbgr680084.outbound.protection.outlook.com ([40.107.68.84]:28741 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728045AbgIBSmt (ORCPT <rfc822;linux-pci@vger.kernel.org>); Wed, 2 Sep 2020 14:42:49 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TY1mGNspKMSdV4BZ9zVxy/0sGJfKGaTYuZZCkN1ZH6ZAs0HngP9XY0CtKUR+9xFTWuDZW/2s5aaBpUPC0gu7kN8TI2QU5ObiJ16Z3dZj+KrZ9NsgdwE8qOXawmXGTCwNP6vV7Fw75RrkZiyM3b+OJQEeRl9xJQbMeWc31yvY5MS2DJxdr/njyoNkOYpg1kkTMzFaMOppWMIGQxb3aojXluf5CjCR8OO2TV+0SCaZbPzuFqkYHdFP2wH76J1e6kVXLSRjHhw6sbpD4wdH4Y9666K3+O3m/9zhLG0JgzNfLuOxuE/BRpyFcVfjYXLG3M90s+4f4YHeZMziGnmnFtVZQw== 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-SenderADCheck; bh=DCbKvBEcraY10XDQFhaOo+ma2huZAcWakhSf/Lt3X0U=; b=RFKLSp4cPigTVxscya152Irtwhob48nBWiL+fJz7eUslF2vhKaOdPkNO3Ir0q3jhNqpBQmFNRBy6WgGI8xsAVzeNFHIWRI1IBuc1e1FYD9q86wPSc7E02SQhf7c6HpWHyUnYIuYa3RN7J8PlxjR8IvBtCRGjmZmdmMdOLfd2hj8QbyqRshYLvoVUBKT8Va/B+cqFdExDCphXS/im2JbS3PwIXGpu1J1ptzhL//ullFI5qUwmpWwQTTahMeir7yiotn1tSnBEXPPyYUA3A1mvkFzmfkJoLKFqyusnLWRX+FhfuYtuM2TwkgSLI6MwzUWMETTEOq24IQwTvS2c6ivfjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DCbKvBEcraY10XDQFhaOo+ma2huZAcWakhSf/Lt3X0U=; b=1gN3IpQxdUdWecsnydbwksmNDcHtdnrl+8SfP9GkPPGSq2N389I0eZ+N4R8VPqEaXBefqAasT0us/x84EaIB2YCDPTz91wNHKtCAwjTV0LRVZ5sn6bObwg7bCS5/ozNfpX2ACpPbWDBdYLN9kl1wJKjkh2kL07KiRoD08+QQKHE= Received: from BN6PR04CA0091.namprd04.prod.outlook.com (2603:10b6:404:c9::17) by MN2PR12MB4045.namprd12.prod.outlook.com (2603:10b6:208:1d6::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.23; Wed, 2 Sep 2020 18:42:47 +0000 Received: from BN8NAM11FT052.eop-nam11.prod.protection.outlook.com (2603:10b6:404:c9:cafe::fd) by BN6PR04CA0091.outlook.office365.com (2603:10b6:404:c9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3348.16 via Frontend Transport; Wed, 2 Sep 2020 18:42:46 +0000 X-MS-Exchange-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXMB01.amd.com (165.204.84.17) by BN8NAM11FT052.mail.protection.outlook.com (10.13.177.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3326.19 via Frontend Transport; Wed, 2 Sep 2020 18:42:45 +0000 Received: from SATLEXMB02.amd.com (10.181.40.143) by SATLEXMB01.amd.com (10.181.40.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 2 Sep 2020 13:42:44 -0500 Received: from agrodzovsky-All-Series.amd.com (10.180.168.240) by SATLEXMB02.amd.com (10.181.40.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 2 Sep 2020 13:42:44 -0500 From: Andrey Grodzovsky <andrey.grodzovsky@amd.com> To: <amd-gfx@lists.freedesktop.org>, <sathyanarayanan.kuppuswamy@linux.intel.com>, <linux-pci@vger.kernel.org> CC: <alexander.deucher@amd.com>, <nirmodas@amd.com>, <Dennis.Li@amd.com>, <christian.koenig@amd.com>, <luben.tuikov@amd.com>, <bhelgaas@google.com>, Andrey Grodzovsky <andrey.grodzovsky@amd.com> Subject: [PATCH v4 6/8] drm/amdgpu: Disable DPC for XGMI for now. Date: Wed, 2 Sep 2020 14:42:08 -0400 Message-ID: <1599072130-10043-7-git-send-email-andrey.grodzovsky@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1599072130-10043-1-git-send-email-andrey.grodzovsky@amd.com> References: <1599072130-10043-1-git-send-email-andrey.grodzovsky@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 657fbfd2-a64e-478a-acad-08d84f6ffbfa X-MS-TrafficTypeDiagnostic: MN2PR12MB4045: X-Microsoft-Antispam-PRVS: <MN2PR12MB404592E137852264859C4677EA2F0@MN2PR12MB4045.namprd12.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lYjCfQlcTP+SbmPQFaMQ6kru7w9zGOrDDdCRE1xQxDhi43IbW1HsXUMrxPt20Om+Q4WEcTHIPANjcqCmLHRalNBKDIH+L7QD68LyWvoSsIkIMdTSHY2E+83PW+0AbIS9ONl36TnEk6Jw6HmjOMl41MahnZVincqx1KxFi+2Iv1fwO8eJEjDis5107SIA8lQCuef7SxaGASqZ+5ipP33ECsjd2zEYhjvhHjSsyh9Md5zsC9q88eNArJd52EsKtXG/kMROzr10lu3YCZ+OSl68jNqOKmkqM4mKsvN/6WembjunEY8Psco6IJTI8eAPrtq/f+ED4tQ9kfXXVUOvk6HnWB3bhlb9rNZcdguZtqbMxaIcNA/mMc7bwPvCiceZB2wEDWziGKSbXYc+PS7DnjtZFg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SATLEXMB01.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(376002)(136003)(396003)(39860400002)(346002)(46966005)(336012)(2616005)(83380400001)(8676002)(54906003)(110136005)(82740400003)(81166007)(70586007)(86362001)(70206006)(478600001)(316002)(356005)(47076004)(82310400003)(36756003)(4326008)(8936002)(186003)(6666004)(7696005)(5660300002)(26005)(426003)(2906002)(44832011);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2020 18:42:45.9969 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 657fbfd2-a64e-478a-acad-08d84f6ffbfa X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB01.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT052.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4045 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: <linux-pci.vger.kernel.org> X-Mailing-List: linux-pci@vger.kernel.org |
Series |
Implement PCI Error Recovery on Navi12
|
expand
|
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index c477cfd..4d4fc67 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -4778,6 +4778,11 @@ pci_ers_result_t amdgpu_pci_error_detected(struct pci_dev *pdev, pci_channel_sta DRM_INFO("PCI error: detected callback, state(%d)!!\n", state); + if (adev->gmc.xgmi.num_physical_nodes > 1) { + DRM_WARN("No support for XGMI hive yet..."); + return PCI_ERS_RESULT_DISCONNECT; + } + switch (state) { case pci_channel_io_normal: return PCI_ERS_RESULT_CAN_RECOVER;