From patchwork Tue Dec 7 10:13:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 1564610 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=BtJj4drk; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J7bSD4VbVz9s1l for ; Tue, 7 Dec 2021 21:02:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5320D8291E; Tue, 7 Dec 2021 11:01:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="BtJj4drk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DD0978291E; Tue, 7 Dec 2021 11:01:56 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on062d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1e::62d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 598A880F89 for ; Tue, 7 Dec 2021 11:01:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=zhiqiang.hou@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=elVjDOst3NFQXNTSImNCdo/Yw2davRo2xDuErNP4INhy1k8KFeOUdt13Vx1e8TkKpfWdHYseBRnQNb+zn39pZzjCnm7LZbYZf5pyNtSnmOLH789ijaVYCUir3ph8qAG9iMc87HR4IIRJo9m68ZW+NGRSlv9qfFJEzEGXCc2qOoDu7jAgV7+KGLvBxmYnPHKe61NcvCPAy/EH7aCHbP/dmBsnb1yP1/Nc5TzC7m8O8p9w0Zcq9bEorAyqguX5jOJUI88TheJZ442aYATwMowfzRH144+OESHuXiscSfdaS98oY75KlFwZKkd6G/QFrX0cfGxoeIyMHGpttjBlsJImQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hZGfYdJ6aZqUvNr8SwWnz3nAsFOT5FmyusVm5Y8cYbA=; b=fsCmFSG4ODGH4yzFE9xk7iTqdeUeUmfGXijy5qyP3YyHVRENEC5StH724afblgxj1tD3cDPmZH1HRFp/rWPdjnPB28rRvjfdN0TEJrh5uS3f1aPaV8NInEeAwVNhO3wOejQ2oaqQNzI1mJfcppVIbaD2VPu6ZNq0sovt0yhpxRhtLM9fdkl/79erqXslZZx3Lysps7dqDdaxIGf7YjmF+4y2euC1Wtyou4yKyfqrSL9btCGCV9A9utccwVIK/kzVCU8mPP27m8ANLYHaJ+nf+SMEDGb0g6eAAgVX6Y+zAvoAReOl8B238DT8bBPKEXcjSvBWNh+qNjSg5XslYaZEkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hZGfYdJ6aZqUvNr8SwWnz3nAsFOT5FmyusVm5Y8cYbA=; b=BtJj4drk+5ryCIByHKIKh2g+JXt26i4Z4MFIzlT0Opb4b/JzODMXKir8ObJ7swGXUFLjwnhYZMVZHA/4hmGxMqnyqrfMu5QuToEV4ztnzOcrgUO/hvXXj3Gf7BEssyNUrLATdgp9aIw5DFlXRBzFvJNR7TBhHZS8DBR+3T6PXdA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB2974.eurprd04.prod.outlook.com (2603:10a6:802:a::24) by VI1PR04MB3310.eurprd04.prod.outlook.com (2603:10a6:802:11::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Tue, 7 Dec 2021 10:01:45 +0000 Received: from VI1PR04MB2974.eurprd04.prod.outlook.com ([fe80::2da1:bc1a:70ee:b397]) by VI1PR04MB2974.eurprd04.prod.outlook.com ([fe80::2da1:bc1a:70ee:b397%7]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 10:01:45 +0000 From: Zhiqiang Hou To: u-boot@lists.denx.de, priyanka.jain@nxp.com Cc: Hou Zhiqiang Subject: [PATCHv2] pci: layerscape: update the searching compatible of LX2160A PCIe Date: Tue, 7 Dec 2021 18:13:12 +0800 Message-Id: <20211207101312.37623-1-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: SG2PR04CA0151.apcprd04.prod.outlook.com (2603:1096:4::13) To VI1PR04MB2974.eurprd04.prod.outlook.com (2603:10a6:802:a::24) MIME-Version: 1.0 Received: from localhost.localdomain (119.31.174.73) by SG2PR04CA0151.apcprd04.prod.outlook.com (2603:1096:4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20 via Frontend Transport; Tue, 7 Dec 2021 10:01:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b7d29147-673a-4480-31bf-08d9b9689368 X-MS-TrafficTypeDiagnostic: VI1PR04MB3310:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kDpr/0RGVLmkOCyk29QIqoOZ7i9R2k2LUKo/QCHE3diwDBF+0NVa5x/PQr8FVKwxZ5VryI4Cgi/uZuuvy/686RF7GzJWGw8xh3DgF3jLBdFohF5UbSOHvJlBHCgeybwgit7FwFOQLDWaCTaBB+CNXeXiUOJB0xc1weiLqGE5Ekut6i6kTkILOUxymGx0M6M0hj0/2hQbLbgpjP1J3QXKa1yKvG/SKJ2VpuhQsgs1E5grXVdkc5yazJgrFTX8EqalE4nEsYSfJ/KkTBQA4L6jiFnAwtGuK0mJ6BdGAevFvf0L8xkMAo0T5iznvY1K+phYkxJLXmuL73pZAyspVa0O7Z8Za5bNntJs08wxfFA2ELBT40KXFwoy1GMT4diUaULbIknAHqfKT0P+QQ9Kh8D/v/A0t0wcRE6rMs0CJtli8BZiwRDpQFyD2a9+JgjGuQqQL/4K0ggPE//7rp9NCsSpdCDsyLQExaW0S7OirXMQG4LZiDrh1SFXK/EdIk31vIDkMtQLQamvO1se1KkHtjqGJK6OB4MkQGmhH4u+qb9aPsoZb4SfLlyMlNNd2RRq2Gdp/CZDSqPcY2iQg2D7vFZeQfTpqWJNliriXGFrmXMEpQD4SUzAj2HSIbGl1H/YSMgkEuRUh+St4eQEGwq9tyg3jxpalqBJld1Vlq+1JgyjdKnb/2Stz8w5I20pOlbwLZ/XQHRDauy77F6CNaezCrUzSw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB2974.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(38350700002)(6506007)(26005)(38100700002)(86362001)(956004)(2616005)(186003)(36756003)(2906002)(8676002)(508600001)(6486002)(66556008)(8936002)(66476007)(66946007)(6636002)(83380400001)(316002)(6666004)(1076003)(6512007)(5660300002)(4326008)(52116002)(15650500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nYFE3COIQGpNpVs2T0gHPNOSJsQ2aXsJm+F+RIQqxH4/gBHN9o0EzKRyqrudthRQR144IexhPYCPghHw1rCnjqL8eHwgk1fIHIzXU0qbnPRE6sHHMcFqxok6ZoxfG/+J8hdLvkA5awAS3dwRSHG60rLBw0TC0z/7XT2eyTGIj9fzlHzKFDn3ufsljEvsNvVKZAiTEXxZtG16A99TyvLvYYA/4NyqdF5rIvAtblZ80i6t2DOVe60tGbRYNflB0q3GoV3bOER4wVJDLvh6wQYuEucm9GTftJnfI247kN2Iti2b4f6mUymXvqi0OMX8iC1OC9UDRMxYo+O4++g8TXdc/9ihMwV1ZkHHEqOXqrBm6lS0bwqMpdHF7DQfMN6nV0p8oKYYTI5aArX7CgNrcnXqkWcCKnJR6HMmnsAzjI7Di+tKOprTl/6BqQRxDNIb+iADSN2ZwGblxikabYSAeMCRmd7dVJQ+yxc1QrrP0rc7CG3ysbowOsJyLRpuiYWH3XX0x5jbsCu/o2DWi6NuqI23i1smFEcw4UtmkwRGKfCax72s7MG5EBRM0E4OhG1QHll+r7pCWR3zPK0m07H4cBC51AtqMVzrqTJQACfCba6rGehVUCDht51YulOjg1jfmRYSQ5Mjt97N9ioAIMLKbxpCL5LwIkw2YsvqLcq7d2L1MorlZpRUsmpfie/yifaPs7naP6SKNGyVDl7QqiJkhUee0DmLshboBfBttLBFbCGHs8Qo6ptjgzakS00aTaO2exdhuiHPI+YBOyKRidYlgcvHHaTgHUpixS3qJoWxIaUojyk7lOjybJq01MIoHXOVpIR42WeDyr5zyuDNWjOi1Qsdqhx2H930eEWgnzwOC0mwypayJ6+olmjpD4/TM9meh/nkbVelw2+/QzE8jNpyL69BlaP6Azbf5eotB2sYeyl/8U+25CX4J78XyTZWuSWZwE1odF/BrfHTIEASKLU1RWEDkoS5l6+Am0rCrpffThY2z7EEoHvvMShoE1tUR6PHm4002Nl4adoo0qhhDMOrX6idXMdTDNOxyTai8VuYdPRqpIHuLsCtbEbQNKqVR0SNQ0/+uUIV7AQqfK7Ov7+b6kLAtNE7uJ8JDqCb9lynQooES7vD/zfMeexMefUs8suAy8++FyuiQ6DNQyt73eOzpNS4W+acISTrf1q/3QNoyUfKt1Y9ZkEVJ/Dc3Zv/k2l/SuZF4gakgGjzE6HuVNRdkapwJHGDSLPxypLoymaI227O05747Gl4Ue1Qlk+C0uSBClJhZ56ngSPp545a6O21O5KpaSlNmBLdVQz4t5j1XFw4dLJyk4GvxP1ETdxfC7S1GStSxZUIP0i8YX7+cOBTjpwDI+ZKp2QQRsedrRBe3ODix59/g6q5MWH4Z+0w2wf67OAI68fMK1BfQkknFGkxr8SzwAkoF3Mig1A1sWbAmNDiRBlX2760VlHQJoXbPzY78x54yOBSAXiybsZoDClA7dIIXux9CaJm3j1lcbX8+iiH6inIPHNmYZWWLFubvEmM8bBGNcmDIJJe/KW82oVT7zIwChgcdASruDHIhEgpe+HHeHhrwKv14bn1CNrqoZ01n4PRjqq4L9epjIJG2Gyz+GHB8jC5ok4Qp2Wh1pBxgeQmCtU= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7d29147-673a-4480-31bf-08d9b9689368 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB2974.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 10:01:45.3300 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: N/A5g+JU9tHRY6dxx1JfhlVXf2ttc3h2v92PlvU9rcjdS4hrgfgqKgDmWorMH3xUKGrmiNMyYmEFr8/e1To49w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3310 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Hou Zhiqiang The current fixup of LX2160A PCIe nodes is based on non-production rev1 silicon, and in Linux the nodes have been updated for rev2 silicon, so update the searching compatible string to match the kernel changes. And for compatibility with the rev1 nodes, move forward the board specific fixup. Signed-off-by: Hou Zhiqiang --- V2: - Fix build issue on LS1021A platform. drivers/pci/Kconfig | 4 +--- drivers/pci/pcie_layerscape_fixup.c | 9 +++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index ba41787f64..16647bed54 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -219,8 +219,7 @@ config FSL_PCIE_COMPAT default "fsl,ls1046a-pcie" if ARCH_LS1046A default "fsl,ls2080a-pcie" if ARCH_LS2080A default "fsl,ls1088a-pcie" if ARCH_LS1088A - default "fsl,lx2160a-pcie" if ARCH_LX2160A - default "fsl,ls2088a-pcie" if ARCH_LX2162A + default "fsl,ls2088a-pcie" if ARCH_LX2160A || ARCH_LX2162A default "fsl,ls1021a-pcie" if ARCH_LS1021A help This compatible is used to find pci controller node in Kernel DT @@ -229,7 +228,6 @@ config FSL_PCIE_COMPAT config FSL_PCIE_EP_COMPAT string "PCIe EP compatible of Kernel DT" depends on PCIE_LAYERSCAPE_RC || PCIE_LAYERSCAPE_GEN4 - default "fsl,lx2160a-pcie-ep" if ARCH_LX2160A default "fsl,ls-pcie-ep" help This compatible is used to find pci controller ep node in Kernel DT diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index 8a2a0e1f4a..44d82bf856 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -527,7 +527,7 @@ static void fdt_fixup_pcie_ls(void *blob) } if (!IS_ENABLED(CONFIG_PCI_IOMMU_EXTRA_MAPPINGS)) - goto skip; + return; list_for_each_entry(pcie_rc, &ls_pcie_list, list) { nodeoffset = fdt_pcie_get_nodeoffset(blob, pcie_rc); @@ -568,9 +568,6 @@ static void fdt_fixup_pcie_ls(void *blob) } free(entries); } - -skip: - pcie_board_fix_fdt(blob); } #endif @@ -619,6 +616,10 @@ void ft_pci_setup_ls(void *blob, struct bd_info *bd) { struct ls_pcie_rc *pcie_rc; +#if defined(CONFIG_FSL_LSCH3) || defined(CONFIG_FSL_LSCH2) + pcie_board_fix_fdt(blob); +#endif + list_for_each_entry(pcie_rc, &ls_pcie_list, list) ft_pcie_ls_setup(blob, pcie_rc);