# git rev-parse -q --verify 7c8db8431b5bc1c37f6d2ce73d2e18a42b52c87d^{commit} 7c8db8431b5bc1c37f6d2ce73d2e18a42b52c87d already have revision, skipping fetch # git checkout -q -f -B kisskb 7c8db8431b5bc1c37f6d2ce73d2e18a42b52c87d # git clean -qxdf # < git log -1 # commit 7c8db8431b5bc1c37f6d2ce73d2e18a42b52c87d # Author: Michael Ellerman # Date: Thu Apr 12 22:24:45 2018 +1000 # # powerpc/64s: Fix CPU_FTRS_ALWAYS vs DT CPU features # # The cpu_has_feature() mechanism has an optimisation where at build # time we construct a mask of the CPU feature bits that will always be # true for the given .config, based on the platform/bitness/etc. that we # are building for. # # That is incompatible with DT CPU features, where the set of CPU # features is dependent on feature flags that are given to us by # firmware. # # The result is that some feature bits can not be *disabled* by DT CPU # features. Or more accurately, they can be disabled but they will still # appear in the ALWAYS mask, meaning cpu_has_feature() will always # return true for them. # # In the past this hasn't really been a problem because on Book3S # 64 (where we support DT CPU features), the set of ALWAYS bits has been # very small. That was because we always built for POWER4 and later, # meaning the set of common bits was small. # # The only bit that could be cleared by DT CPU features that was also in # the ALWAYS mask was CPU_FTR_NODSISRALIGN, and that was only used in # the alignment handler to create a fake DSISR. That code was itself # deleted in 31bfdb036f12 ("powerpc: Use instruction emulation # infrastructure to handle alignment faults") (Sep 2017). # # However the set of ALWAYS features changed with the recent commit # db5ae1c155af ("powerpc/64s: Refine feature sets for little endian # builds") which restricted the set of feature flags when building # little endian to Power7 or later. That caused the ALWAYS mask to # become much larger for little endian builds. # # The result is that the following feature bits can currently not # be *disabled* by DT CPU features: # # CPU_FTR_REAL_LE, CPU_FTR_MMCRA, CPU_FTR_CTRL, CPU_FTR_SMT, # CPU_FTR_PURR, CPU_FTR_SPURR, CPU_FTR_DSCR, CPU_FTR_PKEY, # CPU_FTR_VMX_COPY, CPU_FTR_CFAR, CPU_FTR_HAS_PPR. # # To fix it we need to mask the set of ALWAYS features with the base set # of DT CPU features, ie. the features that are always enabled by DT CPU # features. That way there are no bits in the ALWAYS mask that are not # also always set by DT CPU features. # # Fixes: db5ae1c155af ("powerpc/64s: Refine feature sets for little endian builds") # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < git log --format=%s --max-count=1 7c8db8431b5bc1c37f6d2ce73d2e18a42b52c87d # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc6xx_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc6xx_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc6xx_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/sound/ppc/pmac.h:25:0, from /kisskb/src/sound/ppc/awacs.c:29: /kisskb/src/sound/ppc/awacs.c: In function 'snd_pmac_awacs_init': /kisskb/src/include/sound/control.h:220:9: warning: 'speaker_vol' may be used uninitialized in this function [-Wmaybe-uninitialized] return _snd_ctl_add_slave(master, slave, 0); ^ /kisskb/src/sound/ppc/awacs.c:886:36: note: 'speaker_vol' was declared here struct snd_kcontrol *master_vol, *speaker_vol; ^ arch/powerpc/boot/mpc832x_rdb.dtb: Warning (interrupts_property): /qe@e0100000/mdio@3120/ethernet-phy@0:#interrupt-cells: size is (4), expected multiple of 8 arch/powerpc/boot/mpc832x_rdb.dtb: Warning (interrupts_property): /qe@e0100000/mdio@3120/ethernet-phy@4:#interrupt-cells: size is (4), expected multiple of 8 arch/powerpc/boot/mpc8272ads.dtb: Warning (pci_bridge): /pci@f0010800: missing bus-range for PCI bridge arch/powerpc/boot/mpc8272ads.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/pq2fads.dtb: Warning (pci_bridge): /pci@f0010800: missing bus-range for PCI bridge arch/powerpc/boot/pq2fads.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' INFO: Uncompressed kernel (size 0xa657f0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa657f0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa657f0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa657f0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa657f0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa657f0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa657f0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa657f0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa657f0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa657f0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa55098) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa55098) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) Image Name: Linux-4.16.0+ Created: Fri Apr 13 01:07:35 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4921063 Bytes = 4805.73 kB = 4.69 MB Load Address: 00b00000 Entry Point: 00b001f4 Image Name: Linux-4.16.0+ Created: Fri Apr 13 01:07:35 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4896590 Bytes = 4781.83 kB = 4.67 MB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.16.0+ Created: Fri Apr 13 01:07:36 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4920930 Bytes = 4805.60 kB = 4.69 MB Load Address: 00b00000 Entry Point: 00b001f4 Image Name: Linux-4.16.0+ Created: Fri Apr 13 01:07:36 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4920204 Bytes = 4804.89 kB = 4.69 MB Load Address: 00b00000 Entry Point: 00b001f4 Image Name: Linux-4.16.0+ Created: Fri Apr 13 01:07:36 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4921093 Bytes = 4805.75 kB = 4.69 MB Load Address: 00b00000 Entry Point: 00b007a0 Image Name: Linux-4.16.0+ Created: Fri Apr 13 01:07:36 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4920876 Bytes = 4805.54 kB = 4.69 MB Load Address: 00b00000 Entry Point: 00b001f4 Image Name: Linux-4.16.0+ Created: Fri Apr 13 01:07:36 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4920951 Bytes = 4805.62 kB = 4.69 MB Load Address: 00b00000 Entry Point: 00b001f4 Image Name: Linux-4.16.0+ Created: Fri Apr 13 01:07:36 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4921073 Bytes = 4805.74 kB = 4.69 MB Load Address: 00b00000 Entry Point: 00b007a0 Image Name: Linux-4.16.0+ Created: Fri Apr 13 01:07:36 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4920202 Bytes = 4804.88 kB = 4.69 MB Load Address: 00b00000 Entry Point: 00b001f4 Completed OK # rm -rf /kisskb/build/powerpc-fixes_ppc6xx_defconfig_powerpc-5.3 # Build took: 0:03:06.733181