From patchwork Fri Sep 22 07:25:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 817363 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xz57z1cQ2z9sPm for ; Fri, 22 Sep 2017 17:43:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751851AbdIVHnA (ORCPT ); Fri, 22 Sep 2017 03:43:00 -0400 Received: from mail-dm3nam03on0072.outbound.protection.outlook.com ([104.47.41.72]:19201 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751795AbdIVHmz (ORCPT ); Fri, 22 Sep 2017 03:42:55 -0400 Received: from DM5PR03CA0040.namprd03.prod.outlook.com (10.174.189.157) by BN3PR03MB2356.namprd03.prod.outlook.com (10.166.74.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Fri, 22 Sep 2017 07:42:53 +0000 Received: from BY2FFO11OLC007.protection.gbl (2a01:111:f400:7c0c::122) by DM5PR03CA0040.outlook.office365.com (2603:10b6:4:3b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.9 via Frontend Transport; Fri, 22 Sep 2017 07:42:53 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11OLC007.mail.protection.outlook.com (10.1.14.254) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.35.14 via Frontend Transport; Fri, 22 Sep 2017 07:42:52 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v8M7gidS030488; Fri, 22 Sep 2017 00:42:49 -0700 From: Zhiqiang Hou To: , , , , , , CC: Hou Zhiqiang Subject: [PATCH 1/2] PCI: Disable MSI for Freescale PCIe RC mode Date: Fri, 22 Sep 2017 15:25:21 +0800 Message-ID: <20170922072522.36306-2-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170922072522.36306-1-Zhiqiang.Hou@nxp.com> References: <20170922072522.36306-1-Zhiqiang.Hou@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131505397732009251; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7966004)(336005)(39380400002)(39860400002)(346002)(376002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(110136005)(50986999)(498600001)(76176999)(2906002)(316002)(50466002)(50226002)(48376002)(16586007)(72206003)(305945005)(2950100002)(36756003)(189998001)(5003940100001)(8656003)(68736007)(81156014)(104016004)(356003)(81166006)(8936002)(8676002)(105606002)(77096006)(97736004)(4326008)(5660300001)(1076002)(106466001)(6666003)(85426001)(575784001)(6636002)(47776003)(53936002)(2201001)(86362001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2356; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC007; 1:uOECwMNOBB4tq5BUHQsMTbsgRha/JIdq7uPwla1aOAuA0n5EC/vJ0WWHbCqFah+JqwLOT5MSFcmPvkf9556nN1k4DI59Q3Ws7NjzZY57g2pO/OVx+EgQdv7+H+MEaawW MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc3888e6-52b3-4d20-83c4-08d5018d8851 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN3PR03MB2356; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2356; 3:NhwdHWGDPf2QoDQiGnFown6mW0IggeX4gSic4CyT6GgvN8bpFbYjST50BZZKUVbinAaioCI5FAgh+Fvp5qmDM6l7Qkln4kvn07kcwfXqjI6VDY0xI5nYpZdO3z3fpUook3hR37NWnGId8aTua5GaFEN1jwKiFR9MPjGW9MWGviEcwmngpJp1Vte3vyR0QuTkP3uPMOETgdF7svxfuQ+V6I12ezcgFJ2JG7GRGsgyei1pw3Cgt/SwY6egutAVhlzW88z6NJIZ6OjHYu0bCAaKFAl5/FDJBmLNW/TAtjs8EbktAJkQin6aHj7egcHaXPy5Jk4u3CeSKA5H49vYaiVbUeI1AOqSRCBW4Repk1LcsoA=; 25:GpuU0yC0GEusrn40nD388R174yxn5K6VhTaj/RdjR9KY0LTH3VdNSt4TEY85b+DPiblhphssM2xtXDQVl0Uh6IlUlF38BZcOg0zat0rGlMuqI3VP0ioCKM82YXFMo+QOPp1Ouhb9eLU2b+OyNLfv5dTtqtgsWUnP9dIgCZ/GZYByEp4BMvAX9SCBZqNkWDY6JlE09iLvfv7JlhRyhpUEKirDr4tHjPM7Cl2b8dSPTKlYp4u2riDkxAhmh5qXu506WXGSh5VgOXAIDWil+MJoOrwhg3qHDYElFDMrmD/4PX2Lq0STNwowK3s7qLvCTEeUkF6/QQ/+LxtczwEWK0vc0g== X-MS-TrafficTypeDiagnostic: BN3PR03MB2356: X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2356; 31:2DOjDdC7PUz/3Wj9gqymatNGMfpidSk1ak8WnHlu8VBm43Y5vz9+uCKKLsvg6tS6dz7R3Kv4fO+Cgt10wtzdLCyMtPFf2EDXILFNuQ/FeoUbofG+qmaJ+UtpJvLZmSA0+xhKCx8XWjW3FwUB7E6IxaJ9E57aKSfl44CBxYZ9jhLQczYsZDrdMsLNaUJH7tNUEZDTAYnEi2i9wnfmu+rdBmUrNqyDa07Key3wGqx/APw=; 4:ptGYhqRNV9IYOYDZ7bDSHo835FOpZcZ2EHUA8tyN/5Nr8CKu6aWzlvf2YKxs8cWV2WeWt+CIdDubFstKpkzFppfxUJgyJB7jO+jaOSMd/57ubnkyIdkibJi3lUD9EaE1VbF3BcUjQ+TyGoOcqwJbSiWhZxrhDdMPhtwrBNCtjcFXinQOrmLaE+6/GWSbxLuJwVaOnhAYNRt7E15eGtEz59OPNSOOaNPiUv+2T4N+g2W0M/2+ye0Bj9O7D4RiH+1qw9HEhU8oPutiDZQh7AouhZ1fAeo7JRHaE3y1GFrnfFo= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(3002001)(6055026)(6096035)(20161123563025)(20161123565025)(20161123556025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123561025)(20161123559100)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN3PR03MB2356; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3PR03MB2356; X-Forefront-PRVS: 0438F90F17 X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2356; 23:qJqxJTqn3Fdv5Mg3JOP0oLN+EzneKNUziWN/BlmNTV1qN90us8azJuSpq15a1wJc9atIBK9hyyv/FMxLKZYnOsLJNN61kqmreWYhHUB5qLZom50v9SLqg+GRbHUhKyasAw15n2gpgoFFNA+hCd4DT3IziwkDETaU2uBbpCmfXE810EnuIfAkj/2CSfVX+zqL5AAjQHu3HNIKshQF0tLDt94cys9LsvWb25rfM3VbvkW+AjnWlHBQwpgf8e12ACEi4BmzqfHy+70NN9bqV0xOapA0Fqk7Vo0qbKV7eHrfvwCRZR2PSmtNhsQ5FQsAQgrninztauaHoNP/ZR6B0oMKTo/bcLjPVdaTfRkTVvAqi27kZZd63o+2yHZwfLLBOKSzcni62Lrrt9nvJMZbVuXHT1H9PjA7tv9OFQG8IVVdfZvL0gui0I1TlqoD6DrCUOp45XD+5XrTNJV8yg3Bv/h+TFHZ5hliPtg7rmL06aYjQzIFor2XehJ3s2K3CoA6wIYqK7fAaE5BBZcCOzKgQe09BH1Ib0usCvBBqYV6ClsT9Eb+SqaoIUE5Rcl1EC7xR3s4cehC3kXbg9p/rwJ2PlKyU5jUm0wsfIhsnh7p+yVEQfmSEUlPvgFyMpKM8EnOdcWB5fY/JQd/CS270f2c2AAdoifKuam8dbzGFCCiB6amhQMoHHqB0GQC+bZEKtHQLMt0Hamp7FW/VGSmYLYI/KNMpkY971UyRY6B+kfOF44/oOXFeZAPJIhibt7XsMsk0ycuAJoIb1C+tg6FUNiRq0JPubBnh+ecgoqc1OpXnroGzFfxoZcdf4Iy6cpWBzXaQ324dlVN7+87uGsr+YvxP8j33wSztfOFI+C5EVykmo2O9qAFYwGKNkiwWNqSxxnaeyBNhd6+nVkuJTOJfzgPHf3g0ZjgCLEN96uH5hYncC5TIbt1faJQBGGnF/POeBLkz8GjMS9bdCNd4T/R5+H3xBe00oaB58uWwg2hNDlS5xVq0f0kDUQKmozcwAAhgSmNxwMKNkp6i2Y1VKly25L33Veluc5KeiUhwuECMETanUodzoNn+V2TQ8O3y05YeF5cIEf/0SOWNwiUH2GwEC646KYboGaeRllNqLSVndzBCr+0SD1WkP+KKzun1kOmaP6VCbpKw7wzVaMIGLws2Whhu0a2v1+vOSqHBEnqADvWS0IaCGKeNLSQdW6ERw/wlSsDMuTuQs42NmljFshOJ7LD5He//ejzz7u8xtD+TYN5YDXM6F4= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2356; 6:pjjaPFXMdeOI8qRfZ5ezwYjXKXLHHh+mhA8/pmiidmlXOHSoQxb/OBtCC3eGwYAP2g17qoFZfidfnMZqNuxMFIteFQq+02N0u7tuhZGCBpTZN7efGclHtA+eB7vHJzY9OgMiUMhygSQhoIomMO5d6LlxPFnbS7X5Hk0mclM6OZFHU84sizwdUPAH5GXOcgjwd7Zbtdj4XAgOay29Kqgi/qYaSJHqRLtLn2mfQwFhIgCcLZaS6S0EbUJoX0jXCG5XtipfEkbDfIYALw27NI4vFbDthl2o7SlwE8ya8h02zWqPsGdWvjXzUAvToSOS5U9ZrGkCJWrjNCERY3hJCFrjdQ==; 5:u/IEOAiUXq7nlQhYHBnmCINPAKCO9AYs8IL6bMu4G8JfXxkChYeN8OUDsHF3rZh5o4JqGq2g4QS38q6sLGIWVYdwB1mosHCPjuN/uTXCV8GFxh61Dr0BfHRmMGlqS+kM5/wFQ/KGpOnRVie0Z9grXA==; 24:gGvZLYtjf5V1MauzCs5oNxFNlIQ5R3rdw6yO8fbXlWQIlGqrg3xGBSdgQGyACot49QaoqLuHgWuZgDXmS49pjqoGvQJjFE7y4rSkJPQTP5s=; 7:fDCfM02v/5nDEVvIkGBxeUDp9iLMhNyCmpmXVC94BLDJzx3hXrShpG/WFY+OdWAZvlnbeqyJveR5xI1rukkD6/5JPC1sxcIxqp1OJ3BI8xRohldXoEzEjdVup43FyiZkTfvb9BcGlHrXQPvpBSRsYuW4sbBuDrGm75uZSxCsN+KbTIlP4eVyW9r7X2EplsVU5fyQhy2G6jrTNBIJX2SVACPcH/xlVcL0sWmVX+wFD3s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2017 07:42:52.9981 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB2356 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Hou Zhiqiang The Freescale PCIe controller advertises the MSI/MSI-X capability in both RC and Endpoint mode, but in RC mode it doesn't support MSI/MSI-X by it self, it can only transfer MSI/MSI-X from downstream devices. So add this quirk to prevent use of MSI/MSI-X in RC mode. Signed-off-by: Hou Zhiqiang Acked-by: Minghuan Lian --- drivers/pci/quirks.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index a4d33619a7bb..c1063a420f0c 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4799,3 +4799,11 @@ static void quirk_no_ats(struct pci_dev *pdev) /* AMD Stoney platform GPU */ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x98e4, quirk_no_ats); #endif /* CONFIG_PCI_ATS */ + +/* Freescale PCIe doesn't support MSI in RC mode */ +static void quirk_fsl_no_msi(struct pci_dev *pdev) +{ + if (pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT) + pdev->no_msi = 1; +} +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, quirk_fsl_no_msi); From patchwork Fri Sep 22 07:25:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 817361 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xz57Z0Fx7z9ryr for ; Fri, 22 Sep 2017 17:43:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751897AbdIVHnI (ORCPT ); Fri, 22 Sep 2017 03:43:08 -0400 Received: from mail-co1nam03on0053.outbound.protection.outlook.com ([104.47.40.53]:59864 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751795AbdIVHnD (ORCPT ); Fri, 22 Sep 2017 03:43:03 -0400 Received: from BN6PR03CA0018.namprd03.prod.outlook.com (10.168.230.156) by CY4PR03MB2694.namprd03.prod.outlook.com (10.173.43.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Fri, 22 Sep 2017 07:43:01 +0000 Received: from BL2FFO11OLC009.protection.gbl (2a01:111:f400:7c09::104) by BN6PR03CA0018.outlook.office365.com (2603:10b6:404:23::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Fri, 22 Sep 2017 07:43:01 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11OLC009.mail.protection.outlook.com (10.173.160.145) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.35.14 via Frontend Transport; Fri, 22 Sep 2017 07:42:57 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v8M7gidT030488; Fri, 22 Sep 2017 00:42:52 -0700 From: Zhiqiang Hou To: , , , , , , CC: Minghuan Lian , Hou Zhiqiang Subject: [PATCH 2/2] pci/layerscape: change the default error response behavior Date: Fri, 22 Sep 2017 15:25:22 +0800 Message-ID: <20170922072522.36306-3-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170922072522.36306-1-Zhiqiang.Hou@nxp.com> References: <20170922072522.36306-1-Zhiqiang.Hou@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131505397821843172; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7966004)(336005)(346002)(39380400002)(376002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(105606002)(47776003)(6636002)(551934003)(2950100002)(86362001)(498600001)(36756003)(2201001)(6666003)(316002)(97736004)(50226002)(104016004)(5003940100001)(189998001)(48376002)(50986999)(356003)(54906003)(77096006)(305945005)(50466002)(72206003)(2906002)(1076002)(8936002)(5660300001)(68736007)(85426001)(4326008)(16586007)(53936002)(81166006)(110136005)(8676002)(8656003)(106466001)(76176999)(81156014)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2694; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC009; 1:MkZSxX7SaQ76YKnSFYdJRP39hbT2Wn0I+z4S0hRGTohVPS/AhMyCAz4U2ep8P1mcvBpkEwb+n+G1WbvEmiJkGA/Bn56r4iIgR5Pdz+uarJWfYk2aGgbv9evaS2NriJz/ MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9873851a-ce40-4f88-4588-08d5018d8dac X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR03MB2694; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2694; 3:7EXFBHuzAgChMoDxx0jnowLY8elLS9AzFq45Bj0F7uSglXHlPMiQOXSbJefwhzhOZvidNI4EOd38rmY/fdsBfMKF4c3HRECzsDF+ySjrUoB8F0N8cgvN6pv6gmM43Ao6snQPRPsoFGuSZlq0rgW429iheucfRH8rvpbUWa1zG9PAoJ/kOGE9I7cS2/DfvQL2S8T7DI5PVd32HcQ2z5bbOz8wEGoIRNeIxOtye3fK3z+DAAxzj2YCUQxvrJ3E/L4Ecu0yc1L5P8rI2LL8MSOY34aJUswHcDMATJtDe4C3GwXJQt/tUzzR7MFPecXqpG9uoQeMADu3ab8s6QAJawB9VB9Eh3nC+/t0+0X7cSCJmi0=; 25:VEXMY9Bw1nEl2AF5X8gaTSwcYIDWHMVLz6DToZ35oAQguszelFGUYKXLeuuDq7Dwta7Rd+f1Jxi6D1SxzIMaVc+S8zp4JNcE3jGgEnbF5Tgu4VAqe4BDt99ct/jkQJ7jSOPoOMmyTXjhdMo/r5WNjt1lUZDiV29jdlzHjZgjKwcOWIoqxLelH3wS0Hfb/mWfKtZ296qLUp4lctFtLjjfszC28MRW+PQMVaVLTwDQE43vSqXMlugLyWkToC/d6MMBLPZOoSMh8xuIIXpNbbA7/uIBH+QxqPbbh7rFrEN2lAQPJNRgM2esbr6LKSzzaqULm+QJ9X2yyYUJMi17skEQdg== X-MS-TrafficTypeDiagnostic: CY4PR03MB2694: X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2694; 31:o/j8HRVCFiZjcTX6qvnO2cvUGlv9UbKH/1RhoVq3xtpdvvEFrTH976fZAPd1VpZk0GWCKeV6XI2xjelv+1+9UpxI1BgjZmzrB2jTmYAcNJYthC1Rv8+5+31SFECHz2sqNulWx4q6nJm6McTwLWtAZsoFcRgmomvEsWQHCWUA2z4UsqvCocJS0nGXpf2xTbVfwe0rDF5PtT+SikGIq2Lp143sg/9XBjRobl6vw8D78F8=; 4:19W+IV/C+52IiPQsMn3IXZDAqxPhPC/pkaqlq5r8HPlaMli2C3328TllLO+myuwtz+86o4zNO7llwbrsgKwFtM1/OtHc7TQTas0QgWqIZ8VTiVwLN02JridwsIoGcy+aYp0IEph0tH5HZtT2ZiumEY0pxQ8OgfCSxuNstC5xE+HeiI+DcRP4EvBSmz+HC1KzXx8BMtnuiru3ONW7JV7fS1b3QdDZYAzvztkFmalnrq2gUOmN6yfbMZlf4X3cdYrvt8OCTEKAGMf2WP/54MfwjBn1a2E9cUa2jXwzf1qP8lM= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6055026)(6096035)(20161123563025)(20161123559100)(20161123556025)(20161123561025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR03MB2694; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR03MB2694; X-Forefront-PRVS: 0438F90F17 X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2694; 23:1xwzYckLmsAIia9dupaTaKOaiA6DuD5R2jimDV7JOsIyUJGrwaqFi8ZE9SQjfSG5NTCLwM6lps0oEUl7ygt85d6/0qWsd7942aSFKxXdpCjpTrlhkzKCufKwYWoNEGr4+IViXtH25lsasqTIQl/Kn1U9+N2X61HwLFBjnHlhMz70NUBY5E/gopGgVhszle89Ilbd5Dz94k+W8ck4bxSBa7mL2fWreTEzd5iwogiwwmn76BnXVNT/omrUn5Wg8oTIWc3CDXXCyfYmjdgBZX/buzTaFIs5lRrxLYq+2h+qqA4IJ5TKrC4STFGnYBl6DLZyBXH7SqCBUAj3Obd1QKYk8M9RCISy70tsypSYi2mpPIIx9PGc7z5M6Hg44EaFKiENoWCCShSMDsaI5wZVVuOVsokhr/1MabMT3iVHAjgN4xLM+zDrzmiyY8pwI1OshKvb/8QXkb7MLF+Bcv1HcMQdgaB2My5DYGeDZhfvfG9Q2JTuXRN2sgLNut1t+yLeBTHb4YXr9IMsW7ipNMpUAzwESYdxHQAHPBoYcysuhyLR/DA+hJHO+P3Fb0e6qZ6IObYz83amCkT8vOqyzFoNwP/TkfUTiGTb0UvlZnvW6SaMb4qtz+3vE23b2GIt0AjeIA2LQ3ZkBu1/glnALkmjjdK+ZyOEjs9oLupNuS48igOubU6ByfJGkBWyU9KP9+nlE3RVopX9wxTAkdVvhuCOBzPHmo+jCzIOZnLAfIZOuZSsKK58ksxEe4YM29YCoMK0YGfeVm++cCXXvuc/S/5QYnBU/5AAWo6UqOkh1ok4Nc+7mmzlnv8ayNfZFQ2RCi8k6FEoxP6/To6uQoZvv3UpPdG7K/35WQLQycOjwc+exDK4rmMF5Imk4tQB1xqC3WQ9G+lP5BUvkUxFhsicmydJBTIKZDNEeyOBQ7FAInZ2pXcxAUl+ol+WTmGHBo2yR3Y3PdUypc4nRUG7vTpSTJut/KNk728ofIs+Fu75G+/rbwBlknBWrT0tyAKTeNqkgY8xjIizzEFvaDaj1tGMEjvxFXBLnPrPqSoUkND3RD//5mg3xaZO8hO8GMyumLPvCK4z7abDFjDeVH80eU7Gsd87SQ7nLtOEJUlrZJ8iYUdLhlLGELYz8DAFid+7pZ4wxIJC3Mw36cO8iH6907kZuQq7rkFQV08RdIP5h4hDk3wyV23kYnB97yymtsvloqCus5g5rFvf64dQ2zxmVd7+8Sh5wXqBf4x634ttIzjmQ+/TShJQXAYnL8G95AK2xW3q8R0mIj6X X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2694; 6:gystn573SgGWOKoEm2PUMEokd3NPch5MJhn08BtZzColkoGdeWCHiuvG46cwstZAiF2SYf0Sb2vWrJq5cYTdqwKU3wQ6I9LMxgQ2DDmyJolWXVLRccsfma1nfsW5GBdxMYyjj+KJo31MCXN/Cpb6Q7IK1P1SlsjEtB5Wukec6AEpPDFFN1l+ibKW682DsQQ3eUgJS7hv98ZF4o3VxMdmw5m26gb3WGlERggMaInsagOIcMrDTxNUCE5WYbR+ButnQDN/9DJGalQRU1K9lBUsk+bnFMzFHQhh7Afjqqaqb9RZ4t+cHoNX9HlQ9DyF/RwW/R+p2sRjVgoZqgBzq/TYqg==; 5:JvC8Jig0yyeFBT2HBxhrnvz9wqK233QpNmyGPuCyFZQ1dVcXSrZHKUtz32WW4eQt7du5Io0I/h84BNJ6ekNREY05EPJJ+EZKev/pNqMsixm8bN3r/8Gm2DtdBFZdaL+T8MF6wOr0vGhmQ4sMGr6X/w==; 24:C6hBhZQ4MMqCt6w6oxESuMbZ82A614Yto5aDHRyyAWADUatnHoHa0oSh65r3xnIeEqIKedKSWRlM77jhng5u9orJqpBb4+vWnrrPPJCcZFQ=; 7:4V5VGPqiWbr9/MDc4mdBOjMn5KfFM2O1Lt7kh4EJUDLob496IiQasV+GuCfwn7TPCX1ce99h+jqp1HQQk8C5zAbjfxlz42VPjLKemfbhR/4wcEQzutCQBHnmdDiRJbz/6lYz+IkXqJnhyiUKdJ/yZDeBvcF+hEO9vjlTGoI5ZbHCZvgiquBVEo2UL60RK5t+wc+AnLNWfYTfzFAzuyjzdcCL39lnfbGw0W05DgHW37I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2017 07:42:57.0364 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2694 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Minghuan Lian By default, when the PCIe controller experiences an erroneous completion from an external completer for its outbound non-posted request, it always sends an OKAY response to the device's internal AXI slave system interface. However, such default system error response behavior cannot be used for other types of outbound non-posted requests. For example, the outbound memory read transaction requires an actual ERROR response, like UR completion or completion timeout. The patch is to fix it by forwarding the error response of the non-posted request. Signed-off-by: Minghuan Lian Signed-off-by: Hou Zhiqiang --- drivers/pci/dwc/pci-layerscape.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/pci/dwc/pci-layerscape.c b/drivers/pci/dwc/pci-layerscape.c index 3b01e309a55e..a647090c140e 100644 --- a/drivers/pci/dwc/pci-layerscape.c +++ b/drivers/pci/dwc/pci-layerscape.c @@ -33,6 +33,8 @@ /* PEX Internal Configuration Registers */ #define PCIE_STRFMR1 0x71c /* Symbol Timer & Filter Mask Register1 */ +#define PCIE_ABSERR 0x8d0 /* Bridge Slave Error Response Register */ +#define PCIE_ABSERR_SETTING 0x9401 /* Forward error of non-posted request */ #define PCIE_IATU_NUM 6 @@ -54,6 +56,19 @@ struct ls_pcie { #define to_ls_pcie(x) dev_get_drvdata((x)->dev) +static int err_response_flag = 1; + +static int __init ls_pcie_param(char *p) +{ + if (p && strncmp(p, "no-err-response", 15) == 0) + err_response_flag = 0; + else + err_response_flag = 1; + + return 0; +} +early_param("ls_pcie", ls_pcie_param); + static bool ls_pcie_is_bridge(struct ls_pcie *pcie) { struct dw_pcie *pci = pcie->pci; @@ -124,6 +139,14 @@ static int ls_pcie_link_up(struct dw_pcie *pci) return 1; } +/* Forward error response of outbound non-posted requests */ +static void ls_pcie_fix_error_response(struct ls_pcie *pcie) +{ + struct dw_pcie *pci = pcie->pci; + + iowrite32(PCIE_ABSERR_SETTING, pci->dbi_base + PCIE_ABSERR); +} + static int ls_pcie_host_init(struct pcie_port *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); @@ -135,6 +158,8 @@ static int ls_pcie_host_init(struct pcie_port *pp) * dw_pcie_setup_rc() will reconfigure the outbound windows. */ ls_pcie_disable_outbound_atus(pcie); + if (err_response_flag) + ls_pcie_fix_error_response(pcie); dw_pcie_dbi_ro_wr_en(pci); ls_pcie_clear_multifunction(pcie);