From: Elliot Berman <quic_eberman@quicinc.com>
To: Bjorn Andersson <quic_bjorande@quicinc.com>,
Mark Rutland <mark.rutland@arm.com>,
Lorenzo Pieralisi <lpieralisi@kernel.org>,
"Sudeep Holla" <sudeep.holla@arm.com>
Cc: Elliot Berman <quic_eberman@quicinc.com>,
Murali Nalajala <quic_mnalajal@quicinc.com>,
Trilok Soni <quic_tsoni@quicinc.com>,
"Srivatsa Vaddagiri" <quic_svaddagi@quicinc.com>,
Carl van Schaik <quic_cvanscha@quicinc.com>,
Prakruthi Deepak Heragu <quic_pheragu@quicinc.com>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rob Herring <robh+dt@kernel.org>,
"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
Jonathan Corbet <corbet@lwn.net>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Jassi Brar <jassisinghbrar@gmail.com>,
<linux-arm-msm@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-doc@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-acpi@vger.kernel.org>
Subject: [PATCH v7 04/20] arm64: smccc: Include alternative-macros.h
Date: Mon, 21 Nov 2022 05:59:53 -0800 [thread overview]
Message-ID: <20221121140009.2353512-5-quic_eberman@quicinc.com> (raw)
In-Reply-To: <20221121140009.2353512-1-quic_eberman@quicinc.com>
Fix build error when CONFIG_ARM64_SVE is selected and
asm/alternative-macros.h wasn't implicitly included by another header.
In file included from arch/arm64/gunyah/gunyah_hypercall.c:6:
arch/arm64/gunyah/gunyah_hypercall.c: In function `gh_hypercall_msgq_send':
./include/linux/arm-smccc.h:387:25: error: expected string literal before `ALTERNATIVE'
387 | #define SMCCC_SVE_CHECK ALTERNATIVE("nop \n", "bl __arm_smccc_sve_check \n", \
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
---
include/linux/arm-smccc.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index 220c8c60e021..6a627cdbbdec 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -383,6 +383,7 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
/* nVHE hypervisor doesn't have a current thread so needs separate checks */
#if defined(CONFIG_ARM64_SVE) && !defined(__KVM_NVHE_HYPERVISOR__)
+#include <asm/alternative-macros.h>
#define SMCCC_SVE_CHECK ALTERNATIVE("nop \n", "bl __arm_smccc_sve_check \n", \
ARM64_SVE)
--
2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Elliot Berman <quic_eberman@quicinc.com>
To: Bjorn Andersson <quic_bjorande@quicinc.com>,
Mark Rutland <mark.rutland@arm.com>,
Lorenzo Pieralisi <lpieralisi@kernel.org>,
"Sudeep Holla" <sudeep.holla@arm.com>
Cc: Elliot Berman <quic_eberman@quicinc.com>,
Murali Nalajala <quic_mnalajal@quicinc.com>,
Trilok Soni <quic_tsoni@quicinc.com>,
"Srivatsa Vaddagiri" <quic_svaddagi@quicinc.com>,
Carl van Schaik <quic_cvanscha@quicinc.com>,
Prakruthi Deepak Heragu <quic_pheragu@quicinc.com>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rob Herring <robh+dt@kernel.org>,
"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
Jonathan Corbet <corbet@lwn.net>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Jassi Brar <jassisinghbrar@gmail.com>,
<linux-arm-msm@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-doc@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-acpi@vger.kernel.org>
Subject: [PATCH v7 04/20] arm64: smccc: Include alternative-macros.h
Date: Mon, 21 Nov 2022 05:59:53 -0800 [thread overview]
Message-ID: <20221121140009.2353512-5-quic_eberman@quicinc.com> (raw)
In-Reply-To: <20221121140009.2353512-1-quic_eberman@quicinc.com>
Fix build error when CONFIG_ARM64_SVE is selected and
asm/alternative-macros.h wasn't implicitly included by another header.
In file included from arch/arm64/gunyah/gunyah_hypercall.c:6:
arch/arm64/gunyah/gunyah_hypercall.c: In function `gh_hypercall_msgq_send':
./include/linux/arm-smccc.h:387:25: error: expected string literal before `ALTERNATIVE'
387 | #define SMCCC_SVE_CHECK ALTERNATIVE("nop \n", "bl __arm_smccc_sve_check \n", \
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
---
include/linux/arm-smccc.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index 220c8c60e021..6a627cdbbdec 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -383,6 +383,7 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
/* nVHE hypervisor doesn't have a current thread so needs separate checks */
#if defined(CONFIG_ARM64_SVE) && !defined(__KVM_NVHE_HYPERVISOR__)
+#include <asm/alternative-macros.h>
#define SMCCC_SVE_CHECK ALTERNATIVE("nop \n", "bl __arm_smccc_sve_check \n", \
ARM64_SVE)
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-11-21 14:02 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-21 13:59 [PATCH v7 00/20] Drivers for gunyah hypervisor Elliot Berman
2022-11-21 13:59 ` Elliot Berman
2022-11-21 13:59 ` [PATCH v7 01/20] docs: gunyah: Introduce Gunyah Hypervisor Elliot Berman
2022-11-21 13:59 ` Elliot Berman
2022-11-21 13:59 ` [PATCH v7 02/20] dt-bindings: Add binding for gunyah hypervisor Elliot Berman
2022-11-21 13:59 ` Elliot Berman
2022-12-05 19:42 ` Rob Herring
2022-12-05 19:42 ` Rob Herring
2022-11-21 13:59 ` [PATCH v7 03/20] gunyah: Common types and error codes for Gunyah hypercalls Elliot Berman
2022-11-21 13:59 ` Elliot Berman
2022-11-21 13:59 ` Elliot Berman [this message]
2022-11-21 13:59 ` [PATCH v7 04/20] arm64: smccc: Include alternative-macros.h Elliot Berman
2022-11-21 13:59 ` [PATCH v7 05/20] virt: gunyah: Add hypercalls to identify Gunyah Elliot Berman
2022-11-21 13:59 ` Elliot Berman
2022-11-21 13:59 ` [PATCH v7 06/20] virt: gunyah: Identify hypervisor version Elliot Berman
2022-11-21 13:59 ` Elliot Berman
2022-11-21 13:59 ` [PATCH v7 07/20] mailbox: Allow direct registration to a channel Elliot Berman
2022-11-21 13:59 ` Elliot Berman
2022-11-22 4:34 ` kernel test robot
2022-11-21 13:59 ` [PATCH v7 08/20] virt: gunyah: msgq: Add hypercalls to send and receive messages Elliot Berman
2022-11-21 13:59 ` Elliot Berman
2022-11-21 13:59 ` [PATCH v7 09/20] mailbox: Add Gunyah message queue mailbox Elliot Berman
2022-11-21 13:59 ` Elliot Berman
2022-11-21 13:59 ` [PATCH v7 10/20] gunyah: rsc_mgr: Add resource manager RPC core Elliot Berman
2022-11-21 13:59 ` Elliot Berman
2022-11-21 15:23 ` Greg Kroah-Hartman
2022-11-21 15:23 ` Greg Kroah-Hartman
2022-12-12 23:46 ` Elliot Berman
2022-12-12 23:46 ` Elliot Berman
2022-12-13 6:25 ` Greg Kroah-Hartman
2022-12-13 6:25 ` Greg Kroah-Hartman
2022-11-21 15:24 ` Greg Kroah-Hartman
2022-11-21 15:24 ` Greg Kroah-Hartman
2022-12-12 23:46 ` Elliot Berman
2022-12-12 23:46 ` Elliot Berman
2022-12-13 6:26 ` Greg Kroah-Hartman
2022-12-13 6:26 ` Greg Kroah-Hartman
2022-12-16 2:25 ` Elliot Berman
2022-12-16 2:25 ` Elliot Berman
2023-01-26 21:27 ` Elliot Berman
2023-01-26 21:27 ` Elliot Berman
2022-11-21 14:00 ` [PATCH v7 11/20] gunyah: rsc_mgr: Add VM lifecycle RPC Elliot Berman
2022-11-21 14:00 ` Elliot Berman
2022-11-21 14:00 ` [PATCH v7 12/20] gunyah: vm_mgr: Introduce basic VM Manager Elliot Berman
2022-11-21 14:00 ` Elliot Berman
2022-11-21 14:00 ` [PATCH v7 13/20] gunyah: rsc_mgr: Add RPC for sharing memory Elliot Berman
2022-11-21 14:00 ` Elliot Berman
2022-11-21 14:00 ` [PATCH v7 14/20] gunyah: vm_mgr: Add/remove user memory regions Elliot Berman
2022-11-21 14:00 ` Elliot Berman
2022-11-21 14:00 ` [PATCH v7 15/20] gunyah: vm_mgr: Add ioctls to support basic non-proxy VM boot Elliot Berman
2022-11-21 14:00 ` Elliot Berman
2022-11-21 14:00 ` [PATCH v7 16/20] samples: Add sample userspace Gunyah VM Manager Elliot Berman
2022-11-21 14:00 ` Elliot Berman
2022-11-21 14:00 ` [PATCH v7 17/20] gunyah: rsc_mgr: Add platform ops on mem_lend/mem_reclaim Elliot Berman
2022-11-21 14:00 ` Elliot Berman
2022-11-21 14:00 ` [PATCH v7 18/20] firmware: qcom_scm: Use fixed width src vm bitmap Elliot Berman
2022-11-21 14:00 ` Elliot Berman
2022-11-21 14:00 ` Elliot Berman
2022-11-21 15:59 ` Kalle Valo
2022-11-21 15:59 ` Kalle Valo
2022-11-21 15:59 ` Kalle Valo
2022-11-21 14:00 ` [PATCH v7 19/20] firmware: qcom_scm: Register Gunyah platform ops Elliot Berman
2022-11-21 14:00 ` Elliot Berman
2022-12-02 16:55 ` kernel test robot
2022-11-21 14:00 ` [PATCH v7 20/20] docs: gunyah: Document Gunyah VM Manager Elliot Berman
2022-11-21 14:00 ` Elliot Berman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221121140009.2353512-5-quic_eberman@quicinc.com \
--to=quic_eberman@quicinc.com \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jassisinghbrar@gmail.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mark.rutland@arm.com \
--cc=quic_bjorande@quicinc.com \
--cc=quic_cvanscha@quicinc.com \
--cc=quic_mnalajal@quicinc.com \
--cc=quic_pheragu@quicinc.com \
--cc=quic_svaddagi@quicinc.com \
--cc=quic_tsoni@quicinc.com \
--cc=robh+dt@kernel.org \
--cc=sudeep.holla@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.