# git gc # git rev-parse -q --verify 9d004b2f4fea97cde123e7f1939b80e77bf2e695^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify 9d004b2f4fea97cde123e7f1939b80e77bf2e695^{commit} 9d004b2f4fea97cde123e7f1939b80e77bf2e695 # git checkout -q -f -B kisskb 9d004b2f4fea97cde123e7f1939b80e77bf2e695 # git clean -qxdf # < git log -1 # commit 9d004b2f4fea97cde123e7f1939b80e77bf2e695 # Merge: a9f94826e4bb 34e37b4c432c # Author: Linus Torvalds # Date: Fri May 27 21:24:19 2022 -0700 # # Merge tag 'cxl-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl # # Pull cxl updates from Dan Williams: # "Compute Express Link (CXL) updates for this cycle. # # The highlight is new driver-core infrastructure and CXL subsystem # changes for allowing lockdep to validate device_lock() usage. Thanks # to PeterZ for setting me straight on the current capabilities of the # lockdep API, and Greg acked it as well. # # On the CXL ACPI side this update adds support for CXL _OSC so that # platform firmware knows that it is safe to still grant Linux native # control of PCIe hotplug and error handling in the presence of CXL # devices. A circular dependency problem was discovered between suspend # and CXL memory for cases where the suspend image might be stored in # CXL memory where that image also contains the PCI register state to # restore to re-enable the device. Disable suspend for now until an # architecture is defined to clarify that conflict. # # Lastly a collection of reworks, fixes, and cleanups to the CXL # subsystem where support for snooping mailbox commands and properly # handling the "mem_enable" flow are the highlights. # # Summary: # # - Add driver-core infrastructure for lockdep validation of # device_lock(), and fixup a deadlock report that was previously # hidden behind the 'lockdep no validate' policy. # # - Add CXL _OSC support for claiming native control of CXL hotplug and # error handling. # # - Disable suspend in the presence of CXL memory unless and until a # protocol is identified for restoring PCI device context from memory # hosted on CXL PCI devices. # # - Add support for snooping CXL mailbox commands to protect against # inopportune changes, like set-partition with the 'immediate' flag # set. # # - Rework how the driver detects legacy CXL 1.1 configurations (CXL # DVSEC / 'mem_enable') before enabling new CXL 2.0 decode # configurations (CXL HDM Capability). # # - Miscellaneous cleanups and fixes from -next exposure" # # * tag 'cxl-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl: (47 commits) # cxl/port: Enable HDM Capability after validating DVSEC Ranges # cxl/port: Reuse 'struct cxl_hdm' context for hdm init # cxl/port: Move endpoint HDM Decoder Capability init to port driver # cxl/pci: Drop @info argument to cxl_hdm_decode_init() # cxl/mem: Merge cxl_dvsec_ranges() and cxl_hdm_decode_init() # cxl/mem: Skip range enumeration if mem_enable clear # cxl/mem: Consolidate CXL DVSEC Range enumeration in the core # cxl/pci: Move cxl_await_media_ready() to the core # cxl/mem: Validate port connectivity before dvsec ranges # cxl/mem: Fix cxl_mem_probe() error exit # cxl/pci: Drop wait_for_valid() from cxl_await_media_ready() # cxl/pci: Consolidate wait_for_media() and wait_for_media_ready() # cxl/mem: Drop mem_enabled check from wait_for_media() # nvdimm: Fix firmware activation deadlock scenarios # device-core: Kill the lockdep_mutex # nvdimm: Drop nd_device_lock() # ACPI: NFIT: Drop nfit_device_lock() # nvdimm: Replace lockdep_mutex with local lock classes # cxl: Drop cxl_device_lock() # cxl/acpi: Add root device lockdep validation # ... # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 9d004b2f4fea97cde123e7f1939b80e77bf2e695 # < make -s -j 24 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig arch/m68k/configs/sun3_defconfig:37:warning: symbol value 'm' invalid for ZPOOL # < make -s -j 24 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 24 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 24 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/include/linux/swab.h:5, from /kisskb/src/include/uapi/linux/byteorder/big_endian.h:14, from /kisskb/src/include/linux/byteorder/big_endian.h:5, from /kisskb/src/arch/m68k/include/uapi/asm/byteorder.h:5, from /kisskb/src/include/asm-generic/bitops/le.h:6, from /kisskb/src/arch/m68k/include/asm/bitops.h:529, from /kisskb/src/include/linux/bitops.h:33, from /kisskb/src/include/linux/kernel.h:22, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:31: /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c: In function 'sun3_82586_timeout': /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:108: warning: array subscript 1 is above array bounds of 'volatile struct transmit_cmd_struct *[1]' [-Warray-bounds] printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); ~~~~~~~~~~~~^~~ /kisskb/src/include/uapi/linux/swab.h:107:12: note: in definition of macro '__swab16' __fswab16(x)) ^ /kisskb/src/include/linux/printk.h:475:26: note: in expansion of macro 'printk_index_wrap' #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:3: note: in expansion of macro 'printk' printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); ^~~~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc8 # Build took: 0:08:01.675723