66e91da883
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmXYTLkACgkQONu9yGCS aT4+fhAAqqR/Cvx53ZKMQ8GZTCudAZnr/Dz6kWYwxhhhIbQjDpCaf9mgsrEDaQS2 ancSZjzYaOUIXq/IsthXxQIUhiZbuM3iuSEi7+odWgSYdkFyzuUt8MWLBGSaB5Er ojn+APtq7vPXTSnp7uMwqMC3/BHCKkeYIjRVevhhHBKG5d3lzkV1xU8NcvMkLaly CIRxpWXD3w2b7K0GEbb/zN1GQEHDCQcxjuaJoe/5FKGJkqd3T31eyiJTRumCCMcz j8vkGkYmcMJpWf04iLgVA1p13I5/HGrXdEBI/GutN8IABIC3Cp42jW8phHYKW5ZM a4R25LZG5buND1Ubpq+EDrYn3EaPek5XRki0w8ZAXfNa3rYc+N6mQjkzNSOzhJ/5 VNsn3EAE1Dwtar5Z3ASe9ugDbh+0bgx85PbfaADK88V+qWb3DVr1TBWmDNu2vfVP rv4I0EKu9r3vOE8aNMEBuhAVkIK3mEQUxwab6RKNrMby/5Uwa+ugrrUtQd8V+T1S j6r6v7u7aZ8mhYO7d6WSvAKL85lCWGbs3WRIKCJZmDRyqWrWW9tVWRN9wrZ2QnRr iaCQKk8P474P7/j1zwnmih8l4wS1oszveNziWwd0fi1Nn/WQYM+JKYQvpuQijmQ+ J9jLyWo7a59zffIE6mzJdNwFy9hlw9X+VnJmExk/Q88Z7Bt5wPQ= =laYd -----END PGP SIGNATURE----- Merge 5.10.210 into android12-5.10-lts Changes in 5.10.210 usb: cdns3: Fixes for sparse warnings usb: cdns3: fix uvc failure work since sg support enabled usb: cdns3: fix incorrect calculation of ep_buf_size when more than one config usb: cdns3: fix iso transfer error when mult is not zero usb: cdns3: Fix uvc fail when DMA cross 4k boundery since sg enabled PCI: mediatek: Clear interrupt status before dispatching handler units: change from 'L' to 'UL' units: add the HZ macros serial: sc16is7xx: set safe default SPI clock frequency spi: introduce SPI_MODE_X_MASK macro serial: sc16is7xx: add check for unsupported SPI modes during probe iio: adc: ad7091r: Set alert bit in config register iio: adc: ad7091r: Allow users to configure device events iio: adc: ad7091r: Enable internal vref if external vref is not supplied dmaengine: fix NULL pointer in channel unregistration function iio:adc:ad7091r: Move exports into IIO_AD7091R namespace. ext4: allow for the last group to be marked as trimmed crypto: api - Disallow identical driver names PM: hibernate: Enforce ordering during image compression/decompression hwrng: core - Fix page fault dead lock on mmap-ed hwrng crypto: s390/aes - Fix buffer overread in CTR mode rpmsg: virtio: Free driver_override when rpmsg_remove() bus: mhi: host: Drop chan lock before queuing buffers parisc/firmware: Fix F-extend for PDC addresses async: Split async_schedule_node_domain() async: Introduce async_schedule_dev_nocall() arm64: dts: qcom: sdm845: fix USB wakeup interrupt types arm64: dts: qcom: sdm845: fix USB DP/DM HS PHY interrupts lsm: new security_file_ioctl_compat() hook scripts/get_abi: fix source path leak mmc: core: Use mrq.sbc in close-ended ffu mmc: mmc_spi: remove custom DMA mapped buffers rtc: Adjust failure return code for cmos_set_alarm() nouveau/vmm: don't set addr on the fail path to avoid warning ubifs: ubifs_symlink: Fix memleak of inode->i_link in error path rename(): fix the locking of subdirectories block: Remove special-casing of compound pages stddef: Introduce DECLARE_FLEX_ARRAY() helper smb3: Replace smb2pdu 1-element arrays with flex-arrays mm: vmalloc: introduce array allocation functions KVM: use __vcalloc for very large allocations net/smc: fix illegal rmb_desc access in SMC-D connection dump tcp: make sure init the accept_queue's spinlocks once bnxt_en: Wait for FLR to complete during probe vlan: skip nested type that is not IFLA_VLAN_QOS_MAPPING llc: make llc_ui_sendmsg() more robust against bonding changes llc: Drop support for ETH_P_TR_802_2. net/rds: Fix UBSAN: array-index-out-of-bounds in rds_cmsg_recv tracing: Ensure visibility when inserting an element into tracing_map afs: Hide silly-rename files from userspace tcp: Add memory barrier to tcp_push() netlink: fix potential sleeping issue in mqueue_flush_file ipv6: init the accept_queue's spinlocks in inet6_create net/mlx5: DR, Use the right GVMI number for drop action net/mlx5e: fix a double-free in arfs_create_groups netfilter: nf_tables: restrict anonymous set and map names to 16 bytes netfilter: nf_tables: validate NFPROTO_* family net: mvpp2: clear BM pool before initialization selftests: netdevsim: fix the udp_tunnel_nic test fjes: fix memleaks in fjes_hw_setup net: fec: fix the unhandled context fault from smmu btrfs: ref-verify: free ref cache before clearing mount opt btrfs: tree-checker: fix inline ref size in error messages btrfs: don't warn if discard range is not aligned to sector btrfs: defrag: reject unknown flags of btrfs_ioctl_defrag_range_args btrfs: don't abort filesystem when attempting to snapshot deleted subvolume rbd: don't move requests to the running list on errors exec: Fix error handling in begin_new_exec() wifi: iwlwifi: fix a memory corruption netfilter: nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress basechain netfilter: nf_tables: reject QUEUE/DROP verdict parameters gpiolib: acpi: Ignore touchpad wakeup on GPD G1619-04 drm: Don't unref the same fb many times by mistake due to deadlock handling drm/bridge: nxp-ptn3460: fix i2c_master_send() error checking drm/tidss: Fix atomic_flush check drm/bridge: nxp-ptn3460: simplify some error checking PM: sleep: Use dev_printk() when possible PM: sleep: Avoid calling put_device() under dpm_list_mtx PM: core: Remove unnecessary (void *) conversions PM: sleep: Fix possible deadlocks in core system-wide PM code fs/pipe: move check to pipe_has_watch_queue() pipe: wakeup wr_wait after setting max_usage ARM: dts: samsung: exynos4210-i9100: Unconditionally enable LDO12 arm64: dts: qcom: sc7180: Use pdc interrupts for USB instead of GIC interrupts arm64: dts: qcom: sc7180: fix USB wakeup interrupt types media: mtk-jpeg: Fix use after free bug due to error path handling in mtk_jpeg_dec_device_run mm: use __pfn_to_section() instead of open coding it mm/sparsemem: fix race in accessing memory_section->usage btrfs: remove err variable from btrfs_delete_subvolume btrfs: avoid copying BTRFS_ROOT_SUBVOL_DEAD flag to snapshot of subvolume being deleted drm: panel-simple: add missing bus flags for Tianma tm070jvhg[30/33] drm/exynos: fix accidental on-stack copy of exynos_drm_plane drm/exynos: gsc: minor fix for loop iteration in gsc_runtime_resume gpio: eic-sprd: Clear interrupt after set the interrupt type spi: bcm-qspi: fix SFDP BFPT read by usig mspi read mips: Call lose_fpu(0) before initializing fcr31 in mips_set_personality_nan tick/sched: Preserve number of idle sleeps across CPU hotplug events x86/entry/ia32: Ensure s32 is sign extended to s64 powerpc/mm: Fix null-pointer dereference in pgtable_cache_add drivers/perf: pmuv3: don't expose SW_INCR event in sysfs powerpc: Fix build error due to is_valid_bugaddr() powerpc/mm: Fix build failures due to arch_reserved_kernel_pages() x86/boot: Ignore NMIs during very early boot powerpc: pmd_move_must_withdraw() is only needed for CONFIG_TRANSPARENT_HUGEPAGE powerpc/lib: Validate size for vector operations x86/mce: Mark fatal MCE's page as poison to avoid panic in the kdump kernel perf/core: Fix narrow startup race when creating the perf nr_addr_filters sysfs file debugobjects: Stop accessing objects after releasing hash bucket lock regulator: core: Only increment use_count when enable_count changes audit: Send netlink ACK before setting connection in auditd_set ACPI: video: Add quirk for the Colorful X15 AT 23 Laptop PNP: ACPI: fix fortify warning ACPI: extlog: fix NULL pointer dereference check PM / devfreq: Synchronize devfreq_monitor_[start/stop] ACPI: APEI: set memory failure flags as MF_ACTION_REQUIRED on synchronous events FS:JFS:UBSAN:array-index-out-of-bounds in dbAdjTree UBSAN: array-index-out-of-bounds in dtSplitRoot jfs: fix slab-out-of-bounds Read in dtSearch jfs: fix array-index-out-of-bounds in dbAdjTree jfs: fix uaf in jfs_evict_inode pstore/ram: Fix crash when setting number of cpus to an odd number crypto: stm32/crc32 - fix parsing list of devices afs: fix the usage of read_seqbegin_or_lock() in afs_lookup_volume_rcu() afs: fix the usage of read_seqbegin_or_lock() in afs_find_server*() rxrpc_find_service_conn_rcu: fix the usage of read_seqbegin_or_lock() jfs: fix array-index-out-of-bounds in diNewExt s390/ptrace: handle setting of fpc register correctly KVM: s390: fix setting of fpc register SUNRPC: Fix a suspicious RCU usage warning ecryptfs: Reject casefold directory inodes ext4: fix inconsistent between segment fstrim and full fstrim ext4: unify the type of flexbg_size to unsigned int ext4: remove unnecessary check from alloc_flex_gd() ext4: avoid online resizing failures due to oversized flex bg wifi: rt2x00: restart beacon queue when hardware reset selftests/bpf: satisfy compiler by having explicit return in btf test selftests/bpf: Fix pyperf180 compilation failure with clang18 scsi: lpfc: Fix possible file string name overflow when updating firmware PCI: Add no PM reset quirk for NVIDIA Spectrum devices bonding: return -ENOMEM instead of BUG in alb_upper_dev_walk scsi: arcmsr: Support new PCI device IDs 1883 and 1886 ARM: dts: imx7d: Fix coresight funnel ports ARM: dts: imx7s: Fix lcdif compatible ARM: dts: imx7s: Fix nand-controller #size-cells wifi: ath9k: Fix potential array-index-out-of-bounds read in ath9k_htc_txstatus() bpf: Add map and need_defer parameters to .map_fd_put_ptr() scsi: libfc: Don't schedule abort twice scsi: libfc: Fix up timeout error in fc_fcp_rec_error() bpf: Set uattr->batch.count as zero before batched update or deletion ARM: dts: rockchip: fix rk3036 hdmi ports node ARM: dts: imx25/27-eukrea: Fix RTC node name ARM: dts: imx: Use flash@0,0 pattern ARM: dts: imx27: Fix sram node ARM: dts: imx1: Fix sram node ionic: pass opcode to devcmd_wait block/rnbd-srv: Check for unlikely string overflow ARM: dts: imx25: Fix the iim compatible string ARM: dts: imx25/27: Pass timing0 ARM: dts: imx27-apf27dev: Fix LED name ARM: dts: imx23-sansa: Use preferred i2c-gpios properties ARM: dts: imx23/28: Fix the DMA controller node name net: dsa: mv88e6xxx: Fix mv88e6352_serdes_get_stats error path block: prevent an integer overflow in bvec_try_merge_hw_page md: Whenassemble the array, consult the superblock of the freshest device arm64: dts: qcom: msm8996: Fix 'in-ports' is a required property arm64: dts: qcom: msm8998: Fix 'out-ports' is a required property wifi: rtl8xxxu: Add additional USB IDs for RTL8192EU devices wifi: rtlwifi: rtl8723{be,ae}: using calculate_bit_shift() wifi: cfg80211: free beacon_ies when overridden from hidden BSS Bluetooth: qca: Set both WIDEBAND_SPEECH and LE_STATES quirks for QCA2066 Bluetooth: L2CAP: Fix possible multiple reject send i40e: Fix VF disable behavior to block all traffic f2fs: fix to check return value of f2fs_reserve_new_block() ALSA: hda: Refer to correct stream index at loops ASoC: doc: Fix undefined SND_SOC_DAPM_NOPM argument fast_dput(): handle underflows gracefully RDMA/IPoIB: Fix error code return in ipoib_mcast_join drm/amd/display: Fix tiled display misalignment f2fs: fix write pointers on zoned device after roll forward drm/drm_file: fix use of uninitialized variable drm/framebuffer: Fix use of uninitialized variable drm/mipi-dsi: Fix detach call without attach media: stk1160: Fixed high volume of stk1160_dbg messages media: rockchip: rga: fix swizzling for RGB formats PCI: add INTEL_HDA_ARL to pci_ids.h ALSA: hda: Intel: add HDA_ARL PCI ID support ALSA: hda: intel-dspcfg: add filters for ARL-S and ARL drm/exynos: Call drm_atomic_helper_shutdown() at shutdown/unbind time IB/ipoib: Fix mcast list locking media: ddbridge: fix an error code problem in ddb_probe drm/msm/dpu: Ratelimit framedone timeout msgs clk: hi3620: Fix memory leak in hi3620_mmc_clk_init() clk: mmp: pxa168: Fix memory leak in pxa168_clk_init() watchdog: it87_wdt: Keep WDTCTRL bit 3 unmodified for IT8784/IT8786 drm/amdgpu: Let KFD sync with VM fences drm/amdgpu: Drop 'fence' check in 'to_amdgpu_amdkfd_fence()' leds: trigger: panic: Don't register panic notifier if creating the trigger failed um: Fix naming clash between UML and scheduler um: Don't use vfprintf() for os_info() um: net: Fix return type of uml_net_start_xmit() i3c: master: cdns: Update maximum prescaler value for i2c clock xen/gntdev: Fix the abuse of underlying struct page in DMA-buf import mfd: ti_am335x_tscadc: Fix TI SoC dependencies PCI: Only override AMD USB controller if required PCI: switchtec: Fix stdev_release() crash after surprise hot remove usb: hub: Replace hardcoded quirk value with BIT() macro tty: allow TIOCSLCKTRMIOS with CAP_CHECKPOINT_RESTORE fs/kernfs/dir: obey S_ISGID PCI/AER: Decode Requester ID when no error info found libsubcmd: Fix memory leak in uniq() virtio_net: Fix "‘%d’ directive writing between 1 and 11 bytes into a region of size 10" warnings blk-mq: fix IO hang from sbitmap wakeup race ceph: fix deadlock or deadcode of misusing dget() drm/amd/powerplay: Fix kzalloc parameter 'ATOM_Tonga_PPM_Table' in 'get_platform_power_management_table()' drm/amdgpu: Release 'adev->pm.fw' before return in 'amdgpu_device_need_post()' perf: Fix the nr_addr_filters fix wifi: cfg80211: fix RCU dereference in __cfg80211_bss_update drm: using mul_u32_u32() requires linux/math64.h scsi: isci: Fix an error code problem in isci_io_request_build() scsi: core: Introduce enum scsi_disposition scsi: core: Move scsi_host_busy() out of host lock for waking up EH handler ip6_tunnel: use dev_sw_netstats_rx_add() ip6_tunnel: make sure to pull inner header in __ip6_tnl_rcv() net-zerocopy: Refactor frag-is-remappable test. tcp: add sanity checks to rx zerocopy ixgbe: Remove non-inclusive language ixgbe: Refactor returning internal error codes ixgbe: Refactor overtemp event handling ixgbe: Fix an error handling path in ixgbe_read_iosf_sb_reg_x550() ipv6: Ensure natural alignment of const ipv6 loopback and router addresses llc: call sock_orphan() at release time netfilter: nf_log: replace BUG_ON by WARN_ON_ONCE when putting logger netfilter: nft_ct: sanitize layer 3 and 4 protocol number in custom expectations net: ipv4: fix a memleak in ip_setup_cork af_unix: fix lockdep positive in sk_diag_dump_icons() net: sysfs: Fix /sys/class/net/<iface> path HID: apple: Add support for the 2021 Magic Keyboard HID: apple: Add 2021 magic keyboard FN key mapping bonding: remove print in bond_verify_device_path uapi: stddef.h: Fix __DECLARE_FLEX_ARRAY for C++ PM: sleep: Fix error handling in dpm_prepare() dmaengine: fsl-dpaa2-qdma: Fix the size of dma pools dmaengine: ti: k3-udma: Report short packet errors dmaengine: fsl-qdma: Fix a memory leak related to the status queue DMA dmaengine: fsl-qdma: Fix a memory leak related to the queue command DMA phy: renesas: rcar-gen3-usb2: Fix returning wrong error code dmaengine: fix is_slave_direction() return false when DMA_DEV_TO_DEV phy: ti: phy-omap-usb2: Fix NULL pointer dereference for SRP drm/msm/dp: return correct Colorimetry for DP_TEST_DYNAMIC_RANGE_CEA case net: stmmac: xgmac: fix handling of DPP safety error for DMA channels selftests: net: avoid just another constant wait tunnels: fix out of bounds access when building IPv6 PMTU error atm: idt77252: fix a memleak in open_card_ubr0 hwmon: (aspeed-pwm-tacho) mutex for tach reading hwmon: (coretemp) Fix out-of-bounds memory access hwmon: (coretemp) Fix bogus core_id to attr name mapping inet: read sk->sk_family once in inet_recv_error() rxrpc: Fix response to PING RESPONSE ACKs to a dead call tipc: Check the bearer type before calling tipc_udp_nl_bearer_add() ppp_async: limit MRU to 64K netfilter: nft_compat: reject unused compat flag netfilter: nft_compat: restrict match/target protocol to u16 netfilter: nft_ct: reject direction for ct id netfilter: nft_set_pipapo: store index in scratch maps netfilter: nft_set_pipapo: add helper to release pcpu scratch area netfilter: nft_set_pipapo: remove scratch_aligned pointer scsi: core: Move scsi_host_busy() out of host lock if it is for per-command blk-iocost: Fix an UBSAN shift-out-of-bounds warning net/af_iucv: clean up a try_then_request_module() USB: serial: qcserial: add new usb-id for Dell Wireless DW5826e USB: serial: option: add Fibocom FM101-GL variant USB: serial: cp210x: add ID for IMST iM871A-USB usb: host: xhci-plat: Add support for XHCI_SG_TRB_CACHE_SIZE_QUIRK hrtimer: Report offline hrtimer enqueue Input: i8042 - fix strange behavior of touchpad on Clevo NS70PU Input: atkbd - skip ATKBD_CMD_SETLEDS when skipping ATKBD_CMD_GETID vhost: use kzalloc() instead of kmalloc() followed by memset() clocksource: Skip watchdog check for large watchdog intervals net: stmmac: xgmac: use #define for string constants net: stmmac: xgmac: fix a typo of register name in DPP safety handling netfilter: nft_set_rbtree: skip end interval element from gc btrfs: forbid creating subvol qgroups btrfs: do not ASSERT() if the newly created subvolume already got read btrfs: forbid deleting live subvol qgroup btrfs: send: return EOPNOTSUPP on unknown flags of: unittest: Fix compile in the non-dynamic case net: openvswitch: limit the number of recursions from action sets spi: ppc4xx: Drop write-only variable ASoC: rt5645: Fix deadlock in rt5645_jack_detect_work() net: sysfs: Fix /sys/class/net/<iface> path for statistics MIPS: Add 'memory' clobber to csum_ipv6_magic() inline assembler i40e: Fix waiting for queues of all VSIs to be disabled tracing/trigger: Fix to return error if failed to alloc snapshot mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again ALSA: hda/realtek: Fix the external mic not being recognised for Acer Swift 1 SF114-32 ALSA: hda/realtek: Enable Mute LED on HP Laptop 14-fq0xxx HID: wacom: generic: Avoid reporting a serial of '0' to userspace HID: wacom: Do not register input devices until after hid_hw_start usb: ucsi_acpi: Fix command completion handling USB: hub: check for alternate port before enabling A_ALT_HNP_SUPPORT usb: f_mass_storage: forbid async queue when shutdown happen media: ir_toy: fix a memleak in irtoy_tx powerpc/kasan: Fix addr error caused by page alignment i2c: i801: Remove i801_set_block_buffer_mode i2c: i801: Fix block process call transactions modpost: trim leading spaces when processing source files list scsi: Revert "scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock" lsm: fix the logic in security_inode_getsecctx() firewire: core: correct documentation of fw_csr_string() kernel API kbuild: Fix changing ELF file type for output of gen_btf for big endian nfc: nci: free rx_data_reassembly skb on NCI device cleanup net: hsr: remove WARN_ONCE() in send_hsr_supervision_frame() xen-netback: properly sync TX responses ALSA: hda/realtek: Enable headset mic on Vaio VJFE-ADL binder: signal epoll threads of self-work misc: fastrpc: Mark all sessions as invalid in cb_remove ext4: fix double-free of blocks due to wrong extents moved_len tracing: Fix wasted memory in saved_cmdlines logic staging: iio: ad5933: fix type mismatch regression iio: magnetometer: rm3100: add boundary check for the value read from RM3100_REG_TMRC iio: accel: bma400: Fix a compilation problem media: rc: bpf attach/detach requires write permission hv_netvsc: Fix race condition between netvsc_probe and netvsc_remove ring-buffer: Clean ring_buffer_poll_wait() error return serial: max310x: set default value when reading clock ready bit serial: max310x: improve crystal stable clock detection x86/Kconfig: Transmeta Crusoe is CPU family 5, not 6 x86/mm/ident_map: Use gbpages only where full GB page should be mapped. mmc: slot-gpio: Allow non-sleeping GPIO ro ALSA: hda/conexant: Add quirk for SWS JS201D nilfs2: fix data corruption in dsync block recovery for small block sizes nilfs2: fix hang in nilfs_lookup_dirty_data_buffers() crypto: ccp - Fix null pointer dereference in __sev_platform_shutdown_locked nfp: use correct macro for LengthSelect in BAR config nfp: flower: prevent re-adding mac index for bonded port wifi: mac80211: reload info pointer in ieee80211_tx_dequeue() irqchip/irq-brcmstb-l2: Add write memory barrier before exit irqchip/gic-v3-its: Fix GICv4.1 VPE affinity update s390/qeth: Fix potential loss of L3-IP@ in case of network issues ceph: prevent use-after-free in encode_cap_msg() of: property: fix typo in io-channels can: j1939: Fix UAF in j1939_sk_match_filter during setsockopt(SO_J1939_FILTER) pmdomain: core: Move the unused cleanup to a _sync initcall tracing: Inform kmemleak of saved_cmdlines allocation Revert "md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d" bus: moxtet: Add spi device table PCI: dwc: endpoint: Fix dw_pcie_ep_raise_msix_irq() alignment support mips: Fix max_mapnr being uninitialized on early stages crypto: lib/mpi - Fix unexpected pointer access in mpi_ec_init serial: Add rs485_supported to uart_port serial: 8250_exar: Fill in rs485_supported serial: 8250_exar: Set missing rs485_supported flag scripts/decode_stacktrace.sh: silence stderr messages from addr2line/nm scripts/decode_stacktrace.sh: support old bash version scripts: decode_stacktrace: demangle Rust symbols scripts/decode_stacktrace.sh: optionally use LLVM utilities netfilter: ipset: fix performance regression in swap operation netfilter: ipset: Missing gc cancellations fixed hrtimer: Ignore slack time for RT tasks in schedule_hrtimeout_range() Revert "arm64: Stash shadow stack pointer in the task struct on interrupt" net: prevent mss overflow in skb_segment() sched/membarrier: reduce the ability to hammer on sys_membarrier nilfs2: fix potential bug in end_buffer_async_write nilfs2: replace WARN_ONs for invalid DAT metadata block requests dm: limit the number of targets and parameter size area PM: runtime: add devm_pm_runtime_enable helper PM: runtime: Have devm_pm_runtime_enable() handle pm_runtime_dont_use_autosuspend() drm/msm/dsi: Enable runtime PM netfilter: nf_tables: fix pointer math issue in nft_byteorder_eval() net: bcmgenet: Fix EEE implementation PCI: dwc: Fix a 64bit bug in dw_pcie_ep_raise_msix_irq() Linux 5.10.210 Change-Id: I5e7327f58dd6abd26ac2b1e328a81c1010d1147c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
990 lines
26 KiB
C
990 lines
26 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* RAM Oops/Panic logger
|
|
*
|
|
* Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
|
|
* Copyright (C) 2011 Kees Cook <keescook@chromium.org>
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/err.h>
|
|
#include <linux/module.h>
|
|
#include <linux/version.h>
|
|
#include <linux/pstore.h>
|
|
#include <linux/io.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/pstore_ram.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_reserved_mem.h>
|
|
#include "internal.h"
|
|
|
|
#define RAMOOPS_KERNMSG_HDR "===="
|
|
#define MIN_MEM_SIZE 4096UL
|
|
|
|
static ulong record_size = MIN_MEM_SIZE;
|
|
module_param(record_size, ulong, 0400);
|
|
MODULE_PARM_DESC(record_size,
|
|
"size of each dump done on oops/panic");
|
|
|
|
static ulong ramoops_console_size = MIN_MEM_SIZE;
|
|
module_param_named(console_size, ramoops_console_size, ulong, 0400);
|
|
MODULE_PARM_DESC(console_size, "size of kernel console log");
|
|
|
|
static ulong ramoops_ftrace_size = MIN_MEM_SIZE;
|
|
module_param_named(ftrace_size, ramoops_ftrace_size, ulong, 0400);
|
|
MODULE_PARM_DESC(ftrace_size, "size of ftrace log");
|
|
|
|
static ulong ramoops_pmsg_size = MIN_MEM_SIZE;
|
|
module_param_named(pmsg_size, ramoops_pmsg_size, ulong, 0400);
|
|
MODULE_PARM_DESC(pmsg_size, "size of user space message log");
|
|
|
|
static unsigned long long mem_address;
|
|
module_param_hw(mem_address, ullong, other, 0400);
|
|
MODULE_PARM_DESC(mem_address,
|
|
"start of reserved RAM used to store oops/panic logs");
|
|
|
|
static ulong mem_size;
|
|
module_param(mem_size, ulong, 0400);
|
|
MODULE_PARM_DESC(mem_size,
|
|
"size of reserved RAM used to store oops/panic logs");
|
|
|
|
static unsigned int mem_type;
|
|
module_param(mem_type, uint, 0400);
|
|
MODULE_PARM_DESC(mem_type,
|
|
"memory type: 0=write-combined (default), 1=unbuffered, 2=cached");
|
|
|
|
static int ramoops_max_reason = -1;
|
|
module_param_named(max_reason, ramoops_max_reason, int, 0400);
|
|
MODULE_PARM_DESC(max_reason,
|
|
"maximum reason for kmsg dump (default 2: Oops and Panic) ");
|
|
|
|
static int ramoops_ecc;
|
|
module_param_named(ecc, ramoops_ecc, int, 0400);
|
|
MODULE_PARM_DESC(ramoops_ecc,
|
|
"if non-zero, the option enables ECC support and specifies "
|
|
"ECC buffer size in bytes (1 is a special value, means 16 "
|
|
"bytes ECC)");
|
|
|
|
static int ramoops_dump_oops = -1;
|
|
module_param_named(dump_oops, ramoops_dump_oops, int, 0400);
|
|
MODULE_PARM_DESC(dump_oops,
|
|
"(deprecated: use max_reason instead) set to 1 to dump oopses & panics, 0 to only dump panics");
|
|
|
|
struct ramoops_context {
|
|
struct persistent_ram_zone **dprzs; /* Oops dump zones */
|
|
struct persistent_ram_zone *cprz; /* Console zone */
|
|
struct persistent_ram_zone **fprzs; /* Ftrace zones */
|
|
struct persistent_ram_zone *mprz; /* PMSG zone */
|
|
phys_addr_t phys_addr;
|
|
unsigned long size;
|
|
unsigned int memtype;
|
|
size_t record_size;
|
|
size_t console_size;
|
|
size_t ftrace_size;
|
|
size_t pmsg_size;
|
|
u32 flags;
|
|
struct persistent_ram_ecc_info ecc_info;
|
|
unsigned int max_dump_cnt;
|
|
unsigned int dump_write_cnt;
|
|
/* _read_cnt need clear on ramoops_pstore_open */
|
|
unsigned int dump_read_cnt;
|
|
unsigned int console_read_cnt;
|
|
unsigned int max_ftrace_cnt;
|
|
unsigned int ftrace_read_cnt;
|
|
unsigned int pmsg_read_cnt;
|
|
struct pstore_info pstore;
|
|
};
|
|
|
|
static struct platform_device *dummy;
|
|
|
|
static int ramoops_pstore_open(struct pstore_info *psi)
|
|
{
|
|
struct ramoops_context *cxt = psi->data;
|
|
|
|
cxt->dump_read_cnt = 0;
|
|
cxt->console_read_cnt = 0;
|
|
cxt->ftrace_read_cnt = 0;
|
|
cxt->pmsg_read_cnt = 0;
|
|
return 0;
|
|
}
|
|
|
|
static struct persistent_ram_zone *
|
|
ramoops_get_next_prz(struct persistent_ram_zone *przs[], int id,
|
|
struct pstore_record *record)
|
|
{
|
|
struct persistent_ram_zone *prz;
|
|
|
|
/* Give up if we never existed or have hit the end. */
|
|
if (!przs)
|
|
return NULL;
|
|
|
|
prz = przs[id];
|
|
if (!prz)
|
|
return NULL;
|
|
|
|
/* Update old/shadowed buffer. */
|
|
if (prz->type == PSTORE_TYPE_DMESG)
|
|
persistent_ram_save_old(prz);
|
|
|
|
if (!persistent_ram_old_size(prz))
|
|
return NULL;
|
|
|
|
record->type = prz->type;
|
|
record->id = id;
|
|
|
|
return prz;
|
|
}
|
|
|
|
static int ramoops_read_kmsg_hdr(char *buffer, struct timespec64 *time,
|
|
bool *compressed)
|
|
{
|
|
char data_type;
|
|
int header_length = 0;
|
|
|
|
if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lld.%lu-%c\n%n",
|
|
(time64_t *)&time->tv_sec, &time->tv_nsec, &data_type,
|
|
&header_length) == 3) {
|
|
time->tv_nsec *= 1000;
|
|
if (data_type == 'C')
|
|
*compressed = true;
|
|
else
|
|
*compressed = false;
|
|
} else if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lld.%lu\n%n",
|
|
(time64_t *)&time->tv_sec, &time->tv_nsec,
|
|
&header_length) == 2) {
|
|
time->tv_nsec *= 1000;
|
|
*compressed = false;
|
|
} else {
|
|
time->tv_sec = 0;
|
|
time->tv_nsec = 0;
|
|
*compressed = false;
|
|
}
|
|
return header_length;
|
|
}
|
|
|
|
static bool prz_ok(struct persistent_ram_zone *prz)
|
|
{
|
|
return !!prz && !!(persistent_ram_old_size(prz) +
|
|
persistent_ram_ecc_string(prz, NULL, 0));
|
|
}
|
|
|
|
static ssize_t ramoops_pstore_read(struct pstore_record *record)
|
|
{
|
|
ssize_t size = 0;
|
|
struct ramoops_context *cxt = record->psi->data;
|
|
struct persistent_ram_zone *prz = NULL;
|
|
int header_length = 0;
|
|
bool free_prz = false;
|
|
|
|
/*
|
|
* Ramoops headers provide time stamps for PSTORE_TYPE_DMESG, but
|
|
* PSTORE_TYPE_CONSOLE and PSTORE_TYPE_FTRACE don't currently have
|
|
* valid time stamps, so it is initialized to zero.
|
|
*/
|
|
record->time.tv_sec = 0;
|
|
record->time.tv_nsec = 0;
|
|
record->compressed = false;
|
|
|
|
/* Find the next valid persistent_ram_zone for DMESG */
|
|
while (cxt->dump_read_cnt < cxt->max_dump_cnt && !prz) {
|
|
prz = ramoops_get_next_prz(cxt->dprzs, cxt->dump_read_cnt++,
|
|
record);
|
|
if (!prz_ok(prz))
|
|
continue;
|
|
header_length = ramoops_read_kmsg_hdr(persistent_ram_old(prz),
|
|
&record->time,
|
|
&record->compressed);
|
|
/* Clear and skip this DMESG record if it has no valid header */
|
|
if (!header_length) {
|
|
persistent_ram_free_old(prz);
|
|
persistent_ram_zap(prz);
|
|
prz = NULL;
|
|
}
|
|
}
|
|
|
|
if (!prz_ok(prz) && !cxt->console_read_cnt++)
|
|
prz = ramoops_get_next_prz(&cxt->cprz, 0 /* single */, record);
|
|
|
|
if (!prz_ok(prz) && !cxt->pmsg_read_cnt++)
|
|
prz = ramoops_get_next_prz(&cxt->mprz, 0 /* single */, record);
|
|
|
|
/* ftrace is last since it may want to dynamically allocate memory. */
|
|
if (!prz_ok(prz)) {
|
|
if (!(cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU) &&
|
|
!cxt->ftrace_read_cnt++) {
|
|
prz = ramoops_get_next_prz(cxt->fprzs, 0 /* single */,
|
|
record);
|
|
} else {
|
|
/*
|
|
* Build a new dummy record which combines all the
|
|
* per-cpu records including metadata and ecc info.
|
|
*/
|
|
struct persistent_ram_zone *tmp_prz, *prz_next;
|
|
|
|
tmp_prz = kzalloc(sizeof(struct persistent_ram_zone),
|
|
GFP_KERNEL);
|
|
if (!tmp_prz)
|
|
return -ENOMEM;
|
|
prz = tmp_prz;
|
|
free_prz = true;
|
|
|
|
while (cxt->ftrace_read_cnt < cxt->max_ftrace_cnt) {
|
|
prz_next = ramoops_get_next_prz(cxt->fprzs,
|
|
cxt->ftrace_read_cnt++, record);
|
|
|
|
if (!prz_ok(prz_next))
|
|
continue;
|
|
|
|
tmp_prz->ecc_info = prz_next->ecc_info;
|
|
tmp_prz->corrected_bytes +=
|
|
prz_next->corrected_bytes;
|
|
tmp_prz->bad_blocks += prz_next->bad_blocks;
|
|
|
|
size = pstore_ftrace_combine_log(
|
|
&tmp_prz->old_log,
|
|
&tmp_prz->old_log_size,
|
|
prz_next->old_log,
|
|
prz_next->old_log_size);
|
|
if (size)
|
|
goto out;
|
|
}
|
|
record->id = 0;
|
|
}
|
|
}
|
|
|
|
if (!prz_ok(prz)) {
|
|
size = 0;
|
|
goto out;
|
|
}
|
|
|
|
size = persistent_ram_old_size(prz) - header_length;
|
|
|
|
/* ECC correction notice */
|
|
record->ecc_notice_size = persistent_ram_ecc_string(prz, NULL, 0);
|
|
|
|
record->buf = kmalloc(size + record->ecc_notice_size + 1, GFP_KERNEL);
|
|
if (record->buf == NULL) {
|
|
size = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
memcpy(record->buf, (char *)persistent_ram_old(prz) + header_length,
|
|
size);
|
|
|
|
persistent_ram_ecc_string(prz, record->buf + size,
|
|
record->ecc_notice_size + 1);
|
|
|
|
out:
|
|
if (free_prz) {
|
|
kfree(prz->old_log);
|
|
kfree(prz);
|
|
}
|
|
|
|
return size;
|
|
}
|
|
|
|
static size_t ramoops_write_kmsg_hdr(struct persistent_ram_zone *prz,
|
|
struct pstore_record *record)
|
|
{
|
|
char hdr[36]; /* "===="(4), %lld(20), "."(1), %06lu(6), "-%c\n"(3) */
|
|
size_t len;
|
|
|
|
len = scnprintf(hdr, sizeof(hdr),
|
|
RAMOOPS_KERNMSG_HDR "%lld.%06lu-%c\n",
|
|
(time64_t)record->time.tv_sec,
|
|
record->time.tv_nsec / 1000,
|
|
record->compressed ? 'C' : 'D');
|
|
persistent_ram_write(prz, hdr, len);
|
|
|
|
return len;
|
|
}
|
|
|
|
static int notrace ramoops_pstore_write(struct pstore_record *record)
|
|
{
|
|
struct ramoops_context *cxt = record->psi->data;
|
|
struct persistent_ram_zone *prz;
|
|
size_t size, hlen;
|
|
|
|
if (record->type == PSTORE_TYPE_CONSOLE) {
|
|
if (!cxt->cprz)
|
|
return -ENOMEM;
|
|
persistent_ram_write(cxt->cprz, record->buf, record->size);
|
|
return 0;
|
|
} else if (record->type == PSTORE_TYPE_FTRACE) {
|
|
int zonenum;
|
|
|
|
if (!cxt->fprzs)
|
|
return -ENOMEM;
|
|
/*
|
|
* Choose zone by if we're using per-cpu buffers.
|
|
*/
|
|
if (cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU)
|
|
zonenum = smp_processor_id();
|
|
else
|
|
zonenum = 0;
|
|
|
|
persistent_ram_write(cxt->fprzs[zonenum], record->buf,
|
|
record->size);
|
|
return 0;
|
|
} else if (record->type == PSTORE_TYPE_PMSG) {
|
|
pr_warn_ratelimited("PMSG shouldn't call %s\n", __func__);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (record->type != PSTORE_TYPE_DMESG)
|
|
return -EINVAL;
|
|
|
|
/*
|
|
* We could filter on record->reason here if we wanted to (which
|
|
* would duplicate what happened before the "max_reason" setting
|
|
* was added), but that would defeat the purpose of a system
|
|
* changing printk.always_kmsg_dump, so instead log everything that
|
|
* the kmsg dumper sends us, since it should be doing the filtering
|
|
* based on the combination of printk.always_kmsg_dump and our
|
|
* requested "max_reason".
|
|
*/
|
|
|
|
/*
|
|
* Explicitly only take the first part of any new crash.
|
|
* If our buffer is larger than kmsg_bytes, this can never happen,
|
|
* and if our buffer is smaller than kmsg_bytes, we don't want the
|
|
* report split across multiple records.
|
|
*/
|
|
if (record->part != 1)
|
|
return -ENOSPC;
|
|
|
|
if (!cxt->dprzs)
|
|
return -ENOSPC;
|
|
|
|
prz = cxt->dprzs[cxt->dump_write_cnt];
|
|
|
|
/*
|
|
* Since this is a new crash dump, we need to reset the buffer in
|
|
* case it still has an old dump present. Without this, the new dump
|
|
* will get appended, which would seriously confuse anything trying
|
|
* to check dump file contents. Specifically, ramoops_read_kmsg_hdr()
|
|
* expects to find a dump header in the beginning of buffer data, so
|
|
* we must to reset the buffer values, in order to ensure that the
|
|
* header will be written to the beginning of the buffer.
|
|
*/
|
|
persistent_ram_zap(prz);
|
|
|
|
/* Build header and append record contents. */
|
|
hlen = ramoops_write_kmsg_hdr(prz, record);
|
|
if (!hlen)
|
|
return -ENOMEM;
|
|
|
|
size = record->size;
|
|
if (size + hlen > prz->buffer_size)
|
|
size = prz->buffer_size - hlen;
|
|
persistent_ram_write(prz, record->buf, size);
|
|
|
|
cxt->dump_write_cnt = (cxt->dump_write_cnt + 1) % cxt->max_dump_cnt;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int notrace ramoops_pstore_write_user(struct pstore_record *record,
|
|
const char __user *buf)
|
|
{
|
|
if (record->type == PSTORE_TYPE_PMSG) {
|
|
struct ramoops_context *cxt = record->psi->data;
|
|
|
|
if (!cxt->mprz)
|
|
return -ENOMEM;
|
|
return persistent_ram_write_user(cxt->mprz, buf, record->size);
|
|
}
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
static int ramoops_pstore_erase(struct pstore_record *record)
|
|
{
|
|
struct ramoops_context *cxt = record->psi->data;
|
|
struct persistent_ram_zone *prz;
|
|
|
|
switch (record->type) {
|
|
case PSTORE_TYPE_DMESG:
|
|
if (record->id >= cxt->max_dump_cnt)
|
|
return -EINVAL;
|
|
prz = cxt->dprzs[record->id];
|
|
break;
|
|
case PSTORE_TYPE_CONSOLE:
|
|
prz = cxt->cprz;
|
|
break;
|
|
case PSTORE_TYPE_FTRACE:
|
|
if (record->id >= cxt->max_ftrace_cnt)
|
|
return -EINVAL;
|
|
prz = cxt->fprzs[record->id];
|
|
break;
|
|
case PSTORE_TYPE_PMSG:
|
|
prz = cxt->mprz;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
persistent_ram_free_old(prz);
|
|
persistent_ram_zap(prz);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct ramoops_context oops_cxt = {
|
|
.pstore = {
|
|
.owner = THIS_MODULE,
|
|
.name = "ramoops",
|
|
.open = ramoops_pstore_open,
|
|
.read = ramoops_pstore_read,
|
|
.write = ramoops_pstore_write,
|
|
.write_user = ramoops_pstore_write_user,
|
|
.erase = ramoops_pstore_erase,
|
|
},
|
|
};
|
|
|
|
static void ramoops_free_przs(struct ramoops_context *cxt)
|
|
{
|
|
int i;
|
|
|
|
/* Free dump PRZs */
|
|
if (cxt->dprzs) {
|
|
for (i = 0; i < cxt->max_dump_cnt; i++)
|
|
persistent_ram_free(cxt->dprzs[i]);
|
|
|
|
kfree(cxt->dprzs);
|
|
cxt->max_dump_cnt = 0;
|
|
}
|
|
|
|
/* Free ftrace PRZs */
|
|
if (cxt->fprzs) {
|
|
for (i = 0; i < cxt->max_ftrace_cnt; i++)
|
|
persistent_ram_free(cxt->fprzs[i]);
|
|
kfree(cxt->fprzs);
|
|
cxt->max_ftrace_cnt = 0;
|
|
}
|
|
}
|
|
|
|
static int ramoops_init_przs(const char *name,
|
|
struct device *dev, struct ramoops_context *cxt,
|
|
struct persistent_ram_zone ***przs,
|
|
phys_addr_t *paddr, size_t mem_sz,
|
|
ssize_t record_size,
|
|
unsigned int *cnt, u32 sig, u32 flags)
|
|
{
|
|
int err = -ENOMEM;
|
|
int i;
|
|
size_t zone_sz;
|
|
struct persistent_ram_zone **prz_ar;
|
|
|
|
/* Allocate nothing for 0 mem_sz or 0 record_size. */
|
|
if (mem_sz == 0 || record_size == 0) {
|
|
*cnt = 0;
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* If we have a negative record size, calculate it based on
|
|
* mem_sz / *cnt. If we have a positive record size, calculate
|
|
* cnt from mem_sz / record_size.
|
|
*/
|
|
if (record_size < 0) {
|
|
if (*cnt == 0)
|
|
return 0;
|
|
record_size = mem_sz / *cnt;
|
|
if (record_size == 0) {
|
|
dev_err(dev, "%s record size == 0 (%zu / %u)\n",
|
|
name, mem_sz, *cnt);
|
|
goto fail;
|
|
}
|
|
} else {
|
|
*cnt = mem_sz / record_size;
|
|
if (*cnt == 0) {
|
|
dev_err(dev, "%s record count == 0 (%zu / %zu)\n",
|
|
name, mem_sz, record_size);
|
|
goto fail;
|
|
}
|
|
}
|
|
|
|
if (*paddr + mem_sz - cxt->phys_addr > cxt->size) {
|
|
dev_err(dev, "no room for %s mem region (0x%zx@0x%llx) in (0x%lx@0x%llx)\n",
|
|
name,
|
|
mem_sz, (unsigned long long)*paddr,
|
|
cxt->size, (unsigned long long)cxt->phys_addr);
|
|
goto fail;
|
|
}
|
|
|
|
zone_sz = mem_sz / *cnt;
|
|
zone_sz = ALIGN_DOWN(zone_sz, 2);
|
|
if (!zone_sz) {
|
|
dev_err(dev, "%s zone size == 0\n", name);
|
|
goto fail;
|
|
}
|
|
|
|
prz_ar = kcalloc(*cnt, sizeof(**przs), GFP_KERNEL);
|
|
if (!prz_ar)
|
|
goto fail;
|
|
|
|
for (i = 0; i < *cnt; i++) {
|
|
char *label;
|
|
|
|
if (*cnt == 1)
|
|
label = kasprintf(GFP_KERNEL, "ramoops:%s", name);
|
|
else
|
|
label = kasprintf(GFP_KERNEL, "ramoops:%s(%d/%d)",
|
|
name, i, *cnt - 1);
|
|
prz_ar[i] = persistent_ram_new(*paddr, zone_sz, sig,
|
|
&cxt->ecc_info,
|
|
cxt->memtype, flags, label);
|
|
kfree(label);
|
|
if (IS_ERR(prz_ar[i])) {
|
|
err = PTR_ERR(prz_ar[i]);
|
|
dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",
|
|
name, record_size,
|
|
(unsigned long long)*paddr, err);
|
|
|
|
while (i > 0) {
|
|
i--;
|
|
persistent_ram_free(prz_ar[i]);
|
|
}
|
|
kfree(prz_ar);
|
|
goto fail;
|
|
}
|
|
*paddr += zone_sz;
|
|
prz_ar[i]->type = pstore_name_to_type(name);
|
|
}
|
|
|
|
*przs = prz_ar;
|
|
return 0;
|
|
|
|
fail:
|
|
*cnt = 0;
|
|
return err;
|
|
}
|
|
|
|
static int ramoops_init_prz(const char *name,
|
|
struct device *dev, struct ramoops_context *cxt,
|
|
struct persistent_ram_zone **prz,
|
|
phys_addr_t *paddr, size_t sz, u32 sig)
|
|
{
|
|
char *label;
|
|
|
|
if (!sz)
|
|
return 0;
|
|
|
|
if (*paddr + sz - cxt->phys_addr > cxt->size) {
|
|
dev_err(dev, "no room for %s mem region (0x%zx@0x%llx) in (0x%lx@0x%llx)\n",
|
|
name, sz, (unsigned long long)*paddr,
|
|
cxt->size, (unsigned long long)cxt->phys_addr);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
label = kasprintf(GFP_KERNEL, "ramoops:%s", name);
|
|
*prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info,
|
|
cxt->memtype, PRZ_FLAG_ZAP_OLD, label);
|
|
kfree(label);
|
|
if (IS_ERR(*prz)) {
|
|
int err = PTR_ERR(*prz);
|
|
|
|
dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx): %d\n",
|
|
name, sz, (unsigned long long)*paddr, err);
|
|
return err;
|
|
}
|
|
|
|
*paddr += sz;
|
|
(*prz)->type = pstore_name_to_type(name);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Read a u32 from a dt property and make sure it's safe for an int. */
|
|
static int ramoops_parse_dt_u32(struct platform_device *pdev,
|
|
const char *propname,
|
|
u32 default_value, u32 *value)
|
|
{
|
|
u32 val32 = 0;
|
|
int ret;
|
|
|
|
ret = of_property_read_u32(pdev->dev.of_node, propname, &val32);
|
|
if (ret == -EINVAL) {
|
|
/* field is missing, use default value. */
|
|
val32 = default_value;
|
|
} else if (ret < 0) {
|
|
dev_err(&pdev->dev, "failed to parse property %s: %d\n",
|
|
propname, ret);
|
|
return ret;
|
|
}
|
|
|
|
/* Sanity check our results. */
|
|
if (val32 > INT_MAX) {
|
|
dev_err(&pdev->dev, "%s %u > INT_MAX\n", propname, val32);
|
|
return -EOVERFLOW;
|
|
}
|
|
|
|
*value = val32;
|
|
return 0;
|
|
}
|
|
|
|
static int ramoops_parse_dt(struct platform_device *pdev,
|
|
struct ramoops_platform_data *pdata)
|
|
{
|
|
struct device_node *of_node = pdev->dev.of_node;
|
|
struct device_node *parent_node;
|
|
struct reserved_mem *rmem;
|
|
struct resource *res;
|
|
u32 value;
|
|
int ret;
|
|
|
|
dev_dbg(&pdev->dev, "using Device Tree\n");
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!res) {
|
|
rmem = of_reserved_mem_lookup(of_node);
|
|
if (rmem) {
|
|
pdata->mem_size = rmem->size;
|
|
pdata->mem_address = rmem->base;
|
|
} else {
|
|
dev_err(&pdev->dev,
|
|
"failed to locate DT /reserved-memory resource\n");
|
|
return -EINVAL;
|
|
}
|
|
} else {
|
|
pdata->mem_size = resource_size(res);
|
|
pdata->mem_address = res->start;
|
|
}
|
|
|
|
/*
|
|
* Setting "unbuffered" is deprecated and will be ignored if
|
|
* "mem_type" is also specified.
|
|
*/
|
|
pdata->mem_type = of_property_read_bool(of_node, "unbuffered");
|
|
/*
|
|
* Setting "no-dump-oops" is deprecated and will be ignored if
|
|
* "max_reason" is also specified.
|
|
*/
|
|
if (of_property_read_bool(of_node, "no-dump-oops"))
|
|
pdata->max_reason = KMSG_DUMP_PANIC;
|
|
else
|
|
pdata->max_reason = KMSG_DUMP_OOPS;
|
|
|
|
#define parse_u32(name, field, default_value) { \
|
|
ret = ramoops_parse_dt_u32(pdev, name, default_value, \
|
|
&value); \
|
|
if (ret < 0) \
|
|
return ret; \
|
|
field = value; \
|
|
}
|
|
|
|
parse_u32("mem-type", pdata->mem_type, pdata->mem_type);
|
|
parse_u32("record-size", pdata->record_size, 0);
|
|
parse_u32("console-size", pdata->console_size, 0);
|
|
parse_u32("ftrace-size", pdata->ftrace_size, 0);
|
|
parse_u32("pmsg-size", pdata->pmsg_size, 0);
|
|
parse_u32("ecc-size", pdata->ecc_info.ecc_size, 0);
|
|
parse_u32("flags", pdata->flags, 0);
|
|
parse_u32("max-reason", pdata->max_reason, pdata->max_reason);
|
|
|
|
#undef parse_u32
|
|
|
|
/*
|
|
* Some old Chromebooks relied on the kernel setting the
|
|
* console_size and pmsg_size to the record size since that's
|
|
* what the downstream kernel did. These same Chromebooks had
|
|
* "ramoops" straight under the root node which isn't
|
|
* according to the current upstream bindings (though it was
|
|
* arguably acceptable under a prior version of the bindings).
|
|
* Let's make those old Chromebooks work by detecting that
|
|
* we're not a child of "reserved-memory" and mimicking the
|
|
* expected behavior.
|
|
*/
|
|
parent_node = of_get_parent(of_node);
|
|
if (!of_node_name_eq(parent_node, "reserved-memory") &&
|
|
!pdata->console_size && !pdata->ftrace_size &&
|
|
!pdata->pmsg_size && !pdata->ecc_info.ecc_size) {
|
|
pdata->console_size = pdata->record_size;
|
|
pdata->pmsg_size = pdata->record_size;
|
|
}
|
|
of_node_put(parent_node);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ramoops_probe(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
struct ramoops_platform_data *pdata = dev->platform_data;
|
|
struct ramoops_platform_data pdata_local;
|
|
struct ramoops_context *cxt = &oops_cxt;
|
|
size_t dump_mem_sz;
|
|
phys_addr_t paddr;
|
|
int err = -EINVAL;
|
|
|
|
/*
|
|
* Only a single ramoops area allowed at a time, so fail extra
|
|
* probes.
|
|
*/
|
|
if (cxt->max_dump_cnt) {
|
|
pr_err("already initialized\n");
|
|
goto fail_out;
|
|
}
|
|
|
|
if (dev_of_node(dev) && !pdata) {
|
|
pdata = &pdata_local;
|
|
memset(pdata, 0, sizeof(*pdata));
|
|
|
|
err = ramoops_parse_dt(pdev, pdata);
|
|
if (err < 0)
|
|
goto fail_out;
|
|
}
|
|
|
|
/* Make sure we didn't get bogus platform data pointer. */
|
|
if (!pdata) {
|
|
pr_err("NULL platform data\n");
|
|
err = -EINVAL;
|
|
goto fail_out;
|
|
}
|
|
|
|
if (!pdata->mem_size || (!pdata->record_size && !pdata->console_size &&
|
|
!pdata->ftrace_size && !pdata->pmsg_size)) {
|
|
pr_err("The memory size and the record/console size must be "
|
|
"non-zero\n");
|
|
err = -EINVAL;
|
|
goto fail_out;
|
|
}
|
|
|
|
if (pdata->record_size && !is_power_of_2(pdata->record_size))
|
|
pdata->record_size = rounddown_pow_of_two(pdata->record_size);
|
|
if (pdata->console_size && !is_power_of_2(pdata->console_size))
|
|
pdata->console_size = rounddown_pow_of_two(pdata->console_size);
|
|
if (pdata->ftrace_size && !is_power_of_2(pdata->ftrace_size))
|
|
pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size);
|
|
if (pdata->pmsg_size && !is_power_of_2(pdata->pmsg_size))
|
|
pdata->pmsg_size = rounddown_pow_of_two(pdata->pmsg_size);
|
|
|
|
cxt->size = pdata->mem_size;
|
|
cxt->phys_addr = pdata->mem_address;
|
|
cxt->memtype = pdata->mem_type;
|
|
cxt->record_size = pdata->record_size;
|
|
cxt->console_size = pdata->console_size;
|
|
cxt->ftrace_size = pdata->ftrace_size;
|
|
cxt->pmsg_size = pdata->pmsg_size;
|
|
cxt->flags = pdata->flags;
|
|
cxt->ecc_info = pdata->ecc_info;
|
|
|
|
paddr = cxt->phys_addr;
|
|
|
|
dump_mem_sz = cxt->size - cxt->console_size - cxt->ftrace_size
|
|
- cxt->pmsg_size;
|
|
err = ramoops_init_przs("dmesg", dev, cxt, &cxt->dprzs, &paddr,
|
|
dump_mem_sz, cxt->record_size,
|
|
&cxt->max_dump_cnt, 0, 0);
|
|
if (err)
|
|
goto fail_out;
|
|
|
|
err = ramoops_init_prz("console", dev, cxt, &cxt->cprz, &paddr,
|
|
cxt->console_size, 0);
|
|
if (err)
|
|
goto fail_init_cprz;
|
|
|
|
cxt->max_ftrace_cnt = (cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU)
|
|
? nr_cpu_ids
|
|
: 1;
|
|
err = ramoops_init_przs("ftrace", dev, cxt, &cxt->fprzs, &paddr,
|
|
cxt->ftrace_size, -1,
|
|
&cxt->max_ftrace_cnt, LINUX_VERSION_CODE,
|
|
(cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU)
|
|
? PRZ_FLAG_NO_LOCK : 0);
|
|
if (err)
|
|
goto fail_init_fprz;
|
|
|
|
err = ramoops_init_prz("pmsg", dev, cxt, &cxt->mprz, &paddr,
|
|
cxt->pmsg_size, 0);
|
|
if (err)
|
|
goto fail_init_mprz;
|
|
|
|
cxt->pstore.data = cxt;
|
|
/*
|
|
* Prepare frontend flags based on which areas are initialized.
|
|
* For ramoops_init_przs() cases, the "max count" variable tells
|
|
* if there are regions present. For ramoops_init_prz() cases,
|
|
* the single region size is how to check.
|
|
*/
|
|
cxt->pstore.flags = 0;
|
|
if (cxt->max_dump_cnt) {
|
|
cxt->pstore.flags |= PSTORE_FLAGS_DMESG;
|
|
cxt->pstore.max_reason = pdata->max_reason;
|
|
}
|
|
if (cxt->console_size)
|
|
cxt->pstore.flags |= PSTORE_FLAGS_CONSOLE;
|
|
if (cxt->max_ftrace_cnt)
|
|
cxt->pstore.flags |= PSTORE_FLAGS_FTRACE;
|
|
if (cxt->pmsg_size)
|
|
cxt->pstore.flags |= PSTORE_FLAGS_PMSG;
|
|
|
|
/*
|
|
* Since bufsize is only used for dmesg crash dumps, it
|
|
* must match the size of the dprz record (after PRZ header
|
|
* and ECC bytes have been accounted for).
|
|
*/
|
|
if (cxt->pstore.flags & PSTORE_FLAGS_DMESG) {
|
|
cxt->pstore.bufsize = cxt->dprzs[0]->buffer_size;
|
|
cxt->pstore.buf = kzalloc(cxt->pstore.bufsize, GFP_KERNEL);
|
|
if (!cxt->pstore.buf) {
|
|
pr_err("cannot allocate pstore crash dump buffer\n");
|
|
err = -ENOMEM;
|
|
goto fail_clear;
|
|
}
|
|
}
|
|
|
|
err = pstore_register(&cxt->pstore);
|
|
if (err) {
|
|
pr_err("registering with pstore failed\n");
|
|
goto fail_buf;
|
|
}
|
|
|
|
/*
|
|
* Update the module parameter variables as well so they are visible
|
|
* through /sys/module/ramoops/parameters/
|
|
*/
|
|
mem_size = pdata->mem_size;
|
|
mem_address = pdata->mem_address;
|
|
record_size = pdata->record_size;
|
|
ramoops_max_reason = pdata->max_reason;
|
|
ramoops_console_size = pdata->console_size;
|
|
ramoops_pmsg_size = pdata->pmsg_size;
|
|
ramoops_ftrace_size = pdata->ftrace_size;
|
|
|
|
pr_info("using 0x%lx@0x%llx, ecc: %d\n",
|
|
cxt->size, (unsigned long long)cxt->phys_addr,
|
|
cxt->ecc_info.ecc_size);
|
|
|
|
return 0;
|
|
|
|
fail_buf:
|
|
kfree(cxt->pstore.buf);
|
|
fail_clear:
|
|
cxt->pstore.bufsize = 0;
|
|
persistent_ram_free(cxt->mprz);
|
|
fail_init_mprz:
|
|
fail_init_fprz:
|
|
persistent_ram_free(cxt->cprz);
|
|
fail_init_cprz:
|
|
ramoops_free_przs(cxt);
|
|
fail_out:
|
|
return err;
|
|
}
|
|
|
|
static int ramoops_remove(struct platform_device *pdev)
|
|
{
|
|
struct ramoops_context *cxt = &oops_cxt;
|
|
|
|
pstore_unregister(&cxt->pstore);
|
|
|
|
kfree(cxt->pstore.buf);
|
|
cxt->pstore.bufsize = 0;
|
|
|
|
persistent_ram_free(cxt->mprz);
|
|
persistent_ram_free(cxt->cprz);
|
|
ramoops_free_przs(cxt);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id dt_match[] = {
|
|
{ .compatible = "ramoops" },
|
|
{}
|
|
};
|
|
|
|
static struct platform_driver ramoops_driver = {
|
|
.probe = ramoops_probe,
|
|
.remove = ramoops_remove,
|
|
.driver = {
|
|
.name = "ramoops",
|
|
.of_match_table = dt_match,
|
|
},
|
|
};
|
|
|
|
static inline void ramoops_unregister_dummy(void)
|
|
{
|
|
platform_device_unregister(dummy);
|
|
dummy = NULL;
|
|
}
|
|
|
|
static void __init ramoops_register_dummy(void)
|
|
{
|
|
struct ramoops_platform_data pdata;
|
|
|
|
/*
|
|
* Prepare a dummy platform data structure to carry the module
|
|
* parameters. If mem_size isn't set, then there are no module
|
|
* parameters, and we can skip this.
|
|
*/
|
|
if (!mem_size)
|
|
return;
|
|
|
|
pr_info("using module parameters\n");
|
|
|
|
memset(&pdata, 0, sizeof(pdata));
|
|
pdata.mem_size = mem_size;
|
|
pdata.mem_address = mem_address;
|
|
pdata.mem_type = mem_type;
|
|
pdata.record_size = record_size;
|
|
pdata.console_size = ramoops_console_size;
|
|
pdata.ftrace_size = ramoops_ftrace_size;
|
|
pdata.pmsg_size = ramoops_pmsg_size;
|
|
/* If "max_reason" is set, its value has priority over "dump_oops". */
|
|
if (ramoops_max_reason >= 0)
|
|
pdata.max_reason = ramoops_max_reason;
|
|
/* Otherwise, if "dump_oops" is set, parse it into "max_reason". */
|
|
else if (ramoops_dump_oops != -1)
|
|
pdata.max_reason = ramoops_dump_oops ? KMSG_DUMP_OOPS
|
|
: KMSG_DUMP_PANIC;
|
|
/* And if neither are explicitly set, use the default. */
|
|
else
|
|
pdata.max_reason = KMSG_DUMP_OOPS;
|
|
pdata.flags = RAMOOPS_FLAG_FTRACE_PER_CPU;
|
|
|
|
/*
|
|
* For backwards compatibility ramoops.ecc=1 means 16 bytes ECC
|
|
* (using 1 byte for ECC isn't much of use anyway).
|
|
*/
|
|
pdata.ecc_info.ecc_size = ramoops_ecc == 1 ? 16 : ramoops_ecc;
|
|
|
|
dummy = platform_device_register_data(NULL, "ramoops", -1,
|
|
&pdata, sizeof(pdata));
|
|
if (IS_ERR(dummy)) {
|
|
pr_info("could not create platform device: %ld\n",
|
|
PTR_ERR(dummy));
|
|
dummy = NULL;
|
|
}
|
|
}
|
|
|
|
static int __init ramoops_init(void)
|
|
{
|
|
int ret;
|
|
|
|
ramoops_register_dummy();
|
|
ret = platform_driver_register(&ramoops_driver);
|
|
if (ret != 0)
|
|
ramoops_unregister_dummy();
|
|
|
|
return ret;
|
|
}
|
|
postcore_initcall(ramoops_init);
|
|
|
|
static void __exit ramoops_exit(void)
|
|
{
|
|
platform_driver_unregister(&ramoops_driver);
|
|
ramoops_unregister_dummy();
|
|
}
|
|
module_exit(ramoops_exit);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Marco Stornelli <marco.stornelli@gmail.com>");
|
|
MODULE_DESCRIPTION("RAM Oops/Panic logger/driver");
|