From patchwork Tue Sep 6 10:03:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chin Liang See X-Patchwork-Id: 666446 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3sT2Mc2kcqz9s3v for ; Tue, 6 Sep 2016 20:07:24 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=altera.onmicrosoft.com header.i=@altera.onmicrosoft.com header.b=R8ZWQ7U0; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E02AC4BA5C; Tue, 6 Sep 2016 12:07:22 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nZL5J-GTa4p8; Tue, 6 Sep 2016 12:07:22 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0CD1C4BA35; Tue, 6 Sep 2016 12:07:22 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D5D6E4B71E for ; Tue, 6 Sep 2016 12:04:19 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BUo2AxjXghRq for ; Tue, 6 Sep 2016 12:04:19 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0078.outbound.protection.outlook.com [104.47.40.78]) by theia.denx.de (Postfix) with ESMTPS id 2C9E64B9CB for ; Tue, 6 Sep 2016 12:04:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=altera.onmicrosoft.com; s=selector1-altera-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=sbnGKTRj427eBWEZLIV/P//IBJ/+C4HuRME3L7GRlKg=; b=R8ZWQ7U0qwcY4NOOnsr9MJRlGnWhJJjv0nr6AXEFQfoFMW+hsK3HrNDip1oU2UNspgezUAq3w9Jt2IN4+eMwVY6Mb/FWOWgn3suxxBAJS7imlJA3GSdJpiDChuECzr5qiq8ms65qb0vYxjaEYAUAswVQin30o/LabsUL/HcDAVI= Received: from BN6PR03CA0046.namprd03.prod.outlook.com (10.175.124.32) by BY1PR0301MB1269.namprd03.prod.outlook.com (10.161.205.143) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9; Tue, 6 Sep 2016 10:04:07 +0000 Received: from BN1AFFO11FD009.protection.gbl (2a01:111:f400:7c10::158) by BN6PR03CA0046.outlook.office365.com (2603:10b6:404:10c::32) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9 via Frontend Transport; Tue, 6 Sep 2016 10:04:06 +0000 Authentication-Results: spf=softfail (sender IP is 66.35.236.227) smtp.mailfrom=altera.com; lists.denx.de; dkim=none (message not signed) header.d=none; lists.denx.de; dmarc=none action=none header.from=altera.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning altera.com discourages use of 66.35.236.227 as permitted sender) Received: from sj-itexedge03.altera.priv.altera.com (66.35.236.227) by BN1AFFO11FD009.mail.protection.outlook.com (10.58.52.69) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.6 via Frontend Transport; Tue, 6 Sep 2016 10:04:06 +0000 Received: from sj-mail01.altera.com (137.57.1.6) by webmail.altera.com (66.35.236.227) with Microsoft SMTP Server (TLS) id 14.3.174.1; Tue, 6 Sep 2016 03:03:29 -0700 Received: from ubuntu.localdomain (pg-clsee-450.altera.priv.altera.com [137.57.103.106]) by sj-mail01.altera.com (8.13.7+Sun/8.13.7) with ESMTP id u86A3exJ009127; Tue, 6 Sep 2016 03:03:56 -0700 (PDT) From: Chin Liang See To: Date: Tue, 6 Sep 2016 18:03:21 +0800 Message-ID: <1473156209-5734-4-git-send-email-clsee@altera.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1473156209-5734-1-git-send-email-clsee@altera.com> References: <1473156209-5734-1-git-send-email-clsee@altera.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:66.35.236.227; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(189002)(199003)(105596002)(81166006)(47776003)(2906002)(4326007)(92566002)(33646002)(87936001)(86362001)(4001430100002)(2351001)(229853001)(19580395003)(2950100001)(19580405001)(16796002)(106466001)(36756003)(97736004)(50226002)(11100500001)(76176999)(107886002)(50986999)(189998001)(110136002)(626004)(5003940100001)(7696003)(305945005)(7846002)(356003)(8676002)(8936002)(5660300001)(50466002)(48376002)(68736007)(81156014)(586003)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0301MB1269; H:sj-itexedge03.altera.priv.altera.com; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD009; 1:F1Ya8VEadJGOoxtRxZ4od6nQ8lzjzcAwD8SGJ0RXGnxvRO2/I2CgE+HYK6C6VtxBXMycDrHk/FX4K8TdxDFGKcPrw+Y+IjSl0eLEIRkB96HYS8TEOpeeNzTX2cs6DUfQ2a9PZXWdXhZvY5RiAo+U04Aj0RbxHew5sRIQdyzv+aqhjPCQMv63BC+FThc564XhPObUj4dFkIraKZS84OX/GTDKVh2r0ZdziOpy38NeYiE/Gq7gnCoyu9lZjg8E611JBmED56mLfRQ1bTZd9mtf84T3vBTYklQHxLdeTF/W5AsbrZ35lFVm75k0AUj8+MfG3cJLTAAEZwKOOLhUVxHVxAGj5KGPXorvfaEx0tQ1vOPrc1o+S/5uAV6CjvEKdw7KmjgIoPvdJhjcODA7kycuFksQDK+AQyBwcsnGY1Jl6pLP+1Q0GY7F+r8YfygIlwN2WOW/l49Fq3ivTEVHuhDGrK1C48yiUmoeAaKxrD4iC0+dXwHOWnWSDw1fj8Gw8MdlLD8yH5Lv0MwaE04asvcTzFy+i7RFcq5QkGkA2j+7++Q= X-MS-Office365-Filtering-Correlation-Id: 55e882e1-6175-4baf-9009-08d3d63d2355 X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1269; 2:lZD9GR5Xx+gNRcpboatSWCAcn3T2KakIEeuBS0GWG+MFLY6Ca5QiJIl7mXVrViJKKZwVnAo4q9Xer0jIQQJqGLI4939ILbYNFwM4k/XiwDwz9vnQ0d00j00sLNAWO7wNaFpNLrxCEeVpsAlJCCgmSD5+bU2yy6yHD4HCele4w/1V5JjBznS9J9crnUK/5emv; 3:5y+QU+nm1epwRFK8NQrxoWenYU8LJhTOFugyrzwtBGOxrAoBAfltyEMCxctt+eJGh57viQuvE2aqW9/X/d+FBW9h8KwZeMiLtJMusezd3puGlYbjVZoqVTT40WGO3afQzq1kT7RRNUyfB5743QXIpwhyZmMYQwIWyeuPSan+dY1KhBvhhrFz5GjOoYx+7rUVVZ7HJfWt2qOYiEQO0yfYfAKNUWbyFgZVb8ZJK5bDHbo=; 25:6/eaBF5gYDwm/26gRRLgGqPpxZ2oHZ42kA9LXUG9b3T7Yl0VmJQlVbkcDQJGjNrEKUVQ5B5Yk8P1RHn+ma5Vi9xe1VIExMoZFJhA8ZW4F5Otq8ytHh65cNjIbQsguIkaN6XiaQub4lGqn7iK3b45JMWfmDAn6cWRAFfrWT2D9q2N0MW8WksNqVDHcJiQ7s5uJ6WfH+IuqM42A145Paqh9NwPx3zmL7O50sPl5yLWF3nwHPDXwqPAr/ESgcXZxtvIMg2C5kqT5A+Ya8WJHCXLlY4sA+b9zK/ls8S6ktGuYMKb9g8ptZ1z78TjQFlTSkeHqd77YAGjohkDQB4c98TRFwT6JOGl6Frn4YR9m+AECXcEmJWSCio/9fCRxOV1rB+knR0ZgsNS1JIYLsJwM7DWj9Ke+TXDywsxiKldPnRMDEg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1269; X-LD-Processed: fbd72e03-d4a5-4110-adce-614d51f2077a,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1269; 31:smeT/P4k6GDxMuPIbLJxEKaHW7UrkS4eMpSaYBbijSDMfHalVWekMATTKu+ll2fxbYZxQlOgT2rvqvTW3RVYOPYqi1Byvi24hG3IeA616s30SfmpA8lT8iAXX/ExKY+YjGLYdLd9i3QP2Qq3SiNePMgF6QlYn6n+XTcIks+mj4O3Zm1MXqWKEAhDFtl4udigmdQQnc9vWSbvg7O6v+NPWzIHoGXA+oUBVTlHEnGdhkk=; 20:hXvJH31ql6h4tAeUiL2PS4hALxihjUIjY0pSVPOwcDYiq8+tPAilDdv2pchhtpzOF5u77vyleWhfgQ14GJU/lKI9KuTDqTUE/6gj3Q2u1FQp3YuuJIbIWUwBIzsRzB3QmFLrUetCyAvBvp9MmIC2vCyMVM+82AZupXiKSag8mLg=; 4:LziFL1sj1OcoBWWQUsxLbPh2R9FOXYSry0MpPtwLUXohkcj3RI7eL0Fb0QYRM5W/izwAYzd5e7V9sl97oyVCb6tbXqiFtLVlmRWyj16l8wW9P72g/oFLrwXfNAUwSeOKq+1RCvIT3NU0RtStq/984RAaJbwlFgFKszy/nxxmnYicLO5N0jSB/OvdKn0HnnmKgnTQWpyHUcr+pKO87yM/jbKdftPEknnr+ASdLWaVO7smI5GTAUNJ4gOEWmnSE7ZnmO62SP2zJEYu8zRhIORX2uaMgeW+0u6cuLJKgTFDYQhby4aw7qEW7gIeRt9eyqe6AP+/s8RWnq5aNglIveTpIavnG2xvlqvwCKD+7nHeSRDK7XiEkTEEh57A5tZQmF5aoERXuFS48jU24MOFG8kpyu8+hVk8Qfd8n5LzQop/KH5t0kDxC1n5e5NT+fHadmsi4vCZIJQpgcHqrqAB6KWRsc9ImRQJsizASd2HvSF1abkF+sO5qwfF085FSNlPukmwPaRl0x0XrHnvmLfoZehPm6X4ZlMpJK2mBlthZLhEZ8A= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(80048183373757); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(13015025)(13017025)(13024025)(13023025)(13018025)(10201501046)(3002001)(6055026); SRVR:BY1PR0301MB1269; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0301MB1269; X-Forefront-PRVS: 0057EE387C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0301MB1269; 23:XBWarXmKFPV3+2qQoGwvH+oOGpZGYEnWSSoth7d?= =?us-ascii?Q?iFKAiFJpl1AcOQucpPlWDpl8gAMQyEqH5aEBQJMtGyqV3/p8o3r/tWAKHppL?= =?us-ascii?Q?/zzSQhjMDs6FTK1l7DPv1lu44eHieI1VvFzUQgl79viSAebWSRM6rwdhBOev?= =?us-ascii?Q?NOhHd5Np8pAXU8rsqXoNADmXsXhfxw+sIuTG6ehZOwkcJ94CoTj66K4stQFD?= =?us-ascii?Q?p9jmPU+v8JKByJ5b1VL9pwN9r0XSF8OYPjV+Il6ebzG4W9ppcmX+ZagTeuWS?= =?us-ascii?Q?+mrBTgw1awyhqVWBuHsTKQ5zVN3BNpOnuuAsx2Dujaf3sQ9vVrdeFi+OjQM3?= =?us-ascii?Q?sHqJvoRARaBEuys0aZs521xKMQsUrMP3Rk9LbJILHVAlsrc39Ve65+NwCuof?= =?us-ascii?Q?nm0wVdfyskYfrTlftnm2P+BkvU8HTF39hg9asZqsNe1vti0NXA69vS+XEcMo?= =?us-ascii?Q?0O2OJ3ooHiRSxc3JslZ8ovorD2s65pH1H3/kPjHK1JveoClTiN4AY5d1dBjo?= =?us-ascii?Q?5RkwrIFmtDx3euVjexZdfuLyh/xjvOBRa13yF05wMW8iEzi9Arhy4Rl434Zt?= =?us-ascii?Q?gAwpDepU+0PwVoV82K4JJjAOg9d4uy2aBFsFkgQRZfK4QmnQO/NcJx5xK9o6?= =?us-ascii?Q?IIwAu/sPIBWtNsFlmqERPR90i33DyTDCa5bNyb0iXhKdiY4D77Uy+qAnxejr?= =?us-ascii?Q?LhkhIGWEOnjVXjSyf+Jke3lVk/nGgpmVHW5a86RCx0Jkxqc/LFCaKS8b2y+8?= =?us-ascii?Q?eJHYq9dhYxDSDie6O/e7+Q3oJeKQIQm5iosxMPJX70pH8tXX05zVGJFyhRMg?= =?us-ascii?Q?0efr7iOcGHPiwYjqbLLmvjX9xYccd1NhNZE9B0TB6g9TPfB4KVzPAnuZYGwg?= =?us-ascii?Q?oAqLLaT0pZAL9DChMfxeHflDsy3TFnAqNVw12X173rd8kkmZ6Ei0GmIn+/P8?= =?us-ascii?Q?xGWjy8uoGWOWaixmifr2OY4PgibwF9kt3byHU+pfx8sukl7gjauBXQ22tnpZ?= =?us-ascii?Q?zDzdamMvjVTNQaqM0SqfQKt2tp44YPFARUd1HXXxsGJBLIbppmE4OCTUMWdf?= =?us-ascii?Q?VlWxZk3ndec3QzUEkGvfzkcE9UnAO0OMlvTfWCiguawIL6Z1DRgxlI1JF3/L?= =?us-ascii?Q?q9ccSxgLnXSM=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1269; 6:06QIH7HojDxUx6VP5Oxw1RoWaR5YxYuKy9KA1/ttYMEpSFnfRomUtbi+XTUHv+KVDn20speDow3Rd+vgoK9Wr0IvadCIDJ28R6rtoNyECJtAwBpTueKTBvXOGHeBkg+oa//TbGEZRpPlbjEpd7rgdtnWNKrnTFzrx2oJiD+/ip30Sc5vvPP52DM8iMJ2FjqNaSeT+K/aOnYOxIx84LF7ODu0eimcdargva8z/6wd4p2D9LWE3R/CjGGtTop+xgrM9dWNQWfpmla5iVYNEjuXqYx65p4FKTaU9IxndO6yNMAjSTaeXZfdOInfLcrO0TtCMN8Dst5jTHavQP58+OCo1Q==; 5:Yc/wpP18W1rxZI41Y8ZbwbO47PEyLf4efO+3gt6D2MA9guL+xV6rL3x9KLYLy+kC7eKl8XgV2kOqoZkE3WvXC3CTk4lzTRXd9TuzZZ26etkj7KkOHcESyjPr1YmKtzK9buU+zH04mMgjxw2R11B3CQ==; 24:BN3wJ25gf15H28vY4TQ+CR2BxUFYaYiGGybt76a5NZD9S5cGcXw/4zhmcOFchy3UUhpUu1wHpT+kfAcZDFBe4EiuEiDLBP9N/hNkp3SKceY=; 7:r1wOQM4M5TlxY6HLlU15uqN9VE+ZMVDW0OKbScwHoztL6P4a7EsyTLVFdDHib82lCx73TUoWZ2s5Psuwf5RkKKP5YRAH9vVI3VFRp0uXLYH3WyQPpXc6cbfQ7QmPKAc+EnRFvK7nIKL8brLp32B/jVofT0Cj5IKrQ+ZaGccnH+yRBE/rNV5c/7kPFE9femBJ+htcfjhOUgnOs7h7dzNVG3rTSqT4izOD8ZDz7beFmAJnrU1uq4RGLppgSdncz8z4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2016 10:04:06.0099 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a; Ip=[66.35.236.227]; Helo=[sj-itexedge03.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0301MB1269 Cc: Marek Vasut , Ley Foon Tan , Chin Liang See Subject: [U-Boot] [PATCH v2 03/11] arm: socfpga: rstmgr: Separate the Reset Manager for Stratix 10 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Separate the Reset Manager to support both GEN5 SoC and Stratix 10 SoC. Signed-off-by: Chin Liang See Cc: Marek Vasut Cc: Dinh Nguyen Cc: Ley Foon Tan Acked-by: Marek Vasut --- Changes for v2 - Change the segregate to separate --- arch/arm/mach-socfpga/reset_manager.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/mach-socfpga/reset_manager.c b/arch/arm/mach-socfpga/reset_manager.c index b6beaa2..0fa5f1a 100644 --- a/arch/arm/mach-socfpga/reset_manager.c +++ b/arch/arm/mach-socfpga/reset_manager.c @@ -15,8 +15,10 @@ DECLARE_GLOBAL_DATA_PTR; static const struct socfpga_reset_manager *reset_manager_base = (void *)SOCFPGA_RSTMGR_ADDRESS; +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) static struct socfpga_system_manager *sysmgr_regs = (struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS; +#endif /* CONFIG_TARGET_SOCFPGA_GEN5) */ /* Assert or de-assert SoCFPGA reset manager reset. */ void socfpga_per_reset(u32 reset, int set) @@ -31,8 +33,10 @@ void socfpga_per_reset(u32 reset, int set) reg = &reset_manager_base->per2_mod_reset; else if (RSTMGR_BANK(reset) == 3) reg = &reset_manager_base->brg_mod_reset; +#ifdef CONFIG_TARGET_SOCFPGA_GEN5 else if (RSTMGR_BANK(reset) == 4) reg = &reset_manager_base->misc_mod_reset; +#endif /* CONFIG_TARGET_SOCFPGA_GEN5) */ else /* Invalid reset register, do nothing */ return; @@ -60,9 +64,15 @@ void socfpga_per_reset_all(void) */ void reset_cpu(ulong addr) { +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) /* request a warm reset */ writel((1 << RSTMGR_CTRL_SWWARMRSTREQ_LSB), &reset_manager_base->ctrl); +#elif defined(CONFIG_TARGET_SOCFPGA_STRATIX10) + writel((1 << RSTMGR_MPUMODRST_CORE0), + &reset_manager_base->mpu_mod_reset); +#endif + /* * infinite loop here as watchdog will trigger and reset * the processor @@ -92,6 +102,7 @@ void socfpga_bridges_reset(int enable) void socfpga_bridges_reset(int enable) { +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) const uint32_t l3mask = L3REGS_REMAP_LWHPS2FPGA_MASK | L3REGS_REMAP_HPS2FPGA_MASK | L3REGS_REMAP_OCRAM_MASK; @@ -116,5 +127,6 @@ void socfpga_bridges_reset(int enable) /* Remap the bridges into memory map */ writel(l3mask, SOCFPGA_L3REGS_ADDRESS); } +#endif /* CONFIG_TARGET_SOCFPGA_GEN5) */ } #endif