From patchwork Fri Oct 16 07:19:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Minghuan Lian X-Patchwork-Id: 7411291 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4F053BEEA4 for ; Fri, 16 Oct 2015 07:18:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65070207C3 for ; Fri, 16 Oct 2015 07:18:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72D1920795 for ; Fri, 16 Oct 2015 07:18:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752762AbbJPHSt (ORCPT ); Fri, 16 Oct 2015 03:18:49 -0400 Received: from mail-bn1on0141.outbound.protection.outlook.com ([157.56.110.141]:45669 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752370AbbJPHSs (ORCPT ); Fri, 16 Oct 2015 03:18:48 -0400 Received: from BY2PR03CA006.namprd03.prod.outlook.com (10.255.93.23) by BY2PR03MB571.namprd03.prod.outlook.com (10.141.143.145) with Microsoft SMTP Server (TLS) id 15.1.293.16; Fri, 16 Oct 2015 07:18:46 +0000 Received: from BN1BFFO11FD033.protection.gbl (10.255.93.4) by BY2PR03CA006.outlook.office365.com (10.255.93.23) with Microsoft SMTP Server (TLS) id 15.1.300.14 via Frontend Transport; Fri, 16 Oct 2015 07:18:46 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.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 BN1BFFO11FD033.mail.protection.outlook.com (10.58.144.96) with Microsoft SMTP Server (TLS) id 15.1.293.9 via Frontend Transport; Fri, 16 Oct 2015 07:18:45 +0000 Received: from lmh.ap.freescale.net (lmh.ap.freescale.net [10.193.20.20]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t9G7ISIK004957; Fri, 16 Oct 2015 00:18:42 -0700 From: Minghuan Lian To: CC: , Zang Roy-R61911 , Hu Mingkai-B21284 , "Yoder Stuart-B08248" , Li Yang , Arnd Bergmann , Bjorn Helgaas , "Jingoo Han" , Zhou Wang , "Minghuan Lian" Subject: [PATCH v4 4/6] PCI: layerscape: update ls_add_pcie_port() Date: Fri, 16 Oct 2015 15:19:18 +0800 Message-ID: <1444979960-24100-4-git-send-email-Minghuan.Lian@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444979960-24100-1-git-send-email-Minghuan.Lian@freescale.com> References: <1444979960-24100-1-git-send-email-Minghuan.Lian@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD033; 1:ocCAhfPpROyOYymUVHSOkn8jT8h4bNgnOzhj9P2l/Z2OR0lx8ii4raxSnvdo/OVqBuk4pmZVo++SruvYSO4QMoJrnm+D1Mziqm+TGTYJ88jM5QNnP0wJtDIXtAhZp/IuUP1TrPmLKXsRCdN8/JZr/O2hhZVA+cqiHROr/tDI3MK24gggQvv3qa/YTEaIDnBe1cl1JSGRYQANQWn059sl8zcFKPJUNEGSnlysc/jYtLOyY+bq9MHMaNBTyQvKBm8pNeNvcZm8ksoVeQ/ebfnpsnW97dqaDxV2cZSiAK9G1dc6FC+WC5xW6UhooLp079X8hHKHGnflA9P5a8iZBXu41TsKk4I++1W4FwneWCREhdtzmgWSdsVAluSDbDlk+LLqiHtsee31VuGeV8wZPXu+mw== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(54534003)(5001960100002)(107886002)(106466001)(47776003)(2950100001)(189998001)(87936001)(19580395003)(6806005)(105606002)(48376002)(46102003)(64706001)(2351001)(85426001)(229853001)(104016004)(5007970100001)(77096005)(92566002)(50466002)(86362001)(19580405001)(11100500001)(81156007)(76176999)(110136002)(5003940100001)(36756003)(5008740100001)(50226001)(50986999)(97736004)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR03MB571; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB571; 2:5eyRyWcYyVLEq+Ew/9mCDCW3KY6OAn4vBzMvT1YB0AtIlO1CwZ1dMR0x2ZlIT1e43LbqLPTrmURoqggSB1Xtai8mw1T+R638wWQi+Gv45puHYqLoBaNaJYDXhUYBRam8qA/V4UNGB1VqCX8/JwJl6A1Q6I+ytfBviuTDVyRWx4E=; 3:aQO9yT4JyC0NLhZg/YR9GMvpHFfpBD+kUGjwT6Iwyz2mlJFbsUbz4ELPnY4xD/Lg15jVA2ss2/qbWoNSr8pkd+XrvCT4S5VMxu1N2V4x9jd9E1WClY7eR+nZrPHvXI4D3DElO2TklqXAGlhkXF9FuMsNmIpNCIfigr4WyYpCqmeS8c4l1lop1DkdnUjnwL2/VRLVa/rvckgHQdjGgb9v1lpQdiC8UJvz/xowm5WDb9M=; 25:Kmo8EURzrwLzNhlGbtmfHNzbATiL4A1X6AweK/+RvnTnoyEcIZyBydtqNlHERs1bMs+OOVpO4pXN600djEAOpPzP55v4xP7Pd0shcBo1BNrIOlqRMeDbGJo/+u9Lbt76izq3LKJOcwAaVI9uBSLw3ucreuG79hw2rTxiLT720UqkFKpWmpcqGrHU0yf4DW3ao6UWx246CgNMxU09QgiCmJkHb+V2+h233W70Sb7LSXlblHhBwlwqpKbYpH8kCZC/bsTx1xTMJxDi3g4hozy8ZA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB571; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB571; 20:N525oIx0b2ZoPvEobsEx57+jaD5mt4NUL8B0fHx9tvSNCv7bhAkt7yURU1ZUYJ8IKv8xb9rInL8ZHec0ftk0bh2ynA1A+iN5P+j8Mq8Ar2w0re4Rzi35XHCzk73+0K1ZAgQ/GkRhPFLxWXL6r/qo6KvDzZx9N3+qEjYZXRfRXMRVCfjxlf4s1m/LZmYro9DSH74Kud5ZAIcngp5y0Hg96IRA4VzT30nOKp55lxlkPXuRxMwIe2DYDzHu+UJuml+WfvBVigyJM23K2w3c/F64qDLMD3DE8QseirPoNM1SkiWC+bXHSAuQo8a3bUxhU0vXO6rsJGveQ1sQfJXoCI0ampc8SdAk15n4+GS9IbQuhNM=; 4:ja4w0/rcvHHGqyPpdQtV00LrN27mdXFCEhQNmx/Kmoi4BdIn1k+d9gF/s2cxzJf5yzjaMo5hfOXGSHHKOHyCCB5uqbvbNs8AzppqvELmJadIiK0heFA5FOpSHUkgTWC27PUXKccY/i7fmdzcgoVGpYEwse7OJCSt7z279XpnoK1o164L0gqXLPKkAZ+BO58iPFKdJ5XGoYh+GILEek7/G497vgjnJ5EZ2Cu4gTmKa+yiYYQSjytezqwWlaTuRr3A6OtIsg52sMjLNOploRfwch1kMLQNcYQND0JYq41pnLdFMLRHCzAa5sPHKjx+d6u1NB1ataUEleM2KvpyJj0H620cnwTSsc5GFKBw7e88ZUY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001); SRVR:BY2PR03MB571; BCL:0; PCL:0; RULEID:; SRVR:BY2PR03MB571; X-Forefront-PRVS: 0731AA2DE6 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB571; 23:e4KtLM2pEIrKWeSxzULPfM+XR0nt5dBh4i1IEeAffQ?= =?us-ascii?Q?XjdcHHoP/Ll487Zm+Z/Z2J6pB/0XLvbGbybzO0RcJQA78ffaG3hvyQA7M7pD?= =?us-ascii?Q?VidNwe0wF/lMKg6WU47rZgFFXOoGkAbJF438aWhRbamMmQplmK9qRxX6OimI?= =?us-ascii?Q?ceHRKwMer8Eqm/Mo2sn46Iwu0UB6I5WHH8bFdSy2yR6ul1YNasO9fX0eqPNT?= =?us-ascii?Q?rw2Dlec8zL+XA6rAWpM67Jt/OG4fJ9YEXZSseLYn04XECttvmCY2Mtiig2XZ?= =?us-ascii?Q?kgB8yI1KE/BSZDz0XretscVPmXvqbylTzRZgDbxiA83q7bTxvnGVbElZqRpw?= =?us-ascii?Q?xlHTeE+Mj/QTEjLH7toohQhiiXns7XRbRtcAvkYQh2MhrWVVQd9Bq4ILqS1G?= =?us-ascii?Q?WU2RMu9mEJ//84bbSfIuMECzYS7L+wybfB+FFzvhddRNtwBdSOHgEjukUT/x?= =?us-ascii?Q?7IG2v8s6LCMmec9P2NuHv7KgnvedjA0Q7SaFfMggVaSPVfuMy1wVoZMzlzna?= =?us-ascii?Q?HDP4SCKZlQkx6aIHDP8VBc6KS2BB1qlZn8m7aCIWlz+7tnpVTNU5xnP3+F8z?= =?us-ascii?Q?P5H8oKq0QCeW3ezkmuQNPMMyMjIY/A2H1pH7fQhsYstyZbrInOyKIga9N+d+?= =?us-ascii?Q?ilIanSpbcqDsX2SnDyfQpk75Ts+DfsjYlM+ZXGp3PLoxyOBR7/P1vct4HFNr?= =?us-ascii?Q?8I3qi0ZnA3wyHWbw80vXmVedY54NvtTNnlFsOPxMi/Gqw0TZWX2i5gFiytle?= =?us-ascii?Q?48xuVsyjxeXlLfFaxCUR0Lnkj6SBz9H2w9Wq0LtYZj+ATlLak2Ia4g1ejVrq?= =?us-ascii?Q?hoqOap8evUWfYQoCY3GwJM+55yzCpOxPVVsYPx3jQpELDGLjehFCAMz6gtCu?= =?us-ascii?Q?lScLrZd+yfaXVZDoZKNyZ+psTX7k2nuZ2MPmNQZJyUpVw39kSKV0rWD5hr6b?= =?us-ascii?Q?nrySQeWWfgeRnyM4ccKFrEd7WfaJwczTyv+WJvBamN3x+f9N6l/FTpeqrdpK?= =?us-ascii?Q?WElat/NyJZWah/616NGOxho3Vc790o5umHwK2I5p2imMwWrHrB2I9DqTpkAP?= =?us-ascii?Q?l/0612M6KZKRy0NopLcUBuUsjjJ4pC4AeKAib0XG7XBgu4uxodKL7qEjI/O3?= =?us-ascii?Q?asF8oxC4tVHdm/2B7OdRFf8m7jaU5x?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB571; 5:2mJCtklyrUGOiD9EzAW9bsXkRhBZ2CqT3b7eIPktmrpzGLrU+qJ/7IM5JdsWeXih+/IifOVnhaW7/LBuAwhB+cvIDuQOlYvhlHQJWzP+OSrxE+jorKOZc3xI5obE3Q7MVkbZdVnLCwsMbzPjErLdKw==; 24:ZzEfGbfl64jUYzV4x7rRwn/x4zBOxr/S3qBHkUD2MGS6EghVs/afbyCCth1lbqPf4fOTzxGmrRP5gVSYOrlLA3JWKwNcbw6BH9o+ZAXfoQA=; 20:nS7eoAOb7mLyUB3VoCJrzInh9tpRhaIKkzcjzjCK22j+4sAdI1WO+DKiwhCcseAxeL2gNhBRY8tL+3Re01/2yg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2015 07:18:45.7713 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB571 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To keep consistent with the other DesignWare-based host drivers, The patch updates ls_add_pcie_port(). Signed-off-by: Minghuan Lian --- Change log v4: split from [PATCH v3] PCI: layerscape: Add PCIe support for LS1043a and LS2080a drivers/pci/host/pci-layerscape.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/pci/host/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c index 89b7eb8..891e504 100644 --- a/drivers/pci/host/pci-layerscape.c +++ b/drivers/pci/host/pci-layerscape.c @@ -125,15 +125,14 @@ static const struct of_device_id ls_pcie_of_match[] = { }; MODULE_DEVICE_TABLE(of, ls_pcie_of_match); -static int ls_add_pcie_port(struct ls_pcie *pcie) +static int __init +ls_add_pcie_port(struct pcie_port *pp, struct platform_device *pdev) { - struct pcie_port *pp; int ret; + struct ls_pcie *pcie = to_ls_pcie(pp); - pp = &pcie->pp; - pp->dev = pcie->dev; + pp->dev = &pdev->dev; pp->dbi_base = pcie->dbi; - pp->root_bus_nr = -1; pp->ops = pcie->drvdata->ops; ret = dw_pcie_host_init(pp); @@ -160,8 +159,6 @@ static int __init ls_pcie_probe(struct platform_device *pdev) if (!pcie) return -ENOMEM; - pcie->dev = &pdev->dev; - dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); pcie->dbi = devm_ioremap_resource(&pdev->dev, dbi_base); if (IS_ERR(pcie->dbi)) { @@ -174,7 +171,7 @@ static int __init ls_pcie_probe(struct platform_device *pdev) if (!ls_pcie_is_bridge(pcie)) return -ENODEV; - ret = ls_add_pcie_port(pcie); + ret = ls_add_pcie_port(&pcie->pp, pdev); if (ret < 0) return ret;