From patchwork Wed Oct 4 09:10:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bogdan Purcareata X-Patchwork-Id: 821210 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3y6VWD4DZQz9sRm for ; Wed, 4 Oct 2017 20:11:03 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7B686C21F78; Wed, 4 Oct 2017 09:10:53 +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_H4, RCVD_IN_MSPIKE_WL, 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 CF93CC21D19; Wed, 4 Oct 2017 09:10:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DE797C21D8C; Wed, 4 Oct 2017 09:10:49 +0000 (UTC) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0086.outbound.protection.outlook.com [104.47.36.86]) by lists.denx.de (Postfix) with ESMTPS id 03055C21CB1 for ; Wed, 4 Oct 2017 09:10:49 +0000 (UTC) Received: from BN3PR03CA0106.namprd03.prod.outlook.com (10.174.66.24) by CY1PR03MB2363.namprd03.prod.outlook.com (10.166.207.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Wed, 4 Oct 2017 09:10:46 +0000 Received: from BN1BFFO11FD005.protection.gbl (2a01:111:f400:7c10::1:197) by BN3PR03CA0106.outlook.office365.com (2603:10b6:400:4::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.9 via Frontend Transport; Wed, 4 Oct 2017 09:10:46 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; lists.denx.de; dkim=none (message not signed) header.d=none; lists.denx.de; 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 BN1BFFO11FD005.mail.protection.outlook.com (10.58.144.68) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Wed, 4 Oct 2017 09:10:45 +0000 Received: from localhost.localdomain (fsr-ub1464-106.ea.freescale.net [10.171.73.43]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v949Ahaq008475; Wed, 4 Oct 2017 02:10:44 -0700 From: Bogdan Purcareata To: , , , Date: Wed, 4 Oct 2017 09:10:42 +0000 Message-ID: <1507108242-3236-1-git-send-email-bogdan.purcareata@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131515818460027722; (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)(39860400002)(346002)(376002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(68736007)(50986999)(5003940100001)(8656003)(2906002)(77096006)(5660300001)(189998001)(104016004)(50226002)(356003)(305945005)(316002)(53936002)(8936002)(81166006)(8676002)(49486002)(81156014)(50466002)(97736004)(85426001)(110136005)(48376002)(105606002)(16586007)(86362001)(575784001)(2201001)(498600001)(106466001)(47776003)(36756003)(33646002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2363; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD005; 1:2vmEXz04OkkCFOIC3FxC0YHI7XWZBYCHSX/hgFioERoU8mk7TgQDtv4i6gSHwdhGx7ByaB1D9rx91siagYyck77IEtrbokQ4Z4UoMdaJxmpyhzD2pMmy1y9VefYJvbPg MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e63ea906-5c41-4914-39e9-08d50b07cc1c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017052603199)(201703131430075)(201703131517081); SRVR:CY1PR03MB2363; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2363; 3:5N977qxRr9xCNxuEXCiBVFla1WB7qlnyY+UQyNt7YR67apDLH0+8c/TRzAFMasdtWPnAnTDkESxmQuQu7qATm0mn0tlUBxVjg/1xSQvAOTRNvck8iGoIVckuj4p+Eby1+UWbE/EVmLU5/Gy7000jPwvWYxkFtMcWHzUA/y/QrKbLRO0uBPUkoLV5ilOXWiq8WjGSLaGHpO/GEY9Wm4sfX0Z/b6oy4nQUb014g2NAfCVFNlcRp3hrvnJC9adKKFyQv2U5bj3O+8u02qWZi0HvqS1YwI93YJMqe6gn20cAjkz7rYQBFD0cIm8FPBR5bo7TqMYlhCQbdSvB54lkRtnm1wcYvB4RXmoHgQf66S22T5A=; 25:PMRlYqtfONQvUu+XKe4ZrKjh6T5Yks2UvUlLJ3VqmU9U54bSAPAKNBz19ohMHQLwHjQJI7nZDttNI5JvFqsBI2tonegCc8tDRd/WLK+lK2mEDtndQBNyJq3SCKhnUZVT46Lvm0I1Id8nBW53+C2TXOeGU99L/wpQzxPxtwF6kA7K/Q+MBt4zP9e+ChUswvxHnRufMuBKIv+A2Kig1S2aN2vtBbdrPJQGH1r87GnEui8o3VL52JRPE6QD9Jke3+LH6Hu7egkaMzcaMzQX0w7iLxPmuWTZSL3cjgA9Sc/VJivHLmgyEzEBxE1KtqCr8pyVKVUP5yMO/LwY86+DeBRFJQ== X-MS-TrafficTypeDiagnostic: CY1PR03MB2363: X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2363; 31:LvU+vV5jdaw/ZYT9cCt1jFGsSCsF5RErZI8FqF+f2Ddf+Tojz/O5GhKxBmzgZOjHD46rsR8Phv0uxApVyNbzWuiqbTmY00g8c+OppX8JZC0zGTpdnWKTE7fep5kFrK4aNPAUVY8NNoEO/4y0F5/eCgbTfbusFgw2QAx3OzWeVuqqk5apw6BQvAaTp2gIuHF/PmECxpGw9Kw9rjvs1KG0nu33M5cJzNpa2ulSbzaS1ig=; 4:tstvykBjW1lPWjl50sEKHfVsps4xs2Sbl1yqvfcf/kPLW96AZP46KUhaZYSi6fp9cZIilBAAVWQ5PwkCJynB5fi7gtZHTPri3VTH2iOX+9Yp1KKb3LUjdRnabiS1m/VPcxfsFYObuF1I5INkelHmq1Pw6g99ltvlKzPpHLuBLgNFyU7EVtWu695fQfQ0AWqYbLUoGDnsf1BNGcG6pz/Id/Ebl6K9CIzQrGkKur0ytOoJW/3d+SkMRfSFWCZYU1/A3GhDJIlx+6eJRQo3mRwTtkAdlsU8a4tEhhAvPTGID5Q= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6096035)(20161123565025)(20161123559100)(20161123556025)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123563025)(20161123561025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR03MB2363; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR03MB2363; X-Forefront-PRVS: 0450A714CB X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2363; 23:9fOdnfP0YAzQ+pjjRQ2zAxpwo/mI7pYEwXyk7eofn?= 3ULaBtS78JamJWCfANhO5B3Hbh5J1DayJc1ALofvPJ/+V8UyINTP5xccmloPq7yV7p8wmuFMpKvyWOtRVIT2vw2AAqWIFSWRc/l0JXKkmjqSHpx28IB1MeJVmuI/bpvVWB/3cmAWZO6rdjML74chGxhCGMrG8E2bqB5RNyIHdCJuSl6B3VzSVfiuppLDYH62e2tCc/IUfgoRYRJfNXm3LTsOGFd82bqjyuetnbsde9rEeQqVANpnVQuyhtEmz9OLTjicQwWcGI5bgK0W1p+MAjhNm97Qa5+FMOEtzb96g/Y5NYJk2jVLqzBfxnh3lmU5DkaHyIFsjmFpn44earfVEts+/LorEOXZyeUzqOqYM7NtowWlz81PJrI1+yFeZBXqlkExDpUoCUUGjAAFvLSaXao7YADkj5lrZ+xcaLgI5g872ZVTiCyEfq3/JNmbUpq529gUdzF05aCJTA8i6Qh0xC1lWWxeDasnSX30OhGUlmYdDN/vYVzcdQFQMxL38YqJUm0x7UUtGHMXWoUik0NWkVpBsgjfvuOHNSRPeDt1f17el7/x/xpoAuBFtsxa1frrMkKiR6jKu5rHUYx//y+9Jstjv9ofJMS2hReaHk8soTtuuLm6/k1BNzuE2WMv+hnlVthHo2k1i239zq7+jOxJskcchqJMugXVs3o0sqdDvLpwczkOZNwa6ewuN/0TWwxF6Pihkl2hQJRj8frF3xWPhYCsEFD/C0qqJGok877sI9i9GZeEQJJv+3g9z3tt6lVeTVJnDRdLsFUPhNGNosfaHKuocq/SSTaE2OIaEaTafryrS34TwvcFILqjmM8NZ+VuZ+0TrlWqdwqHpuhHnPCsaoHmhPPzdmAYgskAaeyzsIBvxTe0c29dMPu3wuk4F8xy1g6ygE2iLDzfB/jSEoKZajg0cTSTB/3XOFrUVLG8z00E2Roqx25bzISmLLuKSRBS4iAAuNYGhVxKZsxqsT9Pc19BhT/wCG3CXRl5V68cgR/6Ac2WMZNfQRJWMmYwLa7PBXtSq0Vg+xkrNzq40FANn4FrN8+65X4K6CZx1AlxdyxsA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2363; 6:j5K8Af62uDkB+FJla5jbxiZV4FLzTX57Mz0+TvYxniSP+/nTRki854IXtUBrxYML/M3+T4fhZ5TbWsI54lLOEMciCq8LRuZkRsvpGpkyd/ssEarh4+kfNng1hFrlMXAOepxJWZ0nHZN4jYbH9HGqByK2DWCT1yOq/SIpHh649Gg3ON3UQDl7Qs3ICEKNWRELmyhmz9GqF1daj1bUq31WlajONoSqNqV6EDjGwzwEwCOmKIkjwFwOeGy/k8Jeoz+yaVZNfi+8/zvxWidTFPFmnxEXVK+MPkAZ70rXvjuXnIMqwbGfzByexhh1Zz7aAdwbT0ILsCgcpfp7c5LzRxY3pg==; 5:+cSBMSWMy7mDJ/9V9z7laUuSNdqFOerVm9yhJCVo0JuNs3vdjzrtsvCwtGxOSb+HIfEC/Ybk3X4KaGnu5QLFkiLOn6s2wDkEenwL+YbD6zJZw3McIsnV4d8HK8uPEINu3tKR+yKVP7E/KMqhv3sOaQ==; 24:eNVRHZw6cL4cu7/cEearQtX1o3tPjCGRUHuEdv1vA/4057mWqlYGYTc7RrwJjoFZ5sdmAEplDl7iKa2MhstjTMq1Fnipownx6INw5BbDyDc=; 7:XbhQ9jbw8dubKCLxWtga1ZFYPtyiL2s161caZSoXgnjAIP1C4UcM2HO4pfKCEL7DK/yHx84EEM7jxugFEskNMZYtFf7RM59YoitjwXBgoKQbZMvrB7QucBQ7mpXYPYZEP2mBD850JV4omlcQim832GlvyeCiyPiov5ojPcPbCM3cPj1mIY82AR1mSpg4lNv2HHYDcckJGxGWCAfPTL1ggkkSJYySnK8lLOq86B9G9So= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2017 09:10:45.8155 (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: CY1PR03MB2363 Subject: [U-Boot] [PATCH] armv8: ls1088a: Update MC boot sequence 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" This patch follows the work of previous commits: 5707dfb02e drivers: net: fsl-mc: Fixup MAC addresses in DPC 33a8991a87 drivers: net: fsl-mc: Link MC boot to PHY_RESET_R 1161dbcc0a drivers: net: fsl-mc: Include MAC addr fixup to DPL Add support for LS1088 platforms, to make sure u-boot env MAC addresses are properly set in DPC / DPL. Signed-off-by: Bogdan Purcareata --- board/freescale/ls1088a/eth_ls1088aqds.c | 14 ++++++++------ board/freescale/ls1088a/eth_ls1088ardb.c | 13 ++++++++----- include/configs/ls1088a_common.h | 6 ++++++ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c index c19f59a..de70aee 100644 --- a/board/freescale/ls1088a/eth_ls1088aqds.c +++ b/board/freescale/ls1088a/eth_ls1088aqds.c @@ -14,14 +14,13 @@ #include #include #include +#include #include #include "../common/qixis.h" #include "ls1088a_qixis.h" -#define MC_BOOT_ENV_VAR "mcinitcmd" - #ifdef CONFIG_FSL_MC_ENET #define SFP_TX 0 @@ -612,7 +611,6 @@ static void ls1088a_handle_phy_interface_rgmii(int dpmac_id) int board_eth_init(bd_t *bis) { int error = 0, i; - char *mc_boot_env_var; #ifdef CONFIG_FSL_MC_ENET struct memac_mdio_info *memac_mdio0_info; char *env_hwconfig = env_get("hwconfig"); @@ -655,9 +653,6 @@ int board_eth_init(bd_t *bis) } } - mc_boot_env_var = env_get(MC_BOOT_ENV_VAR); - if (mc_boot_env_var) - run_command_list(mc_boot_env_var, -1, 0); error = cpu_eth_init(bis); if (hwconfig_f("xqsgmii", env_hwconfig)) { @@ -681,3 +676,10 @@ int board_eth_init(bd_t *bis) error = pci_eth_init(bis); return error; } + +#if defined(CONFIG_RESET_PHY_R) +void reset_phy(void) +{ + mc_env_boot(); +} +#endif /* CONFIG_RESET_PHY_R */ diff --git a/board/freescale/ls1088a/eth_ls1088ardb.c b/board/freescale/ls1088a/eth_ls1088ardb.c index 853d815..97accc9 100644 --- a/board/freescale/ls1088a/eth_ls1088ardb.c +++ b/board/freescale/ls1088a/eth_ls1088ardb.c @@ -15,15 +15,14 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; -#define MC_BOOT_ENV_VAR "mcinitcmd" int board_eth_init(bd_t *bis) { #if defined(CONFIG_FSL_MC_ENET) - char *mc_boot_env_var; int i, interface; struct memac_mdio_info mdio_info; struct mii_dev *dev; @@ -92,11 +91,15 @@ int board_eth_init(bd_t *bis) dev = miiphy_get_dev_by_name(DEFAULT_WRIOP_MDIO2_NAME); wriop_set_mdio(WRIOP1_DPMAC2, dev); - mc_boot_env_var = env_get(MC_BOOT_ENV_VAR); - if (mc_boot_env_var) - run_command_list(mc_boot_env_var, -1, 0); cpu_eth_init(bis); #endif /* CONFIG_FMAN_ENET */ return pci_eth_init(bis); } + +#if defined(CONFIG_RESET_PHY_R) +void reset_phy(void) +{ + mc_env_boot(); +} +#endif /* CONFIG_RESET_PHY_R */ diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 84e9b14..fa058f7 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -122,6 +122,12 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET 0x00F20000 #define CONFIG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH 0x200000 #define CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET 0x07000000 + +/* Define phy_reset function to boot the MC based on mcinitcmd. + * This happens late enough to properly fixup u-boot env MAC addresses. + */ +#define CONFIG_RESET_PHY_R + /* * Carve out a DDR region which will not be used by u-boot/Linux *