# git rev-parse -q --verify 1a2dcbdde82e3a5f1db9b2f4c48aa1aeba534fb2^{commit} 1a2dcbdde82e3a5f1db9b2f4c48aa1aeba534fb2 already have revision, skipping fetch # git checkout -q -f -B kisskb 1a2dcbdde82e3a5f1db9b2f4c48aa1aeba534fb2 # git clean -qxdf # < git log -1 # commit 1a2dcbdde82e3a5f1db9b2f4c48aa1aeba534fb2 # Author: Sreekanth Reddy # Date: Tue Sep 13 17:35:38 2022 +0530 # # scsi: mpt3sas: re-do lost mpt3sas DMA mask fix # # This is a re-do of commit e0e0747de0ea ("scsi: mpt3sas: Fix return value # check of dma_get_required_mask()"), which I ended up undoing in a # mis-merge in commit 62e6e5940c0c ("Merge tag 'scsi-misc' of # git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi"). # # The original commit message was # # scsi: mpt3sas: Fix return value check of dma_get_required_mask() # # Fix the incorrect return value check of dma_get_required_mask(). Due to # this incorrect check, the driver was always setting the DMA mask to 63 bit. # # Link: https://lore.kernel.org/r/20220913120538.18759-2-sreekanth.reddy@broadcom.com # Fixes: ba27c5cf286d ("scsi: mpt3sas: Don't change the DMA coherent mask after allocations") # Signed-off-by: Sreekanth Reddy # Signed-off-by: Martin K. Petersen # # and this fix was lost when I mis-merged the conflict with commit # 9df650963bf6 ("scsi: mpt3sas: Don't change DMA mask while reallocating # pools"). # # Reported-by: Juergen Gross # Fixes: 62e6e5940c0c ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") # Link: https://lore.kernel.org/all/CAHk-=wjaK-TxrNaGtFDpL9qNHL1MVkWXO1TT6vObD5tXMSC4Zg@mail.gmail.com # Signed-off-by: Linus Torvalds # < /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 1a2dcbdde82e3a5f1db9b2f4c48aa1aeba534fb2 # < make -s -j 40 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 40 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 40 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 40 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/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[4]: *** [/kisskb/src/scripts/Makefile.build:250: arch/sparc/kernel/irq_32.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:500: arch/sparc/kernel] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:500: arch/sparc] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1992: .] Error 2 make: *** [Makefile:231: __sub-make] Error 2 Command 'make -s -j 40 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:09:26.516995