Received: by 2002:a25:86ce:0:0:0:0:0 with SMTP id y14csp1484728ybm; Thu, 23 May 2019 01:41:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqymADWS3ywWN8tgFCirF5YnKT4mNIovgvEMaHfAZ2MDY7PQ6fb0LlAE4jQQbGfcevzBwbL6 X-Received: by 2002:a65:4283:: with SMTP id j3mr46976425pgp.88.1558600884040; Thu, 23 May 2019 01:41:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558600884; cv=none; d=google.com; s=arc-20160816; b=Jv9Hq9XmAqjHkW/VztdiZTcFGI6s+tSnwEJlIJISd1NFbU1x483dOd8R5GnfbAF/09 kFbcATLUKaS120ZObFuGUur4Jc70ph6o7XZqmI5qjjV1O0I3edMgi1mmF8NMXJpL9c/o +hmDdjtC4xrM7k7UQ3nF0ARHMxhAoMpjdg0LfgF9tzD67qTmY6bMjpA0rJ2bkW4Q3vIW VoO7whqgWUzkCDAh3FC08lhAcg1E96MYgUNHtcWe/WpmDWlDIjVpd9ZDZbkfIDJ6WLtZ TJEmjVOVXn5xi71uyjs7juIBcHf5JY1oaFfm+mr7F0M8+LrJPg6+3spzXEmlY/nAs/7s Kdvg== 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=IkYWeZ4tDG4CTAbPN5POqn8JSBG26w6X70unKoUvBPM=; b=QpBrPjnI1NOlfRe9TzDuI0JG/hCb6J9PjuKDMYHIzmZDosDooTo6EG/BtOwGo+beje 3qSeOHJyjOuxP2PHRG8DoK5i43ad8RCdCWBJjVuQh42eAflvveoQUMfynWXjNlkJpcOC tA7PxohkwlSTJenNuczaSLwc82E0ZnILA9JUM16LE4U0djSTN6B9aGB8ao2Ac7WSsWpQ tbNH2cm27zD+nyOp6vLIgxp5UZ5ZDY0M8DxNMWVXfBS0yCQRI4RudR/fhszfT6q+OnTj lsn3vLndzzmsuB6qYIIhavUhb4fkVqXeVHGqWyDUEVne1Aov+8Hs72xoKdfkCxsPkhAD bslw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=qHg2rjE3; 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 m19si28124579pgl.241.2019.05.23.01.41.05; Thu, 23 May 2019 01:41:24 -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=qHg2rjE3; 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 S1729797AbfEWIja (ORCPT + 99 others); Thu, 23 May 2019 04:39:30 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:8671 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726070AbfEWIja (ORCPT ); Thu, 23 May 2019 04:39:30 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 458jbg5PJgz9tybB; Thu, 23 May 2019 10:39:27 +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=qHg2rjE3; 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 OWyPUnGABWAd; Thu, 23 May 2019 10:39:27 +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 458jbg45Bxz9tyb8; Thu, 23 May 2019 10:39:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1558600767; bh=IkYWeZ4tDG4CTAbPN5POqn8JSBG26w6X70unKoUvBPM=; h=From:Subject:To:Cc:Date:From; b=qHg2rjE3OqyRKas86pc9/NGYDIII6/uVB0IAX3H9hHyYs9na347WtU7xnQmxxOrHI ATgiOEP0CmRJyc0GQhr0RTlSB6F3LJ8EQpqEubQW6WWat7ntmekc1NbfJ/+4mmPk4I DElM4EKV4T+9+2nW8XFF4YxEP/PAOS8nLw0ptvio= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 948398B851; Thu, 23 May 2019 10:39:28 +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 1AzVhv0qAqSB; Thu, 23 May 2019 10:39:28 +0200 (CEST) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 537F68B77D; Thu, 23 May 2019 10:39:28 +0200 (CEST) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 12F2168517; Thu, 23 May 2019 08:39:27 +0000 (UTC) Message-Id: <97664671a229a4240bfb22f69ec4743e837c2b83.1558600628.git.christophe.leroy@c-s.fr> From: Christophe Leroy Subject: [PATCH] powerpc/32: fix build failure on book3e with KVM To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 23 May 2019 08:39:27 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Build failure was introduced by the commit identified below, due to missed macro expension leading to wrong called function's name. arch/powerpc/kernel/head_fsl_booke.o: In function `SystemCall': arch/powerpc/kernel/head_fsl_booke.S:416: undefined reference to `kvmppc_handler_BOOKE_INTERRUPT_SYSCALL_SPRN_SRR1' Makefile:1052: recipe for target 'vmlinux' failed The called function should be kvmppc_handler_8_0x01B(). This patch fixes it. Reported-by: Paul Mackerras Fixes: 1a4b739bbb4f ("powerpc/32: implement fast entry for syscalls on BOOKE") Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_booke.h | 4 ++-- arch/powerpc/kernel/head_fsl_booke.S | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/head_booke.h b/arch/powerpc/kernel/head_booke.h index bfeb469e8106..dec0912a6508 100644 --- a/arch/powerpc/kernel/head_booke.h +++ b/arch/powerpc/kernel/head_booke.h @@ -83,7 +83,7 @@ END_BTB_FLUSH_SECTION SAVE_4GPRS(3, r11); \ SAVE_2GPRS(7, r11) -.macro SYSCALL_ENTRY trapno intno +.macro SYSCALL_ENTRY trapno intno srr1 mfspr r10, SPRN_SPRG_THREAD #ifdef CONFIG_KVM_BOOKE_HV BEGIN_FTR_SECTION @@ -94,7 +94,7 @@ BEGIN_FTR_SECTION mfspr r11, SPRN_SRR1 mtocrf 0x80, r11 /* check MSR[GS] without clobbering reg */ bf 3, 1975f - b kvmppc_handler_BOOKE_INTERRUPT_\intno\()_SPRN_SRR1 + b kvmppc_handler_\intno\()_\srr1 1975: mr r12, r13 lwz r13, THREAD_NORMSAVE(2)(r10) diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S index 6621f230cc37..2b39f42c3676 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S @@ -413,7 +413,7 @@ interrupt_base: /* System Call Interrupt */ START_EXCEPTION(SystemCall) - SYSCALL_ENTRY 0xc00 SYSCALL + SYSCALL_ENTRY 0xc00 BOOKE_INTERRUPT_SYSCALL SPRN_SRR1 /* Auxiliary Processor Unavailable Interrupt */ EXCEPTION(0x2900, AP_UNAVAIL, AuxillaryProcessorUnavailable, \ -- 2.13.3