all: Annotate some tables to have clang-format leave them alone

One of the shortcomings of clang-format is that it doesn't allow
for aligned define tables, which is used for a number of constants.

Add annotation to disable the automatic formatting where needed.

Signed-off-by: Olof Johansson <[email protected]>

11 files changed, 44 insertions, 0 deletions

diff --git a/include/sbi/riscv_asm.h b/include/sbi/riscv_asm.h
index 9648629b..39a76159 100644
--- a/include/sbi/riscv_asm.h
+++ b/include/sbi/riscv_asm.h
@@ -12,6 +12,8 @@
 
 #include <sbi/riscv_encoding.h>
 
+/* clang-format off */
+
 #ifdef __ASSEMBLY__
 #define __ASM_STR(x)	x
 #else
@@ -78,6 +80,8 @@
 #error "Unexpected __SIZEOF_SHORT__"
 #endif
 
+/* clang-format on */
+
 #ifndef __ASSEMBLY__
 
 #define csr_swap(csr, val)					\
diff --git a/include/sbi/riscv_barrier.h b/include/sbi/riscv_barrier.h
index ce4b5d15..14ebeccd 100644
--- a/include/sbi/riscv_barrier.h
+++ b/include/sbi/riscv_barrier.h
@@ -10,6 +10,8 @@
 #ifndef __RISCV_BARRIER_H__
 #define __RISCV_BARRIER_H__
 
+/* clang-format off */
+
 #define RISCV_ACQUIRE_BARRIER		"\tfence r , rw\n"
 #define RISCV_RELEASE_BARRIER		"\tfence rw,  w\n"
 
@@ -37,6 +39,8 @@
 /* CPU relax for busy loop */
 #define cpu_relax()		asm volatile ("" : : : "memory")
 
+/* clang-format on */
+
 #define __smp_store_release(p, v)				\
 do {								\
 	RISCV_FENCE(rw,w);					\
diff --git a/include/sbi/riscv_encoding.h b/include/sbi/riscv_encoding.h
index 1448f58c..5a5086a0 100644
--- a/include/sbi/riscv_encoding.h
+++ b/include/sbi/riscv_encoding.h
@@ -14,6 +14,7 @@
 
 /* TODO: Make constants usable in assembly with _AC() macro */
 
+/* clang-format off */
 #define MSTATUS_UIE			0x00000001
 #define MSTATUS_SIE			0x00000002
 #define MSTATUS_HIE			0x00000004
@@ -561,4 +562,6 @@
 					 (s32)(((insn) >> 7) & 0x1f))
 #define MASK_FUNCT3			0x7000
 
+/* clang-format on */
+
 #endif
diff --git a/include/sbi/riscv_io.h b/include/sbi/riscv_io.h
index ea29c44d..e4bdc277 100644
--- a/include/sbi/riscv_io.h
+++ b/include/sbi/riscv_io.h
@@ -70,6 +70,9 @@ static inline u64 __raw_readq(const volatile void *addr)
 #endif
 
 /* FIXME: These are now the same as asm-generic */
+
+/* clang-format off */
+
 #define __io_rbr()		do {} while (0)
 #define __io_rar()		do {} while (0)
 #define __io_rbw()		do {} while (0)
@@ -106,4 +109,6 @@ static inline u64 __raw_readq(const volatile void *addr)
 #define writeq(v,c)	({ __io_bw(); __raw_writeq((v),(c)); __io_aw(); })
 #endif
 
+/* clang-format on */
+
 #endif
diff --git a/include/sbi/sbi_const.h b/include/sbi/sbi_const.h
index e90b7523..423d2cfa 100644
--- a/include/sbi/sbi_const.h
+++ b/include/sbi/sbi_const.h
@@ -19,6 +19,8 @@
  * leave it unchanged in asm.
  */
 
+/* clang-format off */
+
 #ifdef __ASSEMBLY__
 #define _AC(X,Y)	X
 #define _AT(T,X)	X
@@ -40,4 +42,6 @@
 #define	__STR(s)	#s
 #define	STRINGIFY(s)	__STR(s)
 
+/* clang-format on */
+
 #endif
diff --git a/include/sbi/sbi_ecall_interface.h b/include/sbi/sbi_ecall_interface.h
index 2bf004d9..8e79e24d 100644
--- a/include/sbi/sbi_ecall_interface.h
+++ b/include/sbi/sbi_ecall_interface.h
@@ -10,6 +10,8 @@
 #ifndef __SBI_ECALL_INTERFACE_H__
 #define __SBI_ECALL_INTERFACE_H__
 
+/* clang-format off */
+
 #define SBI_ECALL_SET_TIMER			0
 #define SBI_ECALL_CONSOLE_PUTCHAR		1
 #define SBI_ECALL_CONSOLE_GETCHAR		2
