# 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_mpc85xx_smp_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_smp_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_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/include/linux/kernel.h:10:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:9, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:77:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ arch/powerpc/boot/mpc8541cds.dtb: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) arch/powerpc/boot/tqm8548.dtb: Warning (pci_bridge): /pcie@e000a000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/tqm8548.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/mpc8555cds.dtb: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) arch/powerpc/boot/mpc8568mds.dtb: Warning (pci_bridge): /pcie@e000a000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8568mds.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/mpc8548cds_32b.dtb: Warning (pci_bridge): /pcie@e000a000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8548cds_32b.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/sbc8548.dtb: Warning (pci_bridge): /pcie@e000a000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/sbc8548.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/mpc8572ds.dtb: Warning (pci_bridge): /pcie@ffe08000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8572ds.dtb: Warning (pci_bridge): /pcie@ffe09000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8572ds.dtb: Warning (pci_bridge): /pcie@ffe0a000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8572ds.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' arch/powerpc/boot/mpc8544ds.dtb: Warning (pci_bridge): /pcie@e0009000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8544ds.dtb: Warning (pci_bridge): /pcie@e000a000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8544ds.dtb: Warning (pci_bridge): /pcie@e000b000/pcie@0: missing bus-range for PCI bridge arch/powerpc/boot/mpc8544ds.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe363c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbd2e84) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:10 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5830591 Bytes = 5693.94 kB = 5.56 MB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:10 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5855876 Bytes = 5718.63 kB = 5.58 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:10 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5854567 Bytes = 5717.35 kB = 5.58 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:11 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5854551 Bytes = 5717.33 kB = 5.58 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:11 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5854515 Bytes = 5717.30 kB = 5.58 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:11 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5856876 Bytes = 5719.61 kB = 5.59 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:11 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5854907 Bytes = 5717.68 kB = 5.58 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:11 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5854662 Bytes = 5717.44 kB = 5.58 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:11 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5855114 Bytes = 5717.88 kB = 5.58 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:11 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5854566 Bytes = 5717.35 kB = 5.58 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:11 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5856424 Bytes = 5719.16 kB = 5.59 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5854517 Bytes = 5717.30 kB = 5.58 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5856600 Bytes = 5719.34 kB = 5.59 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5854453 Bytes = 5717.24 kB = 5.58 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5854551 Bytes = 5717.33 kB = 5.58 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.16.0-g7c8db84 Created: Fri Apr 13 01:22:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5854873 Bytes = 5717.65 kB = 5.58 MB Load Address: 00c00000 Entry Point: 00c0020c Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-5.3 # Build took: 0:01:41.697647