From patchwork Mon Apr 3 13:15:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jayachandran C X-Patchwork-Id: 9659553 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1CDA66032D for ; Mon, 3 Apr 2017 13:15:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CF6F24DA2 for ; Mon, 3 Apr 2017 13:15:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01AC52840B; Mon, 3 Apr 2017 13:15:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2784524DA2 for ; Mon, 3 Apr 2017 13:15:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752717AbdDCNPX (ORCPT ); Mon, 3 Apr 2017 09:15:23 -0400 Received: from mail-sn1nam02on0087.outbound.protection.outlook.com ([104.47.36.87]:11520 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752328AbdDCNPV (ORCPT ); Mon, 3 Apr 2017 09:15:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ep9Oe+wMhFnnMkJzENQSVTxpGud2UMgMwGsSJqSEOUc=; b=BKWEdMAO9AJLa328o8XygVoqBvkXf2DSlrlb/flttW5149E+ONZ5mBHIcXhyGee6tgnwPDiXcne2KeNy/MkePRqE5laMzzNQwClLTbqIYBimzbHu/yDgGpThHWumWX6y9oFWFb0LrHk/xkhBpsQKPEZfE+kOlgNxx1BMAy53ETo= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from vulcan.caveonetworks.com (50.233.148.156) by DM5PR07MB3001.namprd07.prod.outlook.com (10.172.87.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Mon, 3 Apr 2017 13:15:20 +0000 From: Jayachandran C To: Bjorn Helgaas , linux-pci@vger.kernel.org, Alex Williamson , iommu@lists.linux-foundation.org Cc: Jayachandran C , linux-arm-kernel@lists.infradead.org, Jon Masters , Robin Murphy Subject: [PATCH v4 1/2] PCI: Add device flag PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT Date: Mon, 3 Apr 2017 13:15:03 +0000 Message-Id: <1491225304-3559-2-git-send-email-jnair@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491225304-3559-1-git-send-email-jnair@caviumnetworks.com> References: <1491225304-3559-1-git-send-email-jnair@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CY4PR1201CA0007.namprd12.prod.outlook.com (10.172.75.17) To DM5PR07MB3001.namprd07.prod.outlook.com (10.172.87.139) X-MS-Office365-Filtering-Correlation-Id: 9c5835d5-b023-4ef4-fedd-08d47a937ac8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:DM5PR07MB3001; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3001; 3:bvV7pCKDnyNFJwvARSC8ZGsHw+DJB1cIyrN9WoptnTXu+IZxBvwoxZ7+UReTkpbOsiLbJ++JDATAvqinoqPgXIxy1+BT5t/edBBAxqRrMyjlAvnkTSUlKOT6YjML43tBBeTj0nPVN+PXlLV59KXDBRExTrgRtnkYQ5o6wOE8YqrSE2bDnx3JE0lWm00Ggi33NHytoX2KG9OlAPBg8KiP29H53mlFJmFcZ3BNx33MsW7uEceG4wKCfwsuSbcVT7NeOcuQxpqBf0aJTEwM5prsOoGl4b74et3mmbo/Y4TQziSrvXKyiHO9keW74rnOulEBffkTW0WMAetzd19xuJMtsQ==; 25:zsB4GDwLpVpvEb8GBSTyXz/AK3DYWztOfynmukhmG97bCvzwaQZRc8K8MTnUzs4KSgJ5OfhW+MTwIdpT8UmIOfI+D2+Z+KPe/qLWY5EVjLUE4ClwwbcJPZZ1ba48BBO9QVgx97iMirUZ6HQw54mq+KCGJMzyMNaEJgAOx20qpr3Zxjs/h6x/6FSaW8eEXHenhVl80g5yH6S6oOQRQURwd0ML//jMAwsxdNQfpStgM0739UPsVmqpbf6Kq6SqWrYty1h1oSj3pV58UxFZEgVk/t2YGB1yXtaHdvwyYaX78P2pXBBQ1RtBvMVc5PfdsJYXsEwPC/Cn/PwVpo/mW8iBvzGGpVge6o/zV1uMzl8+ZAiAA+YntThfneucs71kJhCSfXmi7OFbUxFOSVhWU4RTiUVSaXIhe0X9KSZUgGJ49uRT+P78y5VgymquLOUCvHjoSFpWNHymAm/0wURJ1Ufyiw== X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3001; 31:4PqAplXcgDOXDZ/RBTS+qSSAi0jHpAYJTSFulwej8r3cmmoqYQMwFQfqFbJn3gD1ZXhFtADZ1YINTcInBJyIYtSh+iGyCnILcZI5rt1FK6d6kJGPzTpSj6ltxBEmpAd/spY/h4jxO2PAMEDsGVXvKlxGY2R4E8FxKIsasa4cn7cPbp419zSzxwtMSsDR5S8edhUDiWSpcofGMO8y2xPqIpE1yslaxusLU5VrYaVQJ4E=; 20:eBsYKRcayrbK1a+WzAn10tPEVBRSQ380UsLi2nhQBlgoxCDYR72Z0jkMAN3XlUAcY12UvUjQSG5ISs3YY6rMMNHRECWuN1JvaRt//3BCgDLWh/4DXwDgv4mf1OG2vWN8FxZwXAPmP2IxN7BeYzXreQsq2fO6fAf0V8aOC3Jv23eH1+zGuRZIz5/FCOaxo0trWFcVbVvFBdiGj3NvjKDLPQHHA9JcbMOcMigelmAj5U30M90kk5tL2HM8qQq/qtwyNRh+o7PtdJoOIM4mi3+D1y1LWINlx4UWTYz+Z5JpM6Q+a75BSs5KHuJAsYnTbqr5+huZcje6egS6bIonVKoDqTADie/h7XBilOKzYmDzbf+Z5YkZSdDnvdfciw6Hrrf95Urbibidhu5khs1dpw7fKRbe+M741SHvCWRqSmD8txvQYQzVXg4r51D8Jmo/9fY7p1jikSybG2VGR5BGRCSvQ1PBjEo7CLx0c3sIucCJ9QqWQYU6ebHSsdzc6PnRBTDg9AXxXY1wObuy2uXoW/Eu6GHtll9liqmZupJtEoUwogq+fBGaCjNtVBAYaibA7g/cB2TGL3M4O3PcUOAsL2gU2zKG7OHGIGYCTFDRbVJy1Dk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(3002001)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(20161123555025)(20161123564025)(20161123562025)(6072148); SRVR:DM5PR07MB3001; BCL:0; PCL:0; RULEID:; SRVR:DM5PR07MB3001; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3001; 4:I39EhfpiHeRROCbX98fFlq9T0kkmOVEwE0ggzUbhsn094TiRqm/7OWoD6nIyi8OIVitkeIku/pBUGxTQ773cTSsKbaMK5gvU1nQE65E8HI3W60Gyo/JE0dgrjFSl4m5HCinKKYKQhX8tdHCT22Ej6asLl3V3ESUYUXTjhPJE0msvU5iwu14ks71Ujuup63sZmUX8JHjPqqIPXZvN1ddFYTsVCedn79xfmS6zFa3joVMaaKbGG9M1bF/I8SX8l0hSVubKENbMUUJh+BADDl2+DF+KdNLEPh+A5Q/y474OrgC2VqA4dICiB8/LikmWGsavuNR5hroBBu7eH09XNWQOJE6qk6yJWgZKflB9cUPoV5SEVJuSYVWipcVqkvXTMlrPiFCKQ2Ae2y5AfKkQz28W1fqMaLaoWH1PrnVnko6fwEltukZejjOusH9mcdjpzfmje7UZUuSymO7LrEuHhpfyiKWY0gqJyAfc+3jhounSNIAO019bIGZ6luxtcbH8wG3KekWiXCxEJcKNyAxhaYrwQCvPfMKu/8QFFD//hmJBfsgVDTvtPy2n3Wwa7hI63L11ajB/AUhYXet3P3mQ1kZtLozpsaTn+Elo5Jq5cauktmIPhIp/807mgR25P2juk1T6Y8HiykRCPr3u6AVehIBW3V9ES0mEhmvW4pkxST8geTnkBCavR1VNAfPXW+Wcrfne X-Forefront-PRVS: 0266491E90 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39410400002)(39850400002)(39840400002)(39400400002)(39450400003)(54906002)(7736002)(8676002)(6506006)(81166006)(50226002)(38730400002)(5890100001)(3846002)(305945005)(6116002)(575784001)(33646002)(76176999)(50986999)(36756003)(25786009)(42882006)(2950100002)(5003940100001)(189998001)(2906002)(5660300001)(42186005)(53416004)(6512007)(4326008)(53936002)(6666003)(6486002)(66066001)(48376002)(47776003)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3001; H:vulcan.caveonetworks.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR07MB3001; 23:vlhXe4cSLxmFj7v8amcr9bYtuhUf8OVTCJrd8TzY7?= =?us-ascii?Q?7BQBWQ2AKEx/Vb5dLQTj5Qu3pOZMmmxfLKsRxo20ZCq1TrCBDIJ/HOpN3yBF?= =?us-ascii?Q?WyvbOG/nCNdWPWQ4njuqllrSQJDoa2VZLCXfOz2kJSp2R0NVQg1SinzN+dFB?= =?us-ascii?Q?Vzkig/ePtXKXbX6ZC0aX+zTUaT94s86frGL/N6AsYfU3Pn9bqgi6PaCZrBfW?= =?us-ascii?Q?CKKH6OlnLS6VVyq+pTHy+g3jsGKWV6Ttwuz5GIAMdqZ68dVFs9TAorzyKWhw?= =?us-ascii?Q?Jp+vElQa8Xhi1vTlQ0C1SZ+SuwpueJEaMdoBcuYR0szu6GntsINIYaGEyOdO?= =?us-ascii?Q?J491SLEXLv7L8XWUNkoMY9ngs5gv3gF8KjAubZeidp/WlNj8smMeboaw59Aq?= =?us-ascii?Q?WrNBTupNtMKqqeVSPVHPuwNZFgLEvm+PFj6yNUkxHTXJEgeV9Ls8BT0OeMKv?= =?us-ascii?Q?hw9OT070EKi3AE9H/tyrRoleYhG3b7ffEI6ljJCzt3NmYRUlkxSXiEgdp2bf?= =?us-ascii?Q?dnzgRQG4cs1tK+IW3tEUs1ul/88K8zu9P26mt46WZMFuTEf8Lvz8A1qSOGsM?= =?us-ascii?Q?dgYmfSsMJCREY1fHLrMA+MK4OI4AljkpLpMrh1izc3VqrE92uYfuxSvFNRTY?= =?us-ascii?Q?xljFP2t1uQBeAyG+oXNhMRs3dFdy+IHW8SIl9gfDboCJN8haKRCgxwIjxUJb?= =?us-ascii?Q?EZISmlPjDgFI6qBidwW50CTHvF6Z7XogjtCTJLATjWwjG9D1Abh8ZKSg0TsP?= =?us-ascii?Q?7WC63y9D2UIFpaqr1tp3OhfsrFORi4QTzc/yl01LiEeEaVko454+vGeB7gCj?= =?us-ascii?Q?UNhXRP01ltEngj4hrIlrOoE3Q/he7i3C/IIHxmASo9kn8E7NHntgkerM67s+?= =?us-ascii?Q?hfBhdvVgXZgHMGqL9HHR/DwhtSKKVFBthqktfiZ0QWdEJPgXnpVxlYTE3a4M?= =?us-ascii?Q?W/kYqjXjmALmiXvNNjE9Q+QkvdERHDYzaTvrau6yjKU7dkAbXhBHNeXCNx9O?= =?us-ascii?Q?MmXaA/YkqsrM0cLEimQV7Z6IbEGpeytXgBUfFLT2XinGqdmuD8aaCYd+QfFu?= =?us-ascii?Q?HRsr+c=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3001; 6:05Ml5PXwd2uI0XyEJSqOlHnRiZBo+1ZZ61uf7uh1gbushPSXZWKOPcLmutZecSv/rnw+Tm6VSe6Wt3aLrO1Ce+uS4OBkjR7EwaHh45d/WgxfwZF164xfbGGRUn4uA7IZ5kKL9oSfb0lSQaEtAFTM8HnZ5yGSMJrVgom3BFnsEjEa3HGFQnORqVQisRZ1/K/ebiuelwjcmCLWPVnEaunIump+3JPqGy+4F0I5eCS1kbWKtzEpvb4xtvJSQlqJtXhyAc5H4aQb13LsGbj2Z3v4NMHIhwXAg2iWGyN2pV0DKyI8Xz3BezMsnYfd7zfr+JH5ZwZtHErghqFaGtiMwuIKO/HLDp3C5HKa/fdIguwzy00Vma8eNJ/FcIAfsrL737rH0Q4jTArlAr9hTcQtiC7kVg==; 5:UdbK51vrgH9X3euOelvidQXFeJKAXYXxJWqcNXFbeJAcoWlL0R6AYIQ4tLm4NJVXM6tKsGSGBLL6YIQ42WURZo4TjLbjCJ6mF2eaNY5X0a71ufqqPglecpTimFyuxIWrpZiuRHJbSx8oACwbDepUag==; 24:TbuSmyIhlPJzgkI0M4GN2lcrZnciuasL9bv/H/SkJT506A+xPOqEXlst9nVbhFpb7qfj5RRQ+ETBbaWOKlL8yfO9Lvd6OusL4nSVAgXOUWY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3001; 7:S3ZWVEM5K7fHODar2rNTclPJ+YMZnet5jcsbtKpqKD7mj/ubYyAYigRnQMSREcIechfhQHYEqQJYaHr59SR/tkhbjkbry7dyQeJ/ipKm5NHZUKzPlmNPKyYFE7id/7HmkeisxUogs75vQtoglt1s4uqUr4c25kg0sQw94KGtFjhtiIIc05yC8nrd+MQouTzcHJhxHaWqinKSDmRnUkSQjTTk6gHrKZFG+P4E8mytLNacpM2hOVdT3LkhRo15nDvPJwMohtutli9TrhrSlTIVzdgHYcvwiMTsaodi6LffsOHzfYK4RsgjZHc84blYkjWxVqR+OTzGMj+2VhvjB///RQ== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2017 13:15:20.0272 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3001 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a new quirk flag PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT to limit the DMA alias search to go no further than the bridge where the IOMMU unit is attached. The flag will be used to indicate a bridge device which forwards the address translation requests to the IOMMU, i.e where the interrupt and DMA requests leave the PCIe hierarchy and go into the system blocks. Usually this happens at the PCI RC, so this flag is not needed. But on systems where there are bridges that introduce aliases above the "real" root bridge, this flag is needed to ensure that the function pci_for_each_dma_alias() works correctly. The function pci_for_each_dma_alias() is updated to stop when it see a bridge with this flag set. Signed-off-by: Jayachandran C Reviewed-by: Robin Murphy --- drivers/pci/search.c | 4 ++++ include/linux/pci.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/pci/search.c b/drivers/pci/search.c index 33e0f03..4c6044a 100644 --- a/drivers/pci/search.c +++ b/drivers/pci/search.c @@ -60,6 +60,10 @@ int pci_for_each_dma_alias(struct pci_dev *pdev, tmp = bus->self; + /* stop at bridge where translation unit is associated */ + if (tmp->dev_flags & PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT) + return ret; + /* * PCIe-to-PCI/X bridges alias transactions from downstream * devices using the subordinate bus number (PCI Express to diff --git a/include/linux/pci.h b/include/linux/pci.h index eb3da1a..3f596ac 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -178,6 +178,8 @@ enum pci_dev_flags { PCI_DEV_FLAGS_NO_PM_RESET = (__force pci_dev_flags_t) (1 << 7), /* Get VPD from function 0 VPD */ PCI_DEV_FLAGS_VPD_REF_F0 = (__force pci_dev_flags_t) (1 << 8), + /* a non-root bridge where translation occurs, stop alias search here */ + PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT = (__force pci_dev_flags_t) (1 << 9), }; enum pci_irq_reroute_variant {