# git rev-parse -q --verify df0219d11b6f04251d38e345db4f9780cb32e2e2^{commit} df0219d11b6f04251d38e345db4f9780cb32e2e2 already have revision, skipping fetch # git checkout -q -f -B kisskb df0219d11b6f04251d38e345db4f9780cb32e2e2 # git clean -qxdf # < git log -1 # commit df0219d11b6f04251d38e345db4f9780cb32e2e2 # Merge: 95607ad99b5a 591d2108f3ab # Author: Linus Torvalds # Date: Tue Aug 23 13:42:31 2022 -0700 # # Merge tag 'parisc-for-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux # # Pull parisc fixes from Helge Deller: # "Some interesting background to the current patchset: # # It turned out that the fldw instruction (which loads a 32-bit word # from memory into one half of a FP register) failed on unaligned # addresses and even trashed some other random FP register instead. It's # a trivial one-liner fix in the exception handler but this failure # dates back to the very beginnings of the parisc-port. It's strange # that it was never noticed before. # # Another patch fixes an annoyance noticed by Randy Dunlap. Running # "make ARCH=parisc64 randconfig" always returned a 32-bit config, # although one would expect a 64-bit config. Masahiro Yamada suggested # to mimik sparc Kconfig code, which fixed the issue nicely. This # allowed to drop some compiler build checks too. # # Third, it's possible to build an optimized 32-bit kernel for PA8X00 # (64-bit) CPUs, which then wouldn't start on 32-bit-only (PA1.x) # machines. I've added a bootup check which prevents that and which # prints a message to the console. This can be tested with qemu, which # currently only supports 32-bit emulation. # # The other patches are usual clean-up stuff like added return value # checks and typo fixes in comments. # # Summary: # # - Fix emulation of fldw instruction on unaligned addresses # # - Fix "make ARCH=parisc64 randconfig" to return a 64-bit config # # - Prevent boot if trying to boot a 32-bit kernel compiled for PA8X00 # CPUs on 32-bit only machines # # - ccio-dma: Handle kmalloc failure in ccio_init_resources()" # # * tag 'parisc-for-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: # parisc: Add runtime check to prevent PA2.0 kernels on PA1.x machines # parisc: ccio-dma: Handle kmalloc failure in ccio_init_resources() # parisc: led: Move from strlcpy with unused retval to strscpy # parisc: ccio-dma: Fix typo in comment # Revert "parisc: Show error if wrong 32/64-bit compiler is being used" # parisc: Make CONFIG_64BIT available for ARCH=parisc64 only # parisc: Fix exception handler for fldw and fstw instructions # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux-ld --version # < git log --format=%s --max-count=1 df0219d11b6f04251d38e345db4f9780cb32e2e2 # < make -s -j 48 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_64BIT=n # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # < make -s -j 48 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux- help # make -s -j 48 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux- olddefconfig # make -s -j 48 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux- :1517:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_page_for_dma': /kisskb/src/arch/sparc/mm/srmmu.c:1639:13: error: cast between incompatible function types from 'void (*)(long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1639 | xc1((smpfunc_t) local_ops->page_for_dma, page); | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_cache_mm': /kisskb/src/arch/sparc/mm/srmmu.c:1662:29: error: cast between incompatible function types from 'void (*)(struct mm_struct *)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1662 | xc1((smpfunc_t) local_ops->cache_mm, (unsigned long) mm); | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_tlb_mm': /kisskb/src/arch/sparc/mm/srmmu.c:1674:29: error: cast between incompatible function types from 'void (*)(struct mm_struct *)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1674 | xc1((smpfunc_t) local_ops->tlb_mm, (unsigned long) mm); | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_cache_range': /kisskb/src/arch/sparc/mm/srmmu.c:1694:29: error: cast between incompatible function types from 'void (*)(struct vm_area_struct *, long unsigned int, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1694 | xc3((smpfunc_t) local_ops->cache_range, | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_tlb_range': /kisskb/src/arch/sparc/mm/srmmu.c:1711:29: error: cast between incompatible function types from 'void (*)(struct vm_area_struct *, long unsigned int, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1711 | xc3((smpfunc_t) local_ops->tlb_range, | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_cache_page': /kisskb/src/arch/sparc/mm/srmmu.c:1726:29: error: cast between incompatible function types from 'void (*)(struct vm_area_struct *, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1726 | xc2((smpfunc_t) local_ops->cache_page, | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_tlb_page': /kisskb/src/arch/sparc/mm/srmmu.c:1741:29: error: cast between incompatible function types from 'void (*)(struct vm_area_struct *, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1741 | xc2((smpfunc_t) local_ops->tlb_page, | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_page_to_ram': /kisskb/src/arch/sparc/mm/srmmu.c:1756:13: error: cast between incompatible function types from 'void (*)(long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1756 | xc1((smpfunc_t) local_ops->page_to_ram, page); | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_sig_insns': /kisskb/src/arch/sparc/mm/srmmu.c:1767:21: error: cast between incompatible function types from 'void (*)(struct mm_struct *, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1767 | xc2((smpfunc_t) local_ops->sig_insns, | ^ /kisskb/src/arch/sparc/kernel/irq_32.c: In function 'sparc_floppy_request_irq': /kisskb/src/arch/sparc/kernel/irq_32.c:258:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 258 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_one = SPARC_RD_PSR_L0; \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:272:17: note: in expansion of macro 'INSTANTIATE' 272 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:143:24: note: while referencing 'trapbase_cpu1' 143 | extern struct tt_entry trapbase_cpu1; | ^~~~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/include/asm/traps.h:10, from /kisskb/src/arch/sparc/kernel/kernel.h:8, from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/irq_32.c:261:46: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 261 | (unsigned long) &table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two);\ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/include/uapi/asm/traps.h:27:38: note: in definition of macro 'SPARC_BRANCH' 27 | (0x10800000 | (((dest_addr-inst_addr)>>2)&0x3fffff)) | ^~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:272:17: note: in expansion of macro 'INSTANTIATE' 272 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:143:24: note: while referencing 'trapbase_cpu1' 143 | extern struct tt_entry trapbase_cpu1; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:259:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 259 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two = \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:272:17: note: in expansion of macro 'INSTANTIATE' 272 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:143:24: note: while referencing 'trapbase_cpu1' 143 | extern struct tt_entry trapbase_cpu1; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:262:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 262 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_three = SPARC_RD_WIM_L3; \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:272:17: note: in expansion of macro 'INSTANTIATE' 272 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:143:24: note: while referencing 'trapbase_cpu1' 143 | extern struct tt_entry trapbase_cpu1; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:263:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 263 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP; | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:272:17: note: in expansion of macro 'INSTANTIATE' 272 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:143:24: note: while referencing 'trapbase_cpu1' 143 | extern struct tt_entry trapbase_cpu1; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:258:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 258 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_one = SPARC_RD_PSR_L0; \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:274:17: note: in expansion of macro 'INSTANTIATE' 274 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:144:24: note: while referencing 'trapbase_cpu2' 144 | extern struct tt_entry trapbase_cpu2; | ^~~~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/include/asm/traps.h:10, from /kisskb/src/arch/sparc/kernel/kernel.h:8, from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/irq_32.c:261:46: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 261 | (unsigned long) &table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two);\ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/include/uapi/asm/traps.h:27:38: note: in definition of macro 'SPARC_BRANCH' 27 | (0x10800000 | (((dest_addr-inst_addr)>>2)&0x3fffff)) | ^~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:274:17: note: in expansion of macro 'INSTANTIATE' 274 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:144:24: note: while referencing 'trapbase_cpu2' 144 | extern struct tt_entry trapbase_cpu2; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:259:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 259 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two = \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:274:17: note: in expansion of macro 'INSTANTIATE' 274 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:144:24: note: while referencing 'trapbase_cpu2' 144 | extern struct tt_entry trapbase_cpu2; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:262:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 262 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_three = SPARC_RD_WIM_L3; \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:274:17: note: in expansion of macro 'INSTANTIATE' 274 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:144:24: note: while referencing 'trapbase_cpu2' 144 | extern struct tt_entry trapbase_cpu2; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:263:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 263 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP; | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:274:17: note: in expansion of macro 'INSTANTIATE' 274 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:144:24: note: while referencing 'trapbase_cpu2' 144 | extern struct tt_entry trapbase_cpu2; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:258:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 258 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_one = SPARC_RD_PSR_L0; \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:276:17: note: in expansion of macro 'INSTANTIATE' 276 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:145:24: note: while referencing 'trapbase_cpu3' 145 | extern struct tt_entry trapbase_cpu3; | ^~~~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/include/asm/traps.h:10, from /kisskb/src/arch/sparc/kernel/kernel.h:8, from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/irq_32.c:261:46: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 261 | (unsigned long) &table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two);\ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/include/uapi/asm/traps.h:27:38: note: in definition of macro 'SPARC_BRANCH' 27 | (0x10800000 | (((dest_addr-inst_addr)>>2)&0x3fffff)) | ^~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:276:17: note: in expansion of macro 'INSTANTIATE' 276 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:145:24: note: while referencing 'trapbase_cpu3' 145 | extern struct tt_entry trapbase_cpu3; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:259:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 259 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two = \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:276:17: note: in expansion of macro 'INSTANTIATE' 276 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:145:24: note: while referencing 'trapbase_cpu3' 145 | extern struct tt_entry trapbase_cpu3; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:262:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 262 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_three = SPARC_RD_WIM_L3; \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:276:17: note: in expansion of macro 'INSTANTIATE' 276 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:145:24: note: while referencing 'trapbase_cpu3' 145 | extern struct tt_entry trapbase_cpu3; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:263:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 263 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP; | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:276:17: note: in expansion of macro 'INSTANTIATE' 276 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:145:24: note: while referencing 'trapbase_cpu3' 145 | extern struct tt_entry trapbase_cpu3; | ^~~~~~~~~~~~~ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:249: arch/sparc/kernel/irq_32.o] Error 1 make[3]: *** Waiting for unfinished jobs.... cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:249: arch/sparc/mm/srmmu.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:465: arch/sparc/mm] Error 2 make[2]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:465: arch/sparc/kernel] Error 2 make[1]: *** [/kisskb/src/Makefile:1853: arch/sparc] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:222: __sub-make] Error 2 Command 'make -s -j 48 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sparc-allmodconfig_sparc64-gcc11 # Build took: 0:02:41.937574