From patchwork Tue Mar 23 01:02:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1456944 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=aqI9464Z; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F4CvR0bfTz9sCD for ; Tue, 23 Mar 2021 12:09:39 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4F4CvQ6Xrbz3br1 for ; Tue, 23 Mar 2021 12:09:38 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=aqI9464Z; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org 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=aqI9464Z; 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 4F4Cn04Ntdz3bcl for ; Tue, 23 Mar 2021 12:04:04 +1100 (AEDT) Received: by mail-pj1-x102c.google.com with SMTP id q6-20020a17090a4306b02900c42a012202so9382433pjg.5 for ; Mon, 22 Mar 2021 18:04:04 -0700 (PDT) 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=nXjI3MKqqUglifKQA8zc/gRtp5duBK6cOq58P6laAog=; b=aqI9464Zme0kXr32WJLOb/zEoPdK0nhlxWwYPwq5vecB6gvYmg5kC60lOU+QlwKh/y lIkT5staUjWjq7tRyw79OJhblZpJ8CX8AhIniFpQJhaP6XY6IGWMFR0IRPbUZM/inNqS tnw+GJ2WUdMgzTH4Jj0yoOZtNdWhIrqwBISSfUmIl+9fYRG23x0e+qi+WviphHSEA5ww KRNWUKQSJ8LqZ3v0XnKpZw1YELs4z3latiu9U+nLhhJGbm8g3PCVMmRUMGZfz4I/ZTUG N4cvHn7EWxhdqr0cUiYiwL2ntagfevV+4bParERp/QRVsjU47ipIijhKnhA1pEMR1uoQ 7OKw== 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=nXjI3MKqqUglifKQA8zc/gRtp5duBK6cOq58P6laAog=; b=qmtIF7KTJzg1VNiBC8F6EbevGee327Zfy2fee1uxupgWJtnMMNKRDifHwvRUte7Xat u5Xr5TXA4PL9GZ2inMDWNTVRk3g8MoRM0r1etgHrQwxBMVjSFMw8tLnlB4QtiKbqCZDO qB1IzjGdQ9y4UGTBqX9TsZGhljEdKnhBsXhkQea+8E7AHPY91UvwAs4pj6bcnvK7sYUD e5/BpxbR7Lewd5ajsYX5g6R44YYsJdzB1tYCFhPEcLaEkiBy7JFSGR9Cnu7YcPWF3wJN VSWf04Sc6syUEUekD4ZgwNGIU5Zc/Mhegv4QPWqWtcpJV1Ago+sPAfE4lkSKPQE8xe8v Qadw== X-Gm-Message-State: AOAM533ADqx3j0hWttL3hOEOHqtGZLujwIU3rtdClLAKmKfN8zEt/+jX aizitOsYDeoZusP5piFt/4o= X-Google-Smtp-Source: ABdhPJwb0n15uBxD82UyhDnIaLCRikVNz8wtZ22PFAMXF6fmq/QflfbK2LQWKBTeWtEK0bSh3SDALg== X-Received: by 2002:a17:90a:1642:: with SMTP id x2mr1879263pje.88.1616461441940; Mon, 22 Mar 2021 18:04:01 -0700 (PDT) Received: from bobo.ibm.com ([58.84.78.96]) by smtp.gmail.com with ESMTPSA id e7sm14491894pfc.88.2021.03.22.18.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 18:04:01 -0700 (PDT) From: Nicholas Piggin To: kvm-ppc@vger.kernel.org Subject: [PATCH v4 14/46] KVM: PPC: Book3S 64: add hcall interrupt handler Date: Tue, 23 Mar 2021 11:02:33 +1000 Message-Id: <20210323010305.1045293-15-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210323010305.1045293-1-npiggin@gmail.com> References: <20210323010305.1045293-1-npiggin@gmail.com> MIME-Version: 1.0 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: Fabiano Rosas , linuxppc-dev@lists.ozlabs.org, Nicholas Piggin , Daniel Axtens Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add a separate hcall entry point. This can be used to deal with the different calling convention. Reviewed-by: Daniel Axtens Reviewed-by: Fabiano Rosas Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/exceptions-64s.S | 6 +++--- arch/powerpc/kvm/book3s_64_entry.S | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 16fbfde960e7..98bf73df0f57 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1989,16 +1989,16 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR) ori r12,r12,0xc00 #ifdef CONFIG_RELOCATABLE /* - * Requires __LOAD_FAR_HANDLER beause kvmppc_interrupt lives + * Requires __LOAD_FAR_HANDLER beause kvmppc_hcall 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 a5412e24cc05..8cf5e24a81eb 100644 --- a/arch/powerpc/kvm/book3s_64_entry.S +++ b/arch/powerpc/kvm/book3s_64_entry.S @@ -8,9 +8,13 @@ #include /* - * This is branched to from interrupt handlers in exception-64s.S which set + * These are branched to from interrupt handlers in exception-64s.S which set * IKVM_REAL or IKVM_VIRT, if HSTATE_IN_GUEST was found to be non-zero. */ +.global kvmppc_hcall +.balign IFETCH_ALIGN_BYTES +kvmppc_hcall: + .global kvmppc_interrupt .balign IFETCH_ALIGN_BYTES kvmppc_interrupt: