Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp7015570ybi; Thu, 13 Jun 2019 08:11:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqwpYQ+/xUQlWA7EpiceZKfe6KfwHk9ukO2VoFvVhSgnwvoBmQ+cwG3xgfko9lME4iVDpGZn X-Received: by 2002:a65:5a42:: with SMTP id z2mr31866619pgs.421.1560438677331; Thu, 13 Jun 2019 08:11:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560438677; cv=none; d=google.com; s=arc-20160816; b=ec3Jz+AJuS0IsD+PmH3cQrzCQLjiOb8T/Ur475DSsWE3W0Xu6AayHRx2Z6lZrvWjDi 8Ijp3ilVuNesBOV2584Yb4uuNdMopINBoWgJo/o+9sduwCeQH4eHYUML5VWET13pZUHD XRhtYkafFywFbOpwRLQjpLbcKGe2Bj9w+cBzqzQMHO1PIkQdNC+RsfhVNgqnC1J0xpEq lXanVtrlvzcqrbpnCbgB4KFCk09XSRS81iyDkO74YGPcbaAW6QS5qbpXUfgmLtLB+QAr dc1jR4WLLwKbzjMtzZITYvoXFFDwJ5or5MHlLqKDhM3dECV4vqvcqyVlBIIVSrmlM77z jAEQ== 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:message-id :dkim-signature; bh=u+wmpa7FkR8lFNxaOvzsfaQBff2eaQMcSvF8WxVITQ4=; b=doIh1GNuWMA2/YYbqf/H0HUvbzUoukhbTDHQvwhNiQOl/VfUG4chCHGgY9N1axYJ2r blpn4j8qE5voE5PaF4qEUnrz4QIpJXL05c75DtHFj8huUyWrlsYjRYWugGcgmT6ktvtx dlmWWO4XuX/esjJezGrswAnKLv0hKRpwbYvcUOVWHwkraBLu8MAWBEiaLzO4SxqzYrN2 JyE8XrrollUuBGG5r8hp1qOodcDke9TdYQyIqsV6wW9WKtQRWbPhwxusr8Ay8yi0JfAa 8KNEXj2bRZf8LDhL4Oma3sctRIHYKAPSK0TWh6aYU+pbJ+EHke+9Myg8OUT9qOc8MPWN jRXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=pK6vNxO0; 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 l24si42607pgm.248.2019.06.13.08.11.01; Thu, 13 Jun 2019 08:11:17 -0700 (PDT) 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; dkim=pass header.i=@c-s.fr header.s=mail header.b=pK6vNxO0; 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 S1733305AbfFMPKf (ORCPT + 99 others); Thu, 13 Jun 2019 11:10:35 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:47821 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732312AbfFMNwd (ORCPT ); Thu, 13 Jun 2019 09:52:33 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 45PlY94W79z9tyf4; Thu, 13 Jun 2019 15:52:29 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=pK6vNxO0; dkim-adsp=pass; dkim-atps=neutral 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 J-VKxj5mP6NZ; Thu, 13 Jun 2019 15:52:29 +0200 (CEST) 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 45PlY9300Yz9tydq; Thu, 13 Jun 2019 15:52:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1560433949; bh=u+wmpa7FkR8lFNxaOvzsfaQBff2eaQMcSvF8WxVITQ4=; h=From:Subject:To:Cc:Date:From; b=pK6vNxO0jjGBEl047wa0XrcU9BSCZvDqEf2bgBhSZcxdg5nxXLopOw6tG9V0lEk7l ps7nr/xu/ytQCcaXwXnvrD1UyXE78QgaDTbabboXnoAZbtAcKm7v8Bu1rgVigBIzrw iw63+toBCJl+gV1V5sKtpd2W2fD633m0SK9wcs8Q= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id D74078B8E9; Thu, 13 Jun 2019 15:52:30 +0200 (CEST) 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 X5YrSOYZs0HE; Thu, 13 Jun 2019 15:52:30 +0200 (CEST) Received: from po16838vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id B34448B8B9; Thu, 13 Jun 2019 15:52:30 +0200 (CEST) Received: by po16838vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 86E5768D76; Thu, 13 Jun 2019 13:52:30 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/booke: fix fast syscall entry on SMP To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 13 Jun 2019 13:52:30 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use r10 instead of r9 to calculate CPU offset as r9 contains the value from SRR1 which is used later. Fixes: 1a4b739bbb4f ("powerpc/32: implement fast entry for syscalls on BOOKE") Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_booke.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/head_booke.h b/arch/powerpc/kernel/head_booke.h index dec0912a6508..2ae635df9026 100644 --- a/arch/powerpc/kernel/head_booke.h +++ b/arch/powerpc/kernel/head_booke.h @@ -145,9 +145,9 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV) tophys(r11,r11) addi r11,r11,global_dbcr0@l #ifdef CONFIG_SMP - lwz r9,TASK_CPU(r2) - slwi r9,r9,3 - add r11,r11,r9 + lwz r10, TASK_CPU(r2) + slwi r10, r10, 3 + add r11, r11, r10 #endif lwz r12,0(r11) mtspr SPRN_DBCR0,r12 -- 2.13.3