# git rev-parse -q --verify 435faf5c218a47fd6258187f62d9bb1009717896^{commit} 435faf5c218a47fd6258187f62d9bb1009717896 already have revision, skipping fetch # git checkout -q -f -B kisskb 435faf5c218a47fd6258187f62d9bb1009717896 # git clean -qxdf # < git log -1 # commit 435faf5c218a47fd6258187f62d9bb1009717896 # Merge: 571d54ed91c0 09c0533d129c # Author: Linus Torvalds # Date: Thu Jun 4 20:14:18 2020 -0700 # # Merge tag 'riscv-for-linus-5.8-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux # # Pull RISC-V updates from Palmer Dabbelt: # # - The remainder of the code necessary to support the Kendryte K210: # # * Support for building device trees into the kernel, as the K210 # doesn't have a bootloader that provides one # # * A K210 device tree and the associated defconfig update # # * Support for skipping PMP initialization on systems that trap on # PMP accesses rather than treating them as WARL # # - Support for KGDB # # - Improvements to text patching # # - Some cleanups to the SiFive L2 cache driver # # * tag 'riscv-for-linus-5.8-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: # soc: sifive: l2 cache: Mark l2_get_priv_group as static # soc: sifive: l2 cache: Eliminate an unsigned zero compare warning # riscv: Add support to determine no. of L2 cache way enabled # riscv: cacheinfo: Implement cache_get_priv_group with a generic ops structure # riscv: Use text_mutex instead of patch_lock # riscv: Use NOKPROBE_SYMBOL() instead of __krpobes annotation # riscv: Remove the 'riscv_' prefix of function name # riscv: Add SW single-step support for KDB # riscv: Use the XML target descriptions to report 3 system registers # riscv: Add KGDB support # kgdb: Add kgdb_has_hit_break function # RISC-V: Skip setting up PMPs on traps # riscv: K210: Update defconfig # riscv: K210: Add a built-in device tree # riscv: Allow device trees to be built into the kernel # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 435faf5c218a47fd6258187f62d9bb1009717896 # < make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # < make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- help # make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:12279:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- In file included from /kisskb/src/include/linux/kernel.h:15:0, from /kisskb/src/kernel/rcu/rcuperf.c:13: /kisskb/src/kernel/rcu/rcuperf.c: In function 'kfree_perf_init': /kisskb/src/kernel/rcu/rcuperf.c:726:65: warning: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'unsigned int' [-Wformat=] pr_alert("kfree object size=%lu\n", kfree_mult * sizeof(struct kfree_obj)); ^ /kisskb/src/include/linux/printk.h:318:35: note: in definition of macro 'pr_alert' printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/kernel/module.c: In function 'do_init_module': /kisskb/src/kernel/module.c:3593:2: error: implicit declaration of function 'module_enable_ro' [-Werror=implicit-function-declaration] module_enable_ro(mod, true); ^ cc1: some warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:267: kernel/module.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1735: kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/dynamic_debug.h:6:0, from /kisskb/src/include/linux/printk.h:403, from /kisskb/src/include/linux/kernel.h:15, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/kobject.h:19, from /kisskb/src/include/linux/of.h:17, from /kisskb/src/include/linux/irqdomain.h:35, from /kisskb/src/include/linux/acpi.h:13, from /kisskb/src/sound/soc/codecs/max98390.c:9: /kisskb/src/sound/soc/codecs/max98390.c: In function 'max98390_dsm_init': /kisskb/src/include/linux/jump_label.h:471:59: warning: format '%ld' expects argument of type 'long int', but argument 4 has type 'size_t' [-Wformat=] else if (__builtin_types_compatible_p(typeof(*x), struct static_key_false)) \ ^ /kisskb/src/include/linux/dynamic_debug.h:105:2: note: in expansion of macro 'static_branch_unlikely' static_branch_unlikely(&descriptor.key.dd_key_false) ^ /kisskb/src/include/linux/dynamic_debug.h:124:6: note: in expansion of macro 'DYNAMIC_DEBUG_BRANCH' if (DYNAMIC_DEBUG_BRANCH(id)) \ ^ /kisskb/src/include/linux/dynamic_debug.h:143:2: note: in expansion of macro '__dynamic_func_call' __dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__) ^ /kisskb/src/include/linux/dynamic_debug.h:157:2: note: in expansion of macro '_dynamic_func_call' _dynamic_func_call(fmt,__dynamic_dev_dbg, \ ^ /kisskb/src/include/linux/dev_printk.h:114:2: note: in expansion of macro 'dynamic_dev_dbg' dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/sound/soc/codecs/max98390.c:780:2: note: in expansion of macro 'dev_dbg' dev_dbg(component->dev, ^ In file included from /kisskb/src/drivers/net/phy/mdio-cavium.c:11:0: /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_set_mode': /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:21:16: note: in expansion of macro 'oct_mdio_readq' smi_clk.u64 = oct_mdio_readq(p->register_base + SMI_CLK); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:24:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_clk.u64, p->register_base + SMI_CLK); ^ /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_c45_addr': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:39:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_wr.u64, p->register_base + SMI_WR_DAT); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:47:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_cmd.u64, p->register_base + SMI_CMD); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:54:16: note: in expansion of macro 'oct_mdio_readq' smi_wr.u64 = oct_mdio_readq(p->register_base + SMI_WR_DAT); ^ /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_read': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:86:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_cmd.u64, p->register_base + SMI_CMD); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:93:16: note: in expansion of macro 'oct_mdio_readq' smi_rd.u64 = oct_mdio_readq(p->register_base + SMI_RD_DAT); ^ /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_write': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:125:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_wr.u64, p->register_base + SMI_WR_DAT); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:131:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_cmd.u64, p->register_base + SMI_CMD); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:138:16: note: in expansion of macro 'oct_mdio_readq' smi_wr.u64 = oct_mdio_readq(p->register_base + SMI_WR_DAT); ^ /kisskb/src/drivers/net/phy/mdio-octeon.c: In function 'octeon_mdiobus_probe': /kisskb/src/drivers/net/phy/mdio-octeon.c:48:3: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] (u64)devm_ioremap(&pdev->dev, mdio_phys, regsize); ^ In file included from /kisskb/src/drivers/net/phy/mdio-octeon.c:14:0: /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-octeon.c:56:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-octeon.c:77:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^ /kisskb/src/drivers/net/phy/mdio-octeon.c: In function 'octeon_mdiobus_remove': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-octeon.c:91:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^ /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_psr_enable': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:8930:9: warning: missing braces around initializer [-Wmissing-braces] struct dc_static_screen_params params = {0}; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:8930:9: warning: (near initialization for 'params.triggers') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c: In function 'bios_parser_get_i2c_info': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:297:9: warning: missing braces around initializer [-Wmissing-braces] struct atom_i2c_record dummy_record = {0}; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:297:9: warning: (near initialization for 'dummy_record.record_header') [-Wmissing-braces] In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:261:0: warning: "M_SPC_CFG_CLEAR" redefined #define M_SPC_CFG_CLEAR M_BCM1480_SPC_CFG_CLEAR ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:392:0: note: this is the location of the previous definition #define M_SPC_CFG_CLEAR _SB_MAKEMASK1(32) ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:262:0: warning: "M_SPC_CFG_ENABLE" redefined #define M_SPC_CFG_ENABLE M_BCM1480_SPC_CFG_ENABLE ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:393:0: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) ^ /kisskb/src/net/smc/smc_llc.c: In function 'smc_llc_srv_add_link_local': /kisskb/src/net/smc/smc_llc.c:1145:9: warning: missing braces around initializer [-Wmissing-braces] struct smc_llc_msg_add_link add_llc = {0}; ^ /kisskb/src/net/smc/smc_llc.c:1145:9: warning: (near initialization for 'add_llc.hd') [-Wmissing-braces] /kisskb/src/net/smc/smc_llc.c: In function 'smc_llc_srv_delete_link_local': /kisskb/src/net/smc/smc_llc.c:1178:9: warning: missing braces around initializer [-Wmissing-braces] struct smc_llc_msg_del_link del_llc = {0}; ^ /kisskb/src/net/smc/smc_llc.c:1178:9: warning: (near initialization for 'del_llc.hd') [-Wmissing-braces] /kisskb/src/net/smc/smc_llc.c: In function 'smc_llc_send_link_delete_all': /kisskb/src/net/smc/smc_llc.c:1250:9: warning: missing braces around initializer [-Wmissing-braces] struct smc_llc_msg_del_link delllc = {0}; ^ /kisskb/src/net/smc/smc_llc.c:1250:9: warning: (near initialization for 'delllc.hd') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c: In function 'dp_test_get_audio_test_data': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c:2712:8: warning: missing braces around initializer [-Wmissing-braces] union audio_test_mode dpcd_test_mode = {0}; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c:2712:8: warning: (near initialization for 'dpcd_test_mode.bits') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c:2714:8: warning: missing braces around initializer [-Wmissing-braces] union audio_test_pattern_period dpcd_pattern_period[AUDIO_CHANNELS_COUNT] = {0}; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c:2714:8: warning: (near initialization for 'dpcd_pattern_period[0]') [-Wmissing-braces] In file included from /kisskb/src/drivers/net/ethernet/intel/ice/ice_flex_pipe.c:6:0: /kisskb/src/drivers/net/ethernet/intel/ice/ice_flex_pipe.c: In function 'ice_free_flow_profs': /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.h:197:33: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] #define ICE_FLOW_ENTRY_HNDL(e) ((u64)e) ^ /kisskb/src/drivers/net/ethernet/intel/ice/ice_flex_pipe.c:2922:9: note: in expansion of macro 'ICE_FLOW_ENTRY_HNDL' ICE_FLOW_ENTRY_HNDL(e)); ^ In file included from /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c:5:0: /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c: In function 'ice_flow_add_entry': /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.h:197:33: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] #define ICE_FLOW_ENTRY_HNDL(e) ((u64)e) ^ /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c:946:13: note: in expansion of macro 'ICE_FLOW_ENTRY_HNDL' *entry_h = ICE_FLOW_ENTRY_HNDL(e); ^ /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c: In function 'ice_flow_rem_entry': /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.h:198:32: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define ICE_FLOW_ENTRY_PTR(h) ((struct ice_flow_entry *)(h)) ^ /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c:974:10: note: in expansion of macro 'ICE_FLOW_ENTRY_PTR' entry = ICE_FLOW_ENTRY_PTR(entry_h); ^ /kisskb/src/drivers/android/binderfs.c: In function 'binderfs_fill_super': /kisskb/src/drivers/android/binderfs.c:653:9: warning: missing braces around initializer [-Wmissing-braces] struct binderfs_device device_info = { 0 }; ^ /kisskb/src/drivers/android/binderfs.c:653:9: warning: (near initialization for 'device_info.name') [-Wmissing-braces] In file included from /kisskb/src/arch/mips/include/asm/page.h:258:0, from /kisskb/src/arch/mips/include/asm/io.h:29, from /kisskb/src/arch/mips/include/asm/mmiowb.h:5, from /kisskb/src/include/linux/spinlock.h:60, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/net.h:19, from /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c:8: /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c: In function 'siw_tx_hdt': /kisskb/src/arch/mips/include/asm/page.h:249:53: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) ^ /kisskb/src/include/asm-generic/memory_model.h:33:41: note: in definition of macro '__pfn_to_page' #define __pfn_to_page(pfn) (mem_map + ((pfn) - ARCH_PFN_OFFSET)) ^ /kisskb/src/arch/mips/include/asm/page.h:249:31: note: in expansion of macro 'PFN_DOWN' #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) ^ /kisskb/src/arch/mips/include/asm/page.h:250:41: note: in expansion of macro 'virt_to_pfn' #define virt_to_page(kaddr) pfn_to_page(virt_to_pfn(kaddr)) ^ /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c:528:23: note: in expansion of macro 'virt_to_page' page_array[seg] = virt_to_page(va & PAGE_MASK); ^ make: *** [Makefile:180: sub-make] Error 2 Command 'make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc4.9 # Build took: 0:17:52.593340