From patchwork Tue Jun 2 18:35:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Tull X-Patchwork-Id: 6530721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 49B3FC0020 for ; Tue, 2 Jun 2015 18:43:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CE1822047C for ; Tue, 2 Jun 2015 18:43:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 43C6720457 for ; Tue, 2 Jun 2015 18:43:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yzr7N-00017O-QM; Tue, 02 Jun 2015 18:40:53 +0000 Received: from mail-bl2on0061.outbound.protection.outlook.com ([65.55.169.61] helo=na01-bl2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yzr71-0000pT-PN for linux-arm-kernel@lists.infradead.org; Tue, 02 Jun 2015 18:40:34 +0000 Received: from BY2PR03CA073.namprd03.prod.outlook.com (10.141.249.46) by BY2PR03MB239.namprd03.prod.outlook.com (10.242.37.19) with Microsoft SMTP Server (TLS) id 15.1.184.10; Tue, 2 Jun 2015 18:40:06 +0000 Received: from BN1BFFO11FD037.protection.gbl (2a01:111:f400:7c10::1:113) by BY2PR03CA073.outlook.office365.com (2a01:111:e400:2c5d::46) with Microsoft SMTP Server (TLS) id 15.1.172.22 via Frontend Transport; Tue, 2 Jun 2015 18:40:00 +0000 Authentication-Results: spf=fail (sender IP is 66.35.236.236) smtp.mailfrom=opensource.altera.com; kernel.org; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of opensource.altera.com does not designate 66.35.236.236 as permitted sender) receiver=protection.outlook.com; client-ip=66.35.236.236; helo=sj-itexedge04.altera.priv.altera.com; Received: from sj-itexedge04.altera.priv.altera.com (66.35.236.236) by BN1BFFO11FD037.mail.protection.outlook.com (10.58.144.100) with Microsoft SMTP Server (TLS) id 15.1.184.11 via Frontend Transport; Tue, 2 Jun 2015 18:39:54 +0000 Received: from na01-bn1-obe.outbound.protection.outlook.com (207.46.163.142) by webmail.altera.com (66.35.236.236) with Microsoft SMTP Server (TLS) id 14.3.174.1; Tue, 2 Jun 2015 11:38:55 -0700 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=atull@opensource.altera.com; Received: from linuxheads99.altera.com (64.129.157.38) by CY1PR03MB1517.namprd03.prod.outlook.com (10.163.17.23) with Microsoft SMTP Server (TLS) id 15.1.172.22; Tue, 2 Jun 2015 18:39:26 +0000 From: Alan Tull To: Dinh Nguyen , Rob Herring Subject: [PATCHv6 1/2] ARM: socfpga: support suspend to ram Date: Tue, 2 Jun 2015 13:35:38 -0500 Message-ID: <1433270139-7042-2-git-send-email-atull@opensource.altera.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1433270139-7042-1-git-send-email-atull@opensource.altera.com> References: <1433270139-7042-1-git-send-email-atull@opensource.altera.com> MIME-Version: 1.0 X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BN1PR08CA0022.namprd08.prod.outlook.com (10.242.217.150) To CY1PR03MB1517.namprd03.prod.outlook.com (25.163.17.23) X-Microsoft-Exchange-Diagnostics-untrusted: 1; CY1PR03MB1517; 2:1upx2PfHl3PLvvtSG3TcAZtlnvHLtdn+IKdy6RlsXFdsUa7bG/fEGMuYDhfdUsWG; 2:XdKi0uwWJEYwWEYV1sKZv93H7C9C/NEJru2Qi4txg3zRaoOrp3OeCIg3rwlQcVREnN379iM5F2cg5+DS9qjhqlc3OQsvHEqJeAGGKtSvQnECWgBrUZs1D5pX2ztzkn/orZGofH4wlDSiRtU2MUtR0w==; 6:jxm4xc3qksbCmF8/ZcFmTAAEyGOL4IBLlUKRN8dlxJVUFdlNUdjDTnFMZaGD0MAB7KuS0D0T8ePEpcbOYLx1qyNNp9cX2dmjuUnH1tZTk/ZMtACjZA4P8jDOmkXt7POXAdmwMrWDImyX5NeDby+ZEw==; 3:q0mlTmBFYIpZSoji3eRfZCLMPS2CZeglQJD+PuUTqlGZRc0ozJrcRhvGDVdx1vSDqCrYH0epEwUvxrIKKKd9g95TmfqAWOQpTum0HIWkkfRHtlIXfv9Jswf+/jYiYuStP33PLKJ+yGo6LWgS+KxPnanvQT15UsrECbyvjNNwz7FQYAEfQs+xsEjskDGzxalBnsy/2BwyCAG6HvC55WAdrY7TYvhNJzvBg7PU1ZxtG+I6VluCSuiz+7EML4Lfk7fkUfm4wmlgOXcPuLxRfP3uNvzP1QEJqtsscuwrBz2QddurRoCr7V9qQZ8VUrzvRn8J X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB1517; UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY2PR03MB239; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:;UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:CY1PR03MB1517; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB1517; BCL:0; PCL:0; RULEID:(601004)(520003)(5005006)(3002001); SRVR:BY2PR03MB239; BCL:0; PCL:0; RULEID:; SRVR:BY2PR03MB239; X-Forefront-PRVS: 05954A7C45 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM; SFS:(10009020)(6009001)(189002)(199003)(229853001)(66066001)(42186005)(46102003)(106356001)(53416004)(33646002)(105586002)(5001830100001)(50986999)(76176999)(189998001)(2950100001)(19580395003)(81156007)(69596002)(50226001)(5001770100001)(92566002)(5001860100001)(77156002)(15975445007)(77096005)(101416001)(62966003)(19580405001)(86362001)(97736004)(48376002)(5001960100002)(68736005)(64706001)(40100003)(50466002)(87976001)(122386002)(4001540100001)(47776003)(2004002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB1517; H:linuxheads99.altera.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:0; LANG:en; Received-SPF: None (protection.outlook.com: opensource.altera.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics-untrusted: =?us-ascii?Q?1; CY1PR03MB1517; 9:Ofbk5A74+5P5XtwrYlTD/45YgRjI9UoUFAacy3znFi?= =?us-ascii?Q?KflPDmC76KxuIVRsZi5TIV7JBCmPPxZsAuSsZKJWwP6RDvNyawX1OJ6eHSUJ?= =?us-ascii?Q?pf/J/y8N6Die6Uw2Tn6aHCRbf3lbbr+ksGorQMFGv6sfChoTaGn/XOiliGeH?= =?us-ascii?Q?iey7bjEL+Wbn/h7KG4ytplr/uqpNIKQjSVwrICRH29biOaohhMSU+/D6epz/?= =?us-ascii?Q?FEXq8Tgx3bWxRkBTXf88X2qY/BpnT1Un0FcnJxSPzVFZbUHS9tLyxzytr97t?= =?us-ascii?Q?7L9yq2W9avP+hXb9MS8N3bDwgqnnSThyvqMpYHOmo6y/uNjCbEutCCqmxpM8?= =?us-ascii?Q?YKEEeuTmtACPPlsV78+otOxT5Qm1xIYomAAHzfjOliP2bMfDcGyF9HFEFDuH?= =?us-ascii?Q?AViDTGNa59yL5XGAiRubEB23JleqFz8JRtiMB02rDQqa5xoGwWndShEDNU/L?= =?us-ascii?Q?xKFj8lLZcboHuF/ir9CsdEmVO7eOTKEopxSO9FuN/0Ly3iYF5hqA2R8JApLG?= =?us-ascii?Q?ajFo5iUpC6QrqJyDArud+1iK+UF75l+L7QVBBiz3eeZErASPtAHZI/20T7Xp?= =?us-ascii?Q?i6Cg/lTRjWpHGsRaK2Y9CkTnCuhixm8lYCwqG5SbFjsPL9GRiJpczfDpXfTT?= =?us-ascii?Q?pFb69QReUo3GptC0A8uLuls33B95Je5oM16fOTIRvCGQbP4+Bpay83fwxlLR?= =?us-ascii?Q?8yJ1Jq3G31qtgamX155V77klsa6AAMWIRS1QSQcH+C47D1Wgg+sYKy0Iz1d5?= =?us-ascii?Q?yg7EayzH17v0010nwvEY0MBQDTmgCtyilUtNUNU6BDwXh+MtBIabYgrkQjdt?= =?us-ascii?Q?zqZlVBiLHvv7JpRbjh4FccFjwXhaGLmi9J4xFJjylpPIvuKHmFQ5pCT17RVg?= =?us-ascii?Q?7EdkKUQXlXxyCUmH1pk74JPeHE72ZbKSGHQkxHwxTZ50cFYsVzh2T3uuqEHT?= =?us-ascii?Q?kQS8xtEkvXtaKMa0fZlmimEurD2GTcufIKhcYsicLU0f+6fs+dMnrtvDR1m3?= =?us-ascii?Q?5PXRNKx1PbTQTKlxmC/BztEZ485N2ihnBc0SRVdsDTXYx3cZc3LNeluOlvMV?= =?us-ascii?Q?53ZJOaN4GukbuM2V36dnloopHKFyQHHQ4UzNNdxSp3AdNBXmk4RSl5dPt6eA?= =?us-ascii?Q?ChtQD2iOM=3D?= X-Microsoft-Exchange-Diagnostics-untrusted: 1; CY1PR03MB1517; 3:ohlS6kiq2f1cyZ/Hv6FVHU6c6H7Da826w8Emey9JSHpMbteFuGgDXaATQ8CZt9r+gSFkN12bUUQtx35VoM71EE3j/WLCOF0lesEyYQjCvk+EXJQcqMDuxwa+cNV2sI+Q0viWscN7oIxafE0nHR530Q==; 10:wZbsB7EbbwgKb1XS31lFKkyBuSOMhd+FAFT4ShZMY1Znksp1aLBZ6VLzLt/tL33l1h+FSzrj9Pk6ndxf2arMCIh20y/aEjEPzsJDqOYN6Tk=; 6:/IMsnuydM+dcXHESsbJBRWsX7p7FbrJrp4PQZ3QxOlZQTNEyvGFVCRt7+K6fFa5/4quwBy2QvyiCJ/a+rb8ZdQy8ex4g9wn95xqM5gmr6TbW6b5KRESE7tIwCBwfLCXQcPn8XA9fO1xI8xPDg61rPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1517 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BN1BFFO11FD037.protection.gbl X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD037; 1:sNJz89XKDvWcKo5DyEOrTyhzXg1jQINh3tTaKASgSdwahWN8fBF7hBN+h97u4o/E2PZg9RQiEj+oZ2FqxYNxbJqD5UbFstgdG1dXtB+fPhC6mg8P/ThQbut43Rm7U7TzIN8jy54A2N9Sj0szQNcrYrkz/ozZGZfRxRdOQwvU+cjiItfOoOmoUdmm4seDQjQGZI0+xQ+bJSvf4poHFjiI2Q/ipmmZlUDYngObXql6TK1jae90qO3L4bZ7ckEDRbyyr52Il2612/0uZvTQken+5gTLrIjmcP1hIe5t0ykX1OAq2CCxf4dVxw2iCq4nRNXt X-Forefront-Antispam-Report: CIP:66.35.236.236; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(339900001)(189002)(199003)(85426001)(6070500001)(5001770100001)(106466001)(2950100001)(229853001)(77096005)(15975445007)(68736005)(66066001)(64706001)(50226001)(16796002)(47776003)(105606002)(19580395003)(81156007)(97736004)(33646002)(19580405001)(48376002)(4001540100001)(6806004)(76176999)(50986999)(86362001)(77156002)(62966003)(46102003)(5001830100001)(50466002)(5001920100001)(87936001)(92566002)(5001860100001)(5001960100002)(40100003)(189998001)(53416004)(122386002)(7099028)(2004002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB239; H:sj-itexedge04.altera.priv.altera.com; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:0; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB239; 2:h4ZJxdFGviLEyTSbXhgRfl+7A2lwZTwpaLwWYHIQwKH+ZinIlNQNkNjKEVxEZQlI; 2:yzG3SgDPxR94p8kvSIUQ3bOQZs5iubroVwioxqjbvc/UrIdYbrLqJg9oApsADnXbqDDY4835JSKV9Z/a3rH1+XpkaTz3VeadfnP2TVNwQBKaYc8up1hCKVQgEjdua/3L8eJXupOn4rulNQJ5jcqB/SUJU1fDRHkV5cm3J3dLPiYjPIbTYEIN5z7KK7inNGKyniTmSykMJSODViHJoSAE8onNmP7KC6Rw93ZT+Jz+0uM=; 6:Ka2FKispraw/aHMAy3ZLxJSpViGhIz4tTilagHznOI4OVsbOuS+yTCJlIomPvIQeq5Fy/Mxd1uPKEcOI+DXWYm6hvHPkfJiJmKEGBtZF6pkrgqsUH9dgz7GAUC79ubVp2GOUGkpaFz+9/ATtLNVjBw==; 3:29U93HV6NrhYWZB3nWryEFI4bjk1UM7vdRW3gDsXXsKv5eYfbEp0C8RIfn8jdLcLlN6w5AawK9oRi27rPz1d/aIQYPUf7m4gDU7ZcxXb8H+3tybfTxX0RlahInivFTfliQuhy0+Xe2pfbGY1s0a48B05ctzvLfZWL+ZJHACIvAoHY5LoIy7bJZk4tzazQSIufcwhHpUSqmb48ZqHZdcQU9Y3BehIwTCVlDxeilDRRzfSCGXH1lpo7ce5qChSU2+Qnjk7T2MbdGyhUkf+8RrI023Z7iPJlq+FEbDKimCB79twgPkwAV5hchFgcKk6z/T2 X-Forefront-PRVS: 05954A7C45 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB239; 9:8PahXhTRPlkJW/je/WRR7t/WqH2sB8evHoTIyAVnwOz?= =?us-ascii?Q?Y0lLYy6jg57fhB3+i164D/XoOtpNFODVaeSmW4dJqIbpU1N+eylsSBfZzwd/?= =?us-ascii?Q?4NxQ4dRttt3pmiPTJ7wwTORPDIBHCF4VohxO6zSwsL+2VwkpZ2dGkvY4QOg/?= =?us-ascii?Q?tLfibVk9K9MrMPTPvOLLd/WgYRGR1OcQ2LpfpEzAKuPn/i6kpKkDOb8N8GDo?= =?us-ascii?Q?4JS+fHfILfabpFdLQkBE3vEnHmGZg5I2rTTf+UekxhxvV55fL9Ab0f8JurB8?= =?us-ascii?Q?YjJMQIz8ZMK1sggM51OuojAze5TPsg9uEnDCuGNRnIMhYOIx+GjZeG0itR/K?= =?us-ascii?Q?Tt19R4dBFrFALL1YogAhBNyMKITztGiXjIpPSwXZ9KvrnFzWXJDMh8IFqFDN?= =?us-ascii?Q?BgTzRYUevU1/5/LtXVdq5vC+K37z3sEVgF9Na3BcYRGKKX3chLUbX8DL/Wyp?= =?us-ascii?Q?cR/Xu9HZAez3VeuIk7MsmW6tCz0I0VNZUQvvhHIuOkkqy8b2tCvo0Cxlub6W?= =?us-ascii?Q?2aKWBLDpfiTU3b2m/RezUyBZ8uibNyjHG8njnHdjbeTX5DWGtFLDF1EIJZvy?= =?us-ascii?Q?p6l6FmSkxVmIfPv+VYcyec2Au5WBqlRcA422QVmM2ZwcA/Eu51tTKd8V0hJb?= =?us-ascii?Q?ZlsfBGwucNpq4C1uv0kWFBrHbC0AsisL1isFezvXM1uYSY1ofWktJOo3nF01?= =?us-ascii?Q?upYQ2QBnx/qjEwMpy1SCwlkFt1Cg1BbaQaKVxVSQwYqX9NTeUBdXCs9uk2HO?= =?us-ascii?Q?zeTkasZ1VrZWAmb3xuDem9IuBDrO334VYiRak2CihopHtEFffTnESgsuW7jG?= =?us-ascii?Q?sAAdRPymyIPTcsTMOl0sxH1nAayaF2QpasmTtUWEvjjA6KAeKS4upCiBk5fi?= =?us-ascii?Q?uvRrnyR7DmT8EpVUzyEqSP24NHNR+bb/EP3DVo/cNkCciQzL5PFz3PVmQgc2?= =?us-ascii?Q?YO0ly3EsHYvWnW/WJU78wHbeRdNx7zY0cLSdNjNcD4xUOVlYKA2D524nLFVm?= =?us-ascii?Q?XkRdqVtFxjPVDmJNROR89eyjQGj0utx8EheXcueTDqbdZfIfKLPnu0Z4aRHF?= =?us-ascii?Q?+goFE2hcagqERlFYUTO7FWi5UKYsTD3eQGu+Ln8WZ9AIMCzpGDQbzQeUFLzz?= =?us-ascii?Q?jyK1iLo7ce1GOxuoGnXNkOMXhfgApqXhXMti12ATU8gxz50nRFapPXFkssuw?= =?us-ascii?Q?b4pvIIsdbXX+MUJNJYJekAE7w2xa1Usc8?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB239; 3:9/pzVfe43Dq8LiuXLuZHSH/PIRIyyx+bpZZ7YyMuZ9K8KPDk2CAITEjl3PkX4okRrQvF+ETkcz0BnGZD56BrgMZhK+z72Wn1sGj9sL6JK3GZO4iM9SSglqEGgIGW9RIRUtrUiWSeeXi1m2JSe4iWOg==; 10:RAisIil7xLFbqPRBAPiXhqh7Pc+mU6lvilp2bWvnFZBSGT0jVX8+g8K94DINWvTFeQDKXjnhBPzgfzyLkakbWzHFZ+0z+GlntAggYymx9Wo=; 6:xGBtPh50YatBk6W1w2wv+lgUW0LUDdofk3cV13JauyMKBEXmfbNNzDGRZyL8vYn+JwSQ3LpS1PXx+mzgks6fdLloSNrkcoo5GTwiQosJCWtKu90WJgfTqmQIOBS1F3BUkpp+yIcYdLPpMA1VhD3pug== X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2015 18:39:54.2403 (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.236]; Helo=[sj-itexedge04.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB239 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150602_114032_334071_DD35DED9 X-CRM114-Status: GOOD ( 13.26 ) X-Spam-Score: -1.1 (-) Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Arnd Bergmann , Pawel Moll , Ian Campbell , Alan Tull , Pavel Machek , linux-kernel@vger.kernel.org, Kumar Gala , Steffen Trumtrar , Delicious Quinoq , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add code that requests that the sdr controller go into self-refresh mode. This code is run from ocram. Suspend-to-RAM and EDAC support are mutually exclusive on SOCFPGA. If the EDAC is enabled, it will prevent the platform from going into suspend. Example of how to request to suspend to ram: $ echo enabled > \ /sys/devices/soc/ffc02000.serial0/tty/ttyS0/power/wakeup $ echo -n mem > /sys/power/state Signed-off-by: Alan Tull Cc: Pavel Machek Cc: Arnd Bergmann Cc: Dinh Nguyen Cc: Steffen Trumtrar --- v2: use Generic on-chip SRAM driver to allocate ocram rm fncpy_align since generic allocator handles alignment check __arm_ioremap_exec return code check for NULL pointers add a comment regarding sdram controller configuration v3: fix renamed #define propagate socfpga_setup_ocram_self_refresh error code v4: Kconfig: don't need to select GENERIC_ALLOCATER add CONFIG_SOCFPGA_SUSPEND make s2r and EDAC support mutually exclusive socfpga.c: add sdr_ctl_base_addr return error if ocram not available in device tree update copyright years v5: remove compile time dependency edac driver will prevent suspend don't configure scu standby mode; done in enable_scu(). fix comments about required sdram controller configuration v6: needed a static declaration --- arch/arm/mach-socfpga/Kconfig | 10 ++- arch/arm/mach-socfpga/Makefile | 1 + arch/arm/mach-socfpga/core.h | 6 +- arch/arm/mach-socfpga/pm.c | 149 ++++++++++++++++++++++++++++++++++ arch/arm/mach-socfpga/self-refresh.S | 136 +++++++++++++++++++++++++++++++ arch/arm/mach-socfpga/socfpga.c | 6 +- drivers/edac/altera_edac.c | 20 +++++ 7 files changed, 325 insertions(+), 3 deletions(-) create mode 100644 arch/arm/mach-socfpga/pm.c create mode 100644 arch/arm/mach-socfpga/self-refresh.S diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index b5f8d75..b26a684 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -1,4 +1,4 @@ -config ARCH_SOCFPGA +menuconfig ARCH_SOCFPGA bool "Altera SOCFPGA family" if ARCH_MULTI_V7 select ARM_AMBA select ARM_GIC @@ -8,3 +8,11 @@ config ARCH_SOCFPGA select HAVE_ARM_SCU select HAVE_ARM_TWD if SMP select MFD_SYSCON + +if ARCH_SOCFPGA +config SOCFPGA_SUSPEND + bool "Suspend to RAM on SOCFPGA" + help + Select this if you want to enable Suspend-to-RAM on SOCFPGA + platforms. +endif diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile index 6dd7a93..b8f9e23 100644 --- a/arch/arm/mach-socfpga/Makefile +++ b/arch/arm/mach-socfpga/Makefile @@ -4,3 +4,4 @@ obj-y := socfpga.o obj-$(CONFIG_SMP) += headsmp.o platsmp.o +obj-$(CONFIG_SOCFPGA_SUSPEND) += pm.o self-refresh.o diff --git a/arch/arm/mach-socfpga/core.h b/arch/arm/mach-socfpga/core.h index 7637b7f..35472f2 100644 --- a/arch/arm/mach-socfpga/core.h +++ b/arch/arm/mach-socfpga/core.h @@ -1,6 +1,6 @@ /* * Copyright 2012 Pavel Machek - * Copyright (C) 2012 Altera Corporation + * Copyright (C) 2012-2015 Altera Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,6 +40,10 @@ extern void socfpga_sysmgr_init(void); extern void __iomem *sys_manager_base_addr; extern void __iomem *rst_manager_base_addr; +extern void __iomem *sdr_ctl_base_addr; + +u32 socfpga_sdram_self_refresh(u32 sdr_base); +extern unsigned int socfpga_sdram_self_refresh_sz; extern struct smp_operations socfpga_smp_ops; extern char secondary_trampoline, secondary_trampoline_end; diff --git a/arch/arm/mach-socfpga/pm.c b/arch/arm/mach-socfpga/pm.c new file mode 100644 index 0000000..1ed89fc --- /dev/null +++ b/arch/arm/mach-socfpga/pm.c @@ -0,0 +1,149 @@ +/* + * arch/arm/mach-socfpga/pm.c + * + * Copyright (C) 2014-2015 Altera Corporation. All rights reserved. + * + * with code from pm-imx6.c + * Copyright 2011-2014 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "core.h" + +/* Pointer to function copied to ocram */ +static u32 (*socfpga_sdram_self_refresh_in_ocram)(u32 sdr_base); + +static int socfpga_setup_ocram_self_refresh(void) +{ + struct platform_device *pdev; + phys_addr_t ocram_pbase; + struct device_node *np; + struct gen_pool *ocram_pool; + unsigned long ocram_base; + void __iomem *suspend_ocram_base; + int ret = 0; + + np = of_find_compatible_node(NULL, NULL, "mmio-sram"); + if (!np) { + pr_err("%s: Unable to find mmio-sram in dtb\n", __func__); + return -ENODEV; + } + + pdev = of_find_device_by_node(np); + if (!pdev) { + pr_warn("%s: failed to find ocram device!\n", __func__); + ret = -ENODEV; + goto put_node; + } + + ocram_pool = dev_get_gen_pool(&pdev->dev); + if (!ocram_pool) { + pr_warn("%s: ocram pool unavailable!\n", __func__); + ret = -ENODEV; + goto put_node; + } + + ocram_base = gen_pool_alloc(ocram_pool, socfpga_sdram_self_refresh_sz); + if (!ocram_base) { + pr_warn("%s: unable to alloc ocram!\n", __func__); + ret = -ENOMEM; + goto put_node; + } + + ocram_pbase = gen_pool_virt_to_phys(ocram_pool, ocram_base); + + suspend_ocram_base = __arm_ioremap_exec(ocram_pbase, + socfpga_sdram_self_refresh_sz, + false); + if (!suspend_ocram_base) { + pr_warn("%s: __arm_ioremap_exec failed!\n", __func__); + ret = -ENOMEM; + goto put_node; + } + + /* Copy the code that puts DDR in self refresh to ocram */ + socfpga_sdram_self_refresh_in_ocram = + (void *)fncpy(suspend_ocram_base, + &socfpga_sdram_self_refresh, + socfpga_sdram_self_refresh_sz); + + WARN(!socfpga_sdram_self_refresh_in_ocram, + "could not copy function to ocram"); + if (!socfpga_sdram_self_refresh_in_ocram) + ret = -EFAULT; + +put_node: + of_node_put(np); + + return ret; +} + +static int socfpga_pm_suspend(unsigned long arg) +{ + u32 ret; + + if (!sdr_ctl_base_addr) + return -EFAULT; + + ret = socfpga_sdram_self_refresh_in_ocram((u32)sdr_ctl_base_addr); + + pr_debug("%s self-refresh loops request=%d exit=%d\n", __func__, + ret & 0xffff, (ret >> 16) & 0xffff); + + return 0; +} + +static int socfpga_pm_enter(suspend_state_t state) +{ + switch (state) { + case PM_SUSPEND_STANDBY: + case PM_SUSPEND_MEM: + outer_disable(); + cpu_suspend(0, socfpga_pm_suspend); + outer_resume(); + break; + default: + return -EINVAL; + } + return 0; +} + +static const struct platform_suspend_ops socfpga_pm_ops = { + .valid = suspend_valid_only_mem, + .enter = socfpga_pm_enter, +}; + +static int __init socfpga_pm_init(void) +{ + int ret; + + ret = socfpga_setup_ocram_self_refresh(); + if (ret) + return ret; + + suspend_set_ops(&socfpga_pm_ops); + pr_info("SoCFPGA initialized for DDR self-refresh during suspend.\n"); + + return 0; +} +arch_initcall(socfpga_pm_init); diff --git a/arch/arm/mach-socfpga/self-refresh.S b/arch/arm/mach-socfpga/self-refresh.S new file mode 100644 index 0000000..f2d7f88 --- /dev/null +++ b/arch/arm/mach-socfpga/self-refresh.S @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2014-2015 Altera Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +#include +#include + +#define MAX_LOOP_COUNT 1000 + +/* Register offset */ +#define SDR_CTRLGRP_LOWPWREQ_ADDR 0x54 +#define SDR_CTRLGRP_LOWPWRACK_ADDR 0x58 + +/* Bitfield positions */ +#define SELFRSHREQ_POS 3 +#define SELFRSHREQ_MASK 0x8 + +#define SELFRFSHACK_POS 1 +#define SELFRFSHACK_MASK 0x2 + + /* + * This code assumes that when the bootloader configured + * the sdram controller for the DDR on the board it + * configured the following fields depending on the DDR + * vendor/configuration: + * + * sdr.ctrlcfg.lowpwreq.selfrfshmask + * sdr.ctrlcfg.lowpwrtiming.clkdisablecycles + * sdr.ctrlcfg.dramtiming4.selfrfshexit + */ + + .arch armv7-a + .text + .align 3 + + /* + * socfpga_sdram_self_refresh + * + * r0 : sdr_ctl_base_addr + * r1 : temp storage of return value + * r2 : temp storage of register values + * r3 : loop counter + * + * return value: lower 16 bits: loop count going into self refresh + * upper 16 bits: loop count exiting self refresh + */ +ENTRY(socfpga_sdram_self_refresh) + /* Enable dynamic clock gating in the Power Control Register. */ + mrc p15, 0, r2, c15, c0, 0 + orr r2, r2, #1 + mcr p15, 0, r2, c15, c0, 0 + + /* Enable self refresh: set sdr.ctrlgrp.lowpwreq.selfrshreq = 1 */ + ldr r2, [r0, #SDR_CTRLGRP_LOWPWREQ_ADDR] + orr r2, r2, #SELFRSHREQ_MASK + str r2, [r0, #SDR_CTRLGRP_LOWPWREQ_ADDR] + + /* Poll until sdr.ctrlgrp.lowpwrack.selfrfshack == 1 or hit max loops */ + mov r3, #0 +while_ack_0: + ldr r2, [r0, #SDR_CTRLGRP_LOWPWRACK_ADDR] + and r2, r2, #SELFRFSHACK_MASK + cmp r2, #SELFRFSHACK_MASK + beq ack_1 + + add r3, #1 + cmp r3, #MAX_LOOP_COUNT + bne while_ack_0 + +ack_1: + mov r1, r3 + + /* + * Execute an ISB instruction to ensure that all of the + * CP15 register changes have been committed. + */ + isb + + /* + * Execute a barrier instruction to ensure that all cache, + * TLB and branch predictor maintenance operations issued + * by any CPU in the cluster have completed. + */ + dsb + dmb + + wfi + + /* Disable self-refresh: set sdr.ctrlgrp.lowpwreq.selfrshreq = 0 */ + ldr r2, [r0, #SDR_CTRLGRP_LOWPWREQ_ADDR] + bic r2, r2, #SELFRSHREQ_MASK + str r2, [r0, #SDR_CTRLGRP_LOWPWREQ_ADDR] + + /* Poll until sdr.ctrlgrp.lowpwrack.selfrfshack == 0 or hit max loops */ + mov r3, #0 +while_ack_1: + ldr r2, [r0, #SDR_CTRLGRP_LOWPWRACK_ADDR] + and r2, r2, #SELFRFSHACK_MASK + cmp r2, #SELFRFSHACK_MASK + bne ack_0 + + add r3, #1 + cmp r3, #MAX_LOOP_COUNT + bne while_ack_1 + +ack_0: + /* + * Prepare return value: + * Shift loop count for exiting self refresh into upper 16 bits. + * Leave loop count for requesting self refresh in lower 16 bits. + */ + mov r3, r3, lsl #16 + add r1, r1, r3 + + /* Disable dynamic clock gating in the Power Control Register. */ + mrc p15, 0, r2, c15, c0, 0 + bic r2, r2, #1 + mcr p15, 0, r2, c15, c0, 0 + + mov r0, r1 @ return value + bx lr @ return + +ENDPROC(socfpga_sdram_self_refresh) +ENTRY(socfpga_sdram_self_refresh_sz) + .word . - socfpga_sdram_self_refresh diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c index a154920..19643a7 100644 --- a/arch/arm/mach-socfpga/socfpga.c +++ b/arch/arm/mach-socfpga/socfpga.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Altera Corporation + * Copyright (C) 2012-2015 Altera Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ void __iomem *sys_manager_base_addr; void __iomem *rst_manager_base_addr; +void __iomem *sdr_ctl_base_addr; unsigned long socfpga_cpu1start_addr; void __init socfpga_sysmgr_init(void) @@ -49,6 +50,9 @@ void __init socfpga_sysmgr_init(void) np = of_find_compatible_node(NULL, NULL, "altr,rst-mgr"); rst_manager_base_addr = of_iomap(np, 0); + + np = of_find_compatible_node(NULL, NULL, "altr,sdr-ctl"); + sdr_ctl_base_addr = of_iomap(np, 0); } static void __init socfpga_init_irq(void) diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index 3c4929f..e6490c7 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -388,6 +388,23 @@ static int altr_sdram_remove(struct platform_device *pdev) return 0; } +/* + * If you want to suspend, need to disable EDAC by removing it + * from the device tree or defconfig. + */ +#ifdef CONFIG_PM +static int altr_sdram_prepare(struct device *dev) +{ + pr_err("Suspend not allowed when EDAC is enabled.\n"); + + return -EPERM; +} + +static const struct dev_pm_ops altr_sdram_pm_ops = { + .prepare = altr_sdram_prepare, +}; +#endif + static const struct of_device_id altr_sdram_ctrl_of_match[] = { { .compatible = "altr,sdram-edac", }, {}, @@ -399,6 +416,9 @@ static struct platform_driver altr_sdram_edac_driver = { .remove = altr_sdram_remove, .driver = { .name = "altr_sdram_edac", +#ifdef CONFIG_PM + .pm = &altr_sdram_pm_ops, +#endif .of_match_table = altr_sdram_ctrl_of_match, }, };