From patchwork Fri Mar 3 04:35:10 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: 734933 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vZGvd3DwBz9s8L for ; Fri, 3 Mar 2017 15:50:21 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1F56CC21D22; Fri, 3 Mar 2017 04:49:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2768AC21C5D; Fri, 3 Mar 2017 04:49:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 26190C21CDD; Fri, 3 Mar 2017 04:49:24 +0000 (UTC) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0080.outbound.protection.outlook.com [104.47.40.80]) by lists.denx.de (Postfix) with ESMTPS id 85B64C21CE0 for ; Fri, 3 Mar 2017 04:49:19 +0000 (UTC) Received: from BN3PR03CA0115.namprd03.prod.outlook.com (10.174.66.33) by CY1PR0301MB0731.namprd03.prod.outlook.com (10.160.159.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Fri, 3 Mar 2017 04:49:15 +0000 Received: from BN1AFFO11FD033.protection.gbl (2a01:111:f400:7c10::129) by BN3PR03CA0115.outlook.office365.com (2603:10b6:400:4::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12 via Frontend Transport; Fri, 3 Mar 2017 04:49:15 +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 BN1AFFO11FD033.mail.protection.outlook.com (10.58.52.246) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.933.11 via Frontend Transport; Fri, 3 Mar 2017 04:49:14 +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 v234n80K023208; Thu, 2 Mar 2017 21:49:12 -0700 From: Zhiqiang Hou To: , , , , Date: Fri, 3 Mar 2017 12:35:10 +0800 Message-ID: <1488515710-47701-2-git-send-email-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1488515710-47701-1-git-send-email-Zhiqiang.Hou@nxp.com> References: <1488515710-47701-1-git-send-email-Zhiqiang.Hou@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131329901550952842; (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)(7916002)(39400400002)(39850400002)(39840400002)(39380400002)(39410400002)(39860400002)(39450400003)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(356003)(305945005)(85426001)(81166006)(8676002)(48376002)(2201001)(189998001)(626004)(50466002)(86362001)(5003940100001)(47776003)(4326008)(8936002)(104016004)(5660300001)(50226002)(76176999)(50986999)(8656002)(2950100002)(6636002)(38730400002)(77096006)(92566002)(2906002)(53936002)(105606002)(36756003)(106466001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0731; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD033; 1:kBTBe+M03zXiTFpvT4o8RbGxGgz5l9otpq3PuGxGqDBfq1d/TNUjCaDQeRZklH04SY8/wljd2YCi4UHEXMETTRrbV3jNtuNerMXBTAdn3TUcr6Gi/h9PUA7WJI9dzAHNl2pwglZPbCqob0xbqPJbkbntdYDFKL0UicL5QbwS81UM0dwTq8Vq3NGUlqfOd694cdbaydI7wt3pGnbfqjsKWTdipHDa3gTrSrB3WaycUJysQN0KXcnt97qE/p8m9koCTK3UI3JWYa8SD5Xbe/4zplRZSIkEhxXLrjhJ41yiZe/J1b6+EE6wX0HialNlZfyC2xoEh/tr4wcxDCzDmy4nuirwUOi0XyXmSMls0LadwRJ55AwWhlpIk9wAWZ9cgwUEfs3Lx3u8cH/tsKXz/fXvi0ZMAMvi+daOGHO52KXylUDQCER2AV5XHlwNggn1+AK7JdtfjOxK2NmPE/ZYhYzWbjwQLBE+tA9FBShR98r1mk3mHTsnFWDNGWmmd6BpwbB28a9FSEDMlOyk48i5g28yXqbwYJ0geTxaNCbk79R1zpKxstVvdh46dnidpggeqivp7EcuwknyXAXHCQVBahNGo0sdFA1jLc4SJh5sbGS/umjq4dUL4qkV3uthGpNfgIk1QSRX2qOzRP2LK1h5bxjVlzDWjJauRJ5oW+FWdTDpiTe+sjyoUnb/8CeFeC8Wa4ZymPjHlzWPfbE6Mba98J07Yw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: ac71ea71-24f9-42fb-8028-08d461f0a4c9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0301MB0731; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0731; 3:4QAoiAVcTaRv3SUJNgyDmpYnOgHxEh0lb6DBhbCjRk+RHjvIAooZ59V3pHIra39ZjVpaQdhincKIP0cmk4GCBaQnpYvofqCaPkktUjtaksLq7FS3RSMs2DnTe/dty8VqkNxv9/D/c+JLnPlKIjFw+NKD5j6fRgUkljlMsGKpw4uxrtKFivRgD99A6o6VHJA/bNmqnToH+jpptnQ7PPYvp9TxKXAA8qpOT06FPKb3i41EgdEFidWyYxhkMorjZtgxkrH4X2IR9BY1H4ck0VnJcpeosgckENkhQynpJna5rrUZw/iLmtpGXWH6U00QbmzT+Z8mqMnd7zwh7hUU/op6u5myGb+xV5fSuz+yZ+9hmTQ8uF8flN5z84r9lRQMyy8q; 25:hfoEKJB5sryjekM2KyxKSpjgWHS7aLWAsTmngHxS7F8mCLem1E4Xve081tmqiu+5v3z2LLKQZq4H4zqxP/g8DFIEgkGa3WE/dNuc/ljpJj5jUob2LWKPMHWP+Tzkw7MXeXye3ICK4pYZhSG4IlP5MG9u5/f2PgtyEkIq2b3TvIf6PYFg0hH+PIjA9ajJ2pYM+8l8nOpGLv1M/NEFoy/4U413OGmnS5vEL5q6DF1qkM9tr1vYFAajvHZca/gPSPBKqMKIfcJUasRvljHlBJnJg9WQfv9Mtxs+ZcB3YBpu3o1FyfZoviLUmFlPKZ+z7tQJGpq2zkao7H+W+7PFugh1ScggUyFVwqxuMNIZXWBxsU40aBQaY6AqwbE1C4H8jjO9ZCdc9SWCVF6cJtEOHesp4zaC8W6cULu0/YLVkAE/MmtZIC56yjeE0gCalD6d/4yFiwNpWIFVHBl0Rup/OC4I8g== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0731; 31:MI1Ozz/zNjsQ93Q1SmurWWRObBiXCqMlcojjZ8z5EPJKE8smhEvZXLxdYzK99SnYuGcdVYyV0lJzxa+1/IHdd1gWFz1aZT/qnjiPBFjzGEc50mvTPdA24wNiyrCFa5g8fKmtHc9WF0Zc+AiTGBu9MCj0ikILPP/5GlPmf3ytlRjLpadc0a9Ng0w6pwrKjohabozwF7b4DqFY6xMZ2kFmOP5si95dsjPEAPvWHo+xsTGANa8aM3TdaVINUwVI/fii2Dwpr69TtOkJZuESu7ywVA== 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)(13018025)(13015025)(13017025)(13023025)(13024025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123565025)(20161123559025)(20161123561025)(20161123563025); SRVR:CY1PR0301MB0731; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0731; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0731; 4:VoMCa8W10eZE9qOyCFCDLGbN2TTm+yNGTgJ+ufqfElqLT0K94YRGBCKuZShojfYzBD8GrSulGFDoVCxctfooI4AODxFthzvd0aGAXRhdyzeGigGBKjsN4+eWz35jquKT9yRhvm2Tkv2T360aIfuw7xwWTu5UkjsgnKcCiilYdOi5uae2eqCXsJKEDjWfaGPRE9V6cz7MNnTffP+Luh1wyv/JYK4HMebXT4u6olM4PVbh6pHpZwm/ApNQJVbZrc4OuBwydo2893dMRXdv3pw+sFVtAA7ot0yrm9HIWiankBAj4/nR50MlGiG5j0SPCl+QCVowtYl/TpHrSj2YAats3K2PKKl0PMP4gK6JqWZOLJd36yjzAqTV4CXWKxZYxZyucFE1ZVNN5xjXEes837MU2+NhSZvzGDfdzNCocCjSkSuY3yg6iVSdtMHREz6XNB67rMLs2KHuZV3c85ympZMdYKcZFGOyH/Zav5FcOtuFT5qDdt7OJ1LcB5xaXbzWbS4o6hp4juQNFSr6ohO/IyfUvPzF42+saLhqH8+t8DnjcKUopQNOx2jo9UURVwaO77qbyK1+fk6xgCaO6hQZriJIA9ULM4XEAMC7xNgS3rFeosJQ/90uBuxRxEHeDpzM40DOkZoFJcPiTSJ4+Z/jPqRIPznmFd/qWymMFn6LAu/lL4QsFEInQCirjPCaAJWWLtAp2RpSR6M1Cb48pETKN6sh5HKcoltM8/5ID8eOckpx+Y3XPU0V9JIwIdxR1q0jd8Kv X-Forefront-PRVS: 0235CBE7D0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0731; 23:W70SY1DGEsqaLxSzTYd3Bl8aGskyUHObZnSOca/?= =?us-ascii?Q?+BNNqWTcU22MarWOZhqxOFzOfoGl8CcYNuYSkty7QQ/R46Uu5reM3zAclgtt?= =?us-ascii?Q?Fyk6XbtkEntNVYKxaFv93gwklMITwiy+JgV4xNaaRDPhXuObKOeuKYI9e/a9?= =?us-ascii?Q?7tkB9lTF6TkrowbMO3dlr8qgLfURHou/Ib9oz9ii1k6wXDnu1TFPTXPEDZeX?= =?us-ascii?Q?jsJ1W+3muPvb/1GtvkbfL/efx9tAIdfFXU5i0iIeNYPGss4p088BpC09uW8q?= =?us-ascii?Q?3tT3oIZMsJ5rrRAk8q3ispOIs1DzB+oVmGtChR6l2tEXLYtf8NBhD829BXWu?= =?us-ascii?Q?q+ZvhCRb+uFzXEqcIxfvf/qC6if6K+PJJ8T0UXpelaguF41EuU3ErNOSuG+5?= =?us-ascii?Q?IA2VpUH5Vr6l4Bfs0FrSXZntI0h3xE+xSihwl3b5mab/Q9CHv+NA9qL0bM60?= =?us-ascii?Q?byj4dLfD6ekpsBbCd3BuLFXzQKdyEVvnjmXgEw/aWd0w6UIXPLlizSLPiNcP?= =?us-ascii?Q?CExx3YFKwegMOWYmZuub5l/wZ3ppE/zryVOk9YrFddHo9YFjERploegzUsPH?= =?us-ascii?Q?l1VhbeocxPEaTEWjr+ST+f3oQTJal1j9a9P4wtU/miv1Ij5FxGlYFQUqIr9Y?= =?us-ascii?Q?Nu2tGml1gLyuLjYVt6M9cITRlHV9Pt50E0P9+w3ubl535fdoQx1xVJ54MMZe?= =?us-ascii?Q?FCwYC4X4cQqXVAHwQucTJj00hX1l7wDrEBOZ1/jSjLdpolOpi3g3VWZXAjK6?= =?us-ascii?Q?DHomj2e1e4q7JO1PvtFrWIGxhii1ZFtTFexQSevwvjk3qfXSdh4VC2olDu85?= =?us-ascii?Q?gsoLOu2dNcgkQKNuKMQDUyUN8fBeFP7S4Ffo4nLEw6Hl6xkLuAvV4FC4BC+3?= =?us-ascii?Q?oxf+pJ6ywWJQqfZBILamt2bsWyKz58H/+wabyuMs22PVKyHodbXukCnuyw8x?= =?us-ascii?Q?KQXfQaj1SAsSVd/fVHa9/3rGfH9cY+P4VLtkSjFGmfJ0RIoEKUGBVs9sRWN6?= =?us-ascii?Q?JjQOtOZscBFopWarRsyxBzKg66Bhn+PC6hwqQRh86nX84SE/KOv0biZ/MaaW?= =?us-ascii?Q?n73eaIetRYQaow/Z81DJo2Smhc5v+zuRNID2aKOw2B6Q0JkP6A21gN3N4QVa?= =?us-ascii?Q?AR3txpOTrLxxxrv2KNSDGc0thAPixxlynA7DVDgIfZTN71R/chr2mAaqtSVF?= =?us-ascii?Q?jRmqhkECI1N9u7g0=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0731; 6:vOZAhScquBluq6e2hP+XkVyzXSPwlDccLsDipmSH5FAsxqPMkCD5S46Q+kPxDE6Z1QhnaJVHWXuiUpmBqW/YXx1NtWqncTjMGzgoxTl+WBZ2cNXnIcaTxo0758WjD5P7tE9Es/p/0MV7hEBRcejtaJhuSzf2+0sg1alEfAW9hciPNjP4oijV3GKtuIJY1giICcuMg636Yds30rMbmQW8ywKNxWHMO7uEG4bMW8a9CxNPfTtFmDKnb92tpePmNJh+nuY+CVvg7Dv9Ts+rCu0hC9E68L82kTXgWO/krL5xZMj7fnI4N1pl14Km76YUoy4VBd/HkKRVUyvpDbLJZ88LBZZBCxjsd0eUxi/Jij8KZVzvdGrI71aGEYNaERKWFULAbmh9SSS8+euzpoqpMdqLIYFAuyr/8DNQzKXs8lc3b5I=; 5:9kTCGDUwkuD0aTm7igyKKvjroajidWaqKE4P+4suPER6xogui6Q+bL4us4CHDU5NPk6TDXjNUZ4GP/S4k6sOfrA3GHlNsh9SFfrpdqQvh2rNmoth5bxgk+P4j6oIOaekKtkFBWGSrOH8q1iBcSlkNO4p6n86NV4Jug8X1kgDR+2GUQPF9PeqGRJ3NG1pLep+; 24:u+5Qx8Nbs/+logbgBCtL4ovlrTb2lF1Z4Btxz5FUPpIBINBXoqJIK1PO+p7mi2PcSO1+jT08ENGMElmXwQi0M6Luw5XXOVtF48GjCeqvKbI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0731; 7:awbMK5OYCjXGvTpcjWJQ6GBDyhc7PLGS36uThC5mK0+fh0L4yLXYor23PXpeGMx3Dfjs66Xdrm4H7ALELpvN35U9rZrCN5XPnY4UFZLDVULjcmq9jQVVQKZ4NlONBrFlb/iqQHg6m5XODb6aa577uGGrpMh5l1DvJu3RnxRdeXL3HkqOZtgYtu1e/EE6mlh3KZfEhOP7VkKc5WlhocLM54jWdi8x7g13/GFGqZFsjkdLRH7Rdq/G8NMKaqKrlkHPVFSC9jFyxo07XLsBqtINisHWRQ9KEDPaMYpnprd9is36TUT8KtTNZuAoFA8IDC5dnMvRU8r7qzPeG2h+XyiU6g== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2017 04:49:14.9080 (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: CY1PR0301MB0731 Cc: Hou Zhiqiang Subject: [U-Boot] [PATCHv3 2/2] pci: layerscape: Add support ls2088a kernel DT node fixup X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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: Hou Zhiqiang There isn't LS2088A DT file, actually it reuse LS2080A DT file under u-boot, while under kernel there are DT files for LS2080A and LS2088A respectively with different PCIe node compatible string. Signed-off-by: Hou Zhiqiang --- V3: - removed unused variable. drivers/pci/pcie_layerscape_fixup.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index 19ede2f..64e461e 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -72,19 +72,26 @@ static void fdt_pcie_set_msi_map_entry(void *blob, struct ls_pcie *pcie, u32 *prop; u32 phandle; int nodeoffset; + uint svr; + char *compat = NULL; /* find pci controller node */ nodeoffset = fdt_node_offset_by_compat_reg(blob, "fsl,ls-pcie", pcie->dbi_res.start); if (nodeoffset < 0) { #ifdef CONFIG_FSL_PCIE_COMPAT /* Compatible with older version of dts node */ - nodeoffset = fdt_node_offset_by_compat_reg(blob, - CONFIG_FSL_PCIE_COMPAT, pcie->dbi_res.start); + svr = (get_svr() >> SVR_VAR_PER_SHIFT) & 0xFFFFFE; + if (svr == SVR_LS2088A || svr == SVR_LS2084A || + svr == SVR_LS2048A || svr == SVR_LS2044A) + compat = "fsl,ls2088a-pcie"; + else + compat = CONFIG_FSL_PCIE_COMPAT; + if (compat) + nodeoffset = fdt_node_offset_by_compat_reg(blob, + compat, pcie->dbi_res.start); +#endif if (nodeoffset < 0) return; -#else - return; -#endif } /* get phandle to MSI controller */ @@ -146,19 +153,25 @@ static void fdt_fixup_pcie(void *blob) static void ft_pcie_ls_setup(void *blob, struct ls_pcie *pcie) { int off; + uint svr; + char *compat = NULL; off = fdt_node_offset_by_compat_reg(blob, "fsl,ls-pcie", pcie->dbi_res.start); if (off < 0) { #ifdef CONFIG_FSL_PCIE_COMPAT /* Compatible with older version of dts node */ - off = fdt_node_offset_by_compat_reg(blob, - CONFIG_FSL_PCIE_COMPAT, - pcie->dbi_res.start); + svr = (get_svr() >> SVR_VAR_PER_SHIFT) & 0xFFFFFE; + if (svr == SVR_LS2088A || svr == SVR_LS2084A || + svr == SVR_LS2048A || svr == SVR_LS2044A) + compat = "fsl,ls2088a-pcie"; + else + compat = CONFIG_FSL_PCIE_COMPAT; + if (compat) + off = fdt_node_offset_by_compat_reg(blob, + compat, pcie->dbi_res.start); +#endif if (off < 0) return; -#else - return; -#endif } if (pcie->enabled)