Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp1135295ybe; Thu, 5 Sep 2019 10:50:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqzDXV1TRTNyoaiXRupshrg2z+xQBU0ldrSIdqN2m7UsE8EDj+QW5DYk+VHfDCbGYVC31KRQ X-Received: by 2002:a17:90a:a611:: with SMTP id c17mr5372350pjq.17.1567705806126; Thu, 05 Sep 2019 10:50:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567705806; cv=none; d=google.com; s=arc-20160816; b=ui+vumx3qJwGdCUUWU2sXSJO/CkP7iA+0izST6KILNfZM7zL9dOMXpQp43+WtqWZJO eGZYv/Mrwmg1uyoE2NPXnifKm9n7Jc+4FP+VOix21+cCbQiD3Fly2NIhKvCQc3Yhb3be sTA21Jzv3r2fXmBNnF1ROiPdg6S2qMBdOWirvrC4/5dY4SgVNtx06S66sGO2k1hgwFEM gBrOFevVnTvR+ycwls1Zt6Wri0wXycDo6GwYV59El2rBFbNOcnN0wCXwjElWa7ZnDgeS l2aN0xfKQtptgeAKeFbe2a555wJUa6iSIKd3k++s3ZOxtkF07b1F0xdO4m5LCPmWPHeB uXUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=HTTCbiycHpLnbjua3L1q3ej13API+hOei9U1sFU1o6E=; b=BqgBo591sckuelO+Kczq1M5a1lV8SaTR7j8BbbjwiFPDahyIZduuHX/hu7mTG+WQ6u GOhCoNnHyxMlfyWM43QMBsA71+XnA/kmgW8/KL1yL0T/CXJA5AWpDEqc6yHl62Tam3zX 7CJMirvBzq1GWlSHYUsEewDSCxiVS7309nXIT4VyKh7oxQ1HC9kV3rkT/9DqiEk108AC W7Vn9HWUmq0pM5M/7DSCwDK0Ca+kFmfRdheMa+E4nYl0dGqUTYPUNjsnNK8NlqKBJJ6N jE+7+NLM5ICH5aeDO2mfD30SPjrnLVLmdCCOABy6CQtJNDKUTFsb/BUwpe2HLrcIv+Mt lxsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b="TCXzn6Q/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e66si2339602pgc.197.2019.09.05.10.49.44; Thu, 05 Sep 2019 10:50:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b="TCXzn6Q/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387715AbfIEOBK (ORCPT + 99 others); Thu, 5 Sep 2019 10:01:10 -0400 Received: from smtp-fw-33001.amazon.com ([207.171.190.10]:39331 "EHLO smtp-fw-33001.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726968AbfIEOBJ (ORCPT ); Thu, 5 Sep 2019 10:01:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1567692069; x=1599228069; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=HTTCbiycHpLnbjua3L1q3ej13API+hOei9U1sFU1o6E=; b=TCXzn6Q/UhqjXR+RdwTSiTqAkCWyUICreD5B36u5S9IbLJPA5/WcgeIQ ml+M3A5oBc4XbEBrBdzxsDvN3Qx0DWvsGkrIiNPfrSxMnPR7X8DMkzADC boihNQKgHmND7j61AeYvtCRkWGWpElRY7rCqZoFxMAuVe8Tckbu4nvO4d 8=; X-IronPort-AV: E=Sophos;i="5.64,470,1559520000"; d="scan'208";a="827733331" Received: from sea3-co-svc-lb6-vlan2.sea.amazon.com (HELO email-inbound-relay-1a-af6a10df.us-east-1.amazon.com) ([10.47.22.34]) by smtp-border-fw-out-33001.sea14.amazon.com with ESMTP; 05 Sep 2019 14:01:07 +0000 Received: from EX13MTAUWA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1a-af6a10df.us-east-1.amazon.com (Postfix) with ESMTPS id 3EB5AA0724; Thu, 5 Sep 2019 14:01:03 +0000 (UTC) Received: from EX13D13UWA001.ant.amazon.com (10.43.160.136) by EX13MTAUWA001.ant.amazon.com (10.43.160.58) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 5 Sep 2019 14:01:03 +0000 Received: from u9ff250417f405e.ant.amazon.com (10.43.160.20) by EX13D13UWA001.ant.amazon.com (10.43.160.136) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 5 Sep 2019 14:00:56 +0000 From: Jonathan Chocron To: , , , , , CC: , , , , , , , , , , , , Subject: [PATCH v5 4/7] PCI: Add quirk to disable MSI-X support for Amazon's Annapurna Labs Root Port Date: Thu, 5 Sep 2019 17:00:18 +0300 Message-ID: <20190905140018.5139-5-jonnyc@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190905140018.5139-1-jonnyc@amazon.com> References: <20190905140018.5139-1-jonnyc@amazon.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.43.160.20] X-ClientProxiedBy: EX13D06UWA002.ant.amazon.com (10.43.160.143) To EX13D13UWA001.ant.amazon.com (10.43.160.136) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Root Port (identified by [1c36:0031]) doesn't support MSI-X. On some platforms it is configured to not advertise the capability at all, while on others it (mistakenly) does. This causes a panic during initialization by the pcieport driver, since it tries to configure the MSI-X capability. Specifically, when trying to access the MSI-X table a "non-existing addr" exception occurs. Example stacktrace snippet: [ 1.632363] SError Interrupt on CPU2, code 0xbf000000 -- SError [ 1.632364] CPU: 2 PID: 1 Comm: swapper/0 Not tainted 5.2.0-rc1-Jonny-14847-ge76f1d4a1828-dirty #33 [ 1.632365] Hardware name: Annapurna Labs Alpine V3 EVP (DT) [ 1.632365] pstate: 80000005 (Nzcv daif -PAN -UAO) [ 1.632366] pc : __pci_enable_msix_range+0x4e4/0x608 [ 1.632367] lr : __pci_enable_msix_range+0x498/0x608 [ 1.632367] sp : ffffff80117db700 [ 1.632368] x29: ffffff80117db700 x28: 0000000000000001 [ 1.632370] x27: 0000000000000001 x26: 0000000000000000 [ 1.632372] x25: ffffffd3e9d8c0b0 x24: 0000000000000000 [ 1.632373] x23: 0000000000000000 x22: 0000000000000000 [ 1.632375] x21: 0000000000000001 x20: 0000000000000000 [ 1.632376] x19: ffffffd3e9d8c000 x18: ffffffffffffffff [ 1.632378] x17: 0000000000000000 x16: 0000000000000000 [ 1.632379] x15: ffffff80116496c8 x14: ffffffd3e9844503 [ 1.632380] x13: ffffffd3e9844502 x12: 0000000000000038 [ 1.632382] x11: ffffffffffffff00 x10: 0000000000000040 [ 1.632384] x9 : ffffff801165e270 x8 : ffffff801165e268 [ 1.632385] x7 : 0000000000000002 x6 : 00000000000000b2 [ 1.632387] x5 : ffffffd3e9d8c2c0 x4 : 0000000000000000 [ 1.632388] x3 : 0000000000000000 x2 : 0000000000000000 [ 1.632390] x1 : 0000000000000000 x0 : ffffffd3e9844680 [ 1.632392] Kernel panic - not syncing: Asynchronous SError Interrupt [ 1.632393] CPU: 2 PID: 1 Comm: swapper/0 Not tainted 5.2.0-rc1-Jonny-14847-ge76f1d4a1828-dirty #33 [ 1.632394] Hardware name: Annapurna Labs Alpine V3 EVP (DT) [ 1.632394] Call trace: [ 1.632395] dump_backtrace+0x0/0x140 [ 1.632395] show_stack+0x14/0x20 [ 1.632396] dump_stack+0xa8/0xcc [ 1.632396] panic+0x140/0x334 [ 1.632397] nmi_panic+0x6c/0x70 [ 1.632398] arm64_serror_panic+0x74/0x88 [ 1.632398] __pte_error+0x0/0x28 [ 1.632399] el1_error+0x84/0xf8 [ 1.632400] __pci_enable_msix_range+0x4e4/0x608 [ 1.632400] pci_alloc_irq_vectors_affinity+0xdc/0x150 [ 1.632401] pcie_port_device_register+0x2b8/0x4e0 [ 1.632402] pcie_portdrv_probe+0x34/0xf0 Notice that this quirk also disables MSI (which may work, but hasn't been tested nor has a current use case), since currently there is no standard way to disable only MSI-X. Signed-off-by: Jonathan Chocron Reviewed-by: Gustavo Pimentel Reviewed-by: Andrew Murray --- drivers/pci/quirks.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 8fe765592943..5a8ea5fdeae7 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2977,6 +2977,24 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, 0x10a1, quirk_msi_intx_disable_qca_bug); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, 0xe091, quirk_msi_intx_disable_qca_bug); + +/* + * Amazon's Annapurna Labs 1c36:0031 Root Ports don't support MSI-X, so it + * should be disabled on platforms where the device (mistakenly) advertises it. + * + * Notice that this quirk also disables MSI (which may work, but hasn't been + * tested), since currently there is no standard way to disable only MSI-X. + * + * The 0031 device id is reused for other non Root Port device types, + * therefore the quirk is registered for the PCI_CLASS_BRIDGE_PCI class. + */ +static void quirk_al_msi_disable(struct pci_dev *dev) +{ + dev->no_msi = 1; + pci_warn(dev, "Disabling MSI/MSI-X\n"); +} +DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, + PCI_CLASS_BRIDGE_PCI, 8, quirk_al_msi_disable); #endif /* CONFIG_PCI_MSI */ /* -- 2.17.1