# git rev-parse -q --verify 9c7a00868c3a77c86ab07a2c51f3bb4897bd8550^{commit} 9c7a00868c3a77c86ab07a2c51f3bb4897bd8550 already have revision, skipping fetch # git checkout -q -f -B kisskb 9c7a00868c3a77c86ab07a2c51f3bb4897bd8550 # git clean -qxdf # git log -1 commit 9c7a00868c3a77c86ab07a2c51f3bb4897bd8550 Author: Michael Ellerman Date: Mon Mar 6 21:51:32 2017 +1100 powerpc/64: Fix L1D cache shape vector reporting L1I values It seems we didn't pay quite enough attention when testing the new cache shape vectors, which means we didn't notice the bug where the vector for the L1D was using the L1I values. Fix it, resulting in eg: L1I cache size: 0x8000 32768B 32K L1I line size: 0x80 8-way associative L1D cache size: 0x10000 65536B 64K L1D line size: 0x80 8-way associative Fixes: 98a5f361b862 ("powerpc: Add new cache geometry aux vectors") Cut-and-paste-bug-by: Benjamin Herrenschmidt Badly-reviewed-by: Michael Ellerman 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 9c7a00868c3a77c86ab07a2c51f3bb4897bd8550 # < make -j 48 ARCH=powerpc O=/home/kisskb/slave/build/powerpc-fixes_powerpc-allnoconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- allnoconfig # make -j 48 ARCH=powerpc O=/home/kisskb/slave/build/powerpc-fixes_powerpc-allnoconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- make[1]: Entering directory '/home/kisskb/slave/build/powerpc-fixes_powerpc-allnoconfig_powerpc-5.3' GEN ./Makefile scripts/kconfig/conf --silentoldconfig Kconfig CHK include/config/kernel.release GEN ./Makefile UPD include/config/kernel.release WRAP arch/powerpc/include/generated/asm/clkdev.h WRAP arch/powerpc/include/generated/asm/div64.h WRAP arch/powerpc/include/generated/asm/export.h WRAP arch/powerpc/include/generated/asm/irq_regs.h WRAP arch/powerpc/include/generated/asm/irq_work.h WRAP arch/powerpc/include/generated/asm/local64.h WRAP arch/powerpc/include/generated/asm/mcs_spinlock.h WRAP arch/powerpc/include/generated/asm/preempt.h WRAP arch/powerpc/include/generated/asm/rwsem.h WRAP arch/powerpc/include/generated/asm/vtime.h CHK include/generated/uapi/linux/version.h UPD include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h Using /home/kisskb/slave/src as source for kernel HOSTCC scripts/sortextable HOSTCC scripts/dtc/dtc.o HOSTCC scripts/dtc/flattree.o CC scripts/mod/empty.o HOSTCC scripts/dtc/fstree.o HOSTCC scripts/mod/mk_elfconfig HOSTCC scripts/dtc/data.o HOSTCC scripts/dtc/livetree.o CC scripts/mod/devicetable-offsets.s HOSTCC scripts/dtc/srcpos.o HOSTCC scripts/dtc/treesource.o HOSTCC scripts/dtc/checks.o SHIPPED scripts/dtc/dtc-parser.tab.h SHIPPED scripts/dtc/dtc-lexer.lex.c HOSTCC scripts/dtc/util.o SHIPPED scripts/dtc/dtc-parser.tab.c HOSTCC scripts/dtc/dtc-lexer.lex.o HOSTCC scripts/dtc/dtc-parser.tab.o GEN scripts/mod/devicetable-offsets.h MKELF scripts/mod/elfconfig.h HOSTCC scripts/mod/sumversion.o HOSTCC scripts/mod/modpost.o HOSTCC scripts/mod/file2alias.o HOSTLD scripts/dtc/dtc HOSTLD scripts/mod/modpost CHK include/generated/timeconst.h CC kernel/bounds.s UPD include/generated/timeconst.h CHK include/generated/bounds.h UPD include/generated/bounds.h CC arch/powerpc/kernel/asm-offsets.s CHK include/generated/asm-offsets.h UPD include/generated/asm-offsets.h CALL /home/kisskb/slave/src/scripts/checksyscalls.sh CC init/main.o CHK include/generated/compile.h CC init/do_mounts.o LD usr/built-in.o CC init/noinitramfs.o CC init/init_task.o UPD include/generated/compile.h CC init/version.o CC arch/powerpc/mm/fault.o LD arch/powerpc/sysdev/built-in.o CC arch/powerpc/lib/alloc.o CC arch/powerpc/mm/pgtable.o AS arch/powerpc/lib/crtsavres.o CC arch/powerpc/mm/mmap.o CC arch/powerpc/mm/mem.o AS arch/powerpc/lib/string.o AS arch/powerpc/lib/checksum_32.o CC arch/powerpc/lib/code-patching.o AS arch/powerpc/lib/div64.o AS arch/powerpc/lib/copy_32.o CC arch/powerpc/lib/checksum_wrappers.o CC arch/powerpc/mm/ppc_mmu_32.o CC arch/powerpc/mm/init-common.o CC arch/powerpc/mm/init_32.o AS arch/powerpc/mm/hash_low_32.o CC arch/powerpc/mm/pgtable_32.o CC arch/powerpc/mm/tlb_hash32.o CC arch/powerpc/mm/hugetlbpage.o CC arch/powerpc/lib/feature-fixups.o CC arch/powerpc/mm/mmu_context_hash32.o LD arch/powerpc/platforms/built-in.o CC arch/powerpc/kernel/ptrace.o CC arch/powerpc/kernel/cputable.o CC arch/powerpc/kernel/vdso.o CC arch/powerpc/kernel/signal_32.o CC arch/powerpc/kernel/pmc.o CC arch/powerpc/kernel/syscalls.o CC arch/powerpc/kernel/align.o CC arch/powerpc/kernel/irq.o CC arch/powerpc/kernel/signal.o CC arch/powerpc/kernel/idle.o CPP arch/powerpc/kernel/systbl_chk.i CC arch/powerpc/kernel/process.o CC arch/powerpc/kernel/sysfs.o CC arch/powerpc/kernel/cacheinfo.o AS arch/powerpc/kernel/misc_32.o CC arch/powerpc/kernel/prom.o CC arch/powerpc/kernel/of_platform.o CC arch/powerpc/kernel/traps.o CC arch/powerpc/kernel/udbg.o AS arch/powerpc/kernel/misc.o CC arch/powerpc/kernel/io.o CC arch/powerpc/kernel/setup-common.o CC arch/powerpc/kernel/prom_parse.o CC arch/powerpc/kernel/time.o CC arch/powerpc/kernel/dma.o LD arch/powerpc/math-emu/built-in.o AS arch/powerpc/kernel/idle_6xx.o AS arch/powerpc/kernel/l2cr_6xx.o AS arch/powerpc/kernel/entry_32.o AS arch/powerpc/kernel/cpu_setup_6xx.o LD arch/powerpc/crypto/built-in.o CC arch/powerpc/kernel/setup_32.o CC arch/powerpc/kernel/pci_32.o LDS arch/powerpc/kernel/vdso32/vdso32.lds CC arch/powerpc/kernel/pci-common.o VDSO32A arch/powerpc/kernel/vdso32/sigtramp.o VDSO32A arch/powerpc/kernel/vdso32/cacheflush.o VDSO32A arch/powerpc/kernel/vdso32/datapage.o VDSO32A arch/powerpc/kernel/vdso32/gettimeofday.o CC arch/powerpc/kernel/pci_of_scan.o CC arch/powerpc/kernel/iomap.o AS arch/powerpc/kernel/head_32.o VDSO32A arch/powerpc/kernel/vdso32/note.o LDS arch/powerpc/kernel/vmlinux.lds AS arch/powerpc/kernel/fpu.o LD arch/powerpc/net/built-in.o CALL /home/kisskb/slave/src/arch/powerpc/kernel/systbl_chk.sh VDSO32L arch/powerpc/kernel/vdso32/vdso32.so.dbg AS arch/powerpc/kernel/systbl.o LD init/mounts.o OBJCOPY arch/powerpc/kernel/vdso32/vdso32.so AS arch/powerpc/kernel/vdso32/vdso32_wrapper.o LD certs/built-in.o LD arch/powerpc/lib/built-in.o LD arch/powerpc/kernel/vdso32/built-in.o LD arch/powerpc/mm/built-in.o LD init/built-in.o LD ipc/built-in.o CC kernel/fork.o CC kernel/exec_domain.o CC kernel/panic.o CC kernel/cpu.o CC security/min_addr.o CC security/commoncap.o CC kernel/user.o CC kernel/sysctl.o CC kernel/capability.o CC kernel/sysctl_binary.o CC kernel/resource.o CC kernel/ptrace.o CC kernel/signal.o CC kernel/kmod.o CC kernel/workqueue.o CC kernel/exit.o CC kernel/softirq.o CC kernel/task_work.o CC kernel/reboot.o CC kernel/params.o CC kernel/kthread.o CC kernel/async.o CC kernel/ksysfs.o CC kernel/sys_ni.o CC kernel/cred.o LD block/built-in.o CC kernel/pid.o CC kernel/range.o CC kernel/smpboot.o CC kernel/extable.o CC kernel/notifier.o CC kernel/sys.o CC kernel/nsproxy.o CC kernel/ucount.o CC mm/filemap.o LD kernel/livepatch/built-in.o LD crypto/built-in.o CC kernel/power/qos.o CC kernel/locking/mutex.o CC mm/mempool.o CC kernel/locking/semaphore.o CC kernel/locking/rwsem.o CC kernel/irq/irqdesc.o CC kernel/printk/printk.o CC kernel/rcu/update.o LD sound/built-in.o CC kernel/locking/percpu-rwsem.o CC fs/open.o CC kernel/locking/rwsem-xadd.o CC kernel/rcu/sync.o CC kernel/rcu/tiny.o LD firmware/built-in.o CC fs/read_write.o CC kernel/sched/core.o CC kernel/irq/handle.o CC kernel/irq/manage.o CC kernel/irq/spurious.o LD net/built-in.o CC fs/file_table.o CC kernel/sched/clock.o CC kernel/sched/loadavg.o CC kernel/sched/cputime.o CC kernel/sched/idle_task.o CC kernel/sched/fair.o CC kernel/sched/rt.o CC kernel/dma.o CC kernel/up.o CC kernel/elfcore.o CC kernel/irq/resend.o CC kernel/time/time.o CC kernel/time/hrtimer.o CC kernel/time/timer.o CC kernel/memremap.o CC kernel/time/timekeeping.o CC kernel/irq/chip.o CC kernel/irq/devres.o CC kernel/irq/dummychip.o CC fs/super.o CC fs/char_dev.o CC fs/stat.o CC fs/exec.o CC kernel/sched/deadline.o LD virt/lib/built-in.o CC kernel/sched/stop_task.o CC mm/oom_kill.o CC mm/maccess.o LD virt/built-in.o CC mm/page_alloc.o CC fs/pipe.o CC fs/namei.o CC mm/page-writeback.o CC kernel/irq/irqdomain.o CC fs/fcntl.o CC fs/ioctl.o LD drivers/amba/built-in.o CC fs/readdir.o LD drivers/auxdisplay/built-in.o LD arch/powerpc/kernel/built-in.o CC fs/select.o CC fs/dcache.o CC fs/inode.o CC mm/readahead.o LD kernel/locking/built-in.o LD kernel/rcu/built-in.o LD drivers/block/built-in.o CC kernel/sched/wait.o CC kernel/sched/swait.o LD drivers/bus/built-in.o LD kernel/power/built-in.o LD drivers/cdrom/built-in.o CC mm/swap.o CC kernel/time/ntp.o LD drivers/char/ipmi/built-in.o LD kernel/printk/built-in.o LD security/built-in.o CC lib/lockref.o CC drivers/char/mem.o CC drivers/char/random.o CC lib/bcd.o CC drivers/char/misc.o CC kernel/sched/completion.o LD drivers/char/agp/built-in.o CC kernel/time/clocksource.o CC kernel/sched/idle.o CC kernel/time/jiffies.o CC fs/attr.o CC fs/bad_inode.o CC fs/filesystems.o CC fs/file.o CC fs/namespace.o CC fs/seq_file.o CC kernel/time/timer_list.o CC drivers/base/component.o CC lib/div64.o CC kernel/time/timeconv.o CC drivers/base/core.o CC drivers/base/bus.o CC kernel/time/timecounter.o CC drivers/base/dd.o CC drivers/base/syscore.o CC lib/sort.o CC lib/random32.o CC lib/parser.o CC lib/bust_spinlocks.o CC lib/debug_locks.o CC lib/kasprintf.o CC mm/truncate.o CC mm/vmscan.o CC mm/util.o CC fs/libfs.o CC fs/xattr.o CC mm/shmem.o CC fs/fs-writeback.o CC fs/pnode.o CC lib/bitmap.o CC lib/scatterlist.o CC fs/splice.o CC mm/mmzone.o CC kernel/time/alarmtimer.o CC fs/sync.o CC fs/utimes.o CC fs/stack.o CC fs/fs_struct.o CC fs/statfs.o LD kernel/irq/built-in.o CC fs/fs_pin.o LD drivers/clocksource/built-in.o CC drivers/base/class.o CC drivers/base/driver.o CC drivers/base/platform.o LD drivers/firewire/built-in.o CC drivers/base/firmware.o CC drivers/base/cpu.o LD kernel/sched/built-in.o LD drivers/clk/bcm/built-in.o CC lib/gcd.o CC lib/lcm.o CC lib/list_sort.o CC lib/uuid.o CC fs/nsfs.o LD drivers/clk/mvebu/built-in.o CC lib/flex_array.o LD drivers/clk/ti/built-in.o LD drivers/firmware/broadcom/built-in.o LD drivers/clk/built-in.o CC lib/iov_iter.o CC lib/bsearch.o CC lib/clz_ctz.o CC mm/vmstat.o CC kernel/time/posix-stubs.o CC kernel/time/clockevents.o CC kernel/time/tick-common.o CC fs/no-block.o CC mm/backing-dev.o CC mm/mm_init.o LD drivers/firmware/tegra/built-in.o LD drivers/firmware/meson/built-in.o LD fs/devpts/built-in.o LD fs/exofs/built-in.o CC lib/find_bit.o CC mm/mmu_context.o CC lib/llist.o LD drivers/gpu/drm/bridge/built-in.o LD fs/quota/built-in.o LD drivers/gpu/drm/hisilicon/built-in.o LD drivers/gpu/drm/i2c/built-in.o CC mm/percpu.o LD drivers/firmware/built-in.o CC mm/slab_common.o LD fs/notify/dnotify/built-in.o CC mm/compaction.o LD drivers/gpu/drm/panel/built-in.o LD drivers/gpu/drm/tilcdc/built-in.o LD fs/notify/fanotify/built-in.o CC lib/memweight.o LD drivers/gpu/vga/built-in.o CC lib/kfifo.o CC fs/ramfs/inode.o CC lib/percpu-refcount.o LD drivers/gpu/drm/omapdrm/displays/built-in.o LD fs/notify/inotify/built-in.o LD drivers/hwtracing/intel_th/built-in.o LD drivers/idle/built-in.o CC lib/percpu_ida.o CC drivers/irqchip/irqchip.o LD drivers/gpu/drm/omapdrm/dss/built-in.o CC drivers/base/init.o LD drivers/char/built-in.o LD drivers/macintosh/built-in.o CC fs/binfmt_elf.o LD drivers/lguest/built-in.o CC drivers/base/devres.o CC drivers/base/attribute_container.o LD fs/notify/built-in.o LD drivers/i2c/algos/built-in.o CC drivers/base/map.o CC drivers/base/transport_class.o LD drivers/mfd/built-in.o LD drivers/i2c/busses/built-in.o LD drivers/gpu/drm/omapdrm/built-in.o LD drivers/i2c/muxes/built-in.o LD drivers/mmc/built-in.o CC drivers/base/topology.o LD drivers/net/built-in.o LD drivers/nfc/built-in.o CC drivers/base/container.o LD drivers/gpu/drm/built-in.o CC mm/vmacache.o CC drivers/base/property.o CC fs/ramfs/file-mmu.o LD drivers/platform/built-in.o LD drivers/i2c/built-in.o LD drivers/pci/dwc/built-in.o LD drivers/power/built-in.o LD drivers/nvme/host/built-in.o LD drivers/nvme/target/built-in.o LD drivers/misc/cb710/built-in.o LD drivers/misc/eeprom/built-in.o CC mm/swap_slots.o CC drivers/of/base.o CC lib/rhashtable.o LD drivers/misc/lis3lv02d/built-in.o CC lib/once.o CC lib/reciprocal_div.o LD drivers/gpu/built-in.o CC drivers/base/cacheinfo.o LD drivers/nvme/built-in.o CC lib/refcount.o LD drivers/base/power/built-in.o CC lib/string_helpers.o CC lib/hexdump.o CC drivers/pci/access.o LD drivers/misc/ti-st/built-in.o CC drivers/pci/bus.o CC lib/kstrtox.o LD drivers/media/firewire/built-in.o LD drivers/misc/mic/bus/built-in.o LD drivers/ptp/built-in.o CC drivers/pci/probe.o CC lib/pci_iomap.o LD fs/ramfs/ramfs.o LD drivers/media/spi/built-in.o LD drivers/misc/mic/built-in.o LD drivers/pwm/built-in.o LD drivers/media/tuners/built-in.o LD drivers/media/mmc/siano/built-in.o LD drivers/base/test/built-in.o LD fs/ramfs/built-in.o LD drivers/media/platform/omap/built-in.o LD drivers/media/i2c/soc_camera/built-in.o CC drivers/base/dma-mapping.o LD drivers/media/common/b2c2/built-in.o LD drivers/media/common/saa7146/built-in.o LD drivers/misc/built-in.o LD drivers/media/common/siano/built-in.o CC drivers/pci/host-bridge.o LD drivers/media/common/v4l2-tpg/built-in.o LD drivers/media/mmc/built-in.o CC drivers/pci/pci-driver.o CC drivers/pci/pci.o CC drivers/pci/remove.o CC mm/interval_tree.o CC mm/list_lru.o LD drivers/media/rc/keymaps/built-in.o CC mm/workingset.o LD drivers/media/platform/built-in.o LD drivers/media/i2c/built-in.o LD drivers/irqchip/built-in.o CC mm/gup.o CC lib/iomap_copy.o LD drivers/media/common/built-in.o CC drivers/of/device.o CC mm/debug.o LD drivers/media/rc/built-in.o CC drivers/pci/search.o CC drivers/pci/pci-sysfs.o CC drivers/of/platform.o LD drivers/soc/bcm/built-in.o CC mm/highmem.o LD drivers/usb/host/built-in.o CC mm/memory.o LD drivers/media/usb/b2c2/built-in.o LD drivers/media/usb/dvb-usb-v2/built-in.o LD kernel/time/built-in.o LD drivers/media/usb/dvb-usb/built-in.o CC drivers/of/fdt.o LD drivers/media/usb/s2255/built-in.o LD drivers/media/pci/b2c2/built-in.o CC drivers/of/fdt_address.o LD drivers/video/backlight/built-in.o LD drivers/tty/ipwireless/built-in.o LD drivers/usb/built-in.o LD kernel/built-in.o CC drivers/of/address.o LD drivers/soc/fsl/built-in.o CC drivers/of/of_pci.o CC drivers/of/irq.o LD drivers/tty/vt/built-in.o CC drivers/of/of_pci_irq.o LD drivers/tty/serial/built-in.o LD drivers/media/pci/ddbridge/built-in.o LD drivers/soc/built-in.o LD drivers/media/pci/mantis/built-in.o LD drivers/media/usb/siano/built-in.o LD drivers/media/pci/dm1105/built-in.o LD drivers/media/pci/netup_unidvb/built-in.o CC mm/mincore.o CC mm/mlock.o CC mm/mmap.o LD drivers/media/pci/ngene/built-in.o LD drivers/tty/built-in.o LD drivers/media/usb/stkwebcam/built-in.o LD drivers/video/fbdev/core/built-in.o LD drivers/media/usb/ttusb-budget/built-in.o CC lib/devres.o CC lib/hweight.o CC lib/bitrev.o CC drivers/pci/rom.o CC mm/mprotect.o HOSTCC lib/gen_crc32table CC lib/syscall.o CC lib/atomic64.o LD drivers/media/pci/pluto2/built-in.o LD drivers/media/pci/pt1/built-in.o CC drivers/of/of_reserved_mem.o CC mm/mremap.o LD drivers/media/usb/ttusb-dec/built-in.o CC mm/msync.o CC lib/strncpy_from_user.o LD drivers/video/fbdev/omap2/omapfb/displays/built-in.o CC drivers/pci/setup-res.o LD drivers/video/fbdev/omap2/omapfb/dss/built-in.o LD drivers/media/pci/pt3/built-in.o LD drivers/media/pci/saa7146/built-in.o LD drivers/media/usb/zr364xx/built-in.o LD drivers/media/pci/smipcie/built-in.o CC lib/strnlen_user.o CC lib/argv_split.o LD drivers/video/fbdev/omap2/omapfb/built-in.o LD drivers/media/usb/built-in.o CC lib/cmdline.o CC lib/chacha20.o CC mm/pgtable-generic.o CC mm/vmalloc.o CC mm/init-mm.o CC mm/page_vma_mapped.o CC mm/pagewalk.o CC mm/rmap.o CC mm/nobootmem.o LD drivers/media/pci/ttpci/built-in.o CC drivers/pci/irq.o LD drivers/video/fbdev/omap2/built-in.o CC drivers/pci/vpd.o LD drivers/base/built-in.o CC mm/memblock.o CC mm/dmapool.o LD drivers/media/pci/built-in.o LD drivers/video/fbdev/built-in.o CC mm/slub.o CC drivers/pci/setup-bus.o CC lib/ctype.o CC drivers/pci/vc.o CC drivers/pci/syscall.o LD fs/built-in.o LD drivers/video/built-in.o CC lib/dec_and_lock.o CC drivers/pci/of.o CC lib/dump_stack.o CC lib/decompress.o CC lib/earlycpio.o CC lib/extable.o CC lib/fdt.o LD drivers/pci/host/built-in.o CC lib/fdt_empty_tree.o CC lib/fdt_ro.o CC lib/fdt_sw.o CC lib/flex_proportions.o CC lib/fdt_strerror.o CC lib/fdt_rw.o CC lib/int_sqrt.o CC lib/fdt_wip.o CC lib/idr.o LD drivers/media/built-in.o CC lib/ioremap.o CC lib/irq_regs.o CC lib/klist.o CC lib/is_single_threaded.o CC lib/kobject_uevent.o CC lib/md5.o CC lib/kobject.o CC lib/nmi_backtrace.o CC lib/nodemask.o CC lib/plist.o CC lib/radix-tree.o CC lib/ratelimit.o CC lib/rbtree.o CC lib/seq_buf.o CC lib/sha1.o CC lib/show_mem.o CC lib/siphash.o CC lib/string.o CC lib/timerqueue.o CC lib/vsprintf.o CC lib/win_minmax.o GEN lib/crc32table.h CC lib/crc32.o LD drivers/of/built-in.o LD mm/built-in.o LD drivers/pci/built-in.o LD drivers/built-in.o AR lib/lib.a EXPORTS lib/lib-ksyms.o LD lib/built-in.o GEN .version CHK include/generated/compile.h UPD include/generated/compile.h CC init/version.o LD init/built-in.o LD vmlinux.o MODPOST vmlinux.o LD vmlinux SORTEX vmlinux SYSMAP System.map /opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-strip -s -R .comment vmlinux -o arch/powerpc/boot/vmlinux.strip make[1]: Leaving directory '/home/kisskb/slave/build/powerpc-fixes_powerpc-allnoconfig_powerpc-5.3' Completed OK # rm -rf /home/kisskb/slave/build/powerpc-fixes_powerpc-allnoconfig_powerpc-5.3 # Build took: 0:00:15.969890