From patchwork Tue Dec 13 06:54:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 705302 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3td9m30sKsz9t0H for ; Tue, 13 Dec 2016 18:08:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 177B1A75E4; Tue, 13 Dec 2016 08:08:25 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U3bdex1oeedH; Tue, 13 Dec 2016 08:08:24 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B61BAB385B; Tue, 13 Dec 2016 08:08:22 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7B704A75B4 for ; Tue, 13 Dec 2016 08:08:16 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zrkFya-sOeA7 for ; Tue, 13 Dec 2016 08:08:16 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0069.outbound.protection.outlook.com [104.47.37.69]) by theia.denx.de (Postfix) with ESMTPS id 076F4B384A for ; Tue, 13 Dec 2016 08:08:08 +0100 (CET) Received: from CY1PR03CA0025.namprd03.prod.outlook.com (10.174.128.35) by MWHPR03MB2477.namprd03.prod.outlook.com (10.169.200.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.771.8; Tue, 13 Dec 2016 07:08:06 +0000 Received: from BN1AFFO11FD039.protection.gbl (2a01:111:f400:7c10::113) by CY1PR03CA0025.outlook.office365.com (2603:10b6:600::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.771.8 via Frontend Transport; Tue, 13 Dec 2016 07:08:06 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD039.mail.protection.outlook.com (10.58.52.243) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.761.6 via Frontend Transport; Tue, 13 Dec 2016 07:08:05 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:887; Count:10 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uBD77q02015536; Tue, 13 Dec 2016 00:08:01 -0700 From: Zhiqiang Hou To: , , , , , , , , , , Date: Tue, 13 Dec 2016 14:54:10 +0800 Message-ID: <1481612064-10336-3-git-send-email-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1481612064-10336-1-git-send-email-Zhiqiang.Hou@nxp.com> References: <1481612064-10336-1-git-send-email-Zhiqiang.Hou@nxp.com> X-IncomingHeaderCount: 10 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131260864859831407; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7916002)(39850400002)(39400400002)(39410400002)(39380400002)(39840400002)(39450400003)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(69596002)(7416002)(5660300001)(2201001)(2950100002)(305945005)(105606002)(356003)(6636002)(86362001)(6666003)(38730400001)(626004)(77096006)(39060400001)(92566002)(85426001)(5003940100001)(8666005)(50226002)(68736007)(5001770100001)(50986999)(47776003)(97736004)(76176999)(8936002)(189998001)(4326007)(104016004)(36756003)(48376002)(81166006)(8676002)(50466002)(81156014)(106466001)(2906002)(7059030)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2477; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD039; 1:dTNJNDRUp27Q5BSq1t5OJ7Z/RD4PCH8hnDMIblXm5n+QLmGb4iQXHJ4bdyWwW1czu2n8FxDrjusaxaB/CsBOuvEopUFjTmPFB5f+eTCn0HcXjyx+U5Lm25cp9PIHn1OgLU6nwstLw2cPlABf2L5wutO+bDtOroYo09gC0Bl7uPHM9msiGXFvXzWooDLLzhO7O33EOM05ks+1c7EiLwdKzICelh+czZ2xEsgdkw9n53wgd+5ILIB8BlMz7baQehUnmd7eRl559uhm79u78wJrfPjJxinQeiLVi1pabknZvP47AC4XjHBanSDu8s3nCPU4MZczAv8+xbZJ6HYbenCbg+n/F7jUPv/ukxzPk+vjo3v/3puM7eoywKjp1AW7zGktqFVLTFy7Ci+uJlKECg4Qqq6eqR5XE+lNYPEB65yPnJHVHqdu6c6/IOuy06xbb5T5aGYppvtBzEnXK+9ObOb/rsXiJ97NQcWgUo8HCKfDmU9Abn/D0Xrvgg+zF9v/P86W/x+cIpu5LJrv14HWGdpQ3MzSwjkzMDuusM1ptq4cf6NJIvp7eI2deS8bYadJ9p/qnbIfYgAvbEJMLwf6M7QNJ7sPd8y3PrYKB+0C9Owd2BpWWGpFjSp0pCFI9U1ndjOvuEt+FYZ7mC9ilcbPxnsWQTwO8qR7aALdf9SPEd7xAwNo1wbuM2hV9innkbL8TIYg/pJwy5PL+l8jklWF+3VhkUROkziaa8w6IGafhp3BOFE= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 14b88176-eff7-4ef2-1b0e-08d42326c956 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:MWHPR03MB2477; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 3:kgL1wvk0YAPpikDTfRcg1BNPASh1n4+///1u5xRRQE1pCkteUSKNKKq4UsmxP0MyyDUhLz4dVPYP8nzL5i7rNARD0waWJg0Kh0gBmYId/ZQynEvCZ937D5sqtzrojry6nc2D40SzTwdZJrbOPPCwpxBp9aY9XYWq/mfokGTj9RAl4p/CAgM6luNox578DtISAXqscm+4mEJdw/SximjnTiVyANYF2hPSkavRyb3nXgUTlKjatclJq/uN/oEpTG5t+u8S1a7zvUkUFsCNpUDjM+WwaByu5QTl9HStsmgvOLzEa34PjhlRzPZr52QqWTSPUeDqBWDHqkBNmuykoAqindCmHoMaFawmBlqCjMfIwmR6Wrva4lv8/0/1Ggnt8mND; 25:HyqksKGK0i6h8y+hyZwBSc1Bi2iWLY9uhSXoZqyhtR68mWpZ9QSC2wDNALQ6s2hJaja94J6REzVOm3KBh3soo9hr9/Zf6DI4nsTglKhfeKtrzzCYrxmyo/qQ0Hyue2kP6oqat2/wyQHVBpb9429+Ev2AcbWQJdw1+XCLOueuo+RIJWXlzX5JZnyDAJ/XzZxtT6vBp+o2mL3huWdM7S230p9/McHgtkS08DrqBj1ndSEKAqZ8ljdKNLI/Fvlf7fFH/xXlLTdSHBZqxq8bVLGNqzkbJEoLfp1wFM/7b+8/dZdD6e1rs96s8kug1pdj1I+dTFJ0BmT4fa8qX2b+HW/BU6C1RglThwAPcaQIF8Y94zUldllq90LTv2/P+MKgfAQr5D1N+1IM90x8d5p2y2AuuCXqyfuVPQHh4KbY3cNcAlqogHb41iX+sgO5ek0zMF+aZzdoAHZqxH0Cx1mpbR7drQ== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 31:oSE05lmiRWU99zc/fAwXiQ2q6HPwCKPk7zghj5+1ZmNngZlNkSSpK10HEsYR5C82AC+Dli1znlmiMCm0DkKO4HQnBtrros2h6h18hQXUC+3aO+bSMleXioF2uChjgcqgLkvB45R0JzyDarpIQE1Bn5o2slqsqUzoWePc0verm5Yx4RNYPAQEbIvNLx8YRB4wUe+1xlLTys10yQBOdd4djLqTfCrrLth6P9lUdhdM9hANeUWO0ppFk9x8xFAE0IC+msYiHHxkGjsugwl+6TJcWA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(8121501046)(5005006)(13017025)(13015025)(13023025)(13024025)(13018025)(3002001)(10201501046)(6055026)(6096035)(20161123559025)(20161123556025)(20161123565025)(20161123563025)(20161123561025); SRVR:MWHPR03MB2477; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2477; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 4:+XQTqUGd+Rzcu+k/JnLjeRnsNBHYDosJDI8tUnQ/4EKV7pXNuQuin8yXIIg4ZJUGy8IPIBIPxiB2SHoriA9/irNIhAkWYt4E9QOFiaZbMpmT6zvhfvpWJNKWKiA6szvNi9Ew130PKo3STlby4wJV9QxZlPoi12FxjSTne2hec46fkU8ScM2TF6wV2SE0OK4yE5f2MSkK8NBWw/CUyN4hF2bZcknJqNrGmG2CCtXOuEJCNqoCd+hpwAT+AEtV3TKi3jHrPwgQ7j7K1HtYCt5v+4Rx0u841+Cqv5i4gIWDuXlYom9BjozneP/SruYi20sQwFQsUezHWbQQt7GNNSb/uspTpzQS9UAqxnupQIivc1c5nuncoyLuYAQi5doGyuDjpJRFz2KtJ3jo9xsuZqfyyDHloB1bWORNZYYUtAmYu6+jeJbEJQe1H0g/YhKfzanyK8KNyJbjliDKvpUT1jCjrckSpVZQbbVupwXKGgAwUNW27nUngo/gAMFAplkVv1WHgvHZYIUTssMM8VMkSvCyCVfQ+aonz4NA9RX1kzbX1S8j/V+mauYuAbzX9b+lkF4hh1wR9lOKrvFxldbPCQROgpo7dZi9cHNAtci9Eout1Cny06BSTQP3GYglVuOuIATbxeeE89hSJK8ZsEJIwn4daijHCK7sAWaA6qJBnD5WvOjeryFhcR+oBGT+VPYIGNjA32m1XEUR+DLt1TxGswSt72qEtSIyfL/0e6YGN3LWEnT61bgSSa7qTKNj8TySbbs+ X-Forefront-PRVS: 01559F388D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2477; 23:Slo40s6cAVyIHWSepQGUKYJfBceZheqsAxCum9ree?= =?us-ascii?Q?UzDRMYNMThg6IIy91RNQK4eWU5q1SVXLQTopCJLaGQcJJcEiglwvxA1C0T7Z?= =?us-ascii?Q?fS40P1FeYeBFnlTsvfFQlXHz3VqOGNquPvz3j8Zt+Jy1u+v6jM886xATXyM+?= =?us-ascii?Q?b05hh57v10pgvmD/jErDGchM1Mz8N7l99FSQ1NHzo16PSxmZ+JVRQ/RsmQw+?= =?us-ascii?Q?Dxa84JtgructXKPBGHnLyS+0PgTaBYFcPwhxHc/XBxYtLHGRkwt69B+WhGHZ?= =?us-ascii?Q?qbANOTRvIrKQ10Wh9NbQD3vUNId/mp8RgC1fSV3jebMlovww80Nlb/q7f0YL?= =?us-ascii?Q?Rr7l9zPvg2UScIAMTzg6t2sQwlqSfSB7i+SlzMAzs/PzBfW0azl1bYRvZUK1?= =?us-ascii?Q?VpCBv1SDfVtQ4xmOzGBjvuZ/idt5kzqe/MavUEZDdHpbChm8Uy+06YhZDk84?= =?us-ascii?Q?KqkI7mIndV4DVEpgunhCV4zmSYFcq7NWp0TODuYaZtvVDnpEsNqfUdIhkWj3?= =?us-ascii?Q?VYYfUFvVD+MfIHUh67RN5btZLyfu4QWauo173CoUO1QUKVXc1Ec3aZFaPavb?= =?us-ascii?Q?t7hL7ro9S3PuUCyzzqu7vZ8WRMxHSHwB/UIzPwoLYQv1ywK4i31MM/ttSJ94?= =?us-ascii?Q?BL1wcbGIvnPovxqkTDGTTbnk6XEUDuPv67aEwq5wLLb2+cMISwgcRyD4VJLr?= =?us-ascii?Q?CWM4hyQWSkALv7PcLGwjXJs+K7DHiY8BSx3jdDOxX9u3/lCqpc0AVlDFRIXZ?= =?us-ascii?Q?/d60JmYms5RMw/JYEfnOHgZhv9swe36KwG8nmqeD5HM8wmE02+I4lhwG8sRQ?= =?us-ascii?Q?HTZFOJ72NlxjnPatUNVxLn4PGTxAYvh6YwCbguhbV4QzBkfMSVqDcK1Q/ydM?= =?us-ascii?Q?V/MKSc3vM6kSC9ArHIOutIES2x67k35GSGhGG+FDk9ZbNAMzKl17q2oASu7u?= =?us-ascii?Q?dFqICNMFlBGPSvzugtAvB/68es9yyOfvMzKznYtizx5zpR2+phS8CYcHm3Et?= =?us-ascii?Q?2Yoow1DJ7Dq4+sbX2PJMxu5evcCqKZbqNoYjpKEFVQsq+KC/HwCbewxNmSfQ?= =?us-ascii?Q?bLqKUTru0rt5C1En1Zegzd4LLehnVXINBZQe4tl4u1sV/yYaXamsbAwmUwF9?= =?us-ascii?Q?DElH2raz5dcaZKbg6mmtRQpdNQJAXk8TIG816lVZF0ar5sEL7izm2t6jT3Yk?= =?us-ascii?Q?f0JGKaj2sg+nMwhXiS/YUNywzPSXo76VxS/nAY5vkf6BON5/3VJ3D/bkfSfo?= =?us-ascii?Q?w3dXoL7oauCTKRKqO06l0s2M61l8ytaZdSAW4kbVZQOJzUvExiQCjkeVkwxi?= =?us-ascii?Q?LXuu6FkUrp8unQKWmlop1D++qjEpHjX1dNg0FYbUGDkrjcA4D115Ax72oVmq?= =?us-ascii?Q?0OodJTWGfbxXRxico38gLrzadE=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 6:JTv/6maG69ZgkP0Ha8JiKFeLdLRMmrrAUxnCPouyeopfai57kLUP03LwtfT+tkjswMmx9H3TW/aiZYFEmzGoc386Oz7dPBcyNikxZzC5087SfB93Vv27Z81o3rsM0HNqwf/dvtibHRXVVI91Kayc8lrL6VC2685EKHYCKh1cRm79fQUKJbesAbLDqIDEmyPDLaA7eta+VJB2LVZczmQULgCVClJU5LrzSNHB5c7QPTxk+zDwpN8iz2xun2atwxU2X/WpGDgoJlkarQm6bz6YTi15oqxRpfQvRvzy9MVVIf4KrlQUoTNQQYI17MOOdsmf5j2Se1WIdfFrHg/brr4SF28skPorW4sLrSJKo+LVjSdLgMMfAkcFTd47h1IRb0e4eyca5TORijGDmbryGMWI6ZlReXW9rtU2lC6R4xQH4SMYX2YAsZzWDIoRiOoSbOzA; 5:pcAGiZc1FIdKI9z5QpAGSYc08Qd/TmK4y1szNNZN28rB6V2+lKLzywYaAzAbrMNHHWWgoB8Bet3qaWCS2rGpPTs/GSBBPQWovM3xSfVEsinsWa1YKk2OQiq4RDRTQSmxrCbGAJAPFGcFvJqvXbonsl7mzoT2Q05MV4eZIIhVMLfvUxQHnHO+79TH0PS9AsiK; 24:aqBYw6WZvsuvMACTSVjt3ubhCvP2gJxg3eOsZxdcmVNg6qmTUsAP6uLlQrpHafPxJHARFgJZXhoTHOumCXVFy9Uzim60MxOnYvBnaRe1ldU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2477; 7:f1f5WKdlYQCXp9xuazqN0BkhOfx6FG4Fhc60aZRvBYXN+RbfIgU+4xnRiwuHUw38dGGWzNSHwkragqotGLHTwwekc+vQvWWRGfD6dIEQ49zjZXVMmfi5z4/nyRJCQ8Fb3F/a26j/nEZGMVvNJm6YcRoMQVVVOHkpA8pf/yEHb7Eaf+bw+ngLfqTtUMhcc78I4QZP7OvfSPI8lQZCDVWtVCzxBzldZGiuMyak7UasZczsiRU+ZtU/CD4wBNOR71SFo/DmmKhcKN0hrpIqsd/0SBk7aDXb8vHwlHqnT59st0io+CjgR9d+SosrgpudetbwMd+shgoxy6IpBpgV5cyFLkhDswR7JjXJfv4fx4k9eLR4qDFRF6x3qeB9179NBgl8WY6eRQCS+mrokm92+gbEdzSTh+pKAtP3bxi5zIDZEd4ELYq6HSBUwivbGTCEdjSEJ0RaVHjxgXAZivx/ufPW9g== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2016 07:08:05.7179 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR03MB2477 Cc: Hou Zhiqiang Subject: [U-Boot] [PATCHv5 03/17] dm: pci: remove pci_bus_to_hose(0) calling X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Minghuan Lian There may be multiple PCIe controllers in a SoC. It is not correct that always calling pci_bus_to_hose(0) to get the first PCIe controller for the PCIe device connected other controllers. We just remove this calling because hose always point the correct PCIe controller. Signed-off-by: Minghuan Lian Signed-off-by: Hou Zhiqiang Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- V5: - No change drivers/pci/pci_common.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c index 1755914..6526de8 100644 --- a/drivers/pci/pci_common.c +++ b/drivers/pci/pci_common.c @@ -181,11 +181,6 @@ phys_addr_t pci_hose_bus_to_phys(struct pci_controller *hose, return phys_addr; } -#ifdef CONFIG_DM_PCI - /* The root controller has the region information */ - hose = pci_bus_to_hose(0); -#endif - /* * if PCI_REGION_MEM is set we do a two pass search with preference * on matches that don't have PCI_REGION_SYS_MEMORY set @@ -236,6 +231,13 @@ int __pci_hose_phys_to_bus(struct pci_controller *hose, return 1; } +/* + * pci_hose_phys_to_bus(): Convert physical address to bus address + * @hose: PCI hose of the root PCI controller + * @phys_addr: physical address to convert + * @flags: flags of pci regions + * @return bus address if OK, 0 on error + */ pci_addr_t pci_hose_phys_to_bus(struct pci_controller *hose, phys_addr_t phys_addr, unsigned long flags) @@ -248,11 +250,6 @@ pci_addr_t pci_hose_phys_to_bus(struct pci_controller *hose, return bus_addr; } -#ifdef CONFIG_DM_PCI - /* The root controller has the region information */ - hose = pci_bus_to_hose(0); -#endif - /* * if PCI_REGION_MEM is set we do a two pass search with preference * on matches that don't have PCI_REGION_SYS_MEMORY set