From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B040C433E0 for ; Tue, 2 Feb 2021 03:10:19 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C12EC64E91 for ; Tue, 2 Feb 2021 03:10:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C12EC64E91 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4DV8vD5kb4zDr3h for ; Tue, 2 Feb 2021 14:10:16 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::102c; helo=mail-pj1-x102c.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=h9xEao17; dkim-atps=neutral Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4DV8lW3ZSFzDqKv for ; Tue, 2 Feb 2021 14:03:35 +1100 (AEDT) Received: by mail-pj1-x102c.google.com with SMTP id gx20so1454511pjb.1 for ; Mon, 01 Feb 2021 19:03:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8TVajqYLB/Li99OMhp5OhsGulAlbbfY7jMeRUpSx/E0=; b=h9xEao17YffqKMp8ERSFryBsfTuUiNZevfY4JojDOcdLcImSBkv+Mab6d88h0tm81W 0XoenOSTtknkSvhF1fzoObhMjCzR1sM0UevcLIBxw+rZ1y24VIHVY0/cLVF0TkkZZ7S1 eDZfAI9Q2tuNIaY3x4SjaM1PqVYu3KmmK01DSPceHthOUG4vYpfiqbK+eclJ719Yo7Pj RcGZKqhgh2bQPTuG2hgHtnA+Fm0yEgqGCOcfX/TjjtF1iqbePh/Y/B0HUnDIH6VlIt7B aHUyIKe1to+Vyy1u48yfHRMcq/xD+FDAejzUXz8jBgeIULrRD2YAq1fWii9wNClESHiQ 8Yvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8TVajqYLB/Li99OMhp5OhsGulAlbbfY7jMeRUpSx/E0=; b=LIsUncaRpAzkdyUMHWHEKtyIt/e/Ja1b8kBjITa+jaLy3RVaPNfdOtFvzbN9bbch93 tzxwTqdse13qC/oY4N6nLtG1duJMJjUTivAy5S74afm8bHfJXpfZq/xeUnfxNXWP7qI5 5N5N8ZMq4qFpA3vnnm78RleLSSQuhTUR0THPNKWy+I/hwkm1aC6G4ML701gLLqsfNfgg +RWscSZt9/mdnOzWE4wBVOflKZTrLrEJOS7Bgw9gNG0YT6UTg3v6aZ3iAz5ysb2j4HSw Eqn3ef7Bq+lWnjCBshnUBMdojtNMzjj6P4zwa7igPHKgsV7c5YSWQYXu47PzmKnq7Am/ yOQQ== X-Gm-Message-State: AOAM5327FesZWtBvfx6pkAIodEXtaQv+mwldZNnXyraMNH5x3SxIVLvr cOuWzCW+13nKAqbnWb2W6tY= X-Google-Smtp-Source: ABdhPJw5P8lmgnELllwG3rGxVL6XBuUcG+jjRNUoRltcg0DyXouWXyjpwnYfWCujFFYNtuns1sBTRQ== X-Received: by 2002:a17:902:c410:b029:dd:7d4a:e50 with SMTP id k16-20020a170902c410b02900dd7d4a0e50mr20523765plk.36.1612235012822; Mon, 01 Feb 2021 19:03:32 -0800 (PST) Received: from bobo.ozlabs.ibm.com (192.156.221.203.dial.dynamic.acc50-nort-cbr.comindico.com.au. [203.221.156.192]) by smtp.gmail.com with ESMTPSA id a24sm20877337pff.18.2021.02.01.19.03.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 19:03:32 -0800 (PST) From: Nicholas Piggin To: kvm-ppc@vger.kernel.org Subject: [RFC PATCH 3/9] KVM: PPC: Book3S 64: add hcall interrupt handler Date: Tue, 2 Feb 2021 13:03:07 +1000 Message-Id: <20210202030313.3509446-4-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210202030313.3509446-1-npiggin@gmail.com> References: <20210202030313.3509446-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, Nicholas Piggin Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add a separate hcall entry point. This can be used to deal with the different calling convention. Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/exceptions-64s.S | 4 ++-- arch/powerpc/kvm/book3s_64_entry.S | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index e6f7fc7c61a1..c25395b5921a 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -2028,13 +2028,13 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR) * Requires __LOAD_FAR_HANDLER beause kvmppc_interrupt lives * outside the head section. */ - __LOAD_FAR_HANDLER(r10, kvmppc_interrupt) + __LOAD_FAR_HANDLER(r10, kvmppc_hcall) mtctr r10 ld r10,PACA_EXGEN+EX_R10(r13) bctr #else ld r10,PACA_EXGEN+EX_R10(r13) - b kvmppc_interrupt + b kvmppc_hcall #endif #endif diff --git a/arch/powerpc/kvm/book3s_64_entry.S b/arch/powerpc/kvm/book3s_64_entry.S index 8e7216f3c3ee..3b894b90862f 100644 --- a/arch/powerpc/kvm/book3s_64_entry.S +++ b/arch/powerpc/kvm/book3s_64_entry.S @@ -9,6 +9,10 @@ /* * We come here from the first-level interrupt handlers. */ +.global kvmppc_hcall +.balign IFETCH_ALIGN_BYTES +kvmppc_hcall: + .global kvmppc_interrupt .balign IFETCH_ALIGN_BYTES kvmppc_interrupt: -- 2.23.0