Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1016313imu; Fri, 9 Nov 2018 09:34:45 -0800 (PST) X-Google-Smtp-Source: AJdET5eGVW5f7r13OHphtWKwjXsUQLacIaKqGddvPvBLkzCMQpoSk9m1KHO7vdXbby6akA0ddLzO X-Received: by 2002:a63:8c4:: with SMTP id 187-v6mr8257279pgi.396.1541784884922; Fri, 09 Nov 2018 09:34:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541784884; cv=none; d=google.com; s=arc-20160816; b=Zdx5PClwg5Gvx/FlmGJRkMLSNhn20K4MlnfQa8ePlX4l8TnbRlGdoE6JV0i/YBZEXt +yqI+PemKXI2geEPWP3dwflf2mxLcRMlzjp+US/LRPuIQjjg7C57OuWA+2jXrVaWg4ta cSVuLnwHTUI1glaJWRv2wdLgmq/yNGH9tkFW5avk6TdVlc57H/YiHn9R69/0SdQek5Qe tjg7ZW6pmR9rxXKpDWe1vaGV4IFZzi2HUhqoRSWn9BZripZssy4kDUobOfNmOkAtFQ4f W2XepNSlvyRESStRu41F6Ypb2CLkFVZIfQNYr0s3iq1iAPDSHUvg8/SxFwbrcHI/z8e+ OsUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id; bh=QMHKxITau9weB/8XaW5j/lZ6ygmvhNBUo6eZu6uyfsM=; b=Ba7F9/xPt7oge9S1g1plRrTsptUVM1oZXyi6cSnQeuVg3XBofPOn6mzIoZHABAEkuo hjVG1vOh4rm70Noe7kK54ev3YWpy4WWvVtzI1QRb6MQQ3LT/3OznSSjLaMiQvPBjk7iJ Cs2XZmSE2D6VyN0JRpwLltT1byjLxPcz9G34wFpMHesRxzRXY2Q5vqz6xqpc9N2WpT7n lPFRLdam+FIgKasyhSIamGR5Nx9ov68tcub5mjtYZzbT+EMAZdHBNOHSICO57frc7DZu DQdGD/3bgsvHSv2YxMiuclu775Wo6xAoRzmMOL4UTnXuTfEzK4qE5NJYdrIT9GhBYIRw WExA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m22-v6si7253595pgb.103.2018.11.09.09.34.19; Fri, 09 Nov 2018 09:34:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728876AbeKJDPJ (ORCPT + 99 others); Fri, 9 Nov 2018 22:15:09 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:38789 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727995AbeKJDPH (ORCPT ); Fri, 9 Nov 2018 22:15:07 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 42s6gp6y7Vz9v0XP; Fri, 9 Nov 2018 18:33:26 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id x0R32gMzQ9Yt; Fri, 9 Nov 2018 18:33:26 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 42s6gp6SxVz9v0XL; Fri, 9 Nov 2018 18:33:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 7DD528B89A; Fri, 9 Nov 2018 18:33:32 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 4PI4i_6WGSS6; Fri, 9 Nov 2018 18:33:32 +0100 (CET) Received: from po14163vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.2]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 52BF38B899; Fri, 9 Nov 2018 18:33:32 +0100 (CET) Received: by po14163vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 334B269A2A; Fri, 9 Nov 2018 17:33:32 +0000 (UTC) Message-Id: <0ed66fd61da6c8488366a3226dd4fd1cc8eb8729.1541784640.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH 9/9] powerpc/smp: Use code patching to restore reset vector To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 9 Nov 2018 17:33:32 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of hardcoding reset vector restore, use patch_instruction() Signed-off-by: Christophe Leroy --- arch/powerpc/platforms/86xx/mpc86xx_smp.c | 3 +-- arch/powerpc/platforms/powermac/smp.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/86xx/mpc86xx_smp.c b/arch/powerpc/platforms/86xx/mpc86xx_smp.c index 020e84a47a32..9f2c1ecc85c3 100644 --- a/arch/powerpc/platforms/86xx/mpc86xx_smp.c +++ b/arch/powerpc/platforms/86xx/mpc86xx_smp.c @@ -86,8 +86,7 @@ smp_86xx_kick_cpu(int nr) mdelay(1); /* Restore the exception vector */ - *vector = save_vector; - flush_icache_range((unsigned long) vector, (unsigned long) vector + 4); + patch_instruction(vector, save_vector); local_irq_restore(flags); diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c index 447da6db450a..35be6e0b886d 100644 --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c @@ -832,8 +832,7 @@ static int smp_core99_kick_cpu(int nr) mdelay(1); /* Restore our exception vector */ - *vector = save_vector; - flush_icache_range((unsigned long) vector, (unsigned long) vector + 4); + patch_instruction(vector, save_vector); local_irq_restore(flags); if (ppc_md.progress) ppc_md.progress("smp_core99_kick_cpu done", 0x347); -- 2.13.3