From patchwork Mon Aug 22 15:02:35 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: 665916 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 3sSYqJ1f4Yz9sBR for ; Tue, 6 Sep 2016 01:41:16 +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=iXcl1oxj; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D10CF4B9AD; Mon, 5 Sep 2016 17:41:13 +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 OWpt8ZIXJ9Il; Mon, 5 Sep 2016 17:41:13 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A6FD54BA29; Mon, 5 Sep 2016 17:41:10 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 793DB4B624 for ; Mon, 5 Sep 2016 17:36:29 +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 RVXxVwoBwSPJ for ; Mon, 5 Sep 2016 17:36:29 +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 NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0053.outbound.protection.outlook.com [104.47.38.53]) by theia.denx.de (Postfix) with ESMTPS id 4E9E94A01C for ; Mon, 5 Sep 2016 17:36:24 +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=6HG3lzPViEYBZNDLPcfkT3B4oIdwTu8BAldkAl/Nlik=; b=iXcl1oxjTL9MvjCkVt6Mw20qF4iLQ9uMDsUv1ehtsoNtSiV5SXuECN3EMA0tGlbaJYXfyk3ZX+ZWUq5qiZ93A9FvzQncVOAAwYmpkdhm9hTpREE+pRKVetFF27BkQMQ66WhV3kbTa2k8dILdA5U0Zw/j0fXe3MHc3iulWtrXcaQ= Received: from DM2PR03CA0043.namprd03.prod.outlook.com (10.141.96.42) by SN2PR03MB1917.namprd03.prod.outlook.com (10.164.114.153) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.3; Mon, 5 Sep 2016 15:36:22 +0000 Received: from BY2FFO11FD002.protection.gbl (2a01:111:f400:7c0c::109) by DM2PR03CA0043.outlook.office365.com (2a01:111:e400:2428::42) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.9 via Frontend Transport; Mon, 5 Sep 2016 15:36:20 +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 BY2FFO11FD002.mail.protection.outlook.com (10.1.14.124) 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; Mon, 5 Sep 2016 15:36:19 +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; Mon, 5 Sep 2016 08:35:46 -0700 Received: from ubuntu.localdomain (pg-clsee-450.altera.priv.altera.com [137.57.93.14]) by sj-mail01.altera.com (8.13.7+Sun/8.13.7) with ESMTP id u85FZOHG028562; Mon, 5 Sep 2016 08:36:13 -0700 (PDT) From: Chin Liang See To: Date: Mon, 22 Aug 2016 23:02:35 +0800 Message-ID: <1471878163-3598-4-git-send-email-clsee@altera.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1471878163-3598-1-git-send-email-clsee@altera.com> References: <1471878163-3598-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)(199003)(189002)(2906002)(110136002)(5003940100001)(92566002)(189998001)(107886002)(356003)(86362001)(4001430100002)(626004)(47776003)(4326007)(48376002)(36756003)(87936001)(305945005)(50226002)(5660300001)(586003)(8936002)(81166006)(68736007)(7696003)(2351001)(33646002)(105596002)(16796002)(81156014)(2950100001)(50986999)(229853001)(8676002)(7846002)(76176999)(97736004)(19580395003)(19580405001)(50466002)(106466001)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB1917; H:sj-itexedge03.altera.priv.altera.com; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD002; 1:XnYSQq6iF65rxsgBm1Gnl7myyFVvZbZd/zDp7C07PGEqYRW2vHSRcVzLwWyLA+m6HaIGxhLGmyqTMh+akt1ciyzKgyRh7KQ5O9GvCwy4EHSEO/ISrj9ZUB3p9bV1X8+l1oy6yehCb4+2r9ATexMWtaIxj//aT//XjxpDgmjFx78fgLrVlP7SZgizqwlfkoWIMIxkN+iRdL+TXfr6YOnJMMoLCrm7jKFr+0viidrTcQsoNjq35ZwEUaFbIVECZw81j9gQTKiEiJvu2ku5jpUZ051h2PM0pnPORG1Hr4VZg/Qtlo0QDPJaYKGQXO9RNloaF94akjuV+0FhNLOCw+d08K8EmSwKNZSktaskD4NYPvfNpsdFGahqBjKm/1/oUyQjRO3i5XumfSrsrCPjKN6IgOgiOKCyhrCqQNZUHFnc7T94mhYVDxLMTEyFb6LyauNPn6T3/PAzC/2NXvBofWlILKZAjkX5frvgzKn9MSgJPpbr688OnrDVrhbskR5jykkpG0naPNMI7+xuCh74dwvID/JOdyeyoApiL9j3Iwef5xc= X-MS-Office365-Filtering-Correlation-Id: 378c314c-cb69-4436-f123-08d3d5a2625a X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB1917; 2:+HG0XSQgyW9mybdfZYH6ZWZdK8lLsbeYYikkHssdDDfQ4KLnfIuDJsBj4NoAg7PToBtCfmQu8GHbN31aZKOarPPFIP0KlURYQMbWGarZfJYPaAkFJGA5V4zVy8SqVjLH+fG4aRLesyMLsngqSRBe6oo6ikflEtk/L/QSLqt5eo6MjnLAdjAH1his82k/sP+x; 3:liiS92cIZzKGI/c2vmZ5bG82Wyy0YMA4djJI3liW6Z50WsEFIQKHlJRp2rvVYeVGyrMz5nuaoSVGcSWYEbDZ9g+jfdg77Cfkj2wPgqkUE6p7Dfx4FcJmpc7BPXe9b4ZZ8GggKrE0a+qImagOyq1IywoVCVET9stmxb9LUPqan/OrH68gV2Xjq2lRjm7LD+5cy42NUZwJXZhxePDXyvNMW5R+AcLfLS2F++JbVK1nua8=; 25:cl2wH4rOBPfRcoHLvJrImCp1LRPcm/luBb/kX0M9yDj0iO5rlwzqUuW3F0O5C/QeVUbFT7aPlS+M4S7lN7HRDJwUw+0ya19zn2Tv/nwo1Nxj6m3evatTAu3LvH2/c1ldbSeOJYOVHsq/tT1GNlb0CzPpd6PCryTwOUsXTc4y0hbEF6rrY6SM5tjhLPtmdBoN+E8HRh++fFN5S9TdAOlzA8gf9yN8NMNdFq7ZAbfxA/e8RDfIiO2Ur6JTjgE3TWX3ldjdPoREtEnBgBI/Z5/xmRqV8+QsEFGQFWHCyszsCU4jX/v1vlU58Aq+iSJ1+1DhOvwMzD/MuI9lRmBhLooLR0iBMTZeKsVH4Ka6aI45t4lO+6sWthBk5/iA5NCzgMnw1uQDSrvSvEoqpuhU5BBtPLzjH2p+0vfFaNx1ZY5URak= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN2PR03MB1917; X-LD-Processed: fbd72e03-d4a5-4110-adce-614d51f2077a,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB1917; 31:QUBPViKvnvNhkFvqkO674Etd/oGKq8bQpalaCFeBU/Yl4J0iovUhTroxE+R56mgKdGeMHceTfPfRWLljk+nJXba8xvLDclFt5wLkpPX81BkSDcBBC7u0zQZ+XKGESYDpyTm0GS842WCVO2z6cLXFoomwZ8OQVoZEmJK96XNfPEyFP2ex7yo8Wr44GpxOXsyW3Fc51h8aaTRNKI6SvrNUztF2XmZXInb322gF3tJt9Uk=; 20:H4azgzxFzF580RSyVFQOy8In257cqWpgQvtZ90FxzZOCjBc24YBMuGr8hXZf8RqIFXWFZtlaIHa2/HgHqmxmxN6r0KaYwroBKxkXYiZ/RWeHtZVlCHCyoFhtwZspexhMkhShULHTCKju+gzFj+aNLBY5/sdvCkNdyNkfa962wuQ=; 4:P6giXl2gmJ4MeBaP5yb/zECJ5znC9iG4OXJAAFWPyxwy5dIez5JCMe0KLZfD4YVVzlokmQbaHPk1b+9SYsRWmyKkNGAi4jDGPhVK0vFsjM1rJiCJo/+yJyP1YGiW7tYy7plxdhvdF9qOB44z4dCnP5pDnN9nWZbYjyVslqQRjZeM5gS2Hl1WhyTALrDem3zRyiifVNWvhO/219/d5RiB99b6+7I+GeELGzEg1NPWrgkkN9f/FrQklhFszHcrSBr92ekwslPKyCdd79DUSqecXB5QymNr2/kzUMa4Gq7kqV6z+xkU1j52hfonENumrbYtRrD2lOaiWiURz6d3x9HNlN6cLbmTP+ayU/VXYRQV43xuaVaj8hiTuwZ1A4nYsqZTAzp++/+BtoTA0nkX8ET1Dk33J1kBALEdBrIEBBv8CE0BmXHfpXYG5ol0Vmu5KcxqE/Com7y4MwBk76GSLyLzFglAFtWuuaXqPyPwC74xftkDcPXKpuhcfikx04prbOyFaQlT/LGWDLgwcxn16V/jX0sFF4MzlTTNHnGRbWodfRQ= 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)(13015025)(13017025)(13023025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:SN2PR03MB1917; BCL:0; PCL:0; RULEID:; SRVR:SN2PR03MB1917; X-Forefront-PRVS: 005671E15D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB1917; 23:v9zTgETgQkd8bR5FKelDdswRuPj5oSL+7UKl2Nwax?= =?us-ascii?Q?VtFuflwyLJX32aBDFJE2J9C2KioT8vmPgJ2Fk9jjSfW5AsQeQUtjKNf9+IKS?= =?us-ascii?Q?O2BNBrs6O93g0fXvWzxUzu6IT0bIT9NvtWSEd1bMX41f+jaTQH3XTJ/z/7i8?= =?us-ascii?Q?27wTQHsXxU8434TPvxceJkOHUMzq9liX2lC03EML3hec55AzSQhpKTvhF2qk?= =?us-ascii?Q?L4eL2IZgMQJi2wJX6uJoeNRkAvnenqhY1ebB4/18ypvM/UAl1/SVZXP1w/cx?= =?us-ascii?Q?pJy3IGn1rDPWy9Br7fYxVb1LtNNiOWZ4FZFc70U9UX1/u9kx8AixKx+DX4cK?= =?us-ascii?Q?pYyvI9lX0q7cZ2M+CD7U2wjCw/TDyB2UiT4rnG793id1RL48mzgQwvZ9kFQK?= =?us-ascii?Q?ZrgCtWk25MuzbRybtrBnPEU7S+1FdJdcLeSD7dZ2AzXQ2GRp7BpLrp+f6pzK?= =?us-ascii?Q?laj37ibtgCXLs7+T75ki0wlXQk0PQui7Bjzt5nBLChC9jeFOsxbNL18kHw8P?= =?us-ascii?Q?Z+TvbYIsrd7aERmRL6Bm6wyPHNQxbTh+Gj+/upgexcD4a0pZ/KvTxWamdBD4?= =?us-ascii?Q?03I0Oo/Spp+zmLR541dKHVp6ICHdL1MY9AhrZ5639GDRbEi0bERlaRxWb3ME?= =?us-ascii?Q?WsQ4vGRT6OuUmMHHD2R4QhVgjCPd0qMA7ss0zJ+S4AUSrPhvQ3cJ/SfBBYVl?= =?us-ascii?Q?jvhYpF9htEZC86XDC0YZ0ly1/OIwdFqO28yr95Z6vMvI2eOMSA8wh3hQI6db?= =?us-ascii?Q?QualZUXqKFb1GmPoFawpsynOiREW6I8l14W/0JOgwZPA63AtVF5/wF9alsUV?= =?us-ascii?Q?hLtj1G3rDBSSkSb97lB1WbwH8420iUmsQVNvlwoef3wdWrNZFUqRp9oZDy16?= =?us-ascii?Q?flN3ypogflY+LVQhyCxod1xbUUy58dsgy+eVBTlhc9LaXvWqqQ7XNDuArk00?= =?us-ascii?Q?Ijcf3gjokyGjwX+rsm+VCvgCVaDOVcfC/CQr+K8mzh0GiOdDjvSyWIMMyG3w?= =?us-ascii?Q?ZyZN54EkQrrDNsVv9fdv2thxe8oqr8xK5s5hsbihMK3Jwr4uHfkhu/u16qBS?= =?us-ascii?Q?dz6qssPm2b2Ht4hMdw/ZLA9T95ArCF333tZbkUHxNPVDb/RdA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB1917; 6:56W3DESlFxCdZB5qRsk+55yXJWWDrGanRyvBjnmguAEWTbdahBYW+IdsehZXvVXqguyBzyoq/W2u2wC7rsntH1U8t0ZuSWjtOC1eWOAvjElI3JGCiT55a2xaOh9jnQy0PgPPdswGqsahuxwG3HCst0Utlp24e50JekzRIMyHXSyiDTFI/Zd1/Dp0ZKQKh0VeB5QQhVDw/ja1LH9uuthBbFYazU4FBcB90cIWKLyrt/TcfoT61jphV1W8JL3UaMseoUV9mRwQ6hLLH/noTi3DYgaeaCKLWcZxiK2k0A+fN7iSii0Jr7eCbenM2aaFQsjk20eNed6OY8Y9S9/ZWE66PA==; 5:2dhxb+SfDet7gvlunu7QFMOVHffm08Tq1hFDxP+RcFuj03Xozg/0sKYhOG8usdHGyDXVbatjp57OyheSHZQww4cqLbb5WRvnzhPVhcpQG3uyt0Fm8aw36wylLbRiotjGv9Ks1Qxd+jtB+WY3mKLWDQ==; 24:kBVBU4CI7uLR2z1NuwzAe6LYrBQ8Z3Zloipm4kCOnk78cz3IZOfrS49Pq3nBPX8yOcITcRg1ipYyaGRQ2K6mFTNwDS9jryBgw8KDS/GwwT4=; 7:vFRNghulHSrdnD2llWi4n/jD99DD+9hA/CDjsW/Vn0OROhyNSgw8GPa/UX4iNCSQa1HSTEaF00wnz1ktUmjBEct9IKgYJAHdRnt/Rq9toCZ6wbdrlhLOxA4b6GRA42Y1HfNAMCxm/rwN9v0FqVjs828EndqadPAmyoye9K1ybi6j7uXd5y2luVrzp2ou5GjDj+dbeec8nZg3MbhGROnQAOiWbO50LXRZyqaabNtsLQJI7YNyKrQdP8LTddZsHXno SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2016 15:36:19.8109 (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: SN2PR03MB1917 Cc: Marek Vasut , Ley Foon Tan , Chin Liang See Subject: [U-Boot] [PATCH 03/11] arm: socfpga: rstmgr: Segregate 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" Segregate 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 --- 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