{"id":814827,"url":"http://patchwork.ozlabs.org/api/1.2/patches/814827/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-pci/patch/1505724481-28413-1-git-send-email-Vadim.Lomovtsev@caviumnetworks.com/","project":{"id":28,"url":"http://patchwork.ozlabs.org/api/1.2/projects/28/?format=json","name":"Linux PCI development","link_name":"linux-pci","list_id":"linux-pci.vger.kernel.org","list_email":"linux-pci@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505724481-28413-1-git-send-email-Vadim.Lomovtsev@caviumnetworks.com>","list_archive_url":null,"date":"2017-09-18T08:48:01","name":"[v4] PCI: quirks: update Cavium ThunderX ACS quirk implementation","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"df08067984a29ba526379301ec22c7a5a8c6e02c","submitter":{"id":70764,"url":"http://patchwork.ozlabs.org/api/1.2/people/70764/?format=json","name":"Vadim Lomovtsev","email":"Vadim.Lomovtsev@caviumnetworks.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-pci/patch/1505724481-28413-1-git-send-email-Vadim.Lomovtsev@caviumnetworks.com/mbox/","series":[{"id":3587,"url":"http://patchwork.ozlabs.org/api/1.2/series/3587/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-pci/list/?series=3587","date":"2017-09-18T08:48:01","name":"[v4] PCI: quirks: update Cavium ThunderX ACS quirk implementation","version":4,"mbox":"http://patchwork.ozlabs.org/series/3587/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814827/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814827/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-pci-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com\n\theader.i=@CAVIUMNETWORKS.onmicrosoft.com header.b=\"HcSAQCRb\"; \n\tdkim-atps=neutral","spf=none (sender IP is )\n\tsmtp.mailfrom=Vadim.Lomovtsev@cavium.com; "],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwfmN1nLyz9s7M\n\tfor ;\n\tMon, 18 Sep 2017 18:48:20 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752218AbdIRIsS (ORCPT );\n\tMon, 18 Sep 2017 04:48:18 -0400","from mail-by2nam03on0087.outbound.protection.outlook.com\n\t([104.47.42.87]:64121\n\t\"EHLO NAM03-BY2-obe.outbound.protection.outlook.com\"\n\trhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP\n\tid S1751830AbdIRIsR (ORCPT );\n\tMon, 18 Sep 2017 04:48:17 -0400","from localhost.localdomain.com (50.233.148.156) by\n\tMWHPR07MB3008.namprd07.prod.outlook.com (10.172.96.14) with Microsoft\n\tSMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id\n\t15.20.56.11; Mon, 18 Sep 2017 08:48:14 +0000"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version;\n\tbh=tm90TKwul8ua6+ZdFkKsaE4biLOW9tNRGIlA0wZTNuI=;\n\tb=HcSAQCRbBxMjD4hCCKG9lMpJ4dSpX/TW2PYLY6DGkDkl3EA+G7eaSZgiER8R/g4UdHV4BkepcO64HIVHZPpiZDGPWYYsNJdniiA1cMmQr2rGhxL7bWGrOywxwmdD4qipwK/C9CVXhXPh7Kmoz3K6+C5K8725OkbiT52zTW0oi8Y=","From":"Vadim Lomovtsev ","To":"bhelgaas@google.com, linux-pci@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org, alex.williamson@redhat.com","Cc":"Wilson.Snyder@cavium.com,\n\tVadim Lomovtsev ","Subject":"[PATCH v4] PCI: quirks: update Cavium ThunderX ACS quirk\n\timplementation","Date":"Mon, 18 Sep 2017 01:48:01 -0700","Message-Id":"<1505724481-28413-1-git-send-email-Vadim.Lomovtsev@caviumnetworks.com>","X-Mailer":"git-send-email 2.4.11","In-Reply-To":"<1505480233-22694-1-git-send-email-Vadim.Lomovtsev@caviumnetworks.com>","References":"<1505480233-22694-1-git-send-email-Vadim.Lomovtsev@caviumnetworks.com>","MIME-Version":"1.0","Content-Type":"text/plain","X-Originating-IP":"[50.233.148.156]","X-ClientProxiedBy":"YQXPR0101CA0063.CANPRD01.PROD.OUTLOOK.COM (52.132.74.40)\n\tTo MWHPR07MB3008.namprd07.prod.outlook.com (10.172.96.14)","X-MS-PublicTrafficType":"Email","X-MS-Office365-Filtering-Correlation-Id":"ce2836eb-f7dc-438f-4c61-08d4fe72006c","X-Microsoft-Antispam":"UriScan:; BCL:0; PCL:0;\n\tRULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);\n\tSRVR:MWHPR07MB3008; ","X-Microsoft-Exchange-Diagnostics":["1; MWHPR07MB3008;\n\t3:VYdRs4I1KAL6p5vIR5XaOXmOotZOM+wW44dH/wQFQjxv2fgEddShHI6k1K6qmdnfwD4/BaPar9cTdbgpVuUOlyYphqMGS0weofaz/vQUlhpxA4zOBhRRRAx4LfpjNlgOKzqI/ONhDCvj/S9/CGFBxyw+hbzvb8ZBGyAW4F4AozhRydvAWDnbRnfIIeIZp6qMCShDUpb485go6uEEzAjpuZCGF4YaSV7nWwWW6i3iNgK/j72OO1PDiXZ6RCOcAVcD;\n\t25:aWXLrTCE2WldJa8kjQ0f5P5MycaoMjHFIOtg/rNh90o1/L9smJ27r9k6Ylkkd2LI8KPqAUZUq/83cr6ay1821/zgSI5muJelpDP91CeuYFtCrBAZtE+Pia5NqjlzpnJWqv/CWQW3rlb2qsfKIQoZMf0SK6o4+4LfPYFoW+lkA14fDus/3ySUEaTGadIGyD4OiKY8hMF2NlWAUcm4YqM0CmaR7T+IlAYUcPu0JmeIQm7mK257GBh2zwAi+J+xrT2f2E2AHXY7MjDUqQ91tPFAw4cbibEnPHBQZWKi6Shr+vE9uo4MTMgnJheqgZm15oTiTdIcDJJd3TNRklkQ9+AGig==;\n\t31:YRndv0wLPyA5SDkfiwAE/hmbmFDToMjVCKtOc3qGwexdGb6I1H0qPCwZ5mVTGGDT4CFTGDgpVcyubkBFMhXHRZUVSEe9OEUJeJDP0un+kigOwcihEIgEzPnPHOE5pehyDSvRat4bIYhnjhPT85B5LsBGfKSAOXaEXgi+kRZ8zwMNEharOYwquxmZkZeybbmtwRYvmkCcGEIm26sjOzugyBCy0hLpe417ItMYxkeB04I=","1; MWHPR07MB3008;\n\t20:AskY0aPnJnkUMEgChSKz4VrFhXjIUSSgkwCU9cKRnsy2uEDRvksQNIfpJcXh10ZvNv62SaeOR0aGRmmpr0W0qUopE3cXnILSR5dVScI2G5IeX3JMQq4tOs7NnwEPWhX4ubBb9tDrl0Q92MOV/w9VTSFFm7vsaIpPr+uKzlTfvnzA8/+U0PAn44ppKeOGbilSQpxAJalCWOVEeUoMVsFZBqAMZ1rcLT/09q5FFGey/0QGDJ3ZVxCNIJgkRG+4rRsjm5YXshhUrr9ZGUDrP6xydgE8jv1gB/HqXtE682irn11ExbrUD9ww+gLslQK4Z3aP4hMBXgA/vw0nG+mTrHyQO5mvAM46AVGc2tdrjO8roMEmahdltRyOlxoFw9kGhR74lv8M8YTP/pnoqwiLakll4n+cWGDyUN7pXYMBhg2m4kHhO7VD58xfpnALweOrp8EFMbqr3xhsBPCQDVt9Pd+/3HqZVfZi/axzObMqzb9v+iV0wAyADIlrcUI/06zF0cHK+IMyJ6Fywr2dRd5BYa5avfuv3kYKJtjoG6PgLDtpMdQDSoMrQuq34a+XONtmv5Wrxl9qpGE71c3DJ18c1K7E9Ay42myzJmdKxoE8JN2aN+A=;\n\t4:i+MILwImWTqbt7XIEFGcVl1HS4EUOJ33uvPjFiWk9saIqbm0VHENPVpI5ia0dO20Np2cAu1rojNWT1RcBFk7v1xEj4TEU6vQpRu7ax/WXgoXj439MEXLCUr04ZbmGhtxUrCdx75xGI9g+B/xlzBuGdRy9LbpOkgRn8uPArBmwTmgnryqTHrifu275duIK4uW4+gKff7H5rclUpYxgCNK9/zY1uFs4KtBgihNJb0YcXdp14RaqMH7JIZuHYtEHr66AnH45LmsOcmLPCWw7z2SDyO1LSJkqQ8kQXJw4oNYqac=","1; MWHPR07MB3008;\n\t23:v+V5MbAUdhnPexMSKP6qVlG86ZmWgs+N0bvPaEaX76pFOYkZcG/izA5qeq2yMahCuJnoiQ3E9YN8Uu/zdG8R388qffrAPxxteVfUjF99NVU/h/69Ab91nx6+PijOeNK+shX9RjVJdMSi+8dLW3Bju8DxCjaZgLZecULZyorpOJ4uLD0h0lPm2tUxD6+t3RLShKRNiuDY9rvUjiaqJvmJnWq9Q8mEEaxceI/gukIZoTb0yD/nwGdG9iooOJAAKhm46QzkVvzUpl6rbhdCfLtEbp9Jxv6SPro09Zj18yOW8EdaCmRRQ1saPhwHVwIJIXnL19fQYF46d3ZS2GaD3rIKnxDWSHEc7z2cvwRN1JMjctIleGHqlQHrteoKsaOD8tzDxj9gTsIX+rMxw+qED9jEEVtM/65dzabH7CG4k0KeOFf3ISZUE3RxbZqdhSo+8ozzE+4Pz9bLJbSO63jcqVHz+TdUWemtDfdzV9ZiWkS65kECYoui84S7z0f8huNcjZaEVFIfwCWDPYykfysZ82waSN0PWo0nM3nzxZ3iiWNmSF1w3Hym1+EPLix9ay/RL0hebu4luG7OvcbQdeldMRGAMAjDjc8hywfSFR+7tzJUC/UqUWxIyoXS8Yh6ooPYNkcAsHKKQ/84TAB426Y8eEgaQ9GJ73gDnNCEn0eat9SQfzvCePYkVfmW2jezZcEwpVjjO1LReqqgN30gFneLJkAr1HWIOL3blf1knbvGYda06mknyfDVxKg9+15orcwUFTsAVkymqqfPBkW1CYGrL+E33wruhjqH32H3o0NHV9WD9faMGDZHXp6IXYTbj4Q8/hHg8Y307BuIgE62jGa/JmQITGsF0oihbow9+sLuMjXUNJhoho3J7S+MAfNIMLNTUEhKRv2cLGNmxm9XBbKmH2TVcL/QXDtXGM24AbixSA5HwDws44QeYxMwWWVZspcVAGzKnrqpO++lGlebhMu1zp5WU8ZYAkn3IYQTcSLHaas0kGwcXMYWzRfb7xX3fobPcz6Ob6QD87FteKjdI55KVcQKB/tTlXCrc7VZuIWNqItaHpTqNQt1jEdbdOZuUETXuvv50994vz/AAuYEYIZX2eUXDn+GzIHhSP2F0taBhw+djqjrnORfSfp4Cd1RwWfvr597yxdPT8ICkK8jSAPWkyEuMeHWhsjcpm/lACjOvFz8LsbPk4mP4SZ9Q0amZKRUiUsh7S4BPdT29MyxUFbtxqvV93/nUi+urQm6jbHaqaajFjDdDsB2tv7fF2nIPr9IVLVtFTmYhZEn0bd3hH0mYYQsNw==","1; MWHPR07MB3008;\n\t6:uT8E3yUIfthPHODdCxAKJi5vx6AKx2y9L8JwqwtPQIbtS9ApSn/pKuWflBDYQFrJLGh8fSUuhsnNdL0RGwRzhu4qBYsQTPlOcNe5H1gmMGxVBhSEwQlh3iXv+AcfzS6PnYqt8RVvs48uW8Dpcbsw7/WBiPyRsrnQPc9UL5l6kf3ai4/ZUEjqBl2cwdbSN4p/EomZDgBp4M9lRbCpwTm2bWDgEueIzO2tn42Xhhsm7y0S6VtrGiiiP31aUPND5557QYTJAHtpXml9a9deEPreSHQ3OFiK7jDu9cby5trhndjvLXRPkWDZZtyxDvOOzy0zDJdTzpWmUQukW0wcVXge9w==;\n\t5:S2rkC4zwvDNiFLq2f3HQFfSwWidUpylDldkI9fTWHD1UUd5IRzBxrmCtVnz9CPcYTeCz6OyAtH9s/ZjjkQL4KmzFztp8Bh6RmiGEkkNxvbFvRtiuHrXz0eCNeu3y8g08X96HMTGaM8snXeMnX11f+g==;\n\t24:b9Z8Ak/UfA5U0bWv+LnQC9Qh4u6h1AzmXo1KSteyZJUT2l0Xsva80iaGD0U/ULa8u6u+JKCUMFnl7e1s0rvA6H1yBzvDQDRwjbVBr6Xv3to=;\n\t7:tArme5Y3Gyt+3b7yArUGoEZGplyWlTgc/SJN6H7r9U6yLJ85mb95OmhLmczt3xQmhCJk83ZIqks3kJi4Ts0PwuymTZ/rtt66TJsb6ZFDb6xAOwNYDXfW6wVlpYAYiMGC5y+Ira1OkPmSSBLZl96x5vr8WVOR19L8oF1uvZwThiWqEpdooEdMlq7MMhVFWL3P05UH35ohr7oI+C4z1/II+oiJ9rEv/bpOKrG6ZreAcNc="],"X-MS-TrafficTypeDiagnostic":"MWHPR07MB3008:","X-Exchange-Antispam-Report-Test":"UriScan:(788757137089);","X-Microsoft-Antispam-PRVS":"","X-Exchange-Antispam-Report-CFA-Test":"BCL:0; PCL:0;\n\tRULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(100000703101)(100105400095)(3002001)(10201501046)(6041248)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123555025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);\n\tSRVR:MWHPR07MB3008; BCL:0; PCL:0;\n\tRULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);\n\tSRVR:MWHPR07MB3008; ","X-Forefront-PRVS":"04347F8039","X-Forefront-Antispam-Report":"SFV:NSPM;\n\tSFS:(10009020)(979002)(6069001)(6009001)(376002)(346002)(189002)(199003)(81156014)(16586007)(97736004)(72206003)(6512007)(6116002)(50466002)(8936002)(8676002)(48376002)(107886003)(110136004)(316002)(68736007)(53936002)(7736002)(15650500001)(2906002)(6486002)(66066001)(47776003)(575784001)(5003940100001)(5660300001)(106356001)(53416004)(6666003)(478600001)(81166006)(305945005)(189998001)(4326008)(42882006)(2950100002)(101416001)(6506006)(69596002)(50986999)(76176999)(50226002)(3846002)(36756003)(25786009)(16526017)(105586002)(969003)(989001)(999001)(1009001)(1019001);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR07MB3008;\n\tH:localhost.localdomain.com; FPR:; SPF:None; PTR:InfoNoRecords;\n\tMX:1; A:1; LANG:en; ","Received-SPF":"None (protection.outlook.com: cavium.com does not designate\n\tpermitted sender hosts)","SpamDiagnosticOutput":"1:99","SpamDiagnosticMetadata":"NSPM","X-OriginatorOrg":"caviumnetworks.com","X-MS-Exchange-CrossTenant-OriginalArrivalTime":"18 Sep 2017 08:48:14.0916\n\t(UTC)","X-MS-Exchange-CrossTenant-FromEntityHeader":"Hosted","X-MS-Exchange-CrossTenant-Id":"711e4ccf-2e9b-4bcf-a551-4094005b6194","X-MS-Exchange-Transport-CrossTenantHeadersStamped":"MWHPR07MB3008","Sender":"linux-pci-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-pci@vger.kernel.org"},"content":"This commit makes Cavium PCI ACS quirk applicable only to Cavium\nThunderX (CN81/83/88XX) PCIE Root Ports which has limited PCI capabilities\nin terms of no ACS support advertisement. However, the RTL internally\nimplements similar protection as if ACS had completion/request redirection,\nupstream forwarding and validation features enabled.\n\nCurrent quirk implementation doesn't take into account PCIERCs which\nalso needs to be quirked. So the pci device id check mask is updated\nand check of device ID moved into separate function.\n\nSigned-off-by: Vadim Lomovtsev \n---\n\tv1\t: put device check into separate function and extend it to all\n\t\t Cavium PCIERC/PCCBR devices;\n\tv1 -> v2: update match function in order to filter only ThunderX devices by device\n\t \t ids to properly filter CN8XXX devices, update subject & description with\n\t\t ACS register info (rejected by maillist due to triple X in subject);\n\tv2 -> v3: update subject: remove CN8XXX from subject line, replace it with ThunderX;\n\tv3 -> v4: update ACS mask (remove TB and TD bits), update commit message (remove\n\t \t ACS register printout);\n\n drivers/pci/quirks.c | 26 ++++++++++++++++----------\n 1 file changed, 16 insertions(+), 10 deletions(-)","diff":"diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c\nindex a4d3361..e6b904a 100644\n--- a/drivers/pci/quirks.c\n+++ b/drivers/pci/quirks.c\n@@ -4211,20 +4211,26 @@ static int pci_quirk_amd_sb_acs(struct pci_dev *dev, u16 acs_flags)\n #endif\n }\n \n-static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)\n+/*\n+ * Cavium devices matching this quirk do not perform peer-to-peer\n+ * with other functions, allowing masking out these bits as if they\n+ * were unimplemented in the ACS capability.\n+ */\n+#define CAVIUM_CN8XXX_ACS_FLAGS (PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_SV | PCI_ACS_UF)\n+\n+static __inline__ bool pci_quirk_cavium_acs_match(struct pci_dev *dev)\n {\n-\t/*\n-\t * Cavium devices matching this quirk do not perform peer-to-peer\n-\t * with other functions, allowing masking out these bits as if they\n-\t * were unimplemented in the ACS capability.\n-\t */\n-\tacs_flags &= ~(PCI_ACS_SV | PCI_ACS_TB | PCI_ACS_RR |\n-\t\t PCI_ACS_CR | PCI_ACS_UF | PCI_ACS_DT);\n+\treturn (pci_is_pcie(dev) &&\n+\t\t(pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT) &&\n+\t\t((dev->device & 0xf800) == 0xa000));\n+}\n \n-\tif (!((dev->device >= 0xa000) && (dev->device <= 0xa0ff)))\n+static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)\n+{\n+\tif (!pci_quirk_cavium_acs_match(dev))\n \t\treturn -ENOTTY;\n \n-\treturn acs_flags ? 0 : 1;\n+\treturn acs_flags & ~(CAVIUM_CN8XXX_ACS_FLAGS) ? 0 : 1;\n }\n \n static int pci_quirk_xgene_acs(struct pci_dev *dev, u16 acs_flags)\n","prefixes":["v4"]}