| Message ID | 1437250134-307-17-git-send-email-scottwood@freescale.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Scott Wood |
| Headers | show
Return-Path: <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 38455140781 for <patchwork-incoming@ozlabs.org>; Sun, 19 Jul 2015 06:29:33 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 1E57D1A0DF0 for <patchwork-incoming@ozlabs.org>; Sun, 19 Jul 2015 06:29:33 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0130.outbound.protection.outlook.com [157.56.110.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id C48671A0F08 for <linuxppc-dev@lists.ozlabs.org>; Sun, 19 Jul 2015 06:09:40 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=none (message not signed) header.d=none; Received: from snotra.am.freescale.net (192.88.168.49) by CY1PR03MB1486.namprd03.prod.outlook.com (10.163.17.16) with Microsoft SMTP Server (TLS) id 15.1.213.14; Sat, 18 Jul 2015 20:09:34 +0000 From: Scott Wood <scottwood@freescale.com> To: <linuxppc-dev@lists.ozlabs.org> Subject: [RFC PATCH 16/17] powerpc/book3e-64/kexec: Set "r4 = 0" when entering spinloop Date: Sat, 18 Jul 2015 15:08:53 -0500 Message-ID: <1437250134-307-17-git-send-email-scottwood@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437250134-307-1-git-send-email-scottwood@freescale.com> References: <1437250134-307-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BY2PR21CA0002.namprd21.prod.outlook.com (25.162.74.140) To CY1PR03MB1486.namprd03.prod.outlook.com (25.163.17.16) X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 2:Z50ewd3/jqbpBYUA9M0GF0NxiDwO+9icX6C4KfnnqqJCZGzfPxnJBOxv8jE1pV48; 3:tVJuTjb5sHt1GqQQ5Dsv684YpdqBRC7Kqj3VONrrd5oCjiyVk2msYh8oiHaV8WDNL69/AQHCAUpAvHQTyxS8Ikeinet6zMl49Lihjp3bPKHT7v0PpykQzO/o45VTERV7SjKFxGElyBp8p2M7IgbWIA==; 25:lrlTaiIR+BxFpcHg8x2obLgqCsBwrcnqW77v7VHOEo0c45c5NKdlgkNiUgfV64EgepcO76R++t3pUA2uziEhmKl8sXRbVK+zQHBVG1WSsAqAqGBLq5ubg9MG3eecK+83m4cTOmhNrCMoLHszEXm9iU0WjWBmarDjlXXjmmqbjf7jkPrle0JiHho7D/3bujLH/7P4B68mUstEpoXRXCUu48I6h/yY03sbN3oWlUAZpCxIq4eFs9/8oq7YHANO+xf7ApQ/vm5r67rXHanaA2gFzA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1486; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 20:NfhTaEMBxj6vCO6ORX3aUmEQFRIRfowrHpOyC9d39ZAzZz4KS23F40mcsIiLKZMufoY+s52SwvC+SYM8DluiLMnOG67B1az1mL6XHfmAfTXUHTFz4f130EVcs408z7NIfojYymDXdDIuYgph7ufybSCaZEBSQv3rgDv5I2dxGE29b1c+HRJPIFTXyVmn83fldKwUAxY0mlrKzWEKmlwx1/fH/xN5xZzRmJi+vAjhIsIBMb34zVKl7o3bRLgVlDtnzjy3lLtCBoS6VhLgWNvbV3xfsD6xTG5fcYQdN2NAB9g3TVANxu9WQQs2MqhMXD1ynQOHQucFjSJNOqtrx4Fuk71nJnxL3lsUpQ6HF7BWDwrsO0owJdfSGyegmFLODNpf/CPWbs/wsZFutwJYtdqnKBYwN9M5iVEMDk176/xlZ4yaKXlh9Ta9gnBEyzPgl/rs+RSm6TCWJYJdx9CJAkwN0qTHbWJxddsmU2ioB+ogy9Apx7T1U5Ge6MIHGgXTeVpK; 4:QyExINXrQ28z0TiXAHLIpPqtPypJECGabxM3Awrd2TnRdUhFosD7N4kKIEb3RexOQCfvJLYJDRBKAl8pvOv8JpCXI6SVDjeBnv0zsPOaLXjZklmNMKWhdeyoGc66PJ4FR5wBkGKNK9cv0i1EONRHfVAHmBel7PO6ge7j43EDhxVpG0DMMB+lSdcdBbK9WbofdbzrZR9Jc/CoWXUFG/Agup5PDLclFNjUpSYHnEiQHmduKjjvvO5l6SnJU2r5/GW16Hi92p9b4zEeRH7KUPTdCdD8IP03Wn3MAoR/kcsRDwI= CY1PR03MB1486: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: <CY1PR03MB1486EABF386336958B462AA3B5870@CY1PR03MB1486.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:CY1PR03MB1486; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB1486; X-Forefront-PRVS: 0641678E68 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(19580395003)(50466002)(19580405001)(229853001)(36756003)(46102003)(2351001)(42186005)(40100003)(87976001)(122386002)(33646002)(86362001)(62966003)(5001960100002)(5001920100001)(92566002)(2950100001)(110136002)(77096005)(107886002)(48376002)(77156002)(50986999)(76176999)(66066001)(47776003)(50226001)(5003940100001)(189998001)(217873001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR03MB1486; H:snotra.am.freescale.net; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 23:90pbed0v3HmymyTUg6IJXBGuJ3AmAx5/tL7qDhYFUFe6/o/6GO/51ONEASos1HFfMfEkR46kXSmpgAyUsM8MW3UhoQ+aM/e8rYSwbXWBD+zziChOrW3+gHbOrxWHxcOwRN3X4T0cnBR+h4YrENYBCOyYJN8r/1YDFgDRYZAVmcqFi5CdUz/ozkX2K1O8/vkIH9gzzVIz4gthDjessOBas2h0mMHLoWUtXSPpdzy7IgkKQWvWmCpNGuBXInWkwzu2PXOJa1siVDhPgSzMgRAZBsJ1Bd+32Cdic04SLaa/OwuiTP0owLuqWvuDts8adQcr3S1dUx8VR4Cn04WCt2iHxHOmubBZNqCHcz06Xmv/OXqQmMs6J25fE19Fhzsg2P8EYwD3jPx1UjbOcEXvAQrdrgfGK6L8cKSEdGVbWZD0OcFv7FexfKW4QyRF74LmMf+YdFZGZNlPfcvp9p8qTHTCbRUuvvTQvHeEEA9aIkESXNkKIi511SWxIRYD47EOUyX/OBQ9tLrys/eRSFmznFS4Ruk410cK7R+Yla6L4mmPt++dr71+x1jvGs5F05x2pPjcil60bcZEtek9mQh88MF7pUOas26CTAPvn9AJjjD0UlIsyrn/RMF85p9UGW6QiHu5KGy5Ayinhw6zSbPxV3gXQz46u4DIS2RH5TD9QgdWZ6SkF0M5Q3Lr59/YcYMisDgipl+LlLorSY0vZOhOODAPYmdDTxH4QmjQoi99YkAVJMl1QrtF1/aFgBL3bT/8bgqSC4D3AAhTITN+erv7KUEa4kL67nRyl5xuZiJ/P+f5qPSF9JBizsrfDz/oRlAO9uqlnCsXQdohCJ9n7eJSGCXXZ5smdg8NfLpEu4qIPTOSMGu+yATO9wWLhDYAXp6Wd2MqcnqPVLELvnflYE8wvP0iL6bB7YANuVMWE7pyTbJW4UM= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB1486; 5:qB3sm/YLPBMQk5A0fYG3dwZ8wsZBRTm5Q00l4h+De6Nr+7A4N/AWBwmOJhlkiQkUM7Si1KYQATMyw2lz/RVm5r4XI7/WKWcKla/wDi9KfijDrY4VFTA2rCin7LEzirOCqy1wny+rIRPYYytYiPWW0Q==; 24:fJk7k+ZZAPYDiHuzd+O8fTM6G7E+9XHnJvontbJCdww1rUpQTltLT1Q1rBYGbx8rzjnfG62U2OP1mXrSU4jEIMNSbUBQrvQzcorea6YXEa4=; 20:SQVm4z8+g2qNqawtYlB8xJ+hUWXspfeWcT0dmpicMeIFkvapAw58iHhpHyVUYbejUWthjIbVLOKie5KJbzbHkw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2015 20:09:34.2662 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1486 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org> List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>, <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe> List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev/> List-Post: <mailto:linuxppc-dev@lists.ozlabs.org> List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help> List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>, <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe> Cc: Scott Wood <scottwood@freescale.com>, Tiejun Chen <tiejun.chen@intel.com>, kexec@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org> |
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S index c5915f0..fb955d9 100644 --- a/arch/powerpc/kernel/misc_64.S +++ b/arch/powerpc/kernel/misc_64.S @@ -476,6 +476,10 @@ _GLOBAL(kexec_wait) #ifdef CONFIG_KEXEC /* use no memory without kexec */ lwz r4,0(r5) cmpwi 0,r4,0 +#ifdef CONFIG_PPC_BOOK3E + /* Don't create TLB entry in book3e_secondary_core_init */ + li r4,0 +#endif bnea 0x60 #endif b 99b
book3e_secondary_core_init will only create a TLB entry if r4 = 0, so do so. Signed-off-by: Scott Wood <scottwood@freescale.com> --- arch/powerpc/kernel/misc_64.S | 4 ++++ 1 file changed, 4 insertions(+)