# git rev-parse -q --verify 9c91e6a5befb89d1494dd156dd4563f9e948a74f^{commit} 9c91e6a5befb89d1494dd156dd4563f9e948a74f already have revision, skipping fetch # git checkout -q -f -B kisskb 9c91e6a5befb89d1494dd156dd4563f9e948a74f # git clean -qxdf # < git log -1 # commit 9c91e6a5befb89d1494dd156dd4563f9e948a74f # Merge: 752272f16dd1 5781823fd0d3 # Author: Linus Torvalds # Date: Mon Nov 25 18:07:36 2019 -0800 # # Merge tag 'edac_for_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras # # Pull EDAC updates from Borislav Petkov: # "A lot of changes this time around, details below. # # From the next cycle onwards, we'll switch the EDAC tree to topic # branches (instead of a single edac-for-next branch) which should make # the changes handling more flexible, hopefully. We'll see. # # Summary: # # - Rework error logging functions to accept a count of errors # parameter (Hanna Hawa) # # - Part one of substantial EDAC core + ghes_edac driver cleanup # (Robert Richter) # # - Print additional useful logging information in skx_* (Tony Luck) # # - Improve amd64_edac hw detection + cleanups (Yazen Ghannam) # # - Misc cleanups, fixes and code improvements" # # * tag 'edac_for_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: (35 commits) # EDAC/altera: Use the Altera System Manager driver # EDAC/altera: Cleanup the ECC Manager # EDAC/altera: Use fast register IO for S10 IRQs # EDAC/ghes: Do not warn when incrementing refcount on 0 # EDAC/Documentation: Describe CPER module definition and DIMM ranks # EDAC: Unify the mc_event tracepoint call # EDAC/ghes: Remove intermediate buffer pvt->detail_location # EDAC/ghes: Fix grain calculation # EDAC/ghes: Use standard kernel macros for page calculations # EDAC: Remove misleading comment in struct edac_raw_error_desc # EDAC/mc: Reduce indentation level in edac_mc_handle_error() # EDAC/mc: Remove needless zero string termination # EDAC/mc: Do not BUG_ON() in edac_mc_alloc() # EDAC: Introduce an mci_for_each_dimm() iterator # EDAC: Remove EDAC_DIMM_OFF() macro # EDAC: Replace EDAC_DIMM_PTR() macro with edac_get_dimm() function # EDAC/amd64: Get rid of the ECC disabled long message # EDAC/ghes: Fix locking and memory barrier issues # EDAC/amd64: Check for memory before fully initializing an instance # EDAC/amd64: Use cached data when checking for ECC # ... # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version # < git log --format=%s --max-count=1 9c91e6a5befb89d1494dd156dd4563f9e948a74f # < make -s -j 10 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-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 # Added to kconfig # yes \n | make -s -j 10 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- oldconfig yes: standard output: Broken pipe # make -s -j 10 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- /kisskb/src/fs/btrfs/tree-checker.c: In function 'check_extent_data_item': /kisskb/src/fs/btrfs/tree-checker.c:230:5: warning: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'unsigned int' [-Wformat=] "invalid item size, have %u expect [%lu, %u)", ^ /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c: In function 'sh_mobile_i2c_isr': /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c:399:26: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized] pd->msg->buf[real_pos] = data; ^ /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c:372:16: note: 'data' was declared here unsigned char data; ^ /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ In file included from /kisskb/src/arch/mips/include/asm/page.h:261:0, from /kisskb/src/arch/mips/include/asm/io.h:29, from /kisskb/src/arch/mips/include/asm/mmiowb.h:5, from /kisskb/src/include/linux/spinlock.h:60, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/net.h:19, from /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c:8: /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c: In function 'siw_tx_hdt': /kisskb/src/arch/mips/include/asm/page.h:249:53: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) ^ /kisskb/src/include/asm-generic/memory_model.h:33:41: note: in definition of macro '__pfn_to_page' #define __pfn_to_page(pfn) (mem_map + ((pfn) - ARCH_PFN_OFFSET)) ^ /kisskb/src/arch/mips/include/asm/page.h:249:31: note: in expansion of macro 'PFN_DOWN' #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) ^ /kisskb/src/arch/mips/include/asm/page.h:250:41: note: in expansion of macro 'virt_to_pfn' #define virt_to_page(kaddr) pfn_to_page(virt_to_pfn(kaddr)) ^ /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c:528:23: note: in expansion of macro 'virt_to_page' page_array[seg] = virt_to_page(va & PAGE_MASK); ^ In file included from /kisskb/src/include/linux/wait.h:9:0, from /kisskb/src/include/linux/net.h:19, from /kisskb/src/drivers/infiniband/sw/siw/siw_qp_rx.c:8: /kisskb/src/drivers/infiniband/sw/siw/siw_qp_rx.c: In function 'siw_proc_send': /kisskb/src/include/linux/spinlock.h:288:3: warning: 'flags' may be used uninitialized in this function [-Wmaybe-uninitialized] _raw_spin_unlock_irqrestore(lock, flags); \ ^ /kisskb/src/drivers/infiniband/sw/siw/siw_qp_rx.c:335:16: note: 'flags' was declared here unsigned long flags; ^ In file included from /kisskb/src/drivers/net/phy/mdio-cavium.c:11:0: /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_set_mode': /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:21:16: note: in expansion of macro 'oct_mdio_readq' smi_clk.u64 = oct_mdio_readq(p->register_base + SMI_CLK); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:24:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_clk.u64, p->register_base + SMI_CLK); ^ /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_c45_addr': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:39:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_wr.u64, p->register_base + SMI_WR_DAT); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:47:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_cmd.u64, p->register_base + SMI_CMD); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:54:16: note: in expansion of macro 'oct_mdio_readq' smi_wr.u64 = oct_mdio_readq(p->register_base + SMI_WR_DAT); ^ /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_read': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:86:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_cmd.u64, p->register_base + SMI_CMD); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:93:16: note: in expansion of macro 'oct_mdio_readq' smi_rd.u64 = oct_mdio_readq(p->register_base + SMI_RD_DAT); ^ /kisskb/src/drivers/net/phy/mdio-cavium.c: In function 'cavium_mdiobus_write': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:125:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_wr.u64, p->register_base + SMI_WR_DAT); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:131:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_cmd.u64, p->register_base + SMI_CMD); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:114:37: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_readq(addr) readq((void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-cavium.c:138:16: note: in expansion of macro 'oct_mdio_readq' smi_wr.u64 = oct_mdio_readq(p->register_base + SMI_WR_DAT); ^ /kisskb/src/drivers/net/phy/mdio-octeon.c: In function 'octeon_mdiobus_probe': /kisskb/src/drivers/net/phy/mdio-octeon.c:48:3: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] (u64)devm_ioremap(&pdev->dev, mdio_phys, regsize); ^ In file included from /kisskb/src/drivers/net/phy/mdio-octeon.c:14:0: /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-octeon.c:56:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^ /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-octeon.c:77:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^ /kisskb/src/drivers/net/phy/mdio-octeon.c: In function 'octeon_mdiobus_remove': /kisskb/src/drivers/net/phy/mdio-cavium.h:113:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ /kisskb/src/drivers/net/phy/mdio-octeon.c:91:2: note: in expansion of macro 'oct_mdio_writeq' oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^ /kisskb/src/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c: In function 'mlx5e_grp_sw_update_stats': /kisskb/src/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c:302:1: warning: the frame size of 1416 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/spi/spi-sh-msiof.c:76:0: warning: "STR" redefined #define STR 0x40 /* Status Register */ ^ In file included from /kisskb/src/arch/mips/include/asm/mach-generic/spaces.h:15:0, from /kisskb/src/arch/mips/include/asm/addrspace.h:13, from /kisskb/src/arch/mips/include/asm/barrier.h:11, from /kisskb/src/include/linux/compiler.h:256, from /kisskb/src/arch/mips/include/asm/bitops.h:17, from /kisskb/src/include/linux/bitops.h:26, from /kisskb/src/include/linux/bitmap.h:8, from /kisskb/src/drivers/spi/spi-sh-msiof.c:10: /kisskb/src/arch/mips/include/asm/mipsregs.h:30:0: note: this is the location of the previous definition #define STR(x) __STR(x) ^ In file included from /kisskb/src/arch/mips/include/asm/octeon/octeon.h:11:0, from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:19, from /kisskb/src/drivers/staging/octeon/ethernet.c:22: /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_writeq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:282:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] cvmx_write_csr((__force uint64_t)csr_addr, val); ^ /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_readq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:299:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return cvmx_read_csr((__force uint64_t) csr_addr); ^ In file included from /kisskb/src/arch/mips/include/asm/octeon/octeon.h:11:0, from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:19, from /kisskb/src/drivers/staging/octeon/ethernet-mdio.c:16: /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_writeq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:282:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] cvmx_write_csr((__force uint64_t)csr_addr, val); ^ /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_readq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:299:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return cvmx_read_csr((__force uint64_t) csr_addr); ^ In file included from /kisskb/src/arch/mips/include/asm/octeon/octeon.h:11:0, from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:19, from /kisskb/src/drivers/staging/octeon/ethernet-mem.c:12: /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_writeq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:282:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] cvmx_write_csr((__force uint64_t)csr_addr, val); ^ /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_readq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:299:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return cvmx_read_csr((__force uint64_t) csr_addr); ^ In file included from /kisskb/src/arch/mips/include/asm/octeon/octeon.h:11:0, from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:19, from /kisskb/src/drivers/staging/octeon/ethernet-rgmii.c:15: /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_writeq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:282:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] cvmx_write_csr((__force uint64_t)csr_addr, val); ^ /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_readq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:299:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return cvmx_read_csr((__force uint64_t) csr_addr); ^ In file included from /kisskb/src/arch/mips/include/asm/octeon/octeon.h:11:0, from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:19, from /kisskb/src/drivers/staging/octeon/ethernet-sgmii.c:14: /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_writeq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:282:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] cvmx_write_csr((__force uint64_t)csr_addr, val); ^ /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_readq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:299:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return cvmx_read_csr((__force uint64_t) csr_addr); ^ In file included from /kisskb/src/arch/mips/include/asm/octeon/octeon.h:11:0, from /kisskb/src/drivers/staging/octeon/octeon-ethernet.h:19, from /kisskb/src/drivers/staging/octeon/ethernet-rx.c:26: /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_writeq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:282:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] cvmx_write_csr((__force uint64_t)csr_addr, val); ^ /kisskb/src/arch/mips/include/asm/octeon/cvmx.h: In function 'cvmx_readq_csr': /kisskb/src/arch/mips/include/asm/octeon/cvmx.h:299:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return cvmx_read_csr((__force uint64_t) csr_addr); ^ In file included from /kisskb/src/drivers/staging/octeon/ethernet-rx.c:27:0: /kisskb/src/drivers/staging/octeon/ethernet-rx.c: In function 'cvm_oct_poll': /kisskb/src/drivers/staging/octeon/ethernet-defines.h:30:38: error: 'CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE' undeclared (first use in this function) #define USE_ASYNC_IOBDMA (CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0) ^ /kisskb/src/drivers/staging/octeon/ethernet-rx.c:190:6: note: in expansion of macro 'USE_ASYNC_IOBDMA' if (USE_ASYNC_IOBDMA) { ^ /kisskb/src/drivers/staging/octeon/ethernet-defines.h:30:38: note: each undeclared identifier is reported only once for each function it appears in #define USE_ASYNC_IOBDMA (CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0) ^ /kisskb/src/drivers/staging/octeon/ethernet-rx.c:190:6: note: in expansion of macro 'USE_ASYNC_IOBDMA' if (USE_ASYNC_IOBDMA) { ^ /kisskb/src/drivers/staging/octeon/ethernet-rx.c: In function 'cvm_oct_rx_initialize': /kisskb/src/drivers/staging/octeon/ethernet-rx.c:472:25: error: 'OCTEON_IRQ_WORKQ0' undeclared (first use in this function) oct_rx_group[i].irq = OCTEON_IRQ_WORKQ0 + i; ^ make[4]: *** [/kisskb/src/scripts/Makefile.build:266: drivers/staging/octeon/ethernet-rx.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:509: drivers/staging/octeon] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:509: drivers/staging] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1652: drivers] Error 2 make: *** [Makefile:179: sub-make] Error 2 Command 'make -s -j 10 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mipsel # Build took: 0:17:24.498305