| Message ID | 1546442912-20818-3-git-send-email-firoz.khan@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xtensa: Unify the system call scripts | expand |
Hi Firoz, On Wed, Jan 2, 2019 at 7:29 AM Firoz Khan <firoz.khan@linaro.org> wrote: > Unified system call table generation script must be run to > generate unistd_32.h and syscall_table.h files. This patch > will have changes which will invokes the script. > > This patch will generate unistd_32.h and syscall_table.h > files by the syscall table generation script invoked by > xtensa/Makefile and the generated files against the removed > files must be identical. > > The generated uapi header file will be included in uapi/- > asm/unistd.h and generated system call table header file > will be included by kernel/syscall.c file. > > Signed-off-by: Firoz Khan <firoz.khan@linaro.org> > --- > arch/xtensa/kernel/syscalls/Makefile | 11 ++++++++-- > arch/xtensa/kernel/syscalls/syscallhdr.sh | 36 ------------------------------- > arch/xtensa/kernel/syscalls/syscalltbl.sh | 32 --------------------------- > 3 files changed, 9 insertions(+), 70 deletions(-) > delete mode 100644 arch/xtensa/kernel/syscalls/syscallhdr.sh > delete mode 100644 arch/xtensa/kernel/syscalls/syscalltbl.sh > > diff --git a/arch/xtensa/kernel/syscalls/Makefile b/arch/xtensa/kernel/syscalls/Makefile > index 659faef..75c7421 100644 > --- a/arch/xtensa/kernel/syscalls/Makefile > +++ b/arch/xtensa/kernel/syscalls/Makefile > @@ -6,8 +6,9 @@ _dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \ > $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)') > > syscall := $(srctree)/$(src)/syscall.tbl > -syshdr := $(srctree)/$(src)/syscallhdr.sh > -systbl := $(srctree)/$(src)/syscalltbl.sh > +syshdr := $(srctree)/scripts/syscallhdr.sh > +sysnr := $(srctree)/scripts/syscallnr.sh > +systbl := $(srctree)/scripts/syscalltbl.sh > > quiet_cmd_syshdr = SYSHDR $@ > cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@' \ > @@ -15,6 +16,12 @@ quiet_cmd_syshdr = SYSHDR $@ > '$(syshdr_pfx_$(basetarget))' \ > '$(syshdr_offset_$(basetarget))' > > +quiet_cmd_sysnr = SYSNR $@ > + cmd_sysnr = $(CONFIG_SHELL) '$(sysnr)' '$<' '$@' \ > + '$(sysnr_abis_$(basetarget))' \ > + '$(sysnr_pfx_$(basetarget))' \ > + '$(sysnr_offset_$(basetarget))' > + This patch seems to do more than it says in the description. Perhaps adding cmd_sysnr needs a separate patch with its own description? -- Thanks. -- Max
Hi Max, Thanks for your feedback. On Fri, 4 Jan 2019 at 04:14, Max Filippov <jcmvbkbc@gmail.com> wrote: > > > > +quiet_cmd_sysnr = SYSNR $@ > > + cmd_sysnr = $(CONFIG_SHELL) '$(sysnr)' '$<' '$@' \ > > + '$(sysnr_abis_$(basetarget))' \ > > + '$(sysnr_pfx_$(basetarget))' \ > > + '$(sysnr_offset_$(basetarget))' > > + > > This patch seems to do more than it says in the description. > Perhaps adding cmd_sysnr needs a separate patch with its > own description? This build rule is unused now as I was tried to implement something else. Hopefully I'll remove the the above change in my v2. Thanks Firoz
On Thu, Jan 3, 2019 at 9:13 PM Firoz Khan <firoz.khan@linaro.org> wrote: > On Fri, 4 Jan 2019 at 04:14, Max Filippov <jcmvbkbc@gmail.com> wrote: > > > > > > +quiet_cmd_sysnr = SYSNR $@ > > > + cmd_sysnr = $(CONFIG_SHELL) '$(sysnr)' '$<' '$@' \ > > > + '$(sysnr_abis_$(basetarget))' \ > > > + '$(sysnr_pfx_$(basetarget))' \ > > > + '$(sysnr_offset_$(basetarget))' > > > + > > > > This patch seems to do more than it says in the description. > > Perhaps adding cmd_sysnr needs a separate patch with its > > own description? > > This build rule is unused now as I was tried to implement > something else. Hopefully I'll remove the the above change > in my v2. Then maybe there's a way to move all these macros to a common makefile, as they seem to be fairly generic? -- Thanks. -- Max
Hi Max, On Fri, 4 Jan 2019 at 11:29, Max Filippov <jcmvbkbc@gmail.com> wrote: > > On Thu, Jan 3, 2019 at 9:13 PM Firoz Khan <firoz.khan@linaro.org> wrote: > > On Fri, 4 Jan 2019 at 04:14, Max Filippov <jcmvbkbc@gmail.com> wrote: > > > > This build rule is unused now as I was tried to implement > > something else. Hopefully I'll remove the the above change > > in my v2. > > Then maybe there's a way to move all these macros to a common > makefile, as they seem to be fairly generic? Good idea! Sure, I'll look into it. Thanks Firoz
diff --git a/arch/xtensa/kernel/syscalls/Makefile b/arch/xtensa/kernel/syscalls/Makefile index 659faef..75c7421 100644 --- a/arch/xtensa/kernel/syscalls/Makefile +++ b/arch/xtensa/kernel/syscalls/Makefile @@ -6,8 +6,9 @@ _dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \ $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)') syscall := $(srctree)/$(src)/syscall.tbl -syshdr := $(srctree)/$(src)/syscallhdr.sh -systbl := $(srctree)/$(src)/syscalltbl.sh +syshdr := $(srctree)/scripts/syscallhdr.sh +sysnr := $(srctree)/scripts/syscallnr.sh +systbl := $(srctree)/scripts/syscalltbl.sh quiet_cmd_syshdr = SYSHDR $@ cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@' \ @@ -15,6 +16,12 @@ quiet_cmd_syshdr = SYSHDR $@ '$(syshdr_pfx_$(basetarget))' \ '$(syshdr_offset_$(basetarget))' +quiet_cmd_sysnr = SYSNR $@ + cmd_sysnr = $(CONFIG_SHELL) '$(sysnr)' '$<' '$@' \ + '$(sysnr_abis_$(basetarget))' \ + '$(sysnr_pfx_$(basetarget))' \ + '$(sysnr_offset_$(basetarget))' + quiet_cmd_systbl = SYSTBL $@ cmd_systbl = $(CONFIG_SHELL) '$(systbl)' '$<' '$@' \ '$(systbl_abis_$(basetarget))' \ diff --git a/arch/xtensa/kernel/syscalls/syscallhdr.sh b/arch/xtensa/kernel/syscalls/syscallhdr.sh deleted file mode 100644 index d37db64..0000000 --- a/arch/xtensa/kernel/syscalls/syscallhdr.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -in="$1" -out="$2" -my_abis=`echo "($3)" | tr ',' '|'` -prefix="$4" -offset="$5" - -fileguard=_UAPI_ASM_XTENSA_`basename "$out" | sed \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ - -e 's/[^A-Z0-9_]/_/g' -e 's/__/_/g'` -grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | ( - printf "#ifndef %s\n" "${fileguard}" - printf "#define %s\n" "${fileguard}" - printf "\n" - - nxt=0 - while read nr abi name entry ; do - if [ -z "$offset" ]; then - printf "#define __NR_%s%s\t%s\n" \ - "${prefix}" "${name}" "${nr}" - else - printf "#define __NR_%s%s\t(%s + %s)\n" \ - "${prefix}" "${name}" "${offset}" "${nr}" - fi - nxt=$((nr+1)) - done - - printf "\n" - printf "#ifdef __KERNEL__\n" - printf "#define __NR_syscalls\t%s\n" "${nxt}" - printf "#endif\n" - printf "\n" - printf "#endif /* %s */" "${fileguard}" -) > "$out" diff --git a/arch/xtensa/kernel/syscalls/syscalltbl.sh b/arch/xtensa/kernel/syscalls/syscalltbl.sh deleted file mode 100644 index 904b8e6..0000000 --- a/arch/xtensa/kernel/syscalls/syscalltbl.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/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 ; do - emit $((nxt+offset)) $((nr+offset)) $entry - nxt=$((nr+1)) - done -) > "$out"
Unified system call table generation script must be run to generate unistd_32.h and syscall_table.h files. This patch will have changes which will invokes the script. This patch will generate unistd_32.h and syscall_table.h files by the syscall table generation script invoked by xtensa/Makefile and the generated files against the removed files must be identical. The generated uapi header file will be included in uapi/- asm/unistd.h and generated system call table header file will be included by kernel/syscall.c file. Signed-off-by: Firoz Khan <firoz.khan@linaro.org> --- arch/xtensa/kernel/syscalls/Makefile | 11 ++++++++-- arch/xtensa/kernel/syscalls/syscallhdr.sh | 36 ------------------------------- arch/xtensa/kernel/syscalls/syscalltbl.sh | 32 --------------------------- 3 files changed, 9 insertions(+), 70 deletions(-) delete mode 100644 arch/xtensa/kernel/syscalls/syscallhdr.sh delete mode 100644 arch/xtensa/kernel/syscalls/syscalltbl.sh -- 1.9.1