# git rev-parse -q --verify 30185b69a2d533c4ba6ca926b8390ce7de495e29^{commit} 30185b69a2d533c4ba6ca926b8390ce7de495e29 already have revision, skipping fetch # git checkout -q -f -B kisskb 30185b69a2d533c4ba6ca926b8390ce7de495e29 # git clean -qxdf # < git log -1 # commit 30185b69a2d533c4ba6ca926b8390ce7de495e29 # Merge: 0f43283be7fe 63e95849a774 # Author: Linus Torvalds # Date: Fri Aug 7 13:35:51 2020 -0700 # # Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux # # Pull clk updates from Stephen Boyd: # "It looks like a smaller batch of clk updates this time around. # # In the core framework we just have some minor tweaks and a debugfs # feature, so not much to see there. The driver updates are fairly well # split between AT91 and Qualcomm clk support. Adding those two drivers # together equals about 50% of the diffstat. # # Otherwise, the big amount of work this time was on supporting # Broadcom's Raspberry Pi firmware clks. # # Highlights: # # Core: # - Document clk_hw_round_rate() so it gets some more use # - Remove unused __clk_get_flags() # - Add a prepare/enable debugfs feature similar to rate setting # # New Drivers: # - Add support for SAMA7G5 SoC clks # - Enable CPU clks on Qualcomm IPQ6018 SoCs # - Enable CPU clks on Qualcomm MSM8996 SoCs # - GPU clk support for Qualcomm SM8150 and SM8250 SoCs # - Audio clks on Qualcomm SC7180 SoCs # - Microchip Sparx5 DPLL clk # - Add support for the new Renesas RZ/G2H (R8A774E1) SoC # # Updates: # - Make defines for bcm63xx-gate clks to use in DT # - Support BCM2711 SoC firmware clks # - Add HDMI clks for BCM2711 SoCs # - Add RTC related clks on Ingenic SoCs # - Support USB PHY clks on Ingenic SoCs # - Support gate clks on BCM6318 SoCs # - RMU and DMAC/GPIO clock support for Actions Semi S500 SoCs # - Use poll_timeout functions in Rockchip clk driver # - Support Rockchip rk3288w SoC variant # - Mark mac_lbtest critical on Rockchip rk3188 # - Add CAAM clock support for i.MX vf610 driver # - Add MU root clock support for i.MX imx8mp driver # - Amlogic g12: add neural network accelerator clock sources # - Amlogic meson8: remove critical flag for main PLL divider # - Amlogic meson8: add video decoder clock gates # - Convert one more Renesas DT binding to json-schema # - Enhance critical clock handling on Renesas platforms to only # consider clocks that were enabled at boot time" # # * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (79 commits) # clk: qcom: gcc: Make disp gpll0 branch aon for sc7180/sdm845 # ipq806x: gcc: add support for child probe # clk: qcom: msm8996: Make symbol 'cpu_msm8996_clks' static # clk: qcom: ipq8074: Add correct index for PCIe clocks # clk: : drop a duplicated word # clk: renesas: cpg-mssr: Add r8a774e1 support # dt-bindings: clock: renesas,cpg-mssr: Document r8a774e1 # clk: Drop duplicate selection in Kconfig # clk: qcom: smd: Add support for MSM8992/4 rpm clocks # clk: qcom: ipq8074: Add missing clocks for pcie # dt-bindings: clock: qcom: ipq8074: Add missing bindings for PCIe # Replace HTTP links with HTTPS ones: Common CLK framework # clk: qcom: Add CPU clock driver for msm8996 # dt-bindings: clk: qcom: Add bindings for CPU clock for msm8996 # soc: qcom: Separate kryo l2 accessors from PMU driver # clk: meson: meson8b: add the vclk2_en gate clock # clk: meson: meson8b: add the vclk_en gate clock # clk: qcom: Fix return value check in apss_ipq6018_probe() # clk: bcm: dvp: Add missing module informations # clk: meson: meson8b: Drop CLK_IS_CRITICAL from fclk_div2 # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 30185b69a2d533c4ba6ca926b8390ce7de495e29 # < make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-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-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:12429:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- In file included from /kisskb/src/arch/mips/include/asm/bug.h:42, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/thread_info.h:12, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:15, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/include/linux/seqlock.h: In function 'write_seqcount_begin_nested': /kisskb/src/include/asm-generic/percpu.h:31:40: error: implicit declaration of function 'raw_smp_processor_id'; did you mean 'mips_set_process_fp_mode'? [-Werror=implicit-function-declaration] #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/bug.h:145:27: note: in definition of macro 'WARN_ON_ONCE' int __ret_warn_once = !!(condition); \ ^~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:301:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:313:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:119:10: note: in expansion of macro 'READ_ONCE' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:231:2: note: in expansion of macro 'RELOC_HIDE' RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)) ^~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:44:31: note: in expansion of macro 'SHIFT_PERCPU_PTR' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:31:25: note: in expansion of macro 'per_cpu_offset' #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:44:53: note: in expansion of macro '__my_cpu_offset' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^~~~~~~~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:242:2: note: in expansion of macro 'arch_raw_cpu_ptr' arch_raw_cpu_ptr(ptr); \ ^~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:119:21: note: in expansion of macro 'raw_cpu_ptr' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:138:11: note: in expansion of macro '__this_cpu_generic_read_nopreempt' __ret = __this_cpu_generic_read_nopreempt(pcp); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:320:31: note: in expansion of macro 'this_cpu_generic_read' #define this_cpu_read_1(pcp) this_cpu_generic_read(pcp) ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:321:23: note: in expansion of macro 'this_cpu_read_1' case 1: pscr_ret__ = stem##1(variable); break; \ ^~~~ /kisskb/src/include/linux/percpu-defs.h:507:29: note: in expansion of macro '__pcpu_size_call_return' #define this_cpu_read(pcp) __pcpu_size_call_return(this_cpu_read_, pcp) ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/lockdep.h:565:9: note: in expansion of macro 'this_cpu_read' this_cpu_read(hardirqs_enabled))); \ ^~~~~~~~~~~~~ /kisskb/src/include/linux/seqlock.h:285:2: note: in expansion of macro 'lockdep_assert_preemption_disabled' lockdep_assert_preemption_disabled(); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/include/linux/smp.h:82, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/time32.h:13, from /kisskb/src/include/linux/time.h:74, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/arch/mips/include/asm/smp.h: At top level: /kisskb/src/arch/mips/include/asm/smp.h:28:19: error: static declaration of 'raw_smp_processor_id' follows non-static declaration static inline int raw_smp_processor_id(void) ^~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/mips/include/asm/bug.h:42, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/thread_info.h:12, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:15, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/include/asm-generic/percpu.h:31:40: note: previous implicit declaration of 'raw_smp_processor_id' was here #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/bug.h:145:27: note: in definition of macro 'WARN_ON_ONCE' int __ret_warn_once = !!(condition); \ ^~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:301:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:313:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:119:10: note: in expansion of macro 'READ_ONCE' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:231:2: note: in expansion of macro 'RELOC_HIDE' RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)) ^~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:44:31: note: in expansion of macro 'SHIFT_PERCPU_PTR' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:31:25: note: in expansion of macro 'per_cpu_offset' #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:44:53: note: in expansion of macro '__my_cpu_offset' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^~~~~~~~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:242:2: note: in expansion of macro 'arch_raw_cpu_ptr' arch_raw_cpu_ptr(ptr); \ ^~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:119:21: note: in expansion of macro 'raw_cpu_ptr' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:138:11: note: in expansion of macro '__this_cpu_generic_read_nopreempt' __ret = __this_cpu_generic_read_nopreempt(pcp); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:320:31: note: in expansion of macro 'this_cpu_generic_read' #define this_cpu_read_1(pcp) this_cpu_generic_read(pcp) ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:321:23: note: in expansion of macro 'this_cpu_read_1' case 1: pscr_ret__ = stem##1(variable); break; \ ^~~~ /kisskb/src/include/linux/percpu-defs.h:507:29: note: in expansion of macro '__pcpu_size_call_return' #define this_cpu_read(pcp) __pcpu_size_call_return(this_cpu_read_, pcp) ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/lockdep.h:565:9: note: in expansion of macro 'this_cpu_read' this_cpu_read(hardirqs_enabled))); \ ^~~~~~~~~~~~~ /kisskb/src/include/linux/seqlock.h:285:2: note: in expansion of macro 'lockdep_assert_preemption_disabled' lockdep_assert_preemption_disabled(); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:114: arch/mips/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1195: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 24 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:00:13.996286