Commit 14b3c9d2 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michael Ellerman
Browse files

powerpc/syscalls: switch to generic syscalltbl.sh 



Many architectures duplicate similar shell scripts.

This commit converts powerpc to use scripts/syscalltbl.sh. This also
unifies syscall_table_32.h and syscall_table_c32.h.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210301153019.362742-1-masahiroy@kernel.org
parent e5d56763

arch/powerpc/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generated-y += syscall_table_32.h

generated-y += syscall_table_64.h

generated-y += syscall_table_c32.h

generated-y += syscall_table_spu.h

generic-y += export.h

generic-y += kvm_types.h

arch/powerpc/kernel/syscalls/Makefile

+5 −17
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ _dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \ 


syscall := $(src)/syscall.tbl

syshdr := $(srctree)/$(src)/syscallhdr.sh

systbl := $(srctree)/$(src)/syscalltbl.sh

systbl := $(srctree)/scripts/syscalltbl.sh



quiet_cmd_syshdr = SYSHDR  $@

      cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@'	\
@@ -16,10 +16,7 @@ quiet_cmd_syshdr = SYSHDR $@ 
		   '$(syshdr_offset_$(basetarget))'



quiet_cmd_systbl = SYSTBL  $@

      cmd_systbl = $(CONFIG_SHELL) '$(systbl)' '$<' '$@'	\

		   '$(systbl_abis_$(basetarget))'		\

		   '$(systbl_abi_$(basetarget))'		\

		   '$(systbl_offset_$(basetarget))'

      cmd_systbl = $(CONFIG_SHELL) $(systbl) --abis $(abis) $< $@



syshdr_abis_unistd_32 := common,nospu,32

$(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE
@@ -29,30 +26,21 @@ syshdr_abis_unistd_64 := common,nospu,64 
$(uapi)/unistd_64.h: $(syscall) $(syshdr) FORCE

	$(call if_changed,syshdr)



systbl_abis_syscall_table_32 := common,nospu,32

systbl_abi_syscall_table_32 := 32

$(kapi)/syscall_table_32.h: abis := common,nospu,32

$(kapi)/syscall_table_32.h: $(syscall) $(systbl) FORCE

	$(call if_changed,systbl)



systbl_abis_syscall_table_64 := common,nospu,64

systbl_abi_syscall_table_64 := 64

$(kapi)/syscall_table_64.h: abis := common,nospu,64

$(kapi)/syscall_table_64.h: $(syscall) $(systbl) FORCE

	$(call if_changed,systbl)



systbl_abis_syscall_table_c32 := common,nospu,32

systbl_abi_syscall_table_c32 := c32

$(kapi)/syscall_table_c32.h: $(syscall) $(systbl) FORCE

	$(call if_changed,systbl)



systbl_abis_syscall_table_spu := common,spu

systbl_abi_syscall_table_spu := spu

$(kapi)/syscall_table_spu.h: abis := common,spu

$(kapi)/syscall_table_spu.h: $(syscall) $(systbl) FORCE

	$(call if_changed,systbl)



uapisyshdr-y		+= unistd_32.h unistd_64.h

kapisyshdr-y		+= syscall_table_32.h		\

			   syscall_table_64.h		\

			   syscall_table_c32.h		\

			   syscall_table_spu.h



uapisyshdr-y	:= $(addprefix $(uapi)/, $(uapisyshdr-y))

arch/powerpc/kernel/syscalls/syscalltbl.sh

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0



in="$1"

out="$2"

my_abis=`echo "($3)" | tr ',' '|'`

my_abi="$4"

offset="$5"



emit() {

	t_nxt="$1"

	t_nr="$2"

	t_entry="$3"



	while [ $t_nxt -lt $t_nr ]; do

		printf "__SYSCALL(%s,sys_ni_syscall)\n" "${t_nxt}"

		t_nxt=$((t_nxt+1))

	done

	printf "__SYSCALL(%s,%s)\n" "${t_nxt}" "${t_entry}"

}



grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | (

	nxt=0

	if [ -z "$offset" ]; then

		offset=0

	fi



	while read nr abi name entry compat ; do

		if [ "$my_abi" = "c32" ] && [ ! -z "$compat" ]; then

			emit $((nxt+offset)) $((nr+offset)) $compat

		else

			emit $((nxt+offset)) $((nr+offset)) $entry

		fi

		nxt=$((nr+1))

	done

) > "$out"

arch/powerpc/kernel/systbl.S

+4 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#define __SYSCALL(nr, entry)	.long entry

#endif



#define __SYSCALL_WITH_COMPAT(nr, native, compat)	__SYSCALL(nr, native)

.globl sys_call_table

sys_call_table:

#ifdef CONFIG_PPC64
@@ -30,8 +31,10 @@ sys_call_table: 
#endif



#ifdef CONFIG_COMPAT

#undef __SYSCALL_WITH_COMPAT

#define __SYSCALL_WITH_COMPAT(nr, native, compat)	__SYSCALL(nr, compat)

.globl compat_sys_call_table

compat_sys_call_table:

#define compat_sys_sigsuspend	sys_sigsuspend

#include <asm/syscall_table_c32.h>

#include <asm/syscall_table_32.h>

#endif

arch/powerpc/platforms/cell/spu_callbacks.c

+1 −1
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ 
 */



static void *spu_syscall_table[] = {

#define __SYSCALL_WITH_COMPAT(nr, entry, compat) __SYSCALL(nr, entry)

#define __SYSCALL(nr, entry) [nr] = entry,

#include <asm/syscall_table_spu.h>

#undef __SYSCALL

};



long spu_sys_callback(struct spu_syscall_block *s)