@@ -20,6 +22,8 @@
 #define SBI_ECALL_REMOTE_SFENCE_VMA_ASID	7
 #define SBI_ECALL_SHUTDOWN			8
 
+/* clang-format on */
+
 #define SBI_ECALL(__num, __a0, __a1, __a2) ({				\
 	register unsigned long a0 asm ("a0") = (unsigned long)(__a0);	\
 	register unsigned long a1 asm ("a1") = (unsigned long)(__a1);	\
diff --git a/include/sbi/sbi_error.h b/include/sbi/sbi_error.h
index 300ee743..39a3864d 100644
--- a/include/sbi/sbi_error.h
+++ b/include/sbi/sbi_error.h
@@ -10,6 +10,8 @@
 #ifndef __SBI_ERROR_H__
 #define __SBI_ERROR_H__
 
+/* clang-format off */
+
 #define SBI_OK		0
 #define SBI_EUNKNOWN	-1
 #define SBI_EFAIL	-2
@@ -23,4 +25,6 @@
 #define SBI_EILL	-10
 #define SBI_ENOSPC	-11
 
+/* clang-format on */
+
 #endif
diff --git a/include/sbi/sbi_ipi.h b/include/sbi/sbi_ipi.h
index 609598e4..f68e8fe4 100644
--- a/include/sbi/sbi_ipi.h
+++ b/include/sbi/sbi_ipi.h
@@ -12,12 +12,16 @@
 
 #include <sbi/sbi_types.h>
 
+/* clang-format off */
+
 #define SBI_IPI_EVENT_SOFT			0x1
 #define SBI_IPI_EVENT_FENCE_I			0x2
 #define SBI_IPI_EVENT_SFENCE_VMA		0x4
 #define SBI_IPI_EVENT_SFENCE_VMA_ASID		0x8
 #define SBI_IPI_EVENT_HALT			0x10
 
+/* clang-format on */
+
 #define SBI_TLB_FIFO_NUM_ENTRIES 4
 enum sbi_tlb_info_types {
 	SBI_TLB_FLUSH_VMA,
diff --git a/include/sbi/sbi_scratch.h b/include/sbi/sbi_scratch.h
index a41549cc..fabbab01 100644
--- a/include/sbi/sbi_scratch.h
+++ b/include/sbi/sbi_scratch.h
@@ -12,6 +12,8 @@
 
 #include <sbi/riscv_asm.h>
 
+/* clang-format off */
+
 /** Offset of fw_start member in sbi_scratch */
 #define SBI_SCRATCH_FW_START_OFFSET		(0 * __SIZEOF_POINTER__)
 /** Offset of fw_size member in sbi_scratch */
@@ -43,6 +45,8 @@
 /** Maximum size of sbi_scratch and sbi_ipi_data */
 #define SBI_SCRATCH_SIZE			(64 * __SIZEOF_POINTER__)
 
+/* clang-format on */
+
 #ifndef __ASSEMBLY__
 
 #include <sbi/sbi_types.h>
diff --git a/include/sbi/sbi_trap.h b/include/sbi/sbi_trap.h
index 504e7dd7..e2a52b54 100644
--- a/include/sbi/sbi_trap.h
+++ b/include/sbi/sbi_trap.h
@@ -10,6 +10,8 @@
 #ifndef __SBI_TRAP_H__
 #define __SBI_TRAP_H__
 
+/* clang-format off */
+
 /** Index of zero member in sbi_trap_regs */
 #define SBI_TRAP_REGS_zero			0
 /** Index of ra member in sbi_trap_regs */
@@ -81,6 +83,8 @@
 /** Last member index in sbi_trap_regs */
 #define SBI_TRAP_REGS_last			34
 
+/* clang-format on */
+
 /** Get offset of member with name 'x' in sbi_trap_regs */
 #define SBI_TRAP_REGS_OFFSET(x)			\
 				((SBI_TRAP_REGS_##x) * __SIZEOF_POINTER__)
diff --git a/include/sbi/sbi_types.h b/include/sbi/sbi_types.h
index 40909f65..f51d8881 100644
--- a/include/sbi/sbi_types.h
+++ b/include/sbi/sbi_types.h
@@ -10,6 +10,8 @@
 #ifndef __SBI_TYPES_H__
 #define __SBI_TYPES_H__
 
+/* clang-format off */
+
 typedef char			s8;
 typedef unsigned char		u8;
 typedef unsigned char		uint8_t;
@@ -58,4 +60,6 @@ typedef unsigned long		physical_size_t;
 #define __packed		__attribute__((packed))
 #define __noreturn		__attribute__((noreturn))
 
+/* clang-format on */
+
 #endif