From patchwork Sun Sep 27 07:18:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 1371943 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: 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=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: 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=nYzGxUu5; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4BzcgB4mGFz9sSf for ; Sun, 27 Sep 2020 17:27:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3967682341; Sun, 27 Sep 2020 09:27:20 +0200 (CEST) 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="nYzGxUu5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8878B8233E; Sun, 27 Sep 2020 09:27:14 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20601.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::601]) (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 9C4018233E for ; Sun, 27 Sep 2020 09:27:11 +0200 (CEST) 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=ZdJHSQEBhTSVMXxZ92JR7wCnot4wfAiIef6CWIpH/Qtao1FxAcLKOVDkTqNm4Itb/UD1/s2MYdmJMr8hdIUptWKza767AiC5MVuH9XlI3/w2weXFzVbQf8XxlgbdT1INmPbuKTZotDOaU7up41W3brBH2nFlkXU04gdmdQ8ERcZCMnpL521J3J6HjozE+F7Gvnn0+y40LlYY/c1fWvcnPTNxmdCUja7NzbWP1XMpGE0kFdMTFU726eLCBFawF5oN7DUd0hpl9x5IbPQpnhh8YCihmTHfi60dnL/vGGE55Xx5byETMvIFBEY9T+9aQB7rtakqoqxVzWt7/OcVWyHp2w== 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-SenderADCheck; bh=kQrzC6ypt67xHZ3XELNW2ATfBzFbP/UD9yXsVLiWjyI=; b=DchsZWvxCKxyU6lOQwiLQdu0wRtGYIaXihdVCjuQoQVV6irbwkCFntn6ivXA/0BgH/7/Pcjdhg+7ZrXHF4myB1cFT+2MJHF9Vdh/n9l6tyhU9hfIWYRteDwB7iBRTSRgeIom5kbyLyG4/08GpUjkQK8Q5nfylHCX2RVgGU9tzm4FVtwji2Qt9RINzT4jMQ5vxNG8grMSeLuA9BhiaQBnL/BHw5IwGIwZnmck8awle0yaHOsTC67mtnjjhtXyuQxNeYfj30uQBeFZwAKyrEv5f6BGIzuhuiMnZvM9i59eb8V5rg7c5piUn6H4Oh7yJKe8UizA2gZRKal6WIBplMqqiw== 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=kQrzC6ypt67xHZ3XELNW2ATfBzFbP/UD9yXsVLiWjyI=; b=nYzGxUu5FhHsiTk+vm5dxnBtTqWrpJ5ZwGcFlrrp1AGAzBjO46i8aBizGK/tqfzWGoTz/pVIdJJaaNp34LQxqzesFiz2v3hu/KTuyp6D//pgm/IrKvanl/LXUk8tRTR9yHHdp2ID17GkGPDRcO4rrrOxbtoDHgHaZWDVlVKltrM= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from HE1PR0402MB3371.eurprd04.prod.outlook.com (2603:10a6:7:85::27) by HE1PR0402MB2730.eurprd04.prod.outlook.com (2603:10a6:3:e2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.24; Sun, 27 Sep 2020 07:27:08 +0000 Received: from HE1PR0402MB3371.eurprd04.prod.outlook.com ([fe80::c872:d354:7cf7:deb9]) by HE1PR0402MB3371.eurprd04.prod.outlook.com ([fe80::c872:d354:7cf7:deb9%3]) with mapi id 15.20.3412.026; Sun, 27 Sep 2020 07:27:08 +0000 From: Zhiqiang Hou To: u-boot@lists.denx.de, priyanka.jain@nxp.com, wasim.khan@nxp.com Cc: Hou Zhiqiang Subject: [PATCHv2] pci: layerscape: Fixup PCIe EP mode DT nodes for LX2160A rev2 Date: Sun, 27 Sep 2020 15:18:24 +0800 Message-Id: <20200927071824.15405-1-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: SG2PR06CA0117.apcprd06.prod.outlook.com (2603:1096:1:1d::19) To HE1PR0402MB3371.eurprd04.prod.outlook.com (2603:10a6:7:85::27) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.73) by SG2PR06CA0117.apcprd06.prod.outlook.com (2603:1096:1:1d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.20 via Frontend Transport; Sun, 27 Sep 2020 07:27:06 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [119.31.174.73] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4403ee47-81cd-4542-b35d-08d862b6bdc6 X-MS-TrafficTypeDiagnostic: HE1PR0402MB2730: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:418; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m5pRGybps5eHTgbHUhII93g5jOZJi7uJYEO7oAYbkg+DfkS0kxOLLKnaOR/aKdmEfmywiNy2OLZZZ1ffQqn2BEV7Z0Y3UYdSAqlbbN7fvAAqtDXNGGXO2gIY6/jOhhAffKrL23n9o5VMr3fYt30wgnOoGG7DBYNIvP8audK6+BAT6yORPWab+8GoP8AcNqW8lcEfwYHzcdHy5075aC4bEpVul8yDrvcnJSTfgiax7lfg+fWbgXXYdD+I0r6U76gm3caorr4Sxak1F9Xll1CHyUN9+oAfLxd7GMhNY/BPrSx+mSs3qAvYp3zjlC5vSia4PwG1jVdY/n+0WKK7A7QsxIvZs47KipWyzo1Vn6F3OgTUoEU9Y/dpt0ucwMI3h24I2cGTBIynqxBtTtEKqgrpuR8Ex69v5As60KXLqkjqviAchZ+7Vr616qZAZmTzcpfd X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:HE1PR0402MB3371.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39850400004)(136003)(396003)(346002)(366004)(376002)(86362001)(8936002)(6512007)(2906002)(36756003)(26005)(52116002)(8676002)(6506007)(4326008)(186003)(16526019)(66556008)(66476007)(6636002)(956004)(2616005)(478600001)(6486002)(1076003)(66946007)(5660300002)(316002)(69590400008)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Jn+ZiD/cXKf/rg2F5rotFNb/XBy7j/9amxwrSMLKmvlx9A6VRuKn5TVEIniTGYDTuKFW6AxpdTo1RnIEdhRq7H/T5h3iPMqt0/QpS1J8gsnDNAx6FmnwTZH9GcByuoHeFxUixcabfnWlkRSHncgxjz0U5vMzWg8RmWmNAjugSns9gICTH8yroyBUl65a7zQvS/zWwudqUcuDml0e+Hhv/nYVqLYg7v1lfrHIxK/wkTCw0EOSoPbFO2glcNf1+aOltm3PaLUn9wu1PVsPP0W15HbUUC8BXSvTCqhTas+UBOkHY8awVY3VqL8GAdKL7qjehT9jEpLBwgjJh5XajWZeRQdAkTM0Xb1JNDa6d50SVeOLL3lQhk2o5t/ZxgUCA7keDACTu19mkOI1uGPWQZDNMjnMjb/HCsiQ/jMym8lVmbldR3KkDVuJ0smIrxV209AXIkNcrMys1EjWA+TpHrhpqbriWTByqElXzaoBA9HKanVfXywx/hE1sHYEb2AyV6El62FRd+J47h1rorqGHoPNRKfd+8iRV1C4QfBPEIr6naA7m5BRT2pTXksrAXWqnj0f1aMPjEted26GCNYGmC6A/r6ab//yHC2epn/xn3CyfZvDjQnec1KkqTI0WdBzcf+Uj5j3bMmG8Zmc25mR2LVt0Q== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4403ee47-81cd-4542-b35d-08d862b6bdc6 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3371.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2020 07:27:08.3429 (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: h4xExtZyQcvvFAJ9qMcuRPw0wP9Xk0otXO/8PvFok8DqSjn5nzqLzNzRBuog9GmOWtrwEXy2ZPSYqnhe5sherw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2730 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean From: Hou Zhiqiang LX2160A rev2 uses different PCIe controller, so EP mode DT nodes also need to be fixed up. Signed-off-by: Hou Zhiqiang --- V2: - Fix a dead loop issue. drivers/pci/pcie_layerscape_fixup_common.c | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c index fef0a75f11..b97c67ad84 100644 --- a/drivers/pci/pcie_layerscape_fixup_common.c +++ b/drivers/pci/pcie_layerscape_fixup_common.c @@ -41,6 +41,8 @@ int lx2_board_fix_fdt(void *fdt) { "config_axi_slave", "config" } }; int off = -1, i; + const fdt32_t *prop; + u32 ob_wins, ib_wins; off = fdt_node_offset_by_compatible(fdt, -1, "fsl,lx2160a-pcie"); while (off != -FDT_ERR_NOTFOUND) { @@ -86,6 +88,32 @@ int lx2_board_fix_fdt(void *fdt) off = fdt_node_offset_by_compatible(fdt, off, "fsl,lx2160a-pcie"); } + + /* Fixup PCIe EP nodes */ + off = -1; + off = fdt_node_offset_by_compatible(fdt, off, "fsl,lx2160a-pcie-ep"); + while (off != -FDT_ERR_NOTFOUND) { + fdt_setprop_string(fdt, off, "compatible", + "fsl,lx2160ar2-pcie-ep"); + prop = fdt_getprop(fdt, off, "apio-wins", NULL); + if (!prop) { + printf("%s: Failed to fixup PCIe EP node @0x%x\n", + __func__, off); + off = fdt_node_offset_by_compatible(fdt, off, + "fsl,lx2160a-pcie-ep"); + continue; + } + + ob_wins = fdt32_to_cpu(*prop); + ib_wins = (ob_wins == 256) ? 24 : 8; + fdt_setprop_u32(fdt, off, "num-ib-windows", ib_wins); + fdt_setprop_u32(fdt, off, "num-ob-windows", ob_wins); + fdt_delprop(fdt, off, "apio-wins"); + + off = fdt_node_offset_by_compatible(fdt, off, + "fsl,lx2160a-pcie-ep"); + } + return 0; }