Unverified Commit fbb995a7 authored by Sunil V L's avatar Sunil V L Committed by Palmer Dabbelt
Browse files

crypto: hisilicon/qm: Fix to enable build with RISC-V clang 

With CONFIG_ACPI enabled for RISC-V, this driver gets enabled in
allmodconfig build. However, build fails with clang and below
error is seen.

drivers/crypto/hisilicon/qm.c:627:10: error: invalid output constraint '+Q' in asm
                       "+Q" (*((char __iomem *)fun_base))
                       ^
This is expected error with clang due to the way it is designed.

To fix this issue, move arm64 assembly code under #if.

Link: https://github.com/ClangBuiltLinux/linux/issues/999


Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
[sunilvl@ventanamicro.com: Moved tmp0 and tmp1 into the #if]
Signed-off-by: default avatarSunil V L <sunilvl@ventanamicro.com>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Link: https://lore.kernel.org/r/20230515054928.2079268-4-sunilvl@ventanamicro.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 7f2e2045

drivers/crypto/hisilicon/qm.c

+5 −0
Original line number Diff line number Diff line
@@ -610,7 +610,10 @@ EXPORT_SYMBOL_GPL(hisi_qm_wait_mb_ready); 
static void qm_mb_write(struct hisi_qm *qm, const void *src)

{

	void __iomem *fun_base = qm->io_base + QM_MB_CMD_SEND_BASE;



#if IS_ENABLED(CONFIG_ARM64)

	unsigned long tmp0 = 0, tmp1 = 0;

#endif



	if (!IS_ENABLED(CONFIG_ARM64)) {

		memcpy_toio(fun_base, src, 16);
@@ -618,6 +621,7 @@ static void qm_mb_write(struct hisi_qm *qm, const void *src) 
		return;

	}



#if IS_ENABLED(CONFIG_ARM64)

	asm volatile("ldp %0, %1, %3\n"

		     "stp %0, %1, %2\n"

		     "dmb oshst\n"
@@ -626,6 +630,7 @@ static void qm_mb_write(struct hisi_qm *qm, const void *src) 
		       "+Q" (*((char __iomem *)fun_base))

		     : "Q" (*((char *)src))

		     : "memory");

#endif

}



static int qm_mb_nolock(struct hisi_qm *qm, struct qm_mailbox *mailbox)