From patchwork Wed Aug 16 04:56:59 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: 9903001 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 F20526028A for ; Wed, 16 Aug 2017 05:14:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E641128966 for ; Wed, 16 Aug 2017 05:14:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D35BA28974; Wed, 16 Aug 2017 05:14:48 +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,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 DD8DF28982 for ; Wed, 16 Aug 2017 05:14:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751490AbdHPFO1 (ORCPT ); Wed, 16 Aug 2017 01:14:27 -0400 Received: from mail-cys01nam02on0059.outbound.protection.outlook.com ([104.47.37.59]:51970 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750912AbdHPFO0 (ORCPT ); Wed, 16 Aug 2017 01:14:26 -0400 Received: from MWHPR03CA0033.namprd03.prod.outlook.com (10.174.173.150) by CO2PR03MB2261.namprd03.prod.outlook.com (10.166.92.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1341.21; Wed, 16 Aug 2017 05:14:24 +0000 Received: from BL2FFO11FD020.protection.gbl (2a01:111:f400:7c09::121) by MWHPR03CA0033.outlook.office365.com (2603:10b6:301:3b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1341.21 via Frontend Transport; Wed, 16 Aug 2017 05:14:24 +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 BL2FFO11FD020.mail.protection.outlook.com (10.173.161.38) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1304.16 via Frontend Transport; Wed, 16 Aug 2017 05:14:23 +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 v7G5DiU8012144; Tue, 15 Aug 2017 22:14:20 -0700 From: Zhiqiang Hou To: , , , CC: , , , , , , Hou Zhiqiang Subject: [PATCHv3 9/9] PCI: dwc: remove the obsolete fixups Date: Wed, 16 Aug 2017 12:56:59 +0800 Message-ID: <1502859419-33696-10-git-send-email-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1502859419-33696-1-git-send-email-Zhiqiang.Hou@nxp.com> References: <1502859419-33696-1-git-send-email-Zhiqiang.Hou@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131473340642456963; (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)(336005)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(5660300001)(106466001)(39060400002)(68736007)(2201001)(7416002)(48376002)(105606002)(53936002)(5003940100001)(77096006)(6666003)(36756003)(575784001)(54906002)(2950100002)(85426001)(2906002)(8656003)(356003)(47776003)(305945005)(72206003)(86362001)(626005)(4326008)(189998001)(498600001)(50986999)(50466002)(97736004)(76176999)(81166006)(81156014)(8676002)(8936002)(50226002)(104016004)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2261; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2FFO11FD020; 1:z28+jXixzek+LPxnQVoeyt4/mf7dOZUevmnelZ2THr?= =?us-ascii?Q?CTeDZpBVCXn6NWN4RyIBClCo+hmkkn1K8xSDszyiWxZQYMs0Acec28M8iRzu?= =?us-ascii?Q?TLgvwIklL8pbabdtroNGbWtH5e9zkT3Q/WyGKoepBZLrXnfoHsp/SnFkRkLx?= =?us-ascii?Q?EgvcgBxUiKL+ZbNJRkcJc287CLsYF24kmD7jzjdvaVW+U7i5LoWcdkgrc9t8?= =?us-ascii?Q?AeSgb3SSyehbFdzl6+KfFYhlDNPa3s5o2hZKVI5GAbRnMgbO3C/SdXBNwQOP?= =?us-ascii?Q?EQcXgMjXfKqRqskYfY+KXQRqd5Ixb9nN0zmqdAiuBeLk3WvNMKUT/q6KlKU8?= =?us-ascii?Q?wbyVKVLvc5o1rFKWMZyOxIGGRa7mL1Y7n8kYDWiT9abAK9vvG420Nk+O3wpv?= =?us-ascii?Q?r/MdEVq9BoHATARu3m8bPL6PPwuas3IfMqmO2tReqIt5bPxFbSVgzIxJ4t/3?= =?us-ascii?Q?yJWQdDAgKfOfyzdJrVnPHK3TW0Zt1lauw1bR6B4cdK54AOuY2olwCbtN7Mn1?= =?us-ascii?Q?q+ImOPTzYqscbl75bBe8lLWGDT8twcqkMrVZDolKA+VqHGNqm7/MMqmZnoQR?= =?us-ascii?Q?+rMbTBicznSZAIGjP4nioh8Gg4ePSWn2plZ0NwMIDe5gRBfBmaYV9XE2sVJG?= =?us-ascii?Q?rSFYCl+Ca01HeSEFmNFndQOdOlCz/rxz8uh0m1/1/Ss09awT11R/wETGeszK?= =?us-ascii?Q?YdwjLlaEKaPnOrYL/CRGanIBZ1L3uGsQ192MD2aUlUtbndNFHz06i67e1Mbd?= =?us-ascii?Q?G0ojqGC9LuZOI7vSFo6IL3lCc80vmvF3T7XVScvdwI28ktd5fsiMykiz+o26?= =?us-ascii?Q?Os7gcSzesWgaTeY0q+TcWWES5g3GOKugXjGDnR/LZhsexXf/UFQha6IOlZzh?= =?us-ascii?Q?L3TVnWPaymbNFvqFTiPrQu2YkFEcPyqAnVJuTzAVqA6MMAPsHqwi05e+uciL?= =?us-ascii?Q?uQpi7tye9XlOtcFW/+0Ypr/abiudTSjotm42L8jw=3D=3D?= MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3f9aa00a-8f9c-4782-6a8b-08d4e465a8d1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(300000503095)(300135400095)(2017052603031)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CO2PR03MB2261; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2261; 3:pyYgyNorxyfvc/NvhOVnrWXeuPUouER193c6N2UcBgVhncS/PBHww2vejvf9cCxzKWlMNoZqKDrCyyPQqZstIcPVBWt2XevxSYQOufOwApRZFbV3Idbor0NlNj3oLpJk7oToPDzf87b8CgYwUJok6RfYGsWqquItg2Si+pjxIlej15cswbq9XOGS0L6yfJr545AqO1Pb4Q0CJrsfUEqXhJRi8e/B1F+Ic6qbC1sywQLp+Ke6A1Omw40DiUyjjyp/oRUURrc0jyJImcltU3us+sN+pNMrtYeuQYA+VMNmXESUv5uZQcJ3IFxJuzlodaDYdHOzwUvb2pY9ytSOHDsImjaXochLvT45T1p0gO1R8g8=; 25:9kXxqY2+XCi58AzdJKkE1n+4SgUsnRnp4JT3KRFD70xGgMF3+Eets2rXxGoMwZtSewZ89gaqhSxDlfyCCDPk4wT5vKYSv8ZZnsP87dLNQvk1aOQYpqsoELJmfp5aBm07dyU8crBYd0BsiRAaC5p2wsZ1Ey71AevX32IMJ3qZc3pNEFs196tiSUE2YycpGFadbkJIhPbfsDJI1rJ1+bbhDiYISJQ586hLBMULMe9lXanZJnLFI0Me9nuqlEjj88E4apWMq4LOvbiEut5HYNZB+A+E98BELqVRK/JZaFnRk3qcASxW6JRoJ9E4lgVh8AzZy9cENUJgU08WM77oBcXJXg== X-MS-TrafficTypeDiagnostic: CO2PR03MB2261: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2261; 31:b8+k8GEK+Q5c3W3w0oZSYc/A30FX82cudtgsurBW6U9LACOCYRvcwXX0x4vY+e7F+SOEzUcr1rIVj9Ns6MqqEWjWekdX2d7U82FRDxMGAxoRR114/qRHEFUyF2Wb/wfCfkUWYaq8IcxP1gx0lhl5nK8pxOW8R6+G8lvLhkbbdIQRTo1nNJR0bqoBSeWWGQQltk9SoCICNpnfNGSpCy5hIC5hUeBhM4dG6rf2nvemZB4=; 4:5pzIqQvU3x3/rMcM8gjpVCmZ3fl9wjhRG5nvnmTE6yOCK0ATiLPVHKcrxsAqUd3bQnEbHCnmFE7y/yardRtbr8xnrPIqkaEJFIYDAru+katx0Y/KnBaG2FFChR+ytUhla7gN/FIedtC80ED8eNtO7KSnCQQb81zPR5qhZJfNHglfC1MPSnbnmowx8XP/VD50DzQn6qqbrxe/+FbbmvSfaCU8G7+25wtoOAr3pwCE0xMZoXV8Dfi888sdZiB3v3ZM0gwPCFNUFIAwr8GoeLysMk+mrKAiLWOQZjE8Q6q9fvs= 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)(601004)(2401047)(5005006)(13016025)(13018025)(8121501046)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6096035)(20161123559100)(20161123561025)(20161123556025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123565025)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2261; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2261; X-Forefront-PRVS: 0401647B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2261; 23:rDhUbyJh8TvYbTBLQAjup/jmcDGvxAWoEIoQaOtua?= =?us-ascii?Q?71IwYDbnY2ho0tPySj2iq/keO0XgVGyKq1UW1X++590Veh9+0Hh8qSdQqNoR?= =?us-ascii?Q?jle5dFeYZd9Z70LGPMc1DePcoNGzR3213kxIB+7RVZ6bFtUr+tYYn0WbEaXn?= =?us-ascii?Q?vLAZOFv1TR1SVO+ZLjxVs1UjSV1JoE9pi9eWfxDE0dOKjREJ+E10PEqQx7rz?= =?us-ascii?Q?n1bEaxtU7x5s9FAcaHs7VWiTRiOi6JzuboIbxRlESIWvFA/t3A2JCIo/iN2a?= =?us-ascii?Q?ijTnilIFK5w0G9SGGWWtbpTEwcfA3WxE2bx2/EgpxlxsVZF2xSxSqSJhmh51?= =?us-ascii?Q?lsxvfHl7Bi2YVxbSpot2cQGMMjTcdO1PtdvmtGKiC4vkyLSt5mnVhimLu6nH?= =?us-ascii?Q?4arDv5s4A4/VOR6nxeDWJNH4DoxcKBvNNy/aQRHbbhh/3xNV+/EU2LNDqlcD?= =?us-ascii?Q?vSrdzKJPT7YhewkseWnv6kAzjXlhurgxXm8Usn8Aw5E4pyq3Za/LPBJb6jJi?= =?us-ascii?Q?Pu8NvaUqoiMupKB9LhEohlmbL0heTbfe1yiVkBGcrw4I6mlRzP0rM15UD5F5?= =?us-ascii?Q?61axtDfFZ7mced9bqrX1ZXp1Rh2FDTIyxGInbAKfW2CI5qAgCuyRdeWZeS2j?= =?us-ascii?Q?OIlHhS33MOC+ZKiZcat4Pe+arNI+8EO6NKCde4+FyEypZAMWvcCUfwiq4kFH?= =?us-ascii?Q?Oo+CUOEm5gJQYKAc53rgoAL81/MZ4MdRHpTb5cXEXpqNEwjWXI4pE8iFDKuZ?= =?us-ascii?Q?uLO5af8gcRhMLObIBakT+Fw18meAOU0RyEsYPGpawZB93muQhgstIOc+ndQW?= =?us-ascii?Q?kgG9gvcUNSeMMo9yu8XwEBNbidy/vDw+9Jdteg0IeLmD+2xJR4WA5f1arLjt?= =?us-ascii?Q?+UZ06zqF3DPgoVHQdiZ1E50tQen3l1v8SwPNUShvVoy2zoHEgTVnVz7VQ5fF?= =?us-ascii?Q?MbLMmhO5mUCqLOQvMP3HjwUOpQ7PTl9t14cD9kQv/OTfPigVgufNtd/ju5gH?= =?us-ascii?Q?v+nQYK2cZE4TIGwo07kzZZR1qvNd0nrcOAgWdzjO1nhzwBK7y/L9Pub3Nqay?= =?us-ascii?Q?2FndYxvYHInoKPLkvc0ClcJoHxxlslSq4791lvPby/xMNynt0TynK/7Xd61M?= =?us-ascii?Q?TmPd9h9cO343+4I1VILnq1UXEmby+Oph8e9JRazSv173qL19rZ0WcBU/mfq7?= =?us-ascii?Q?IV55BDVgt4l1u4=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2261; 6:0pqevT54T7ssJJZO8U2zhowtE7kDY2HAzXkdT98sfHxKfpPBZkwqlKy+4+AY/++iTXrD3+H9DPGukvMlKebNbg116P3IH24STqiD743WCnNtXyKhOiP9McMmNlm9xHAWdpPSsL34yJnBfnSwZU3zRyUk5wyIS1w/PoQQhURdQ6PyGApCYOOX81esFQDFIjpmb71PdZsd9hiZjMi+TC0hVCnZevUGJuxr8RI/IWML3kyNMNzCEm0PrAo7JQyli52q5+TRLjnVJCzwCUnQUtjvj/JiBFN87EZx/OAxYI3Yl5ntVSL9KF3kxjYerezE6F9tO3gNF6KIhkzmtrLet1MdhQ==; 5:keneyBUROzNpPAOpL3UQtIPla/uN2sB7U3QTjQ8I5YevXGgskQtKv+H1G2fTMa44jMZ2dDU5ZUnvEoCHlAOMqve72GjG/FO51qBXhREtD6t7c/HsFE0SXHerjezKDbbFIPNC6EhEY8yIQqRtkdn4OA==; 24:xod03YNzMUG8bB7u16UhSqdXVBbS/JRJygo0kFhX1UQUHDTo6t03Ye2xGZxfpxEa1EQ80TRSJSgGwIQwdRq1UmhEx3BzoZ4W666Bp/f+YZo=; 7:7+9EvV9/TnpA5yGgGmUgw7e6l9hpeGunYS1mXgixMaozfvVgr2TIAPdSYtbpo1dbEweBEyRy7BjZAX2e5EunEvGQnUZ2tmRQh/irCD8MCe+DEJhaFeM7a1V2Zcb60qlR8UN/5m+qf3fpgce6BRQHhyVbZ0AjCwsaMt6noxCMh1v0kXcMwObUSLdCsFo/RAbXK1ZY7wJ2+jL8ldArNlN2sdn4VGl9FNcaSeKwWXh2rA0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2017 05:14:23.9492 (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: CO2PR03MB2261 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 From: Hou Zhiqiang Now, the dw_pcie_setup_rc() works well, so remove the obsolete fixups: Remove the Class field fix code from layerscape pcie driver. Remove the implement of .rd_own_conf() from qcom pcie driver, which is aim to correct the Class code value read from the config space. Remove the line to enable write permission of DBI RO register from artpec6 pcie driver. Signed-off-by: Hou Zhiqiang --- V3: - Add the removing of the obsolete fixups from qcom and artpec6 pcie driver drivers/pci/dwc/pci-layerscape.c | 9 --------- drivers/pci/dwc/pcie-artpec6.c | 6 ------ drivers/pci/dwc/pcie-qcom.c | 17 ----------------- 3 files changed, 32 deletions(-) diff --git a/drivers/pci/dwc/pci-layerscape.c b/drivers/pci/dwc/pci-layerscape.c index 0c1330f..d22ed57 100644 --- a/drivers/pci/dwc/pci-layerscape.c +++ b/drivers/pci/dwc/pci-layerscape.c @@ -73,14 +73,6 @@ static void ls_pcie_clear_multifunction(struct ls_pcie *pcie) iowrite8(PCI_HEADER_TYPE_BRIDGE, pci->dbi_base + PCI_HEADER_TYPE); } -/* Fix class value */ -static void ls_pcie_fix_class(struct ls_pcie *pcie) -{ - struct dw_pcie *pci = pcie->pci; - - iowrite16(PCI_CLASS_BRIDGE_PCI, pci->dbi_base + PCI_CLASS_DEVICE); -} - /* Drop MSG TLP except for Vendor MSG */ static void ls_pcie_drop_msg_tlp(struct ls_pcie *pcie) { @@ -145,7 +137,6 @@ static int ls_pcie_host_init(struct pcie_port *pp) ls_pcie_disable_outbound_atus(pcie); dw_pcie_dbi_ro_wr_en(pci); - ls_pcie_fix_class(pcie); ls_pcie_clear_multifunction(pcie); dw_pcie_dbi_ro_wr_dis(pci); diff --git a/drivers/pci/dwc/pcie-artpec6.c b/drivers/pci/dwc/pcie-artpec6.c index 5d81f1d..d153491 100644 --- a/drivers/pci/dwc/pcie-artpec6.c +++ b/drivers/pci/dwc/pcie-artpec6.c @@ -141,12 +141,6 @@ static int artpec6_pcie_establish_link(struct artpec6_pcie *artpec6_pcie) artpec6_pcie_writel(artpec6_pcie, PCIECFG, val); usleep_range(100, 200); - /* - * Enable writing to config regs. This is required as the Synopsys - * driver changes the class code. That register needs DBI write enable. - */ - dw_pcie_writel_dbi(pci, MISC_CONTROL_1_OFF, DBI_RO_WR_EN); - /* setup root complex */ dw_pcie_setup_rc(pp); diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c index 871e7d9..4fb3ce0d 100644 --- a/drivers/pci/dwc/pcie-qcom.c +++ b/drivers/pci/dwc/pcie-qcom.c @@ -948,25 +948,8 @@ static int qcom_pcie_host_init(struct pcie_port *pp) return ret; } -static int qcom_pcie_rd_own_conf(struct pcie_port *pp, int where, int size, - u32 *val) -{ - struct dw_pcie *pci = to_dw_pcie_from_pp(pp); - - /* the device class is not reported correctly from the register */ - if (where == PCI_CLASS_REVISION && size == 4) { - *val = readl(pci->dbi_base + PCI_CLASS_REVISION); - *val &= 0xff; /* keep revision id */ - *val |= PCI_CLASS_BRIDGE_PCI << 16; - return PCIBIOS_SUCCESSFUL; - } - - return dw_pcie_read(pci->dbi_base + where, size, val); -} - static const struct dw_pcie_host_ops qcom_pcie_dw_ops = { .host_init = qcom_pcie_host_init, - .rd_own_conf = qcom_pcie_rd_own_conf, }; static const struct qcom_pcie_ops ops_v0 = {