# git rev-parse -q --verify 0c855563182001c829065faa17f8e29e9ceffe13^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify 0c855563182001c829065faa17f8e29e9ceffe13^{commit} 0c855563182001c829065faa17f8e29e9ceffe13 # git checkout -q -f -B kisskb 0c855563182001c829065faa17f8e29e9ceffe13 # git clean -qxdf # < git log -1 # commit 0c855563182001c829065faa17f8e29e9ceffe13 # Merge: 6b0fbc540c2f ea9629283839 # Author: Linus Torvalds # Date: Mon Apr 26 12:30:36 2021 -0700 # # Merge tag 'arm-apple-m1-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc # # Pull ARM Apple M1 platform support from Arnd Bergmann: # "The Apple M1 is the processor used it all current generation Apple # Macintosh computers. Support for this platform so far is rudimentary, # but it boots and can use framebuffer and serial console over a special # USB cable. # # Support for several essential on-chip devices (USB, PCIe, IOMMU, NVMe) # is work in progress but was not ready in time. # # A very detailed description of what works is in the commit message of # commit 1bb2fd3880d4 ("Merge tag 'm1-soc-bringup-v5' [..]") and on the # AsahiLinux wiki" # # Link: https://lore.kernel.org/linux-arm-kernel/bdb18e9f-fcd7-1e31-2224-19c0e5090706@marcan.st/ # # * tag 'arm-apple-m1-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: # asm-generic/io.h: Unbork ioremap_np() declaration # arm64: apple: Add initial Apple Mac mini (M1, 2020) devicetree # dt-bindings: display: Add apple,simple-framebuffer # arm64: Kconfig: Introduce CONFIG_ARCH_APPLE # irqchip/apple-aic: Add support for the Apple Interrupt Controller # dt-bindings: interrupt-controller: Add DT bindings for apple-aic # arm64: Move ICH_ sysreg bits from arm-gic-v3.h to sysreg.h # of/address: Add infrastructure to declare MMIO as non-posted # asm-generic/io.h: implement pci_remap_cfgspace using ioremap_np # arm64: Implement ioremap_np() to map MMIO as nGnRnE # docs: driver-api: device-io: Document ioremap() variants & access funcs # docs: driver-api: device-io: Document I/O access functions # asm-generic/io.h: Add a non-posted variant of ioremap() # arm64: arch_timer: Implement support for interrupt-names # dt-bindings: timer: arm,arch_timer: Add interrupt-names support # arm64: cputype: Add CPU implementor & types for the Apple M1 cores # dt-bindings: arm: cpus: Add apple,firestorm & icestorm compatibles # dt-bindings: arm: apple: Add bindings for Apple ARM platforms # dt-bindings: vendor-prefixes: Add apple prefix # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 0c855563182001c829065faa17f8e29e9ceffe13 # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- randconfig KCONFIG_SEED=0xF6D13262 # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_CPU_BIG_ENDIAN=y # Added to kconfig CONFIG_PPC64=y # Added to kconfig CONFIG_PPC_DISABLE_WERROR=y # Added to kconfig CONFIG_SECTION_MISMATCH_WARN_ONLY=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_CC_STACKPROTECTOR_STRONG=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_LD_HEAD_STUB_CATCH=y # Added to kconfig CONFIG_TRIM_UNUSED_KSYMS=n # Added to kconfig CONFIG_UBSAN=n # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4445:warning: override: reassigning to symbol PPC64 .config:4446:warning: override: reassigning to symbol PPC_DISABLE_WERROR .config:4448:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD .config:4453:warning: override: reassigning to symbol UBSAN # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/arch/powerpc/kernel/eeh.c:1571:12: warning: 'proc_eeh_show' defined but not used [-Wunused-function] static int proc_eeh_show(struct seq_file *m, void *v) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/navi10_ppt.c: In function 'navi10_get_gpu_metrics': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/navi10_ppt.c:2297:2: warning: missing braces around initializer [-Wmissing-braces] SmuMetrics_NV12_t nv12_metrics = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/navi10_ppt.c:2297:2: warning: (near initialization for 'nv12_metrics.CurrClock') [-Wmissing-braces] /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:9860: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:9860: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] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c: In function 'dcn_bw_apply_registry_override': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c:638:2: error: implicit declaration of function 'enable_kernel_altivec' [-Werror=implicit-function-declaration] DC_FP_START(); ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c:674:2: error: implicit declaration of function 'disable_kernel_altivec' [-Werror=implicit-function-declaration] DC_FP_END(); ^ cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.o] Error 1 make[5]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn21/rn_clk_mgr.c: In function 'rn_clk_mgr_construct': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn21/rn_clk_mgr.c:880:9: warning: missing braces around initializer [-Wmissing-braces] struct dpm_clocks clock_table = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn21/rn_clk_mgr.c:880:9: warning: (near initialization for 'clock_table.DcfClocks') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c: In function 'vg_update_clocks': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c:116:11: warning: missing braces around initializer [-Wmissing-braces] union display_idle_optimization_u idle_info = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c:116:11: warning: (near initialization for 'idle_info.idle_info') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c:129:10: warning: missing braces around initializer [-Wmissing-braces] union display_idle_optimization_u idle_info = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c:129:10: warning: (near initialization for 'idle_info.idle_info') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c: At top level: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c:704:15: warning: missing braces around initializer [-Wmissing-braces] static struct watermarks dummy_wms = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/vg_clk_mgr.c:704:15: warning: (near initialization for 'dummy_wms.WatermarkRow') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c: In function 'dcn3_init_clocks': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c:214:2: error: implicit declaration of function 'enable_kernel_altivec' [-Werror=implicit-function-declaration] DC_FP_START(); ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c:216:2: error: implicit declaration of function 'disable_kernel_altivec' [-Werror=implicit-function-declaration] DC_FP_END(); ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/dcn301_smu.c: In function 'dcn301_smu_enable_phy_refclk_pwrdwn': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/dcn301_smu.c:198:8: warning: missing braces around initializer [-Wmissing-braces] union display_idle_optimization_u idle_info = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn301/dcn301_smu.c:198:8: warning: (near initialization for 'idle_info.idle_info') [-Wmissing-braces] cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1855: drivers] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 # Build took: 0:04:26.740661