From patchwork Tue Nov 14 07:06:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 837703 X-Patchwork-Delegate: yorksun@freescale.com 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 3ybdrs3cTDz9s7G for ; Tue, 14 Nov 2017 18:08:29 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E1A6CC21D90; Tue, 14 Nov 2017 07:07:14 +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=RCVD_IN_DNSWL_BLOCKED, 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 DE295C21EEE; Tue, 14 Nov 2017 07:06:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D941DC21EEF; Tue, 14 Nov 2017 07:06:34 +0000 (UTC) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0084.outbound.protection.outlook.com [104.47.37.84]) by lists.denx.de (Postfix) with ESMTPS id 44E87C21C4C for ; Tue, 14 Nov 2017 07:06:30 +0000 (UTC) Received: from BN3PR03CA0089.namprd03.prod.outlook.com (10.167.1.177) by BN3PR03MB2353.namprd03.prod.outlook.com (10.166.74.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Tue, 14 Nov 2017 07:06:27 +0000 Received: from BL2FFO11OLC006.protection.gbl (2a01:111:f400:7c09::178) by BN3PR03CA0089.outlook.office365.com (2a01:111:e400:7a4d::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Tue, 14 Nov 2017 07:06:27 +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 BL2FFO11OLC006.mail.protection.outlook.com (10.173.160.95) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Tue, 14 Nov 2017 07:06:27 +0000 Received: from ubuntu1604.ap.freescale.net (ubuntu1604.ap.freescale.net [10.232.133.7]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vAE76LKp030592; Tue, 14 Nov 2017 00:06:25 -0700 From: Rajesh Bhagat To: Date: Tue, 14 Nov 2017 12:36:40 +0530 Message-ID: <1510643206-28716-2-git-send-email-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510643206-28716-1-git-send-email-rajesh.bhagat@nxp.com> References: <1510643206-28716-1-git-send-email-rajesh.bhagat@nxp.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131551167881540362; (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)(7966004)(336005)(376002)(346002)(39860400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(54906003)(106466001)(2870700001)(33646002)(97736004)(316002)(5660300001)(47776003)(2351001)(6916009)(2950100002)(2906002)(53936002)(50986999)(105606002)(76176999)(104016004)(6666003)(36756003)(81166006)(8676002)(575784001)(81156014)(305945005)(85426001)(23676003)(356003)(4326008)(68736007)(50466002)(5820100001)(86362001)(498600001)(77096006)(189998001)(8936002)(8656006)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2353; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC006; 1:Ct9HS1MkC3aUgOaNyMHBZIyia9GBCckLFu0Kf5FX9Y7A9nWuYwQSV8p8QsHUJTzTI7UP5MMDtnTuTX18xvR1B5uxbDyaplXdXesBQXVgU74H1Zl61IHr365k8qzAcec0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02a8cfb7-6ae1-4b01-91ac-08d52b2e39d2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603258); SRVR:BN3PR03MB2353; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2353; 3:ALKi6c6CmnA1cMOBmZq8RpVETaOEv6uD+iV4/HGcDY7poFe6E9FUPVm0DiRKtJm7B3UoK+1bfB81nSyIm46RtrV9aHyIQSlZKWbzW8sV0stp6hN4xLODQFJxFPmr+YlWC/iSczojMoWtyRlPLl9jElMs57MmdSV3CZpChq3cQhVPYu3N7WwK1/8jDje5kOkgIxIQT2BM+5yXh3jFj1toM9wAV54EB4Fp8roIs2Cqs9vBOEIeh0xAt2T1606LjZdYYcu84Ot4qWF00G/A1XOODKe2P5xHmbDbADmntJI/PlsDJokZShhiawqlSYlgmuXta9pOXYQ4+ot9yUdjG4pKcYVFYkZ7+DaLAvihIUPsJz4=; 25:Pgxgmnmv1Tf6KMN4uMV8IOp23r3NP2eB/H7mT3CqDUDwRk6p9Mo2D1iGMu4H5eSx2IJdWX61SxsRaf5viHFhHE+TbG0pYfhRYQZkf2KYHT8pG/dxgTGA3C7TWlRLPa++Y/BauZFJk9k3Grhg1cpCZsRUPBlPbI/TcLO8f50YAaG5oknGC1oi8QCRpMVRUcObXcWpv0pBEntVNNdCmluMZnJdFi3gxdzbn6i4ft5ptbCDELoEqEp2TMrDvlm60HiRx6xzTGBOcAIdp7Svr9DHxTUf9Q2+j913KLRc99TZxfnuEhr15bIsE9gHjKj6nqIisQv5XnhNgMzXBp11xrlbNg== X-MS-TrafficTypeDiagnostic: BN3PR03MB2353: X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2353; 31:QZ/KOrVcgo6hRCl96L+ACyCdjTb/DD64/UOj1gDZp0qkncG4a1Mhk8JDJAfLt6D9DzbOPhTxxY0Is9Eu/GvLIzCboh3LfoLb1sv9ZlLHZddUNaqkezxrylkHOtt509Kut0GHBfiNY81Ej6Y5VyumSzGH7FRmMvONd/f+1aLzZ2d0KTA19dgkyMccwHvEzAQ6JNLMeSwlgZOG1NAORYDRNk/gkP2lj7TQ+dc509VS8Eo=; 4:tXOh6E61c/Z/hGQkhUFMxdfZzm6d4CLOFdqLiQsN+gbIO0cw78qHk8AhMdkdr5otQGohRv2E465/MNzdOrTk2S3LT5vjfq7xeHbmNN6kTbnkWzQ1cnZJWCW4yw50vHiddPTmvjuOkORJsGYkRExtRWi69GkHHbpqXQY6iB/3NSizfdNBCMVkqcPo7DJ/0LWkymClWiuqzuKAkAUL6TaAvG8RnaoWgANK0BoC91brvCa0JYueOXHHJoxyZifD2/4d9ptN1ez5yBcisfAj9v3agEPwlWSGXt2VcYggaHFnqZA/KnOfhoVk5tm9ldLHmhD4eQQoUI5Dc7to9w5nDY/l3JhhdOObRuvn+2Ugvkm9Zrc= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(17755550239193); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(3231022)(6055026)(6096035)(20161123563025)(20161123559100)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123565025)(20161123561025)(20161123556025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN3PR03MB2353; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3PR03MB2353; X-Forefront-PRVS: 04916EA04C X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBN3PR03MB2353=3B23=3Atwjg?= =?utf-8?q?+/DgCnJtqxa39xqPvLWsZZPJNdom9JYxcZto0fTtLBgYBrrj8JVj3T/R?= =?utf-8?q?jME4WGFT1aFlkCQUHnhvs0L38F+XnzkZaFpJIltINg2cLrGabncCbAfK?= =?utf-8?q?qPtU8NsPL4iy7R7RxIP8SW6m/i7gSf1bFdc1lDgevqIp611YKNoCcs0t?= =?utf-8?q?dR8kyP0KrZ7RYdpEmtd6BQO+9gR4ndv99afYywUFOi9O/LUy/xHMBz1v?= =?utf-8?q?IAX2l7ABEL2dgff1d9TzdHd7EM5m0TRbOZZyOlNAIOAUJGQHi05q3oCD?= =?utf-8?q?85DapKcy1p+ZtstBCPunPxFg+lGGvqQHOCFXVjTAHkkuVv1rG1zMcsCz?= =?utf-8?q?zOwVuyLU0h6/qWmI6Mo7vsqYDiHmJ/Koj2bDpxPhpAoP/UNcVIEqDqO4?= =?utf-8?q?h9qLBIDmaxDmnKCbsOReywNunZaIZ1qe7qti+EldWScrrXQ78Qxc3wCn?= =?utf-8?q?XAcYTGLqxsY3mKStlbLyqxlPsdpF7KshYgTkyWTn6wk+Rv8vvtvQnNqv?= =?utf-8?q?bNyWzodYoUh/EfDsLzSCa7vo4lYo7S2E6226Z74tGLOXsvg0uJKVUMhT?= =?utf-8?q?ogQVWx7FHQqB/S5DL4WS8Mpzb919Fp8/S7RKc9QquWuairO9ooNXvUxG?= =?utf-8?q?5TwZBcNJJzXF0glpExhTlesvGK/vyClT0hmsYaeDp/qQzX8lDhAV1m2b?= =?utf-8?q?G5CkChu5jHw2fKMxCck29erEeAUYb4S8hbG7wF/cOfTW4Xb7IRm1jhcz?= =?utf-8?q?4bA/ZvEFiS6RPvBYKkjDWolQTMu/xCV7jQlC519+EEonUP9fSvAiAqjm?= =?utf-8?q?JhgUvFFA780fLgQNX/Zh2hiS3UmpQB5tPA/rWCGo07R+Fkju4s91WkCs?= =?utf-8?q?Jzo4UTr0VgXUfuuE0/z4w9nZFvOXNpNXDwCd3tRVd0WThn7Dy1hmf1O9?= =?utf-8?q?Y1i4PH0kjsOEe8X5Lbc2tqkZthl+Kie6rjT99Fw01YjfYSDp2F9VDjoa?= =?utf-8?q?XLgcnqo0GHSQoBdU8oNlZdHeqOsaGLQYOBphUGm6uSD5uFW6g7lXVEr1?= =?utf-8?q?ALIVtwA7Zir6M3uSilWCiO4I4ZgoOr/Lyu7k0u8kEQP9if5WtRvtXyu8?= =?utf-8?q?7XpVOon6ZbEK6mPBDzrGWWPQfd70S9o4Rly2mfm3o3TGpPHChhzmDKYs?= =?utf-8?q?onatQQoIdCi2Gygm55OaeNEIPZGyqex6od0hU44DHjaBNvZVurOovfps?= =?utf-8?q?1VLk7xKPltGpOa9KDAEcl5DhG2rQO44JZxtm?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2353; 6:zrAs/GwaojExIKISHJNr61kUSuxM1bvLDez54Ap7RU+3sM5OS8WS5/m4MfwmaKmISWQRn9snnSIrbM1RXEE9RcXQ8XensQaaivQPbN5/y4aPvi0QlMJPOLBicBmxSm3kSMclmMw7FPvYqOXqLDwSTY9YMhMG5D3iaFaB20a1/wJ/spP+l7g45WDTxwxjy7rW87OlO8KQoLLbB6ti/P5dnSdWNQq2Aj9+pfxj+EDjedxABZ/OJaH9mXR7ovTFZRZpXv3ORhbEbDqG2MoKfvg69fzMdkLD60h9vwskevZx4ExBYfLpBWMfUPI6fGVzdkhFUt+8+ix77lAeGeHIRt/ya+VJ1xosrrRXPS/WgVfCRv8=; 5:3aJu1WRPmw6lkkTbT7jvPEJ81sMCx2i7BkcFOQ5lDjLbnumilEx5W7VRsirbGTq6qjMRWN4RVyL4nnQkTvdNecfcKQ5dfkspgVHxAyeOZcwHH/8839fCF9LDGiZB/8LJvwJwmLY9kVm4s0sjUVKA3gbqkTtu8n6+NPiqtcvm4CE=; 24:hd1qZ325XIWHIUxFSvsKofYvE8Zj0RvEI5yvtSzETecdRFrlm1KNJBRPDdPVEGlgNghPBX0vvCb7BixwnCwwV3dFsppSplo9lYptmouhNlo=; 7:s1NKZ+oWtT4Ef7o2+TKUDnw1ZPnDyYr9GwzfvFXnMVVs0haPtmSc7YoHfCRoYVGSNQiTDYS8+zRyaCkmCg74Mz9TbFrvCHGOS04ruzNNxDvfVQW8Sk1glZ4ahOmGKWVuqknfhTjL8geLyEztdfl91xsRiAfzO+2KU2vA3GMshi+LyozmsRVDHzogZSjmIb2voWFMfjyIqm1Y8GGQKET/E9HTYTCns2JxvBruWKCdQf3xXtHFOoyWYF8RPQsmAU9C SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2017 07:06:27.9824 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 02a8cfb7-6ae1-4b01-91ac-08d52b2e39d2 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: BN3PR03MB2353 Cc: priyanka.jain@nxp.com Subject: [U-Boot] [PATCH v6 1/7] armv8: lsch3: Add serdes and DDR voltage setup 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" Adds SERDES voltage and reset SERDES lanes API and makes enable/disable DDR controller support 0.9V API common. Signed-off-by: Ashish Kumar Signed-off-by: Rajesh Bhagat --- Changes in v6: - Corrected indentation/alignment issues at various places - Changed NULL ENTRY in srds_prctl_info array to id as zero - Corrected the PLL Reset logic, moved code inside for loop - Used error code(-EINVAL) in setup_serdes_volt API Changes in v5: - Moved local macros to static functions - Used array to handle PRCTL mask and shift operations Changes in v4: - Added local macros instead of magical numbers - Created macros to remove duplicate code Changes in v3: Restructured LS1088A VID support to use common VID driver Cosmetic review comments fixed Added __iomem for accessing registers Changes in v2: Checkpatch errors fixed .../cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c | 312 +++++++++++++++++++++ arch/arm/cpu/armv8/fsl-layerscape/soc.c | 34 +-- .../include/asm/arch-fsl-layerscape/fsl_serdes.h | 2 +- .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 34 +++ arch/arm/include/asm/arch-fsl-layerscape/soc.h | 1 + 5 files changed, 365 insertions(+), 18 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c index 179cac6..3e4b0bc 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c @@ -158,6 +158,318 @@ void serdes_init(u32 sd, u32 sd_addr, u32 rcwsr, u32 sd_prctl_mask, serdes_prtcl_map[NONE] = 1; } +__weak int get_serdes_volt(void) +{ + return -1; +} + +__weak int set_serdes_volt(int svdd) +{ + return -1; +} + +#define LNAGCR0_RESET_MASK 0xFF9FFFFF +#define LNAGCR0_RT_RSTB 0x00600000 +#define RSTCTL_RESET_MASK_1 0xFFFFFFBF +#define RSTCTL_RESET_MASK_2 0xFFFFFF1F +#define RSTCTL_RESET_MASK_3 0xFFFFFFEF +#define RSTCTL_RSTREQ 0x10000000 +#define RSTCTL_RSTERR 0x20000000 +#define RSTCTL_SDEN 0x00000020 +#define RSTCTL_SDRST_B 0x00000040 +#define RSTCTL_PLLRST_B 0x00000080 +#define RSTCTL_RST_DONE 0x40000000 +#define TCALCR_RESET_MASK 0xF7FFFFFF +#define TCALCR_CALRST_B 0x08000000 + +struct serdes_prctl_info { + u32 id; + u32 mask; + u32 shift; +}; + +struct serdes_prctl_info srds_prctl_info[] = { +#ifdef CONFIG_SYS_FSL_SRDS_1 + {.id = 1, + .mask = FSL_CHASSIS3_SRDS1_PRTCL_MASK, + .shift = FSL_CHASSIS3_SRDS1_PRTCL_SHIFT + }, + +#endif +#ifdef CONFIG_SYS_FSL_SRDS_2 + {.id = 2, + .mask = FSL_CHASSIS3_SRDS2_PRTCL_MASK, + .shift = FSL_CHASSIS3_SRDS2_PRTCL_SHIFT + }, +#endif + {.id = 0, + .mask = 0, + .shift = 0 + } /* NULL ENTRY */ +}; + +static int get_serdes_prctl_info_idx(u32 serdes_id) +{ + int pos = 0; + struct serdes_prctl_info *srds_info; + + /* loop until NULL ENTRY defined by .id=0 */ + for (srds_info = srds_prctl_info; srds_info->id != 0; + srds_info++, pos++) { + if (srds_info->id == serdes_id) + return pos; + } + + return -1; +} + +static void do_enabled_lanes_reset(u32 serdes_id, u32 cfg, + struct ccsr_serdes __iomem *serdes_base, + bool cmplt) +{ + int i, pos; + u32 cfg_tmp, reg = 0; + + pos = get_serdes_prctl_info_idx(serdes_id); + if (pos == -1) { + printf("invalid serdes_id %d\n", serdes_id); + return; + } + + cfg_tmp = cfg & srds_prctl_info[pos].mask; + cfg_tmp >>= srds_prctl_info[pos].shift; + + for (i = 0; i < 4 && cfg_tmp & (0xf << (3 - i)); i++) { + reg = in_le32(&serdes_base->lane[i].gcr0); + reg = (cmplt ? reg | LNAGCR0_RT_RSTB : + reg & LNAGCR0_RESET_MASK); + out_le32(&serdes_base->lane[i].gcr0, reg); + } +} + +static void do_pll_reset(u32 cfg, + struct ccsr_serdes __iomem *serdes_base) +{ + int i; + u32 reg = 0; + + for (i = 0; i < 2 && !(cfg & (0x1 << (1 - i))); i++) { + reg = in_le32(&serdes_base->bank[i].rstctl); + reg &= RSTCTL_RESET_MASK_1; + reg |= RSTCTL_RSTREQ; + out_le32(&serdes_base->bank[i].rstctl, reg); + udelay(1); + + reg = in_le32(&serdes_base->bank[i].rstctl); + reg &= RSTCTL_RESET_MASK_2; + out_le32(&serdes_base->bank[i].rstctl, reg); + } + udelay(1); +} + +static void do_rx_tx_cal_reset(struct ccsr_serdes __iomem *serdes_base) +{ + u32 reg = 0; + + reg = in_le32(&serdes_base->srdstcalcr); + reg &= TCALCR_RESET_MASK; + out_le32(&serdes_base->srdstcalcr, reg); + reg = in_le32(&serdes_base->srdsrcalcr); + reg &= TCALCR_RESET_MASK; + out_le32(&serdes_base->srdsrcalcr, reg); +} + +static void do_rx_tx_cal_reset_comp(u32 cfg, int i, + struct ccsr_serdes __iomem *serdes_base) +{ + u32 reg = 0; + + if (!(cfg == 0x3 && i == 1)) { + udelay(1); + reg = in_le32(&serdes_base->srdstcalcr); + reg |= TCALCR_CALRST_B; + out_le32(&serdes_base->srdstcalcr, reg); + reg = in_le32(&serdes_base->srdsrcalcr); + reg |= TCALCR_CALRST_B; + out_le32(&serdes_base->srdsrcalcr, reg); + } + udelay(1); +} + +static void do_pll_reset_done(u32 cfg, + struct ccsr_serdes __iomem *serdes_base) +{ + int i; + u32 reg = 0; + + for (i = 0; i < 2; i++) { + reg = in_le32(&serdes_base->bank[i].pllcr0); + if (!(cfg & (0x1 << (1 - i))) && ((reg >> 23) & 0x1)) { + reg = in_le32(&serdes_base->bank[i].rstctl); + reg |= RSTCTL_RST_DONE; + out_le32(&serdes_base->bank[i].rstctl, reg); + } + } +} + +static void do_serdes_enable(u32 cfg, + struct ccsr_serdes __iomem *serdes_base) +{ + int i; + u32 reg = 0; + + for (i = 0; i < 2 && !(cfg & (0x1 << (1 - i))); i++) { + reg = in_le32(&serdes_base->bank[i].rstctl); + reg |= RSTCTL_SDEN; + out_le32(&serdes_base->bank[i].rstctl, reg); + udelay(1); + + reg = in_le32(&serdes_base->bank[i].rstctl); + reg |= RSTCTL_PLLRST_B; + out_le32(&serdes_base->bank[i].rstctl, reg); + udelay(1); + /* Take the Rx/Tx calibration out of reset */ + do_rx_tx_cal_reset_comp(cfg, i, serdes_base); + } +} + +static void do_pll_lock(u32 cfg, + struct ccsr_serdes __iomem *serdes_base) +{ + int i; + u32 reg = 0; + + for (i = 0; i < 2 && !(cfg & (0x1 << (1 - i))); i++) { + /* if the PLL is not locked, set RST_ERR */ + reg = in_le32(&serdes_base->bank[i].pllcr0); + if (!((reg >> 23) & 0x1)) { + reg = in_le32(&serdes_base->bank[i].rstctl); + reg |= RSTCTL_RSTERR; + out_le32(&serdes_base->bank[i].rstctl, reg); + } else { + udelay(1); + reg = in_le32(&serdes_base->bank[i].rstctl); + reg &= RSTCTL_RESET_MASK_3; + reg |= RSTCTL_SDRST_B; + out_le32(&serdes_base->bank[i].rstctl, reg); + udelay(1); + } + } +} + +int setup_serdes_volt(u32 svdd) +{ + struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); + struct ccsr_serdes __iomem *serdes1_base = + (void *)CONFIG_SYS_FSL_LSCH3_SERDES_ADDR; + u32 cfg_rcwsrds1 = gur_in32(&gur->rcwsr[FSL_CHASSIS3_SRDS1_REGSR - 1]); +#ifdef CONFIG_SYS_FSL_SRDS_2 + struct ccsr_serdes __iomem *serdes2_base = + (void *)(CONFIG_SYS_FSL_LSCH3_SERDES_ADDR + 0x10000); + u32 cfg_rcwsrds2 = gur_in32(&gur->rcwsr[FSL_CHASSIS3_SRDS2_REGSR - 1]); +#endif + u32 cfg_tmp; + int svdd_cur, svdd_tar; + int ret = 1; + + /* Only support switch SVDD to 900mV */ + if (svdd != 900) + return -EINVAL; + + /* Scale up to the LTC resolution is 1/4096V */ + svdd = (svdd * 4096) / 1000; + + svdd_tar = svdd; + svdd_cur = get_serdes_volt(); + if (svdd_cur < 0) + return -EINVAL; + + debug("%s: current SVDD: %x; target SVDD: %x\n", + __func__, svdd_cur, svdd_tar); + if (svdd_cur == svdd_tar) + return 0; + + /* Put the all enabled lanes in reset */ +#ifdef CONFIG_SYS_FSL_SRDS_1 + do_enabled_lanes_reset(1, cfg_rcwsrds1, serdes1_base, false); +#endif + +#ifdef CONFIG_SYS_FSL_SRDS_2 + do_enabled_lanes_reset(2, cfg_rcwsrds2, serdes2_base, false); +#endif + + /* Put the all enabled PLL in reset */ +#ifdef CONFIG_SYS_FSL_SRDS_1 + cfg_tmp = cfg_rcwsrds1 & 0x3; + do_pll_reset(cfg_tmp, serdes1_base); +#endif + +#ifdef CONFIG_SYS_FSL_SRDS_2 + cfg_tmp = cfg_rcwsrds1 & 0xC; + cfg_tmp >>= 2; + do_pll_reset(cfg_tmp, serdes2_base); +#endif + + /* Put the Rx/Tx calibration into reset */ +#ifdef CONFIG_SYS_FSL_SRDS_1 + do_rx_tx_cal_reset(serdes1_base); +#endif + +#ifdef CONFIG_SYS_FSL_SRDS_2 + do_rx_tx_cal_reset(serdes2_base); +#endif + + ret = set_serdes_volt(svdd); + if (ret < 0) { + printf("could not change SVDD\n"); + ret = -1; + } + + /* For each PLL that’s not disabled via RCW enable the SERDES */ +#ifdef CONFIG_SYS_FSL_SRDS_1 + cfg_tmp = cfg_rcwsrds1 & 0x3; + do_serdes_enable(cfg_tmp, serdes1_base); +#endif +#ifdef CONFIG_SYS_FSL_SRDS_2 + cfg_tmp = cfg_rcwsrds1 & 0xC; + cfg_tmp >>= 2; + do_serdes_enable(cfg_tmp, serdes2_base); +#endif + + /* Wait for at at least 625us, ensure the PLLs being reset are locked */ + udelay(800); + +#ifdef CONFIG_SYS_FSL_SRDS_1 + cfg_tmp = cfg_rcwsrds1 & 0x3; + do_pll_lock(cfg_tmp, serdes1_base); +#endif + +#ifdef CONFIG_SYS_FSL_SRDS_2 + cfg_tmp = cfg_rcwsrds1 & 0xC; + cfg_tmp >>= 2; + do_pll_lock(cfg_tmp, serdes2_base); +#endif + /* Take the all enabled lanes out of reset */ +#ifdef CONFIG_SYS_FSL_SRDS_1 + do_enabled_lanes_reset(1, cfg_rcwsrds1, serdes1_base, true); +#endif +#ifdef CONFIG_SYS_FSL_SRDS_2 + do_enabled_lanes_reset(2, cfg_rcwsrds2, serdes2_base, true); +#endif + + /* For each PLL being reset, and achieved PLL lock set RST_DONE */ +#ifdef CONFIG_SYS_FSL_SRDS_1 + cfg_tmp = cfg_rcwsrds1 & 0x3; + do_pll_reset_done(cfg_tmp, serdes1_base); +#endif +#ifdef CONFIG_SYS_FSL_SRDS_2 + cfg_tmp = cfg_rcwsrds1 & 0xC; + cfg_tmp >>= 2; + do_pll_reset_done(cfg_tmp, serdes2_base); +#endif + return ret; +} + void fsl_serdes_init(void) { #if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 497a4b5..47d89b2 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -513,23 +513,6 @@ static int setup_core_volt(u32 vdd) return board_setup_core_volt(vdd); } -#ifdef CONFIG_SYS_FSL_DDR -static void ddr_enable_0v9_volt(bool en) -{ - struct ccsr_ddr __iomem *ddr = (void *)CONFIG_SYS_FSL_DDR_ADDR; - u32 tmp; - - tmp = ddr_in32(&ddr->ddr_cdr1); - - if (en) - tmp |= DDR_CDR1_V0PT9_EN; - else - tmp &= ~DDR_CDR1_V0PT9_EN; - - ddr_out32(&ddr->ddr_cdr1, tmp); -} -#endif - int setup_chip_volt(void) { int vdd; @@ -598,6 +581,23 @@ void fsl_lsch2_early_init_f(void) } #endif +#ifdef CONFIG_SYS_FSL_DDR +void ddr_enable_0v9_volt(bool en) +{ + struct ccsr_ddr __iomem *ddr = (void *)CONFIG_SYS_FSL_DDR_ADDR; + u32 tmp; + + tmp = ddr_in32(&ddr->ddr_cdr1); + + if (en) + tmp |= DDR_CDR1_V0PT9_EN; + else + tmp &= ~DDR_CDR1_V0PT9_EN; + + ddr_out32(&ddr->ddr_cdr1, tmp); +} +#endif + #ifdef CONFIG_QSPI_AHB_INIT /* Enable 4bytes address support and fast read */ int qspi_ahb_init(void) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h index 12fd6b8..9becdf3 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h @@ -164,6 +164,7 @@ void fsl_rgmii_init(void); #ifdef CONFIG_FSL_LSCH2 const char *serdes_clock_to_string(u32 clock); int get_serdes_protocol(void); +#endif #ifdef CONFIG_SYS_HAS_SERDES /* Get the volt of SVDD in unit mV */ int get_serdes_volt(void); @@ -172,6 +173,5 @@ int set_serdes_volt(int svdd); /* The target volt of SVDD in unit mV */ int setup_serdes_volt(u32 svdd); #endif -#endif #endif /* __FSL_SERDES_H__ */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index 957e23b..47e8b5a 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -387,5 +387,39 @@ struct ccsr_reset { u32 ip_rev2; /* 0xbfc */ }; +struct ccsr_serdes { + struct { + u32 rstctl; /* Reset Control Register */ + u32 pllcr0; /* PLL Control Register 0 */ + u32 pllcr1; /* PLL Control Register 1 */ + u32 pllcr2; /* PLL Control Register 2 */ + u32 pllcr3; /* PLL Control Register 3 */ + u32 pllcr4; /* PLL Control Register 4 */ + u32 pllcr5; /* PLL Control Register 5 */ + u8 res[0x20 - 0x1c]; + } bank[2]; + u8 res1[0x90 - 0x40]; + u32 srdstcalcr; /* TX Calibration Control */ + u32 srdstcalcr1; /* TX Calibration Control1 */ + u8 res2[0xa0 - 0x98]; + u32 srdsrcalcr; /* RX Calibration Control */ + u32 srdsrcalcr1; /* RX Calibration Control1 */ + u8 res3[0xb0 - 0xa8]; + u32 srdsgr0; /* General Register 0 */ + u8 res4[0x800 - 0xb4]; + struct serdes_lane { + u32 gcr0; /* General Control Register 0 */ + u32 gcr1; /* General Control Register 1 */ + u32 gcr2; /* General Control Register 2 */ + u32 ssc0; /* Speed Switch Control 0 */ + u32 rec0; /* Receive Equalization Control 0 */ + u32 rec1; /* Receive Equalization Control 1 */ + u32 tec0; /* Transmit Equalization Control 0 */ + u32 ssc1; /* Speed Switch Control 1 */ + u8 res1[0x840 - 0x820]; + } lane[8]; + u8 res5[0x19fc - 0xa00]; +}; + #endif /*__ASSEMBLY__*/ #endif /* __ARCH_FSL_LSCH3_IMMAP_H_ */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h b/arch/arm/include/asm/arch-fsl-layerscape/soc.h index 247f09e..8c242c0 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h @@ -125,6 +125,7 @@ int setup_chip_volt(void); /* Setup core vdd in unit mV */ int board_setup_core_volt(u32 vdd); #endif +void ddr_enable_0v9_volt(bool en); void cpu_name(char *name); #ifdef CONFIG_SYS_FSL_ERRATUM_A009635