90264576e2
* refs/heads/tmp-a483478: UPSTREAM: arm64: vdso: Build vDSO with -ffixed-x18 Revert "drm/dsi: Fix byte order of DCS set/get brightness" Reverting below patches from android-4.19-stable.125 Linux 4.19.125 rxrpc: Fix ack discard rxrpc: Trace discarded ACKs iio: adc: stm32-dfsdm: fix device used to request dma iio: adc: stm32-dfsdm: Use dma_request_chan() instead dma_request_slave_channel() iio: adc: stm32-adc: fix device used to request dma iio: adc: stm32-adc: Use dma_request_chan() instead dma_request_slave_channel() x86/unwind/orc: Fix unwind_get_return_address_ptr() for inactive tasks rxrpc: Fix a memory leak in rxkad_verify_response() rapidio: fix an error in get_user_pages_fast() error handling ipack: tpci200: fix error return code in tpci200_register() mei: release me_cl object reference misc: rtsx: Add short delay after exit from ASPM iio: dac: vf610: Fix an error handling path in 'vf610_dac_probe()' iio: sca3000: Remove an erroneous 'get_device()' staging: greybus: Fix uninitialized scalar variable staging: iio: ad2s1210: Fix SPI reading Revert "gfs2: Don't demote a glock until its revokes are written" brcmfmac: abort and release host after error tty: serial: qcom_geni_serial: Fix wrap around of TX buffer cxgb4/cxgb4vf: Fix mac_hlist initialization and free cxgb4: free mac_hlist properly net: bcmgenet: abort suspend on error net: bcmgenet: code movement Revert "net/ibmvnic: Fix EOI when running in XIVE mode" media: fdp1: Fix R-Car M3-N naming in debug message thunderbolt: Drop duplicated get_switch_at_route() staging: most: core: replace strcpy() by strscpy() libnvdimm/btt: Fix LBA masking during 'free list' population libnvdimm/btt: Remove unnecessary code in btt_freelist_init nfit: Add Hyper-V NVDIMM DSM command set to white list powerpc/64s: Disable STRICT_KERNEL_RWX powerpc: Remove STRICT_KERNEL_RWX incompatibility with RELOCATABLE drm/i915/gvt: Init DPLL/DDI vreg for virtual display instead of inheritance. dmaengine: owl: Use correct lock in owl_dma_get_pchan() dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()' apparmor: Fix aa_label refcnt leak in policy_update apparmor: fix potential label refcnt leak in aa_change_profile apparmor: Fix use-after-free in aa_audit_rule_init drm/etnaviv: fix perfmon domain interation ALSA: hda/realtek - Add more fixup entries for Clevo machines ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Xtreme ALSA: pcm: fix incorrect hw_base increase ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio option padata: purge get_cpu and reorder_via_wq from padata_do_serial padata: initialize pd->cpu with effective cpumask padata: Replace delayed timer with immediate workqueue in padata_reorder ARM: futex: Address build warning platform/x86: asus-nb-wmi: Do not load on Asus T100TA and T200TA USB: core: Fix misleading driver bug report stmmac: fix pointer check after utilization in stmmac_interrupt ceph: fix double unlock in handle_cap_export() HID: quirks: Add HID_QUIRK_NO_INIT_REPORTS quirk for Dell K12A keyboard-dock gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp() x86/apic: Move TSC deadline timer debug printk HID: i2c-hid: reset Synaptics SYNA2393 on resume scsi: ibmvscsi: Fix WARN_ON during event pool release component: Silence bind error on -EPROBE_DEFER aquantia: Fix the media type of AQC100 ethernet controller in the driver vhost/vsock: fix packet delivery order to monitoring devices configfs: fix config_item refcnt leak in configfs_rmdir() scsi: qla2xxx: Delete all sessions before unregister local nvme port scsi: qla2xxx: Fix hang when issuing nvme disconnect-all in NPIV HID: alps: ALPS_1657 is too specific; use U1_UNICORN_LEGACY instead HID: alps: Add AUI1657 device ID HID: multitouch: add eGalaxTouch P80H84 support gcc-common.h: Update for GCC 10 ubi: Fix seq_file usage in detailed_erase_block_info debugfs file i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()' iommu/amd: Fix over-read of ACPI UID from IVRS table ubifs: remove broken lazytime support fix multiplication overflow in copy_fdtable() mtd: spinand: Propagate ECC information to the MTD structure ima: Fix return value of ima_write_policy() evm: Check also if *tfm is an error pointer in init_desc() ima: Set file->f_mode instead of file->f_flags in ima_calc_file_hash() riscv: set max_pfn to the PFN of the last page KVM: SVM: Fix potential memory leak in svm_cpu_init() i2c: dev: Fix the race between the release of i2c_dev and cdev ubsan: build ubsan.c more conservatively x86/uaccess, ubsan: Fix UBSAN vs. SMAP ANDROID: scsi: ufs: Handle clocks when lrbp fails ANDROID: fscrypt: handle direct I/O with IV_INO_LBLK_32 BACKPORT: FROMLIST: fscrypt: add support for IV_INO_LBLK_32 policies ANDROID: Update the ABI xml and qcom whitelist ANDROID: Fix build.config.gki-debug Linux 4.19.124 Makefile: disallow data races on gcc-10 as well KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce ARM: dts: r8a7740: Add missing extal2 to CPG node arm64: dts: renesas: r8a77980: Fix IPMMU VIP[01] nodes ARM: dts: r8a73a4: Add missing CMT1 interrupts arm64: dts: rockchip: Rename dwc3 device nodes on rk3399 to make dtc happy arm64: dts: rockchip: Replace RK805 PMIC node name with "pmic" on rk3328 boards clk: Unlink clock if failed to prepare or enable Revert "ALSA: hda/realtek: Fix pop noise on ALC225" usb: gadget: legacy: fix error return code in cdc_bind() usb: gadget: legacy: fix error return code in gncm_bind() usb: gadget: audio: Fix a missing error return value in audio_bind() usb: gadget: net2272: Fix a memory leak in an error handling path in 'net2272_plat_probe()' dwc3: Remove check for HWO flag in dwc3_gadget_ep_reclaim_trb_sg() clk: rockchip: fix incorrect configuration of rk3228 aclk_gpu* clocks exec: Move would_dump into flush_old_exec x86/unwind/orc: Fix error handling in __unwind_start() x86: Fix early boot crash on gcc-10, third try cifs: fix leaked reference on requeued write ARM: dts: imx27-phytec-phycard-s-rdk: Fix the I2C1 pinctrl entries ARM: dts: dra7: Fix bus_dma_limit for PCIe usb: xhci: Fix NULL pointer dereference when enqueuing trbs from urb sg list USB: gadget: fix illegal array access in binding with UDC usb: host: xhci-plat: keep runtime active when removing host usb: core: hub: limit HUB_QUIRK_DISABLE_AUTOSUSPEND to USB5534B ALSA: usb-audio: Add control message quirk delay for Kingston HyperX headset ALSA: rawmidi: Fix racy buffer resize under concurrent accesses ALSA: hda/realtek - Limit int mic boost for Thinkpad T530 gcc-10: avoid shadowing standard library 'free()' in crypto gcc-10: disable 'restrict' warning for now gcc-10: disable 'stringop-overflow' warning for now gcc-10: disable 'array-bounds' warning for now gcc-10: disable 'zero-length-bounds' warning for now Stop the ad-hoc games with -Wno-maybe-initialized kbuild: compute false-positive -Wmaybe-uninitialized cases in Kconfig gcc-10 warnings: fix low-hanging fruit pnp: Use list_for_each_entry() instead of open coding hwmon: (da9052) Synchronize access with mfd IB/mlx4: Test return value of calls to ib_get_cached_pkey netfilter: nft_set_rbtree: Introduce and use nft_rbtree_interval_start() arm64: fix the flush_icache_range arguments in machine_kexec netfilter: conntrack: avoid gcc-10 zero-length-bounds warning NFSv4: Fix fscache cookie aux_data to ensure change_attr is included nfs: fscache: use timespec64 in inode auxdata NFS: Fix fscache super_cookie index_key from changing after umount mmc: block: Fix request completion in the CQE timeout path mmc: core: Check request type before completing the request i40iw: Fix error handling in i40iw_manage_arp_cache() pinctrl: cherryview: Add missing spinlock usage in chv_gpio_irq_handler pinctrl: baytrail: Enable pin configuration setting for GPIO chip gfs2: Another gfs2_walk_metadata fix ALSA: hda/realtek - Fix S3 pop noise on Dell Wyse ipc/util.c: sysvipc_find_ipc() incorrectly updates position index drm/qxl: lost qxl_bo_kunmap_atomic_page in qxl_image_init_helper() ALSA: hda/hdmi: fix race in monitor detection during probe cpufreq: intel_pstate: Only mention the BIOS disabling turbo mode once dmaengine: mmp_tdma: Reset channel error on release dmaengine: pch_dma.c: Avoid data race between probe and irq handler riscv: fix vdso build with lld tcp: fix SO_RCVLOWAT hangs with fat skbs net: tcp: fix rx timestamp behavior for tcp_recvmsg netprio_cgroup: Fix unlimited memory leak of v2 cgroups net: ipv4: really enforce backoff for redirects net: dsa: loop: Add module soft dependency hinic: fix a bug of ndo_stop virtio_net: fix lockdep warning on 32 bit tcp: fix error recovery in tcp_zerocopy_receive() Revert "ipv6: add mtu lock check in __ip6_rt_update_pmtu" pppoe: only process PADT targeted at local interfaces net: phy: fix aneg restart in phy_ethtool_set_eee netlabel: cope with NULL catmap net: fix a potential recursive NETDEV_FEAT_CHANGE mmc: sdhci-acpi: Add SDHCI_QUIRK2_BROKEN_64_BIT_DMA for AMDI0040 scsi: sg: add sg_remove_request in sg_write virtio-blk: handle block_device_operations callbacks after hot unplug drop_monitor: work around gcc-10 stringop-overflow warning net: moxa: Fix a potential double 'free_irq()' net/sonic: Fix a resource leak in an error handling path in 'jazz_sonic_probe()' shmem: fix possible deadlocks on shmlock_user_lock net: dsa: Do not make user port errors fatal ANDROID: rtc: class: call hctosys in resource managed registration ANDROID: GKI: Update the ABI xml and whitelist ANDROID: power_supply: Add RTX power-supply property f2fs: flush dirty meta pages when flushing them f2fs: fix checkpoint=disable:%u%% f2fs: rework filename handling f2fs: split f2fs_d_compare() from f2fs_match_name() f2fs: don't leak filename in f2fs_try_convert_inline_dir() ANDROID: clang: update to 11.0.1 FROMLIST: x86_64: fix jiffies ODR violation ANDROID: arm64: vdso: Fix removing SCS flags ANDROID: GKI: Update the ABI xml and whitelist ANDROID: Incremental fs: wake up log pollers less often ANDROID: Incremental fs: Fix scheduling while atomic error ANDROID: Incremental fs: Avoid continually recalculating hashes ANDROID: export: Disable symbol trimming on modules ANDROID: GKI: Update the ABI xml and whitelist ANDROID: fscrypt: set dun_bytes more precisely ANDROID: dm-default-key: set dun_bytes more precisely ANDROID: block: backport the ability to specify max_dun_bytes ANDROID: Revert "ANDROID: GKI: gki_defconfig: CONFIG_DM_DEFAULT_KEY=m" Linux 4.19.123 ipc/mqueue.c: change __do_notify() to bypass check_kill_permission() scripts/decodecode: fix trapping instruction formatting objtool: Fix stack offset tracking for indirect CFAs netfilter: nf_osf: avoid passing pointer to local var netfilter: nat: never update the UDP checksum when it's 0 x86/unwind/orc: Fix premature unwind stoppage due to IRET frames x86/unwind/orc: Fix error path for bad ORC entry type x86/unwind/orc: Prevent unwinding before ORC initialization x86/unwind/orc: Don't skip the first frame for inactive tasks x86/entry/64: Fix unwind hints in rewind_stack_do_exit() x86/entry/64: Fix unwind hints in kernel exit path x86/entry/64: Fix unwind hints in register clearing code batman-adv: Fix refcnt leak in batadv_v_ogm_process batman-adv: Fix refcnt leak in batadv_store_throughput_override batman-adv: Fix refcnt leak in batadv_show_throughput_override batman-adv: fix batadv_nc_random_weight_tq KVM: VMX: Mark RCX, RDX and RSI as clobbered in vmx_vcpu_run()'s asm blob KVM: VMX: Explicitly reference RCX as the vmx_vcpu pointer in asm blobs coredump: fix crash when umh is disabled staging: gasket: Check the return value of gasket_get_bar_index() mm/page_alloc: fix watchdog soft lockups during set_zone_contiguous() arm64: hugetlb: avoid potential NULL dereference KVM: arm64: Fix 32bit PC wrap-around KVM: arm: vgic: Fix limit condition when writing to GICD_I[CS]ACTIVER tracing: Add a vmalloc_sync_mappings() for safe measure USB: serial: garmin_gps: add sanity checking for data length USB: uas: add quirk for LaCie 2Big Quadra HID: usbhid: Fix race between usbhid_close() and usbhid_stop() sctp: Fix bundling of SHUTDOWN with COOKIE-ACK HID: wacom: Read HID_DG_CONTACTMAX directly for non-generic devices net: stricter validation of untrusted gso packets bnxt_en: Fix VF anti-spoof filter setup. bnxt_en: Improve AER slot reset. net/mlx5: Fix command entry leak in Internal Error State net/mlx5: Fix forced completion access non initialized command entry bnxt_en: Fix VLAN acceleration handling in bnxt_fix_features(). tipc: fix partial topology connection closure sch_sfq: validate silly quantum values sch_choke: avoid potential panic in choke_reset() net: usb: qmi_wwan: add support for DW5816e net_sched: sch_skbprio: add message validation to skbprio_change() net/mlx4_core: Fix use of ENOSPC around mlx4_counter_alloc() net: macsec: preserve ingress frame ordering fq_codel: fix TCA_FQ_CODEL_DROP_BATCH_SIZE sanity checks dp83640: reverse arguments to list_add_tail vt: fix unicode console freeing with a common interface tracing/kprobes: Fix a double initialization typo USB: serial: qcserial: Add DW5816e support ANDROID: usb: gadget: Add missing inline qualifier to stub functions ANDROID: Drop ABI monitoring from KASAN build config ANDROID: Rename build.config.gki.arch_kasan ANDROID: GKI: Enable CONFIG_STATIC_USERMODEHELPER ANDROID: dm-default-key: Update key size for wrapped keys ANDROID: gki_defconfig: enable CONFIG_MMC_CRYPTO ANDROID: mmc: MMC crypto API ANDROID: GKI: Update the ABI xml and whitelist ANDROID: GKI: add missing exports for cam_smmu_api.ko Linux 4.19.122 drm/atomic: Take the atomic toys away from X cgroup, netclassid: remove double cond_resched mac80211: add ieee80211_is_any_nullfunc() platform/x86: GPD pocket fan: Fix error message when temp-limits are out of range ALSA: hda: Match both PCI ID and SSID for driver blacklist hexagon: define ioremap_uc hexagon: clean up ioremap mfd: intel-lpss: Use devm_ioremap_uc for MMIO lib: devres: add a helper function for ioremap_uc drm/amdgpu: Fix oops when pp_funcs is unset in ACPI event sctp: Fix SHUTDOWN CTSN Ack in the peer restart case net: systemport: suppress warnings on failed Rx SKB allocations net: bcmgenet: suppress warnings on failed Rx SKB allocations lib/mpi: Fix building for powerpc with clang scripts/config: allow colons in option strings for sed s390/ftrace: fix potential crashes when switching tracers cifs: protect updating server->dstaddr with a spinlock ASoC: rsnd: Fix "status check failed" spam for multi-SSI ASoC: rsnd: Don't treat master SSI in multi SSI setup as parent net: stmmac: Fix sub-second increment net: stmmac: fix enabling socfpga's ptp_ref_clock wimax/i2400m: Fix potential urb refcnt leak drm/amdgpu: Correctly initialize thermal controller for GPUs with Powerplay table v0 (e.g Hawaii) ASoC: codecs: hdac_hdmi: Fix incorrect use of list_for_each_entry ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode ASoC: rsnd: Fix parent SSI start/stop in multi-SSI mode usb: dwc3: gadget: Properly set maxpacket limit ASoC: sgtl5000: Fix VAG power-on handling selftests/ipc: Fix test failure seen after initial test run ASoC: topology: Check return value of pcm_new_ver powerpc/pci/of: Parse unassigned resources vhost: vsock: kick send_pkt worker once device is started ANDROID: GKI: fix build warning on 32bits due to ASoC msm change ANDROID: GKI: fix build error on 32bits due to ASoC msm change ANDROID: GKI: update abi definition due to FAIR_GROUP_SCHED removal ANDROID: GKI: Remove FAIR_GROUP_SCHED ANDROID: GKI: BULK update ABI XML representation and qcom whitelist ANDROID: build.config.gki.aarch64: Enable WHITELIST_STRICT_MODE ANDROID: GKI: Update the ABI xml and qcom whitelist ANDROID: remove unused variable ANDROID: Drop ABI monitoring from KASAN build config Linux 4.19.121 mmc: meson-mx-sdio: remove the broken ->card_busy() op mmc: meson-mx-sdio: Set MMC_CAP_WAIT_WHILE_BUSY mmc: sdhci-msm: Enable host capabilities pertains to R1b response mmc: sdhci-pci: Fix eMMC driver strength for BYT-based controllers mmc: sdhci-xenon: fix annoying 1.8V regulator warning mmc: cqhci: Avoid false "cqhci: CQE stuck on" by not open-coding timeout loop btrfs: transaction: Avoid deadlock due to bad initialization timing of fs_info::journal_info btrfs: fix partial loss of prealloc extent past i_size after fsync selinux: properly handle multiple messages in selinux_netlink_send() dmaengine: dmatest: Fix iteration non-stop logic nfs: Fix potential posix_acl refcnt leak in nfs3_set_acl ALSA: opti9xx: shut up gcc-10 range warning iommu/amd: Fix legacy interrupt remapping for x2APIC-enabled system scsi: target/iblock: fix WRITE SAME zeroing iommu/qcom: Fix local_base status check vfio/type1: Fix VA->PA translation for PFNMAP VMAs in vaddr_get_pfn() vfio: avoid possible overflow in vfio_iommu_type1_pin_pages RDMA/core: Fix race between destroy and release FD object RDMA/core: Prevent mixed use of FDs between shared ufiles RDMA/mlx4: Initialize ib_spec on the stack RDMA/mlx5: Set GRH fields in query QP on RoCE scsi: qla2xxx: check UNLOADING before posting async work scsi: qla2xxx: set UNLOADING before waiting for session deletion dm multipath: use updated MPATHF_QUEUE_IO on mapping for bio-based mpath dm writecache: fix data corruption when reloading the target dm verity fec: fix hash block number in verity_fec_decode PM: hibernate: Freeze kernel threads in software_resume() PM: ACPI: Output correct message on target power state ALSA: pcm: oss: Place the plugin buffer overflow checks correctly ALSA: hda/hdmi: fix without unlocked before return ALSA: usb-audio: Correct a typo of NuPrime DAC-10 USB ID ALSA: hda/realtek - Two front mics on a Lenovo ThinkCenter btrfs: fix block group leak when removing fails drm/qxl: qxl_release use after free drm/qxl: qxl_release leak in qxl_hw_surface_alloc() drm/qxl: qxl_release leak in qxl_draw_dirty_fb() drm/edid: Fix off-by-one in DispID DTD pixel clock ANDROID: GKI: Bulk update ABI XML representation ANDROID: GKI: Enable net testing options ANDROID: gki_defconfig: Enable CONFIG_REMOTEPROC ANDROID: Rename build.config.gki.arch_kasan ANDROID: GKI: Update ABI for IOMMU ANDROID: Incremental fs: Fix issues with very large files ANDROID: Correct build.config branch name ANDROID: GKI: Bulk update ABI XML representation and whitelist. UPSTREAM: vdso: Fix clocksource.h macro detection ANDROID: GKI: update abi definition due to added padding ANDROID: GKI: networking: add Android ABI padding to a lot of networking structures ANDROID: GKI: dma-mapping.h: add Android ABI padding to a structure ANDROID: GKI: ioport.h: add Android ABI padding to a structure ANDROID: GKI: iomap.h: add Android ABI padding to a structure ANDROID: GKI: genhd.h: add Android ABI padding to some structures ANDROID: GKI: hrtimer.h: add Android ABI padding to a structure ANDROID: GKI: ethtool.h: add Android ABI padding to a structure ANDROID: GKI: sched: add Android ABI padding to some structures ANDROID: GKI: kernfs.h: add Android ABI padding to some structures ANDROID: GKI: kobject.h: add Android ABI padding to some structures ANDROID: GKI: mm.h: add Android ABI padding to a structure ANDROID: GKI: mmu_notifier.h: add Android ABI padding to some structures ANDROID: GKI: pci: add Android ABI padding to some structures ANDROID: GKI: irqdomain.h: add Android ABI padding to a structure ANDROID: GKI: blk_types.h: add Android ABI padding to a structure ANDROID: GKI: scsi.h: add Android ABI padding to a structure ANDROID: GKI: quota.h: add Android ABI padding to some structures ANDROID: GKI: timer.h: add Android ABI padding to a structure ANDROID: GKI: user_namespace.h: add Android ABI padding to a structure FROMGIT: f2fs: fix missing check for f2fs_unlock_op Linux 4.19.120 propagate_one(): mnt_set_mountpoint() needs mount_lock ext4: check for non-zero journal inum in ext4_calculate_overhead qed: Fix use after free in qed_chain_free bpf, x86_32: Fix clobbering of dst for BPF_JSET hwmon: (jc42) Fix name to have no illegal characters ext4: convert BUG_ON's to WARN_ON's in mballoc.c ext4: increase wait time needed before reuse of deleted inode numbers ext4: use matching invalidatepage in ext4_writepage arm64: Delete the space separator in __emit_inst ALSA: hda: call runtime_allow() for all hda controllers xen/xenbus: ensure xenbus_map_ring_valloc() returns proper grant status objtool: Support Clang non-section symbols in ORC dump objtool: Fix CONFIG_UBSAN_TRAP unreachable warnings scsi: target: tcmu: reset_ring should reset TCMU_DEV_BIT_BROKEN scsi: target: fix PR IN / READ FULL STATUS for FC ALSA: hda: Explicitly permit using autosuspend if runtime PM is supported ALSA: hda: Keep the controller initialization even if no codecs found xfs: fix partially uninitialized structure in xfs_reflink_remap_extent x86: hyperv: report value of misc_features net: fec: set GPR bit on suspend by DT configuration. bpf, x86: Fix encoding for lower 8-bit registers in BPF_STX BPF_B xfs: clear PF_MEMALLOC before exiting xfsaild thread mm: shmem: disable interrupt when acquiring info->lock in userfaultfd_copy path bpf, x86_32: Fix incorrect encoding in BPF_LDX zero-extension perf/core: fix parent pid/tid in task exit events net/mlx5: Fix failing fw tracer allocation on s390 cpumap: Avoid warning when CONFIG_DEBUG_PER_CPU_MAPS is enabled ARM: dts: bcm283x: Disable dsi0 node PCI: Move Apex Edge TPU class quirk to fix BAR assignment PCI: Avoid ASMedia XHCI USB PME# from D0 defect svcrdma: Fix leak of svc_rdma_recv_ctxt objects svcrdma: Fix trace point use-after-free race xfs: acquire superblock freeze protection on eofblocks scans net/cxgb4: Check the return from t4_query_params properly rxrpc: Fix DATA Tx to disable nofrag for UDP on AF_INET6 socket i2c: altera: use proper variable to hold errno nfsd: memory corruption in nfsd4_lock() ASoC: wm8960: Fix wrong clock after suspend & resume ASoC: tas571x: disable regulators on failed probe ASoC: q6dsp6: q6afe-dai: add missing channels to MI2S DAIs iio:ad7797: Use correct attribute_group usb: gadget: udc: bdc: Remove unnecessary NULL checks in bdc_req_complete usb: dwc3: gadget: Do link recovery for SS and SSP binder: take read mode of mmap_sem in binder_alloc_free_page() include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap mtd: cfi: fix deadloop in cfi_cmdset_0002.c do_write_buffer remoteproc: Fix wrong rvring index computation FROMLIST: PM / devfreq: Restart previous governor if new governor fails to start ANDROID: GKI: arm64: Enable GZIP and LZ4 kernel compression modes ANDROID: GKI: arm64: gki_defconfig: Set arm_smmu configuration ANDROID: GKI: iommu/arm-smmu: Modularize ARM SMMU driver ANDROID: GKI: iommu: Snapshot of vendor changes ANDROID: GKI: Additions to ARM SMMU register definitions ANDROID: GKI: iommu/io-pgtable-arm: LPAE related updates by vendor ANDROID: GKI: common: dma-mapping: make dma_common_contiguous_remap more robust ANDROID: GKI: dma-coherent: Expose device base address and size ANDROID: GKI: arm64: add support for NO_KERNEL_MAPPING and STRONGLY_ORDERED ANDROID: GKI: dma-mapping: Add dma_remap functions ANDROID: GKI: arm64: Support early fixup for CMA ANDROID: GKI: iommu: dma-mapping-fast: Fast ARMv7/v8 Long Descriptor Format ANDROID: GKI: arm64: dma-mapping: add support for IOMMU mapper ANDROID: GKI: add ARCH_NR_GPIO for ABI match ANDROID: GKI: kernel: Export symbol of `cpu_do_idle` ANDROID: GKI: kernel: Export symbols needed by msm_minidump.ko and minidump_log.ko (again) ANDROID: GKI: add missing exports for __flush_dcache_area ANDROID: GKI: arm64: Export caching APIs ANDROID: GKI: arm64: provide dma cache routines with same API as 32 bit ANDROID: gki_defconfig: add FORTIFY_SOURCE, remove SPMI_MSM_PMIC_ARB Revert "ANDROID: GKI: spmi: pmic-arb: don't enable SPMI_MSM_PMIC_ARB by default" ANDROID: GKI: update abi definitions after adding padding ANDROID: GKI: elevator: add Android ABI padding to some structures ANDROID: GKI: dentry: add Android ABI padding to some structures ANDROID: GKI: bio: add Android ABI padding to some structures ANDROID: GKI: scsi: add Android ABI padding to some structures ANDROID: GKI: ufs: add Android ABI padding to some structures ANDROID: GKI: workqueue.h: add Android ABI padding to some structures ANDROID: GKI: fs.h: add Android ABI padding to some structures ANDROID: GKI: USB: add Android ABI padding to some structures ANDROID: GKI: mm: add Android ABI padding to some structures ANDROID: GKI: mount.h: add Android ABI padding to some structures ANDROID: GKI: sched.h: add Android ABI padding to some structures ANDROID: GKI: sock.h: add Android ABI padding to some structures ANDROID: GKI: module.h: add Android ABI padding to some structures ANDROID: GKI: device.h: add Android ABI padding to some structures ANDROID: GKI: phy: add Android ABI padding to some structures ANDROID: GKI: add android_kabi.h ANDROID: ABI: update due to previous changes in the tree BACKPORT: sched/core: Fix reset-on-fork from RT with uclamp ANDROID: GKI: Add support for missing V4L2 symbols ANDROID: GKI: Bulk update ABI XML representation ANDROID: GKI: arm64: psci: Support for OS initiated scheme ANDROID: GKI: net: add counter for number of frames coalesced in GRO ANDROID: GKI: cfg80211: Include length of kek in rekey data BACKPORT: loop: change queue block size to match when using DIO ANDROID: Incremental fs: Add setattr call ANDROID: GKI: enable CONFIG_RTC_SYSTOHC ANDROID: GKI: ipv4: add vendor padding to __IPV4_DEVCONF_* enums Revert "ANDROID: GKI: ipv4: increase __IPV4_DEVCONF_MAX to 64" ANDROID: driver: gpu: drm: fix export symbol types ANDROID: SoC: core: fix export symbol type ANDROID: ufshcd-crypto: fix export symbol type ANDROID: GKI: drivers: mailbox: fix race resulting in multiple message submission ANDROID: GKI: arm64: gki_defconfig: Enable a few thermal configs Revert "ANDROID: GKI: add base.h include to match MODULE_VERSIONS" FROMLIST: thermal: Make cooling device trip point writable from sysfs ANDROID: GKI: drivers: thermal: cpu_cooling: Use CPU ID as cooling device ID ANDROID: GKI: PM / devfreq: Allow min freq to be 0 ANDROID: GKI: arm64: gki_defconfig: Enable REGULATOR_PROXY_CONSUMER ANDROID: GKI: Bulk Update ABI XML representation ANDROID: KASAN support for GKI remove CONFIG_CC_WERROR ANDROID: KASAN support for GKI ANDROID: virt_wifi: fix export symbol types ANDROID: vfs: fix export symbol type ANDROID: vfs: fix export symbol types ANDROID: fscrypt: fix export symbol type ANDROID: cfi: fix export symbol types ANDROID: bpf: fix export symbol type Linux 4.19.119 s390/mm: fix page table upgrade vs 2ndary address mode accesses xfs: Fix deadlock between AGI and AGF with RENAME_WHITEOUT serial: sh-sci: Make sure status register SCxSR is read in correct sequence xhci: prevent bus suspend if a roothub port detected a over-current condition usb: f_fs: Clear OS Extended descriptor counts to zero in ffs_data_reset() usb: dwc3: gadget: Fix request completion check UAS: fix deadlock in error handling and PM flushing work UAS: no use logging any details in case of ENODEV cdc-acm: introduce a cool down cdc-acm: close race betrween suspend() and acm_softint staging: vt6656: Power save stop wake_up_count wrap around. staging: vt6656: Fix pairwise key entry save. staging: vt6656: Fix drivers TBTT timing counter. staging: vt6656: Fix calling conditions of vnt_set_bss_mode staging: vt6656: Don't set RCR_MULTICAST or RCR_BROADCAST by default. vt: don't use kmalloc() for the unicode screen buffer vt: don't hardcode the mem allocation upper bound staging: comedi: Fix comedi_device refcnt leak in comedi_open staging: comedi: dt2815: fix writing hi byte of analog output powerpc/setup_64: Set cache-line-size based on cache-block-size ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y iwlwifi: mvm: beacon statistics shouldn't go backwards iwlwifi: pcie: actually release queue memory in TVQM ASoC: dapm: fixup dapm kcontrol widget audit: check the length of userspace generated audit records usb-storage: Add unusual_devs entry for JMicron JMS566 tty: rocket, avoid OOB access tty: hvc: fix buffer overflow during hvc_alloc(). KVM: VMX: Enable machine check support for 32bit targets KVM: Check validity of resolved slot when searching memslots KVM: s390: Return last valid slot if approx index is out-of-bounds tpm: ibmvtpm: retry on H_CLOSED in tpm_ibmvtpm_send() tpm/tpm_tis: Free IRQ if probing fails ALSA: usb-audio: Filter out unsupported sample rates on Focusrite devices ALSA: usb-audio: Fix usb audio refcnt leak when getting spdif ALSA: hda/realtek - Add new codec supported for ALC245 ALSA: hda/realtek - Fix unexpected init_amp override ALSA: usx2y: Fix potential NULL dereference tools/vm: fix cross-compile build mm/ksm: fix NULL pointer dereference when KSM zero page is enabled mm/hugetlb: fix a addressing exception caused by huge_pte_offset vmalloc: fix remap_vmalloc_range() bounds checks USB: hub: Fix handling of connect changes during sleep USB: core: Fix free-while-in-use bug in the USB S-Glibrary USB: early: Handle AMD's spec-compliant identifiers, too USB: Add USB_QUIRK_DELAY_CTRL_MSG and USB_QUIRK_DELAY_INIT for Corsair K70 RGB RAPIDFIRE USB: sisusbvga: Change port variable from signed to unsigned fs/namespace.c: fix mountpoint reference counter race iio: xilinx-xadc: Make sure not exceed maximum samplerate iio: xilinx-xadc: Fix sequencer configuration for aux channels in simultaneous mode iio: xilinx-xadc: Fix clearing interrupt when enabling trigger iio: xilinx-xadc: Fix ADC-B powerdown iio: adc: stm32-adc: fix sleep in atomic context iio: st_sensors: rely on odr mask to know if odr can be set iio: core: remove extra semi-colon from devm_iio_device_register() macro ALSA: usb-audio: Add connector notifier delegation ALSA: usb-audio: Add static mapping table for ALC1220-VB-based mobos ALSA: hda: Remove ASUS ROG Zenith from the blacklist KEYS: Avoid false positive ENOMEM error on key read mlxsw: Fix some IS_ERR() vs NULL bugs vrf: Check skb for XFRM_TRANSFORMED flag xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish net: dsa: b53: b53_arl_rw_op() needs to select IVL or SVL net: dsa: b53: Rework ARL bin logic net: dsa: b53: Fix ARL register definitions net: dsa: b53: Lookup VID in ARL searches when VLAN is enabled vrf: Fix IPv6 with qdisc and xfrm team: fix hang in team_mode_get() tcp: cache line align MAX_TCP_HEADER sched: etf: do not assume all sockets are full blown net/x25: Fix x25_neigh refcnt leak when receiving frame net: stmmac: dwmac-meson8b: Add missing boundary to RGMII TX clock array net: netrom: Fix potential nr_neigh refcnt leak in nr_add_node net: bcmgenet: correct per TX/RX ring statistics macvlan: fix null dereference in macvlan_device_event() macsec: avoid to set wrong mtu ipv6: fix restrict IPV6_ADDRFORM operation cxgb4: fix large delays in PTP synchronization cxgb4: fix adapter crash due to wrong MC size x86/KVM: Clean up host's steal time structure x86/KVM: Make sure KVM_VCPU_FLUSH_TLB flag is not missed x86/kvm: Cache gfn to pfn translation x86/kvm: Introduce kvm_(un)map_gfn() KVM: Properly check if "page" is valid in kvm_vcpu_unmap kvm: fix compile on s390 part 2 kvm: fix compilation on s390 kvm: fix compilation on aarch64 KVM: Introduce a new guest mapping API KVM: nVMX: Always sync GUEST_BNDCFGS when it comes from vmcs01 KVM: VMX: Zero out *all* general purpose registers after VM-Exit f2fs: fix to avoid memory leakage in f2fs_listxattr blktrace: fix dereference after null check blktrace: Protect q->blk_trace with RCU net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup net: ipv6: add net argument to ip6_dst_lookup_flow PCI/ASPM: Allow re-enabling Clock PM scsi: smartpqi: fix call trace in device discovery virtio-blk: improve virtqueue error to BLK_STS tracing/selftests: Turn off timeout setting drm/amd/display: Not doing optimize bandwidth if flip pending. xhci: Ensure link state is U3 after setting USB_SS_PORT_LS_U3 ASoC: Intel: bytcr_rt5640: Add quirk for MPMAN MPWIN895CL tablet perf/core: Disable page faults when getting phys address pwm: bcm2835: Dynamically allocate base pwm: renesas-tpu: Fix late Runtime PM enablement Revert "powerpc/64: irq_work avoid interrupt when called with hardware irqs enabled" loop: Better discard support for block devices s390/cio: avoid duplicated 'ADD' uevents kconfig: qconf: Fix a few alignment issues ipc/util.c: sysvipc_find_ipc() should increase position index selftests: kmod: fix handling test numbers above 9 kernel/gcov/fs.c: gcov_seq_next() should increase position index nvme: fix deadlock caused by ANA update wrong locking ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map() scsi: iscsi: Report unbind session event when the target has been removed pwm: rcar: Fix late Runtime PM enablement ceph: don't skip updating wanted caps when cap is stale ceph: return ceph_mdsc_do_request() errors from __get_parent() scsi: lpfc: Fix crash in target side cable pulls hitting WAIT_FOR_UNREG scsi: lpfc: Fix kasan slab-out-of-bounds error in lpfc_unreg_login watchdog: reset last_hw_keepalive time at start arm64: Silence clang warning on mismatched value/register sizes arm64: compat: Workaround Neoverse-N1 #1542419 for compat user-space arm64: Fake the IminLine size on systems affected by Neoverse-N1 #1542419 arm64: errata: Hide CTR_EL0.DIC on systems affected by Neoverse-N1 #1542419 arm64: Add part number for Neoverse N1 vti4: removed duplicate log message. crypto: mxs-dcp - make symbols 'sha1_null_hash' and 'sha256_null_hash' static bpftool: Fix printing incorrect pointer in btf_dump_ptr drm/msm: Use the correct dma_sync calls harder ext4: fix extent_status fragmentation for plain files ANDROID: abi_gki_aarch64_cuttlefish_whitelist: remove stale symbols ANDROID: GKI: ipv4: increase __IPV4_DEVCONF_MAX to 64 ANDROID: GKI: power: add missing export for POWER_RESET_QCOM=m BACKPORT: cfg80211: Support key configuration for Beacon protection (BIGTK) BACKPORT: cfg80211: Enhance the AKM advertizement to support per interface. UPSTREAM: sysrq: Use panic() to force a crash ANDROID: GKI: kernel: sound: update codec options with block size ANDROID: add compat cross compiler ANDROID: x86/vdso: disable LTO only for VDSO BACKPORT: arm64: vdso32: Enable Clang Compilation UPSTREAM: arm64: compat: vdso: Expose BUILD_VDSO32 BACKPORT: lib/vdso: Enable common headers BACKPORT: arm: vdso: Enable arm to use common headers BACKPORT: x86/vdso: Enable x86 to use common headers BACKPORT: mips: vdso: Enable mips to use common headers UPSTREAM: arm64: vdso32: Include common headers in the vdso library UPSTREAM: arm64: vdso: Include common headers in the vdso library UPSTREAM: arm64: Introduce asm/vdso/processor.h BACKPORT: arm64: vdso32: Code clean up UPSTREAM: linux/elfnote.h: Replace elf.h with UAPI equivalent UPSTREAM: scripts: Fix the inclusion order in modpost UPSTREAM: common: Introduce processor.h UPSTREAM: linux/ktime.h: Extract common header for vDSO UPSTREAM: linux/jiffies.h: Extract common header for vDSO UPSTREAM: linux/time64.h: Extract common header for vDSO BACKPORT: linux/time32.h: Extract common header for vDSO BACKPORT: linux/time.h: Extract common header for vDSO UPSTREAM: linux/math64.h: Extract common header for vDSO BACKPORT: linux/clocksource.h: Extract common header for vDSO BACKPORT: mips: Introduce asm/vdso/clocksource.h BACKPORT: arm64: Introduce asm/vdso/clocksource.h BACKPORT: arm: Introduce asm/vdso/clocksource.h BACKPORT: x86: Introduce asm/vdso/clocksource.h UPSTREAM: linux/limits.h: Extract common header for vDSO BACKPORT: linux/kernel.h: split *_MAX and *_MIN macros into <linux/limits.h> BACKPORT: linux/bits.h: Extract common header for vDSO UPSTREAM: linux/const.h: Extract common header for vDSO BACKPORT: arm64: vdso: fix flip/flop vdso build bug UPSTREAM: lib/vdso: Allow the high resolution parts to be compiled out UPSTREAM: lib/vdso: Only read hrtimer_res when needed in __cvdso_clock_getres() UPSTREAM: lib/vdso: Mark do_hres() and do_coarse() as __always_inline UPSTREAM: lib/vdso: Avoid duplication in __cvdso_clock_getres() UPSTREAM: lib/vdso: Let do_coarse() return 0 to simplify the callsite UPSTREAM: lib/vdso: Remove checks on return value for 32 bit vDSO UPSTREAM: lib/vdso: Build 32 bit specific functions in the right context UPSTREAM: lib/vdso: Make __cvdso_clock_getres() static UPSTREAM: lib/vdso: Make clock_getres() POSIX compliant again UPSTREAM: lib/vdso/32: Provide legacy syscall fallbacks UPSTREAM: lib/vdso: Move fallback invocation to the callers UPSTREAM: lib/vdso/32: Remove inconsistent NULL pointer checks UPSTREAM: lib/vdso: Make delta calculation work correctly UPSTREAM: arm64: compat: Fix syscall number of compat_clock_getres BACKPORT: arm64: lse: Fix LSE atomics with LLVM UPSTREAM: mips: Fix gettimeofday() in the vdso library UPSTREAM: mips: vdso: Fix __arch_get_hw_counter() BACKPORT: arm64: Kconfig: Make CONFIG_COMPAT_VDSO a proper Kconfig option UPSTREAM: arm64: vdso32: Rename COMPATCC to CC_COMPAT UPSTREAM: arm64: vdso32: Pass '--target' option to clang via VDSO_CAFLAGS UPSTREAM: arm64: vdso32: Don't use KBUILD_CPPFLAGS unconditionally UPSTREAM: arm64: vdso32: Move definition of COMPATCC into vdso32/Makefile UPSTREAM: arm64: Default to building compat vDSO with clang when CONFIG_CC_IS_CLANG UPSTREAM: lib: vdso: Remove CROSS_COMPILE_COMPAT_VDSO UPSTREAM: arm64: vdso32: Remove jump label config option in Makefile UPSTREAM: arm64: vdso32: Detect binutils support for dmb ishld BACKPORT: arm64: vdso: Remove stale files from old assembly implementation UPSTREAM: arm64: vdso32: Fix broken compat vDSO build warnings UPSTREAM: mips: compat: vdso: Use legacy syscalls as fallback BACKPORT: arm64: Relax Documentation/arm64/tagged-pointers.rst BACKPORT: arm64: Add tagged-address-abi.rst to index.rst UPSTREAM: arm64: vdso: Fix Makefile regression UPSTREAM: mips: vdso: Fix flip/flop vdso building bug UPSTREAM: mips: vdso: Fix source path UPSTREAM: mips: Add clock_gettime64 entry point UPSTREAM: mips: Add clock_getres entry point BACKPORT: mips: Add support for generic vDSO BACKPORT: arm64: vdso: Explicitly add build-id option BACKPORT: arm64: vdso: use $(LD) instead of $(CC) to link VDSO BACKPORT: arm64: vdso: Cleanup Makefiles UPSTREAM: arm64: vdso: Fix population of AT_SYSINFO_EHDR for compat vdso UPSTREAM: arm64: vdso: Fix compilation with clang older than 8 UPSTREAM: arm64: compat: Fix __arch_get_hw_counter() implementation UPSTREAM: arm64: Fix __arch_get_hw_counter() implementation UPSTREAM: x86/vdso/32: Use 32bit syscall fallback UPSTREAM: x86/vdso: Fix flip/flop vdso build bug UPSTREAM: x86/vdso: Give the [ph]vclock_page declarations real types UPSTREAM: x86/vdso: Add clock_gettime64() entry point BACKPORT: x86/vdso: Add clock_getres() entry point BACKPORT: x86/vdso: Switch to generic vDSO implementation UPSTREAM: x86/segments: Introduce the 'CPUNODE' naming to better document the segment limit CPU/node NR trick UPSTREAM: x86/vdso: Initialize the CPU/node NR segment descriptor earlier UPSTREAM: x86/vdso: Introduce helper functions for CPU and node number UPSTREAM: x86/segments/64: Rename the GDT PER_CPU entry to CPU_NUMBER BACKPORT: arm64: vdso: Enable vDSO compat support UPSTREAM: arm64: compat: Get sigreturn trampolines from vDSO UPSTREAM: arm64: elf: VDSO code page discovery UPSTREAM: arm64: compat: VDSO setup for compat layer UPSTREAM: arm64: vdso: Refactor vDSO code BACKPORT: arm64: compat: Add vDSO UPSTREAM: arm64: compat: Generate asm offsets for signals UPSTREAM: arm64: compat: Expose signal related structures UPSTREAM: arm64: compat: Add missing syscall numbers BACKPORT: arm64: vdso: Substitute gettimeofday() with C implementation UPSTREAM: timekeeping: Provide a generic update_vsyscall() implementation UPSTREAM: lib/vdso: Add compat support UPSTREAM: lib/vdso: Provide generic VDSO implementation UPSTREAM: vdso: Define standardized vdso_datapage UPSTREAM: hrtimer: Split out hrtimer defines into separate header UPSTREAM: nds32: Fix vDSO clock_getres() UPSTREAM: arm64: compat: Reduce address limit for 64K pages BACKPORT: arm64: compat: Add KUSER_HELPERS config option UPSTREAM: arm64: compat: Refactor aarch32_alloc_vdso_pages() BACKPORT: arm64: compat: Split kuser32 UPSTREAM: arm64: compat: Alloc separate pages for vectors and sigpage ANDROID: GKI: Update ABI XML representation ANDROID: GKI: Enable GENERIC_IRQ_CHIP ANDROID: GKI: power_supply: Add FG_TYPE power-supply property ANDROID: GKI: mm: export mm_trace_rss_stat for modules to report RSS changes ANDROID: GKI: gki_defconfig: Enable CONFIG_LEDS_TRIGGER_TRANSIENT ANDROID: GKI: gki_defconfig: Enable CONFIG_CPU_FREQ_STAT ANDROID: GKI: arm64: gki_defconfig: Disable HW tracing features ANDROID: GKI: gki_defconfig: Enable CONFIG_I2C_CHARDEV ANDROID: Incremental fs: Use simple compression in log buffer ANDROID: GKI: usb: core: Add support to parse config summary capability descriptors ANDROID: GKI: Update ABI XML representation ANDROID: dm-bow: Fix not to skip trim at framented range ANDROID: Remove VLA from uid_sys_stats.c f2fs: fix missing check for f2fs_unlock_op ANDROID: fix wakeup reason findings UPSTREAM: cfg80211: fix and clean up cfg80211_gen_new_bssid() UPSTREAM: cfg80211: save multi-bssid properties UPSTREAM: cfg80211: make BSSID generation function inline UPSTREAM: cfg80211: parse multi-bssid only if HW supports it UPSTREAM: cfg80211: Move Multiple BSS info to struct cfg80211_bss to be visible UPSTREAM: cfg80211: Properly track transmitting and non-transmitting BSS UPSTREAM: cfg80211: use for_each_element() for multi-bssid parsing UPSTREAM: cfg80211: Parsing of Multiple BSSID information in scanning UPSTREAM: cfg80211/nl80211: Offload OWE processing to user space in AP mode ANDROID: GKI: cfg80211: Sync nl80211 commands/feature with upstream ANDROID: GKI: gki_defconfig: Enable FW_LOADER_USER_HELPER* ANDROID: GKI: arm64: gki_defconfig: Disable CONFIG_ARM64_TAGGED_ADDR_ABI ANDROID: GKI: gki_defconfig: CONFIG_CHR_DEV_SG=y ANDROID: GKI: gki_defconfig: CONFIG_DM_DEFAULT_KEY=m ANDROID: update the ABI xml representation ANDROID: init: GKI: enable hidden configs for GPU Linux 4.19.118 bpf: fix buggy r0 retval refinement for tracing helpers KEYS: Don't write out to userspace while holding key semaphore mtd: phram: fix a double free issue in error path mtd: lpddr: Fix a double free in probe() mtd: spinand: Explicitly use MTD_OPS_RAW to write the bad block marker to OOB locktorture: Print ratio of acquisitions, not failures tty: evh_bytechan: Fix out of bounds accesses iio: si1133: read 24-bit signed integer for measurement fbdev: potential information leak in do_fb_ioctl() net: dsa: bcm_sf2: Fix overflow checks f2fs: fix to wait all node page writeback iommu/amd: Fix the configuration of GCR3 table root pointer libnvdimm: Out of bounds read in __nd_ioctl() power: supply: axp288_fuel_gauge: Broaden vendor check for Intel Compute Sticks. ext2: fix debug reference to ext2_xattr_cache ext2: fix empty body warnings when -Wextra is used iommu/vt-d: Fix mm reference leak drm/vc4: Fix HDMI mode validation f2fs: fix NULL pointer dereference in f2fs_write_begin() NFS: Fix memory leaks in nfs_pageio_stop_mirroring() drm/amdkfd: kfree the wrong pointer x86: ACPI: fix CPU hotplug deadlock KVM: s390: vsie: Fix possible race when shadowing region 3 tables compiler.h: fix error in BUILD_BUG_ON() reporting percpu_counter: fix a data race at vm_committed_as include/linux/swapops.h: correct guards for non_swap_entry() cifs: Allocate encryption header through kmalloc um: ubd: Prevent buffer overrun on command completion ext4: do not commit super on read-only bdev s390/cpum_sf: Fix wrong page count in error message powerpc/maple: Fix declaration made after definition s390/cpuinfo: fix wrong output when CPU0 is offline NFS: direct.c: Fix memory leak of dreq when nfs_get_lock_context fails NFSv4/pnfs: Return valid stateids in nfs_layout_find_inode_by_stateid() rtc: 88pm860x: fix possible race condition soc: imx: gpc: fix power up sequencing clk: tegra: Fix Tegra PMC clock out parents power: supply: bq27xxx_battery: Silence deferred-probe error clk: at91: usb: continue if clk_hw_round_rate() return zero x86/Hyper-V: Report crash data in die() when panic_on_oops is set x86/Hyper-V: Report crash register data when sysctl_record_panic_msg is not set x86/Hyper-V: Trigger crash enlightenment only once during system crash. x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump x86/Hyper-V: Unload vmbus channel in hv panic callback xsk: Add missing check on user supplied headroom size rbd: call rbd_dev_unprobe() after unwatching and flushing notifies rbd: avoid a deadlock on header_rwsem when flushing notifies video: fbdev: sis: Remove unnecessary parentheses and commented code lib/raid6: use vdupq_n_u8 to avoid endianness warnings x86/Hyper-V: Report crash register data or kmsg before running crash kernel of: overlay: kmemleak in dup_and_fixup_symbol_prop() of: unittest: kmemleak in of_unittest_overlay_high_level() of: unittest: kmemleak in of_unittest_platform_populate() of: unittest: kmemleak on changeset destroy ALSA: hda: Don't release card at firmware loading error irqchip/mbigen: Free msi_desc on device teardown netfilter: nf_tables: report EOPNOTSUPP on unsupported flags/object type ARM: dts: imx6: Use gpc for FEC interrupt controller to fix wake on LAN. arm, bpf: Fix bugs with ALU64 {RSH, ARSH} BPF_K shift by 0 watchdog: sp805: fix restart handler ext4: use non-movable memory for superblock readahead scsi: sg: add sg_remove_request in sg_common_write objtool: Fix switch table detection in .text.unlikely arm, bpf: Fix offset overflow for BPF_MEM BPF_DW ANDROID: GKI: Bulk update ABI report. ANDROID: GKI: qos: Register irq notify after adding the qos request ANDROID: GKI: Add dual role mode to usb_dr_modes array UPSTREAM: virtio-gpu api: comment feature flags ANDROID: arch:arm64: Increase kernel command line size ANDROID: GKI: Add special linux_banner_ptr for modules Revert "ANDROID: GKI: Make linux_banner a C pointer" ANDROID: GKI: PM / devfreq: Add new flag to do simple clock scaling ANDROID: GKI: Resolve ABI diff for struct snd_usb_audio ANDROID: GKI: Bulk update ABI ANDROID: GKI: Update the whitelist for qcom SoCs ANDROID: GKI: arm64: gki_defconfig: Set CONFIG_SCSI_UFSHCD=m ANDROID: GKI: scsi: add option to override the command timeout ANDROID: GKI: scsi: Adjust DBD setting in mode sense for caching mode page per LLD ANDROID: add ion_stat tracepoint to common kernel UPSTREAM: gpu/trace: add a gpu total memory usage tracepoint Linux 4.19.117 mm/vmalloc.c: move 'area->pages' after if statement wil6210: remove reset file from debugfs wil6210: make sure Rx ring sizes are correlated wil6210: add general initialization/size checks wil6210: ignore HALP ICR if already handled wil6210: check rx_buff_mgmt before accessing it x86/resctrl: Fix invalid attempt at removing the default resource group x86/resctrl: Preserve CDP enable over CPU hotplug x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE scsi: target: fix hang when multiple threads try to destroy the same iscsi session scsi: target: remove boilerplate code kvm: x86: Host feature SSBD doesn't imply guest feature SPEC_CTRL_SSBD ext4: do not zeroout extents beyond i_disksize drm/amd/powerplay: force the trim of the mclk dpm_levels if OD is enabled usb: dwc3: gadget: Don't clear flags before transfer ended usb: dwc3: gadget: don't enable interrupt when disabling endpoint mac80211_hwsim: Use kstrndup() in place of kasprintf() btrfs: check commit root generation in should_ignore_root tracing: Fix the race between registering 'snapshot' event trigger and triggering 'snapshot' operation keys: Fix proc_keys_next to increase position index ALSA: usb-audio: Check mapping at creating connector controls, too ALSA: usb-audio: Don't create jack controls for PCM terminals ALSA: usb-audio: Don't override ignore_ctl_error value from the map ALSA: usb-audio: Filter error from connector kctl ops, too ASoC: Intel: mrfld: return error codes when an error occurs ASoC: Intel: mrfld: fix incorrect check on p->sink ext4: fix incorrect inodes per group in error message ext4: fix incorrect group count in ext4_fill_super error message pwm: pca9685: Fix PWM/GPIO inter-operation jbd2: improve comments about freeing data buffers whose page mapping is NULL scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic ovl: fix value of i_ino for lower hardlink corner case net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes net: revert default NAPI poll timeout to 2 jiffies net: qrtr: send msgs from local of same id as broadcast net: ipv6: do not consider routes via gateways for anycast address check net: ipv4: devinet: Fix crash when add/del multicast IP with autojoin hsr: check protocol version in hsr_newlink() amd-xgbe: Use __napi_schedule() in BH context ANDROID: GKI: drivers: of-thermal: Relate thermal zones using same sensor ANDROID: GKI: Bulk ABI update ANDROID: GKI: dma: Add set_dma_mask hook to struct dma_map_ops ANDROID: GKI: ABI update due to recent patches FROMLIST: drm/prime: add support for virtio exported objects FROMLIST: dma-buf: add support for virtio exported objects UPSTREAM: drm/virtio: module_param_named() requires linux/moduleparam.h UPSTREAM: drm/virtio: fix resource id creation race UPSTREAM: drm/virtio: make resource id workaround runtime switchable. BACKPORT: drm/virtio: Drop deprecated load/unload initialization ANDROID: GKI: Add DRM_TTM config to GKI ANDROID: Bulk update the ABI xml representation ANDROID: GKI: spmi: pmic-arb: don't enable SPMI_MSM_PMIC_ARB by default ANDROID: GKI: attribute page lock and waitqueue functions as sched ANDROID: GKI: extcon: Fix Add usage of blocking notifier chain ANDROID: GKI: USB: pd: Extcon fix for C current ANDROID: drm/dsi: Fix byte order of DCS set/get brightness ANDROID: GKI: mm: Export symbols to modularize CONFIG_MSM_DRM ANDROID: GKI: ALSA: compress: Add support to send codec specific data ANDROID: GKI: ALSA: Compress - dont use lock for all ioctls ANDROID: GKI: ASoC: msm: qdsp6v2: add support for AMR_WB_PLUS offload ANDROID: GKI: msm: dolby: MAT and THD audiocodec name modification ANDROID: GKI: asoc: msm: Add support for compressed perf mode ANDROID: GKI: msm: audio: support for gapless_pcm ANDROID: GKI: uapi: msm: dolby: Support for TrueHD and MAT decoders ANDROID: GKI: ASoC: msm: qdsp6v2: Add TrueHD HDMI compress pass-though ANDROID: GKI: ALSA: compress: Add APTX format support in ALSA ANDROID: GKI: msm: qdsp6v2: Add timestamp support for compress capture ANDROID: GKI: SoC: msm: Add support for meta data in compressed TX ANDROID: GKI: ALSA: compress: Add DSD format support for ALSA ANDROID: GKI: ASoC: msm: qdsp6v2: add support for ALAC and APE offload ANDROID: GKI: SoC: msm: Add compressed TX and passthrough support ANDROID: GKI: ASoC: msm: qdsp6v2: Add FLAC in compress offload path ANDROID: GKI: ASoC: msm: add support for different compressed formats ANDROID: GKI: ASoC: msm: Update the encode option and sample rate ANDROID: GKI: Enable CONFIG_SND_VERBOSE_PROCFS in gki_defconfig ANDROID: GKI: Add hidden CONFIG_SND_SOC_COMPRESS to gki_defconfig ANDROID: GKI: ALSA: pcm: add locks for accessing runtime resource ANDROID: GKI: Update ABI for DRM changes ANDROID: GKI: Add drm_dp_send_dpcd_{read,write} accessor functions ANDROID: GKI: drm: Add drm_dp_mst_get_max_sdp_streams_supported accessor function ANDROID: GKI: drm: Add drm_dp_mst_has_fec accessor function ANDROID: GKI: Add 'dsc_info' to struct drm_dp_mst_port ANDROID: GKI: usb: Add support to handle USB SMMU S1 address ANDROID: GKI: usb: Add helper APIs to return xhci phys addresses ANDROID: Add C protos for dma_buf/drm_prime get_uuid ANDROID: GKI: Make linux_banner a C pointer ANDROID: GKI: Add 'refresh_rate', 'id' to struct drm_panel_notifier ANDROID: GKI: Add 'i2c_mutex' to struct drm_dp_aux ANDROID: GKI: Add 'checksum' to struct drm_connector Revert "BACKPORT: drm: Add HDR source metadata property" Revert "BACKPORT: drm: Parse HDR metadata info from EDID" ANDROID: drm: Add DP colorspace property ANDROID: GKI: drm: Initialize display->hdmi when parsing vsdb ANDROID: drivers: gpu: drm: add support to batch commands ANDROID: ABI: update the qcom whitelist ANDROID: GKI: ARM64: smp: add vendor field pending_ipi ANDROID: gki_defconfig: enable msm serial early console ANDROID: serial: msm_geni_serial_console : Add Earlycon support ANDROID: GKI: serial: core: export uart_console_device f2fs: fix quota_sync failure due to f2fs_lock_op f2fs: support read iostat f2fs: Fix the accounting of dcc->undiscard_blks f2fs: fix to handle error path of f2fs_ra_meta_pages() f2fs: report the discard cmd errors properly f2fs: fix long latency due to discard during umount f2fs: add tracepoint for f2fs iostat f2fs: introduce sysfs/data_io_flag to attach REQ_META/FUA ANDROID: GKI: update abi definition due to previous changes in the tree Linux 4.19.116 efi/x86: Fix the deletion of variables in mixed mode mfd: dln2: Fix sanity checking for endpoints etnaviv: perfmon: fix total and idle HI cyleces readout misc: echo: Remove unnecessary parentheses and simplify check for zero powerpc/fsl_booke: Avoid creating duplicate tlb1 entry ftrace/kprobe: Show the maxactive number on kprobe_events drm: Remove PageReserved manipulation from drm_pci_alloc drm/dp_mst: Fix clearing payload state on topology disable Revert "drm/dp_mst: Remove VCPI while disabling topology mgr" crypto: ccree - only try to map auth tag if needed crypto: ccree - dec auth tag size from cryptlen map crypto: ccree - don't mangle the request assoclen crypto: ccree - zero out internal struct before use crypto: ccree - improve error handling crypto: caam - update xts sector size for large input length dm zoned: remove duplicate nr_rnd_zones increase in dmz_init_zone() btrfs: use nofs allocations for running delayed items powerpc: Make setjmp/longjmp signature standard powerpc: Add attributes for setjmp/longjmp scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug powerpc/kprobes: Ignore traps that happened in real mode powerpc/xive: Use XIVE_BAD_IRQ instead of zero to catch non configured IPIs powerpc/hash64/devmap: Use H_PAGE_THP_HUGE when setting up huge devmap PTE entries powerpc/64/tm: Don't let userspace set regs->trap via sigreturn powerpc/powernv/idle: Restore AMR/UAMOR/AMOR after idle xen/blkfront: fix memory allocation flags in blkfront_setup_indirect() ipmi: fix hung processes in __get_guid() libata: Return correct status in sata_pmp_eh_recover_pm() when ATA_DFLAG_DETACH is set hfsplus: fix crash and filesystem corruption when deleting files cpufreq: powernv: Fix use-after-free kmod: make request_module() return an error when autoloading is disabled clk: ingenic/jz4770: Exit with error if CGU init failed Input: i8042 - add Acer Aspire 5738z to nomux list s390/diag: fix display of diagnose call statistics perf tools: Support Python 3.8+ in Makefile ocfs2: no need try to truncate file beyond i_size fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once() ext4: fix a data race at inode->i_blocks NFS: Fix a page leak in nfs_destroy_unlinked_subrequests() powerpc/pseries: Avoid NULL pointer dereference when drmem is unavailable drm/etnaviv: rework perfmon query infrastructure rtc: omap: Use define directive for PIN_CONFIG_ACTIVE_HIGH selftests: vm: drop dependencies on page flags from mlock2 tests arm64: armv8_deprecated: Fix undef_hook mask for thumb setend scsi: zfcp: fix missing erp_lock in port recovery trigger for point-to-point dm verity fec: fix memory leak in verity_fec_dtr dm writecache: add cond_resched to avoid CPU hangs arm64: dts: allwinner: h6: Fix PMU compatible net: qualcomm: rmnet: Allow configuration updates to existing devices mm: Use fixed constant in page_frag_alloc instead of size + 1 tools: gpio: Fix out-of-tree build regression x86/speculation: Remove redundant arch_smt_update() invocation powerpc/pseries: Drop pointless static qualifier in vpa_debugfs_init() erofs: correct the remaining shrink objects crypto: mxs-dcp - fix scatterlist linearization for hash btrfs: fix missing semaphore unlock in btrfs_sync_file btrfs: fix missing file extent item for hole after ranged fsync btrfs: drop block from cache on error in relocation btrfs: set update the uuid generation as soon as possible Btrfs: fix crash during unmount due to race with delayed inode workers mtd: spinand: Do not erase the block before writing a bad block marker mtd: spinand: Stop using spinand->oobbuf for buffering bad block markers CIFS: Fix bug which the return value by asynchronous read is error KVM: VMX: fix crash cleanup when KVM wasn't used KVM: x86: Gracefully handle __vmalloc() failure during VM allocation KVM: VMX: Always VMCLEAR in-use VMCSes during crash with kexec support KVM: x86: Allocate new rmap and large page tracking when moving memslot KVM: s390: vsie: Fix delivery of addressing exceptions KVM: s390: vsie: Fix region 1 ASCE sanity shadow address checks KVM: nVMX: Properly handle userspace interrupt window request x86/entry/32: Add missing ASM_CLAC to general_protection entry signal: Extend exec_id to 64bits ath9k: Handle txpower changes even when TPC is disabled MIPS: OCTEON: irq: Fix potential NULL pointer dereference MIPS/tlbex: Fix LDDIR usage in setup_pw() for Loongson-3 pstore: pstore_ftrace_seq_next should increase position index irqchip/versatile-fpga: Apply clear-mask earlier KEYS: reaching the keys quotas correctly tpm: tpm2_bios_measurements_next should increase position index tpm: tpm1_bios_measurements_next should increase position index tpm: Don't make log failures fatal PCI: endpoint: Fix for concurrent memory allocation in OB address region PCI: Add boot interrupt quirk mechanism for Xeon chipsets PCI/ASPM: Clear the correct bits when enabling L1 substates PCI: pciehp: Fix indefinite wait on sysfs requests nvme: Treat discovery subsystems as unique subsystems nvme-fc: Revert "add module to ops template to allow module references" thermal: devfreq_cooling: inline all stubs for CONFIG_DEVFREQ_THERMAL=n acpi/x86: ignore unspecified bit positions in the ACPI global lock field media: ti-vpe: cal: fix disable_irqs to only the intended target ALSA: hda/realtek - Add quirk for MSI GL63 ALSA: hda/realtek - Remove now-unnecessary XPS 13 headphone noise fixups ALSA: hda/realtek - Set principled PC Beep configuration for ALC256 ALSA: doc: Document PC Beep Hidden Register on Realtek ALC256 ALSA: pcm: oss: Fix regression by buffer overflow fix ALSA: ice1724: Fix invalid access for enumerated ctl items ALSA: hda: Fix potential access overflow in beep helper ALSA: hda: Add driver blacklist ALSA: usb-audio: Add mixer workaround for TRX40 and co usb: gadget: composite: Inform controller driver of self-powered usb: gadget: f_fs: Fix use after free issue as part of queue failure ASoC: topology: use name_prefix for new kcontrol ASoC: dpcm: allow start or stop during pause for backend ASoC: dapm: connect virtual mux with default value ASoC: fix regwmask slub: improve bit diffusion for freelist ptr obfuscation uapi: rename ext2_swab() to swab() and share globally in swab.h IB/mlx5: Replace tunnel mpls capability bits for tunnel_offloads btrfs: track reloc roots based on their commit root bytenr btrfs: remove a BUG_ON() from merge_reloc_roots() btrfs: qgroup: ensure qgroup_rescan_running is only set when the worker is at least queued block, bfq: fix use-after-free in bfq_idle_slice_timer_body locking/lockdep: Avoid recursion in lockdep_count_{for,back}ward_deps() firmware: fix a double abort case with fw_load_sysfs_fallback md: check arrays is suspended in mddev_detach before call quiesce operations irqchip/gic-v4: Provide irq_retrigger to avoid circular locking dependency usb: dwc3: core: add support for disabling SS instances in park mode media: i2c: ov5695: Fix power on and off sequences block: Fix use-after-free issue accessing struct io_cq genirq/irqdomain: Check pointer in irq_domain_alloc_irqs_hierarchy() efi/x86: Ignore the memory attributes table on i386 x86/boot: Use unsigned comparison for addresses gfs2: Don't demote a glock until its revokes are written pstore/platform: fix potential mem leak if pstore_init_fs failed libata: Remove extra scsi_host_put() in ata_scsi_add_hosts() media: i2c: video-i2c: fix build errors due to 'imply hwmon' PCI/switchtec: Fix init_completion race condition with poll_wait() selftests/x86/ptrace_syscall_32: Fix no-vDSO segfault sched: Avoid scale real weight down to zero irqchip/versatile-fpga: Handle chained IRQs properly block: keep bdi->io_pages in sync with max_sectors_kb for stacked devices x86: Don't let pgprot_modify() change the page encryption bit xhci: bail out early if driver can't accress host in resume null_blk: fix spurious IO errors after failed past-wp access null_blk: Handle null_add_dev() failures properly null_blk: Fix the null_add_dev() error path firmware: arm_sdei: fix double-lock on hibernate with shared events media: venus: hfi_parser: Ignore HEVC encoding for V1 cpufreq: imx6q: Fixes unwanted cpu overclocking on i.MX6ULL i2c: st: fix missing struct parameter description qlcnic: Fix bad kzalloc null test cxgb4/ptp: pass the sign of offset delta in FW CMD hinic: fix wrong para of wait_for_completion_timeout hinic: fix a bug of waitting for IO stopped net: vxge: fix wrong __VA_ARGS__ usage bus: sunxi-rsb: Return correct data when mixing 16-bit and 8-bit reads ARM: dts: sun8i-a83t-tbs-a711: HM5065 doesn't like such a high voltage ANDROID: build.config.allmodconfig: Re-enable XFS_FS FROMGIT: of: property: Add device link support for extcon ANDROID: GKI: arm64: gki_defconfig: enable CONFIG_MM_EVENT_STAT ANDROID: GKI: add fields from per-process mm event tracking feature ANDROID: GKI: fix ABI diffs caused by ION heap and pool vmstat additions UPSTREAM: GKI: panic/reboot: allow specifying reboot_mode for panic only ANDROID: GKI: of: property: Add device link support for phys property ANDROID: GKI: usb: phy: Fix ABI diff for usb_otg_state ANDROID: GKI: usb: phy: Fix ABI diff due to usb_phy.drive_dp_pulse ANDROID: GKI: usb: phy: Fix ABI diff for usb_phy_type and usb_phy.reset ANDROID: gki_defconfig: enable CONFIG_GPIO_SYSFS ANDROID: GKI: qcom: Fix compile issue when setting msm_lmh_dcvs as a module ANDROID: GKI: drivers: cpu_cooling: allow platform freq mitigation ANDROID: GKI: ASoC: Add locking in DAPM widget power update ANDROID: GKI: ASoC: jack: Fix buttons enum value ANDROID: GKI: ALSA: jack: Add support to report second microphone ANDROID: GKI: ALSA: jack: Update supported jack switch types ANDROID: GKI: ALSA: jack: update jack types ANDROID: GKI: Export symbols arm_cpuidle_suspend, cpuidle_dev and cpuidle_register_governor ANDROID: GKI: usb: hcd: Add USB atomic notifier callback for HC died error ANDROID: media: increase video max frame number BACKPORT: nvmem: core: add NVMEM_SYSFS Kconfig UPSTREAM: nvmem: add support for cell info UPSTREAM: nvmem: remove the global cell list UPSTREAM: nvmem: use kref UPSTREAM: nvmem: use list_for_each_entry_safe in nvmem_device_remove_all_cells() UPSTREAM: nvmem: provide nvmem_dev_name() ANDROID: GKI: Bulk ABI update ANDROID: GKI: cpuhotplug: adding hotplug enums for vendor code ANDROID: Incremental fs: Fix create_file performance ANDROID: build.config.common: Add BUILDTOOLS_PREBUILT_BIN UPSTREAM: kheaders: include only headers into kheaders_data.tar.xz UPSTREAM: kheaders: remove meaningless -R option of 'ls' ANDROID: GKI: of: platform: initialize of_reserved_mem ANDROID: driver: gpu: drm: add notifier for panel related events ANDROID: include: drm: support unicasting mipi cmds to dsi ctrls ANDROID: include: drm: increase DRM max property count to 64 BACKPORT: drm: Add HDMI colorspace property ANDROID: drm: edid: add support for additional CEA extension blocks BACKPORT: drm: Parse HDR metadata info from EDID BACKPORT: drm: Add HDR source metadata property BACKPORT: drm/dp_mst: Parse FEC capability on MST ports ANDROID: GKI: ABI update for DRM changes ANDROID: ABI: add missing elf variables to representation ANDROID: GKI: power_supply: Add PROP_MOISTURE_DETECTION_ENABLED ANDROID: include: drm: add the definitions for DP Link Compliance tests ANDROID: drivers: gpu: drm: fix bugs encountered while fuzzing FROMLIST: power_supply: Add additional health properties to the header UPSTREAM: power: supply: core: Update sysfs-class-power ABI document UPSTREAM: Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.19.y' into android-4.19 (v5.7-rc1) ANDROID: drivers: gpu: drm: add support for secure framebuffer ANDROID: include: uapi: drm: add additional QCOM modifiers ANDROID: drm: dsi: add two DSI mode flags for BLLP ANDROID: include: uapi: drm: add additional drm mode flags UPSTREAM: drm: plug memory leak on drm_setup() failure UPSTREAM: drm: factor out drm_close_helper() function ANDROID: GKI: Bulk ABI update BACKPORT: nl80211: Add per peer statistics to compute FCS error rate ANDROID: GKI: sound: usb: Add snd_usb_enable_audio_stream/find_snd_usb_substream ANDROID: GKI: add dma-buf includes ANDROID: GKI: sched: struct fields for Per-Sched-domain over utilization ANDROID: GKI: Add vendor fields to root_domain ANDROID: gki_defconfig: Enable CONFIG_IRQ_TIME_ACCOUNTING ANDROID: fix allmodconfig build to use the right toolchain ANDROID: fix allmodconfig build to use the right toolchain ANDROID: GKI: Update ABI Revert "UPSTREAM: mm, page_alloc: spread allocations across zones before introducing fragmentation" Revert "UPSTREAM: mm: use alloc_flags to record if kswapd can wake" Revert "BACKPORT: mm: move zone watermark accesses behind an accessor" Revert "BACKPORT: mm: reclaim small amounts of memory when an external fragmentation event occurs" Revert "BACKPORT: mm, compaction: be selective about what pageblocks to clear skip hints" ANDROID: GKI: panic: add vendor callback function in panic() UPSTREAM: GKI: thermal: make device_register's type argument const ANDROID: GKI: add base.h include to match MODULE_VERSIONS ANDROID: update the ABI based on the new whitelist ANDROID: GKI: fdt: export symbols required by modules ANDROID: GKI: drivers: of: Add APIs to find DDR device rank, HBB ANDROID: GKI: security: Add mmap export symbols for modules ANDROID: GKI: arch: add stub symbols for boot_reason and cold_boot ANDROID: GKI: USB: Fix ABI diff for struct usb_bus ANDROID: GKI: USB: Resolve ABI diff for usb_gadget and usb_gadget_ops ANDROID: GKI: add hidden V4L2_MEM2MEM_DEV ANDROID: GKI: enable VIDEO_V4L2_SUBDEV_API ANDROID: GKI: export symbols from abi_gki_aarch64_qcom_whitelist ANDROID: Update the whitelist for qcom SoCs ANDROID: Incremental fs: Fix compound page usercopy crash ANDROID: Incremental fs: Clean up incfs_test build process ANDROID: Incremental fs: make remount log buffer change atomic ANDROID: Incremental fs: Optimize get_filled_block ANDROID: Incremental fs: Fix mislabeled __user ptrs ANDROID: Incremental fs: Use 64-bit int for file_size when writing hash blocks Linux 4.19.115 drm/msm: Use the correct dma_sync calls in msm_gem drm_dp_mst_topology: fix broken drm_dp_sideband_parse_remote_dpcd_read() usb: dwc3: don't set gadget->is_otg flag rpmsg: glink: Remove chunk size word align warning arm64: Fix size of __early_cpu_boot_status drm/msm: stop abusing dma_map/unmap for cache clk: qcom: rcg: Return failure for RCG update fbcon: fix null-ptr-deref in fbcon_switch RDMA/cm: Update num_paths in cma_resolve_iboe_route error flow Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl RDMA/cma: Teach lockdep about the order of rtnl and lock RDMA/ucma: Put a lock around every call to the rdma_cm layer ceph: canonicalize server path in place ceph: remove the extra slashes in the server path IB/hfi1: Fix memory leaks in sysfs registration and unregistration IB/hfi1: Call kobject_put() when kobject_init_and_add() fails ASoC: jz4740-i2s: Fix divider written at incorrect offset in register hwrng: imx-rngc - fix an error path tools/accounting/getdelays.c: fix netlink attribute length usb: dwc3: gadget: Wrap around when skip TRBs random: always use batched entropy for get_random_u{32,64} mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE slcan: Don't transmit uninitialized stack data in padding net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers net: dsa: bcm_sf2: Ensure correct sub-node is parsed net: dsa: bcm_sf2: Do not register slave MDIO bus with OF ipv6: don't auto-add link-local address to lag ports mm: mempolicy: require at least one nodeid for MPOL_PREFERRED include/linux/notifier.h: SRCU: fix ctags bitops: protect variables in set_mask_bits() macro padata: always acquire cpu_hotplug_lock before pinst->lock net: Fix Tx hash bound checking rxrpc: Fix sendmsg(MSG_WAITALL) handling ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard power: supply: axp288_charger: Add special handling for HP Pavilion x2 10 extcon: axp288: Add wakeup support mei: me: add cedar fork device ids coresight: do not use the BIT() macro in the UAPI header misc: pci_endpoint_test: Avoid using module parameter to determine irqtype misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices misc: rtsx: set correct pcr_ops for rts522A media: rc: IR signal for Panasonic air conditioner too long drm/etnaviv: replace MMU flush marker with flush sequence tools/power turbostat: Fix missing SYS_LPI counter on some Chromebooks tools/power turbostat: Fix gcc build warnings drm/amdgpu: fix typo for vcn1 idle check initramfs: restore default compression behavior drm/bochs: downgrade pci_request_region failure from error to warning drm/amd/display: Add link_rate quirk for Apple 15" MBP 2017 nvme-rdma: Avoid double freeing of async event data sctp: fix possibly using a bad saddr with a given dst sctp: fix refcount bug in sctp_wfree net, ip_tunnel: fix interface lookup with no key ipv4: fix a RCU-list lock in fib_triestat_seq_show ANDROID: GKI: export symbols required by SPECTRA_CAMERA ANDROID: GKI: ARM/ARM64: Introduce arch_read_hardware_id ANDROID: GKI: drivers: base: soc: export symbols for socinfo ANDROID: GKI: Update ABI ANDROID: GKI: ASoC: msm: fix integer overflow for long duration offload playback ANDROID: GKI: Bulk ABI update Revert "ANDROID: GKI: mm: add struct/enum fields for SPECULATIVE_PAGE_FAULTS" ANDROID: GKI: Revert "arm64: kill flush_cache_all()" ANDROID: GKI: Revert "arm64: Remove unused macros from assembler.h" ANDROID: GKI: kernel/dma, mm/cma: Export symbols needed by vendor modules ANDROID: GKI: mm: Export symbols __next_zones_zonelist and zone_watermark_ok_safe ANDROID: GKI: mm/memblock: export memblock_overlaps_memory ANDROID: GKI: net, skbuff: export symbols needed by vendor drivers ANDROID: GKI: Add stub __cpu_isolated_mask symbol ANDROID: GKI: sched: stub sched_isolate symbols ANDROID: GKI: export saved_command_line ANDROID: GKI: Update ABI ANDROID: GKI: ASoC: core: Update ALSA core to issue restart in underrun. ANDROID: GKI: SoC: pcm: Add a restart callback field to struct snd_pcm_ops ANDROID: GKI: SoC: pcm: Add fields to struct snd_pcm_ops and struct snd_soc_component_driver ANDROID: GKI: ASoC: core: Add compat_ioctl callback to struct snd_pcm_ops ANDROID: GKI: ALSA: core: modify, rename and export create_subdir API ANDROID: GKI: usb: Add helper API to issue stop endpoint command ANDROID: GKI: Thermal: thermal_zone_get_cdev_by_name added ANDROID: GKI: add missing exports for CONFIG_ARM_SMMU=m ANDROID: power: wakeup_reason: wake reason enhancements BACKPORT: FROMGIT: kbuild: mkcompile_h: Include $LD version in /proc/version ANDROID: GKI: kernel: Export symbols needed by msm_minidump.ko and minidump_log.ko ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE f2fs: wire up FS_IOC_GET_ENCRYPTION_NONCE ext4: wire up FS_IOC_GET_ENCRYPTION_NONCE fscrypt: add FS_IOC_GET_ENCRYPTION_NONCE ioctl ANDROID: Bulk update the ABI xml ANDROID: gki_defconfig: add CONFIG_IPV6_SUBTREES ANDROID: GKI: arm64: reserve space in cpu_hwcaps and cpu_hwcap_keys arrays ANDROID: GKI: of: reserved_mem: Fix kmemleak crash on no-map region ANDROID: GKI: sched: add task boost vendor fields to task_struct ANDROID: GKI: mm: add rss counter for unreclaimable pages ANDROID: GKI: irqdomain: add bus token DOMAIN_BUS_WAKEUP ANDROID: GKI: arm64: fault: do_tlb_conf_fault_cb register fault callback ANDROID: GKI: QoS: Enhance framework to support cpu/irq specific QoS requests ANDROID: GKI: Bulk ABI update ANDROID: GKI: PM/devfreq: Do not switch governors from sysfs when device is suspended ANDROID: GKI: PM / devfreq: Fix race condition between suspend/resume and governor_store ANDROID: GKI: PM / devfreq: Introduce a sysfs lock ANDROID: GKI: regmap: irq: Add support to clear ack registers ANDROID: GKI: Remove SCHED_AUTOGROUP ANDROID: ignore compiler tag __must_check for GENKSYMS ANDROID: GKI: Bulk update ABI ANDROID: GKI: Fix ABI diff for struct thermal_cooling_device_ops ANDROID: GKI: ASoC: soc-core: export function to find components ANDROID: GKI: thermal: thermal_sys: Add configurable thermal trip points. ANDROID: fscrypt: fall back to filesystem-layer crypto when needed ANDROID: block: require drivers to declare supported crypto key type(s) ANDROID: block: make blk_crypto_start_using_mode() properly check for support ANDROID: GKI: power: supply: format regression ANDROID: GKI: kobject: increase number of kobject uevent pointers to 64 ANDROID: GKI: drivers: video: backlight: Fix ABI diff for struct backlight_device ANDROID: GKI: usb: xhci: Add support for secondary interrupters ANDROID: GKI: usb: host: xhci: Add support for usb core indexing ANDROID: gki_defconfig: enable USB_XHCI_HCD ANDROID: gki_defconfig: enable CONFIG_BRIDGE ANDROID: GKI: Update ABI report ANDROID: GKI: arm64: smp: Add set_update_ipi_history_callback ANDROID: kbuild: ensure __cfi_check is correctly aligned f2fs: keep inline_data when compression conversion f2fs: fix to disable compression on directory f2fs: add missing CONFIG_F2FS_FS_COMPRESSION f2fs: switch discard_policy.timeout to bool type f2fs: fix to verify tpage before releasing in f2fs_free_dic() f2fs: show compression in statx f2fs: clean up dic->tpages assignment f2fs: compress: support zstd compress algorithm f2fs: compress: add .{init,destroy}_decompress_ctx callback f2fs: compress: fix to call missing destroy_compress_ctx() f2fs: change default compression algorithm f2fs: clean up {cic,dic}.ref handling f2fs: fix to use f2fs_readpage_limit() in f2fs_read_multi_pages() f2fs: xattr.h: Make stub helpers inline f2fs: fix to avoid double unlock f2fs: fix potential .flags overflow on 32bit architecture f2fs: fix NULL pointer dereference in f2fs_verity_work() f2fs: fix to clear PG_error if fsverity failed f2fs: don't call fscrypt_get_encryption_info() explicitly in f2fs_tmpfile() f2fs: don't trigger data flush in foreground operation f2fs: fix NULL pointer dereference in f2fs_write_begin() f2fs: clean up f2fs_may_encrypt() f2fs: fix to avoid potential deadlock f2fs: don't change inode status under page lock f2fs: fix potential deadlock on compressed quota file f2fs: delete DIO read lock f2fs: don't mark compressed inode dirty during f2fs_iget() f2fs: fix to account compressed blocks in f2fs_compressed_blocks() f2fs: xattr.h: Replace zero-length array with flexible-array member f2fs: fix to update f2fs_super_block fields under sb_lock f2fs: Add a new CP flag to help fsck fix resize SPO issues f2fs: Fix mount failure due to SPO after a successful online resize FS f2fs: use kmem_cache pool during inline xattr lookups f2fs: skip migration only when BG_GC is called f2fs: fix to show tracepoint correctly f2fs: avoid __GFP_NOFAIL in f2fs_bio_alloc f2fs: introduce F2FS_IOC_GET_COMPRESS_BLOCKS f2fs: fix to avoid triggering IO in write path f2fs: add prefix for f2fs slab cache name f2fs: introduce DEFAULT_IO_TIMEOUT f2fs: skip GC when section is full f2fs: add migration count iff migration happens f2fs: clean up bggc mount option f2fs: clean up lfs/adaptive mount option f2fs: fix to show norecovery mount option f2fs: clean up parameter of macro XATTR_SIZE() f2fs: clean up codes with {f2fs_,}data_blkaddr() f2fs: show mounted time f2fs: Use scnprintf() for avoiding potential buffer overflow f2fs: allow to clear F2FS_COMPR_FL flag f2fs: fix to check dirty pages during compressed inode conversion f2fs: fix to account compressed inode correctly f2fs: fix wrong check on F2FS_IOC_FSSETXATTR f2fs: fix to avoid use-after-free in f2fs_write_multi_pages() f2fs: fix to avoid using uninitialized variable f2fs: fix inconsistent comments f2fs: remove i_sem lock coverage in f2fs_setxattr() f2fs: cover last_disk_size update with spinlock f2fs: fix to check i_compr_blocks correctly FROMLIST: kmod: make request_module() return an error when autoloading is disabled ANDROID: GKI: Update ABI report ANDROID: GKI: ARM64: dma-mapping: export symbol arch_setup_dma_ops ANDROID: GKI: ARM: dma-mapping: export symbol arch_setup_dma_ops ANDROID: GKI: ASoC: dapm: Avoid static route b/w cpu and codec dai ANDROID: GKI: ASoC: pcm: Add support for hostless playback/capture ANDROID: GKI: ASoC: core - add hostless DAI support ANDROID: GKI: drivers: thermal: Resolve ABI diff for struct thermal_zone_device_ops ANDROID: GKI: drivers: thermal: Add support for getting trip temperature ANDROID: GKI: Add functions of_thermal_handle_trip/of_thermal_handle_trip_temp ANDROID: GKI: drivers: thermal: Add post suspend evaluate flag to thermal zone devicetree UPSTREAM: loop: Only freeze block queue when needed. UPSTREAM: loop: Only change blocksize when needed. ANDROID: Fix wq fp check for CFI builds ANDROID: GKI: update abi definition after CONFIG_DEBUG_LIST was enabled ANDROID: gki_defconfig: enable CONFIG_DEBUG_LIST ANDROID: GKI: Update ABI definition ANDROID: GKI: remove condition causing sk_buff struct ABI differences ANDROID: GKI: Export symbol arch_timer_mem_get_cval ANDROID: GKI: pwm: core: Add option to config PWM duty/period with u64 data length ANDROID: Update ABI whitelist for qcom SoCs ANDROID: Incremental fs: Fix remount ANDROID: Incremental fs: Protect get_fill_block, and add a field ANDROID: Incremental fs: Fix crash polling 0 size read_log ANDROID: Incremental fs: get_filled_blocks: better index_out ANDROID: GKI: of: property: Add device links support for "qcom,wrapper-dev" ANDROID: GKI: update abi definitions due to recent changes ANDROID: GKI: clk: Initialize in stack clk_init_data to 0 in all drivers ANDROID: GKI: drivers: clksource: Add API to return cval ANDROID: GKI: clk: Add support for voltage voting ANDROID: GKI: kernel: Export task and IRQ affinity symbols ANDROID: GKI: regulator: core: Add support for regulator providers with sync state ANDROID: GKI: regulator: Call proxy-consumer functions for each regulator registered ANDROID: GKI: regulator: Add proxy consumer driver ANDROID: GKI: regulator: core: allow long device tree supply regulator property names ANDROID: GKI: Revert "regulator: Enable supply regulator if child rail is enabled." ANDROID: GKI: regulator: Remove redundant set_mode call in drms_uA_update ANDROID: GKI: net: Add the get current NAPI context API ANDROID: GKI: remove DRM_KMS_CMA_HELPER from GKI configuration ANDROID: GKI: edac: Fix ABI diffs in edac_device_ctl_info struct ANDROID: GKI: pwm: Add different PWM output types support UPSTREAM: cfg80211: Authentication offload to user space in AP mode Linux 4.19.114 arm64: dts: ls1046ardb: set RGMII interfaces to RGMII_ID mode arm64: dts: ls1043a-rdb: correct RGMII delay mode to rgmii-id ARM: dts: N900: fix onenand timings ARM: dts: imx6: phycore-som: fix arm and soc minimum voltage ARM: bcm2835-rpi-zero-w: Add missing pinctrl name ARM: dts: oxnas: Fix clear-mask property perf map: Fix off by one in strncpy() size argument arm64: alternative: fix build with clang integrated assembler net: ks8851-ml: Fix IO operations, again gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 CHT + AXP288 model bpf: Explicitly memset some bpf info structures declared on the stack bpf: Explicitly memset the bpf_attr structure platform/x86: pmc_atom: Add Lex 2I385SW to critclk_systems DMI table vt: vt_ioctl: fix use-after-free in vt_in_use() vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console vt: vt_ioctl: remove unnecessary console allocation checks vt: switch vt_dont_switch to bool vt: ioctl, switch VT_IS_IN_USE and VT_BUSY to inlines vt: selection, introduce vc_is_sel mac80211: fix authentication with iwlwifi/mvm mac80211: Check port authorization in the ieee80211_tx_dequeue() case media: xirlink_cit: add missing descriptor sanity checks media: stv06xx: add missing descriptor sanity checks media: dib0700: fix rc endpoint lookup media: ov519: add missing endpoint sanity checks libfs: fix infoleak in simple_attr_read() ahci: Add Intel Comet Lake H RAID PCI ID staging: wlan-ng: fix use-after-free Read in hfa384x_usbin_callback staging: wlan-ng: fix ODEBUG bug in prism2sta_disconnect_usb staging: rtl8188eu: Add ASUS USB-N10 Nano B1 to device table media: usbtv: fix control-message timeouts media: flexcop-usb: fix endpoint sanity check usb: musb: fix crash with highmen PIO and usbmon USB: serial: io_edgeport: fix slab-out-of-bounds read in edge_interrupt_callback USB: cdc-acm: restore capability check order USB: serial: option: add Wistron Neweb D19Q1 USB: serial: option: add BroadMobi BM806U USB: serial: option: add support for ASKEY WWHC050 mac80211: set IEEE80211_TX_CTRL_PORT_CTRL_PROTO for nl80211 TX mac80211: add option for setting control flags Revert "r8169: check that Realtek PHY driver module is loaded" vti6: Fix memory leak of skb if input policy check fails bpf/btf: Fix BTF verification of enum members in struct/union netfilter: nft_fwd_netdev: validate family and chain type netfilter: flowtable: reload ip{v6}h in nf_flow_tuple_ip{v6} afs: Fix some tracing details xfrm: policy: Fix doulbe free in xfrm_policy_timer xfrm: add the missing verify_sec_ctx_len check in xfrm_add_acquire xfrm: fix uctx len check in verify_sec_ctx_len RDMA/mlx5: Block delay drop to unprivileged users vti[6]: fix packet tx through bpf_redirect() in XinY cases xfrm: handle NETDEV_UNREGISTER for xfrm device genirq: Fix reference leaks on irq affinity notifiers RDMA/core: Ensure security pkey modify is not lost gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 BYT + AXP288 model gpiolib: acpi: Rework honor_wakeup option into an ignore_wake option gpiolib: acpi: Correct comment for HP x2 10 honor_wakeup quirk mac80211: mark station unauthorized before key removal nl80211: fix NL80211_ATTR_CHANNEL_WIDTH attribute type scsi: sd: Fix optimal I/O size for devices that change reported values scripts/dtc: Remove redundant YYLOC global declaration tools: Let O= makes handle a relative path with -C option perf probe: Do not depend on dwfl_module_addrsym() ARM: dts: omap5: Add bus_dma_limit for L3 bus ARM: dts: dra7: Add bus_dma_limit for L3 bus ceph: check POOL_FLAG_FULL/NEARFULL in addition to OSDMAP_FULL/NEARFULL Input: avoid BIT() macro usage in the serio.h UAPI header Input: synaptics - enable RMI on HP Envy 13-ad105ng Input: raydium_i2c_ts - fix error codes in raydium_i2c_boot_trigger() i2c: hix5hd2: add missed clk_disable_unprepare in remove ftrace/x86: Anotate text_mutex split between ftrace_arch_code_modify_post_process() and ftrace_arch_code_modify_prepare() sxgbe: Fix off by one in samsung driver strncpy size arg dpaa_eth: Remove unnecessary boolean expression in dpaa_get_headroom mac80211: Do not send mesh HWMP PREQ if HWMP is disabled scsi: ipr: Fix softlockup when rescanning devices in petitboot s390/qeth: handle error when backing RX buffer fsl/fman: detect FMan erratum A050385 arm64: dts: ls1043a: FMan erratum A050385 dt-bindings: net: FMan erratum A050385 cgroup1: don't call release_agent when it is "" drivers/of/of_mdio.c:fix of_mdiobus_register() cpupower: avoid multiple definition with gcc -fno-common nfs: add minor version to nfs_server_key for fscache cgroup-v1: cgroup_pidlist_next should update position index hsr: set .netnsok flag hsr: add restart routine into hsr_get_node_list() hsr: use rcu_read_lock() in hsr_get_node_{list/status}() vxlan: check return value of gro_cells_init() tcp: repair: fix TCP_QUEUE_SEQ implementation r8169: re-enable MSI on RTL8168c net: phy: mdio-mux-bcm-iproc: check clk_prepare_enable() return value net: dsa: mt7530: Change the LINK bit to reflect the link status net: ip_gre: Accept IFLA_INFO_DATA-less configuration net: ip_gre: Separate ERSPAN newlink / changelink callbacks bnxt_en: Reset rings if ring reservation fails during open() bnxt_en: fix memory leaks in bnxt_dcbnl_ieee_getets() slcan: not call free_netdev before rtnl_unlock in slcan_open NFC: fdp: Fix a signedness bug in fdp_nci_send_patch() net: stmmac: dwmac-rk: fix error path in rk_gmac_probe net_sched: keep alloc_hash updated after hash allocation net_sched: cls_route: remove the right filter from hashtable net: qmi_wwan: add support for ASKEY WWHC050 net/packet: tpacket_rcv: avoid a producer race condition net: mvneta: Fix the case where the last poll did not process all rx net: dsa: Fix duplicate frames flooded by learning net: cbs: Fix software cbs to consider packet sending time mlxsw: spectrum_mr: Fix list iteration in error path macsec: restrict to ethernet devices hsr: fix general protection fault in hsr_addr_is_self() geneve: move debug check after netdev unregister Revert "drm/dp_mst: Skip validating ports during destruction, just ref" mmc: sdhci-tegra: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSY mmc: sdhci-omap: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSY mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC sleep command mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for erase/trim/discard mmc: core: Allow host controllers to require R1B for CMD6 f2fs: fix to avoid potential deadlock f2fs: add missing function name in kernel message f2fs: recycle unused compress_data.chksum feild f2fs: fix to avoid NULL pointer dereference f2fs: fix leaking uninitialized memory in compressed clusters f2fs: fix the panic in do_checkpoint() f2fs: fix to wait all node page writeback mm/swapfile.c: move inode_lock out of claim_swapfile fscrypt: don't evict dirty inodes after removing key Conflicts: Documentation/arm64/silicon-errata.txt Documentation/devicetree/bindings Documentation/devicetree/bindings/net/fsl-fman.txt arch/arm/kernel/setup.c arch/arm/kernel/smp.c arch/arm/mm/dma-mapping.c arch/arm64/Kconfig arch/arm64/Makefile arch/arm64/include/asm/cpucaps.h arch/arm64/include/asm/cputype.h arch/arm64/include/asm/proc-fns.h arch/arm64/include/asm/traps.h arch/arm64/kernel/arm64ksyms.c arch/arm64/kernel/cpu_errata.c arch/arm64/kernel/setup.c arch/arm64/kernel/smp.c arch/arm64/mm/dma-mapping.c arch/arm64/mm/fault.c arch/arm64/mm/proc.S drivers/base/power/wakeup.c drivers/clk/clk.c drivers/clk/qcom/clk-rcg2.c drivers/clocksource/arm_arch_timer.c drivers/devfreq/devfreq.c drivers/devfreq/governor_simpleondemand.c drivers/dma-buf/dma-buf.c drivers/extcon/extcon.c drivers/gpu/Makefile drivers/gpu/drm/drm_connector.c drivers/gpu/drm/drm_dp_mst_topology.c drivers/gpu/drm/drm_edid.c drivers/gpu/drm/drm_file.c drivers/gpu/drm/drm_panel.c drivers/gpu/drm/drm_property.c drivers/iommu/Kconfig drivers/iommu/Makefile drivers/iommu/arm-smmu.c drivers/iommu/dma-iommu.c drivers/iommu/dma-mapping-fast.c drivers/iommu/io-pgtable-arm.c drivers/iommu/io-pgtable-fast.c drivers/iommu/io-pgtable.c drivers/iommu/iommu.c drivers/irqchip/irq-gic-v3.c drivers/media/v4l2-core/v4l2-ioctl.c drivers/mmc/core/Kconfig drivers/mmc/core/block.c drivers/mmc/core/queue.c drivers/mmc/host/cqhci.c drivers/mmc/host/sdhci-msm.c drivers/net/wireless/ath/wil6210/interrupt.c drivers/net/wireless/ath/wil6210/main.c drivers/net/wireless/ath/wil6210/wil6210.h drivers/net/wireless/ath/wil6210/wmi.c drivers/nvmem/core.c drivers/nvmem/nvmem-sysfs.c drivers/of/fdt.c drivers/power/supply/power_supply_sysfs.c drivers/pwm/sysfs.c drivers/regulator/core.c drivers/scsi/sd.c drivers/scsi/ufs/ufshcd.c drivers/tty/serial/Kconfig drivers/tty/serial/Makefile drivers/usb/common/common.c fs/crypto/crypto.c fs/f2fs/checkpoint.c fs/f2fs/f2fs.h include/drm/drm_connector.h include/drm/drm_dp_mst_helper.h include/drm/drm_panel.h include/linux/clk-provider.h include/linux/dma-buf.h include/linux/dma-mapping-fast.h include/linux/dma-mapping.h include/linux/extcon.h include/linux/io-pgtable.h include/linux/iommu.h include/linux/kobject.h include/linux/mm.h include/linux/mm_types.h include/linux/mmc/host.h include/linux/netdevice.h include/linux/power_supply.h include/linux/pwm.h include/linux/regulator/driver.h include/linux/thermal.h include/linux/vm_event_item.h include/net/cfg80211.h include/scsi/scsi_device.h include/sound/pcm.h include/sound/soc.h include/uapi/drm/drm_mode.h include/uapi/linux/coresight-stm.h include/uapi/linux/ip.h include/uapi/linux/nl80211.h include/uapi/linux/videodev2.h include/uapi/sound/compress_offload.h kernel/dma/coherent.c kernel/dma/mapping.c kernel/panic.c kernel/power/qos.c kernel/sched/sched.h mm/Kconfig mm/filemap.c mm/swapfile.c mm/vmalloc.c mm/vmstat.c net/qrtr/qrtr.c net/wireless/nl80211.c net/wireless/scan.c sound/core/compress_offload.c sound/soc/soc-core.c sound/usb/card.c sound/usb/pcm.c sound/usb/pcm.h sound/usb/usbaudio.h Fixed build errors: drivers/base/power/main.c drivers/thermal/thermal_core.c drivers/cpuidle/lpm-levels.c include/soc/qcom/lpm_levels.h Change-Id: Idf25b239f53681bdfa2ef371a91720fadf1a3f01 Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
1943 lines
55 KiB
C
1943 lines
55 KiB
C
/*
|
|
* Procedures for maintaining information about logical memory blocks.
|
|
*
|
|
* Peter Bergner, IBM Corp. June 2001.
|
|
* Copyright (C) 2001 Peter Bergner.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/init.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/poison.h>
|
|
#include <linux/pfn.h>
|
|
#include <linux/debugfs.h>
|
|
#include <linux/kmemleak.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/bootmem.h>
|
|
|
|
#include <asm/sections.h>
|
|
#include <linux/io.h>
|
|
|
|
#include "internal.h"
|
|
|
|
/**
|
|
* DOC: memblock overview
|
|
*
|
|
* Memblock is a method of managing memory regions during the early
|
|
* boot period when the usual kernel memory allocators are not up and
|
|
* running.
|
|
*
|
|
* Memblock views the system memory as collections of contiguous
|
|
* regions. There are several types of these collections:
|
|
*
|
|
* * ``memory`` - describes the physical memory available to the
|
|
* kernel; this may differ from the actual physical memory installed
|
|
* in the system, for instance when the memory is restricted with
|
|
* ``mem=`` command line parameter
|
|
* * ``reserved`` - describes the regions that were allocated
|
|
* * ``physmap`` - describes the actual physical memory regardless of
|
|
* the possible restrictions; the ``physmap`` type is only available
|
|
* on some architectures.
|
|
*
|
|
* Each region is represented by :c:type:`struct memblock_region` that
|
|
* defines the region extents, its attributes and NUMA node id on NUMA
|
|
* systems. Every memory type is described by the :c:type:`struct
|
|
* memblock_type` which contains an array of memory regions along with
|
|
* the allocator metadata. The memory types are nicely wrapped with
|
|
* :c:type:`struct memblock`. This structure is statically initialzed
|
|
* at build time. The region arrays for the "memory" and "reserved"
|
|
* types are initially sized to %INIT_MEMBLOCK_REGIONS and for the
|
|
* "physmap" type to %INIT_PHYSMEM_REGIONS.
|
|
* The :c:func:`memblock_allow_resize` enables automatic resizing of
|
|
* the region arrays during addition of new regions. This feature
|
|
* should be used with care so that memory allocated for the region
|
|
* array will not overlap with areas that should be reserved, for
|
|
* example initrd.
|
|
*
|
|
* The early architecture setup should tell memblock what the physical
|
|
* memory layout is by using :c:func:`memblock_add` or
|
|
* :c:func:`memblock_add_node` functions. The first function does not
|
|
* assign the region to a NUMA node and it is appropriate for UMA
|
|
* systems. Yet, it is possible to use it on NUMA systems as well and
|
|
* assign the region to a NUMA node later in the setup process using
|
|
* :c:func:`memblock_set_node`. The :c:func:`memblock_add_node`
|
|
* performs such an assignment directly.
|
|
*
|
|
* Once memblock is setup the memory can be allocated using either
|
|
* memblock or bootmem APIs.
|
|
*
|
|
* As the system boot progresses, the architecture specific
|
|
* :c:func:`mem_init` function frees all the memory to the buddy page
|
|
* allocator.
|
|
*
|
|
* If an architecure enables %CONFIG_ARCH_DISCARD_MEMBLOCK, the
|
|
* memblock data structures will be discarded after the system
|
|
* initialization compltes.
|
|
*/
|
|
|
|
static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
|
|
static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
|
|
static struct memblock_region memblock_physmem_init_regions[INIT_PHYSMEM_REGIONS] __initdata_memblock;
|
|
#endif
|
|
|
|
struct memblock memblock __initdata_memblock = {
|
|
.memory.regions = memblock_memory_init_regions,
|
|
.memory.cnt = 1, /* empty dummy entry */
|
|
.memory.max = INIT_MEMBLOCK_REGIONS,
|
|
.memory.name = "memory",
|
|
|
|
.reserved.regions = memblock_reserved_init_regions,
|
|
.reserved.cnt = 1, /* empty dummy entry */
|
|
.reserved.max = INIT_MEMBLOCK_REGIONS,
|
|
.reserved.name = "reserved",
|
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
|
|
.physmem.regions = memblock_physmem_init_regions,
|
|
.physmem.cnt = 1, /* empty dummy entry */
|
|
.physmem.max = INIT_PHYSMEM_REGIONS,
|
|
.physmem.name = "physmem",
|
|
#endif
|
|
|
|
.bottom_up = false,
|
|
.current_limit = MEMBLOCK_ALLOC_ANYWHERE,
|
|
};
|
|
|
|
int memblock_debug __initdata_memblock;
|
|
static bool system_has_some_mirror __initdata_memblock = false;
|
|
static int memblock_can_resize __initdata_memblock;
|
|
static int memblock_memory_in_slab __initdata_memblock = 0;
|
|
static int memblock_reserved_in_slab __initdata_memblock = 0;
|
|
|
|
enum memblock_flags __init_memblock choose_memblock_flags(void)
|
|
{
|
|
return system_has_some_mirror ? MEMBLOCK_MIRROR : MEMBLOCK_NONE;
|
|
}
|
|
|
|
/* adjust *@size so that (@base + *@size) doesn't overflow, return new size */
|
|
static inline phys_addr_t memblock_cap_size(phys_addr_t base, phys_addr_t *size)
|
|
{
|
|
return *size = min(*size, PHYS_ADDR_MAX - base);
|
|
}
|
|
|
|
/*
|
|
* Address comparison utilities
|
|
*/
|
|
static unsigned long __init_memblock memblock_addrs_overlap(phys_addr_t base1, phys_addr_t size1,
|
|
phys_addr_t base2, phys_addr_t size2)
|
|
{
|
|
return ((base1 < (base2 + size2)) && (base2 < (base1 + size1)));
|
|
}
|
|
|
|
bool __init_memblock memblock_overlaps_region(struct memblock_type *type,
|
|
phys_addr_t base, phys_addr_t size)
|
|
{
|
|
unsigned long i;
|
|
|
|
for (i = 0; i < type->cnt; i++)
|
|
if (memblock_addrs_overlap(base, size, type->regions[i].base,
|
|
type->regions[i].size))
|
|
break;
|
|
return i < type->cnt;
|
|
}
|
|
|
|
/**
|
|
* __memblock_find_range_bottom_up - find free area utility in bottom-up
|
|
* @start: start of candidate range
|
|
* @end: end of candidate range, can be %MEMBLOCK_ALLOC_ANYWHERE or
|
|
* %MEMBLOCK_ALLOC_ACCESSIBLE
|
|
* @size: size of free area to find
|
|
* @align: alignment of free area to find
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
|
* @flags: pick from blocks based on memory attributes
|
|
*
|
|
* Utility called from memblock_find_in_range_node(), find free area bottom-up.
|
|
*
|
|
* Return:
|
|
* Found address on success, 0 on failure.
|
|
*/
|
|
static phys_addr_t __init_memblock
|
|
__memblock_find_range_bottom_up(phys_addr_t start, phys_addr_t end,
|
|
phys_addr_t size, phys_addr_t align, int nid,
|
|
enum memblock_flags flags)
|
|
{
|
|
phys_addr_t this_start, this_end, cand;
|
|
u64 i;
|
|
|
|
for_each_free_mem_range(i, nid, flags, &this_start, &this_end, NULL) {
|
|
this_start = clamp(this_start, start, end);
|
|
this_end = clamp(this_end, start, end);
|
|
|
|
cand = round_up(this_start, align);
|
|
if (cand < this_end && this_end - cand >= size)
|
|
return cand;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* __memblock_find_range_top_down - find free area utility, in top-down
|
|
* @start: start of candidate range
|
|
* @end: end of candidate range, can be %MEMBLOCK_ALLOC_ANYWHERE or
|
|
* %MEMBLOCK_ALLOC_ACCESSIBLE
|
|
* @size: size of free area to find
|
|
* @align: alignment of free area to find
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
|
* @flags: pick from blocks based on memory attributes
|
|
*
|
|
* Utility called from memblock_find_in_range_node(), find free area top-down.
|
|
*
|
|
* Return:
|
|
* Found address on success, 0 on failure.
|
|
*/
|
|
static phys_addr_t __init_memblock
|
|
__memblock_find_range_top_down(phys_addr_t start, phys_addr_t end,
|
|
phys_addr_t size, phys_addr_t align, int nid,
|
|
enum memblock_flags flags)
|
|
{
|
|
phys_addr_t this_start, this_end, cand;
|
|
u64 i;
|
|
|
|
for_each_free_mem_range_reverse(i, nid, flags, &this_start, &this_end,
|
|
NULL) {
|
|
this_start = clamp(this_start, start, end);
|
|
this_end = clamp(this_end, start, end);
|
|
|
|
if (this_end < size)
|
|
continue;
|
|
|
|
cand = round_down(this_end - size, align);
|
|
if (cand >= this_start)
|
|
return cand;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* memblock_find_in_range_node - find free area in given range and node
|
|
* @size: size of free area to find
|
|
* @align: alignment of free area to find
|
|
* @start: start of candidate range
|
|
* @end: end of candidate range, can be %MEMBLOCK_ALLOC_ANYWHERE or
|
|
* %MEMBLOCK_ALLOC_ACCESSIBLE
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
|
* @flags: pick from blocks based on memory attributes
|
|
*
|
|
* Find @size free area aligned to @align in the specified range and node.
|
|
*
|
|
* When allocation direction is bottom-up, the @start should be greater
|
|
* than the end of the kernel image. Otherwise, it will be trimmed. The
|
|
* reason is that we want the bottom-up allocation just near the kernel
|
|
* image so it is highly likely that the allocated memory and the kernel
|
|
* will reside in the same node.
|
|
*
|
|
* If bottom-up allocation failed, will try to allocate memory top-down.
|
|
*
|
|
* Return:
|
|
* Found address on success, 0 on failure.
|
|
*/
|
|
phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t size,
|
|
phys_addr_t align, phys_addr_t start,
|
|
phys_addr_t end, int nid,
|
|
enum memblock_flags flags)
|
|
{
|
|
phys_addr_t kernel_end, ret;
|
|
|
|
/* pump up @end */
|
|
if (end == MEMBLOCK_ALLOC_ACCESSIBLE ||
|
|
end == MEMBLOCK_ALLOC_KASAN)
|
|
end = memblock.current_limit;
|
|
|
|
/* avoid allocating the first page */
|
|
start = max_t(phys_addr_t, start, PAGE_SIZE);
|
|
end = max(start, end);
|
|
kernel_end = __pa_symbol(_end);
|
|
|
|
/*
|
|
* try bottom-up allocation only when bottom-up mode
|
|
* is set and @end is above the kernel image.
|
|
*/
|
|
if (memblock_bottom_up() && end > kernel_end) {
|
|
phys_addr_t bottom_up_start;
|
|
|
|
/* make sure we will allocate above the kernel */
|
|
bottom_up_start = max(start, kernel_end);
|
|
|
|
/* ok, try bottom-up allocation first */
|
|
ret = __memblock_find_range_bottom_up(bottom_up_start, end,
|
|
size, align, nid, flags);
|
|
if (ret)
|
|
return ret;
|
|
|
|
/*
|
|
* we always limit bottom-up allocation above the kernel,
|
|
* but top-down allocation doesn't have the limit, so
|
|
* retrying top-down allocation may succeed when bottom-up
|
|
* allocation failed.
|
|
*
|
|
* bottom-up allocation is expected to be fail very rarely,
|
|
* so we use WARN_ONCE() here to see the stack trace if
|
|
* fail happens.
|
|
*/
|
|
WARN_ONCE(IS_ENABLED(CONFIG_MEMORY_HOTREMOVE),
|
|
"memblock: bottom-up allocation failed, memory hotremove may be affected\n");
|
|
}
|
|
|
|
return __memblock_find_range_top_down(start, end, size, align, nid,
|
|
flags);
|
|
}
|
|
|
|
/**
|
|
* memblock_find_in_range - find free area in given range
|
|
* @start: start of candidate range
|
|
* @end: end of candidate range, can be %MEMBLOCK_ALLOC_ANYWHERE or
|
|
* %MEMBLOCK_ALLOC_ACCESSIBLE
|
|
* @size: size of free area to find
|
|
* @align: alignment of free area to find
|
|
*
|
|
* Find @size free area aligned to @align in the specified range.
|
|
*
|
|
* Return:
|
|
* Found address on success, 0 on failure.
|
|
*/
|
|
phys_addr_t __init_memblock memblock_find_in_range(phys_addr_t start,
|
|
phys_addr_t end, phys_addr_t size,
|
|
phys_addr_t align)
|
|
{
|
|
phys_addr_t ret;
|
|
enum memblock_flags flags = choose_memblock_flags();
|
|
|
|
again:
|
|
ret = memblock_find_in_range_node(size, align, start, end,
|
|
NUMA_NO_NODE, flags);
|
|
|
|
if (!ret && (flags & MEMBLOCK_MIRROR)) {
|
|
pr_warn("Could not allocate %pap bytes of mirrored memory\n",
|
|
&size);
|
|
flags &= ~MEMBLOCK_MIRROR;
|
|
goto again;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r)
|
|
{
|
|
type->total_size -= type->regions[r].size;
|
|
memmove(&type->regions[r], &type->regions[r + 1],
|
|
(type->cnt - (r + 1)) * sizeof(type->regions[r]));
|
|
type->cnt--;
|
|
|
|
/* Special case for empty arrays */
|
|
if (type->cnt == 0) {
|
|
WARN_ON(type->total_size != 0);
|
|
type->cnt = 1;
|
|
type->regions[0].base = 0;
|
|
type->regions[0].size = 0;
|
|
type->regions[0].flags = 0;
|
|
memblock_set_region_node(&type->regions[0], MAX_NUMNODES);
|
|
}
|
|
}
|
|
|
|
#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK
|
|
/**
|
|
* memblock_discard - discard memory and reserved arrays if they were allocated
|
|
*/
|
|
void __init memblock_discard(void)
|
|
{
|
|
phys_addr_t addr, size;
|
|
|
|
if (memblock.reserved.regions != memblock_reserved_init_regions) {
|
|
addr = __pa(memblock.reserved.regions);
|
|
size = PAGE_ALIGN(sizeof(struct memblock_region) *
|
|
memblock.reserved.max);
|
|
__memblock_free_late(addr, size);
|
|
}
|
|
|
|
if (memblock.memory.regions != memblock_memory_init_regions) {
|
|
addr = __pa(memblock.memory.regions);
|
|
size = PAGE_ALIGN(sizeof(struct memblock_region) *
|
|
memblock.memory.max);
|
|
__memblock_free_late(addr, size);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/**
|
|
* memblock_double_array - double the size of the memblock regions array
|
|
* @type: memblock type of the regions array being doubled
|
|
* @new_area_start: starting address of memory range to avoid overlap with
|
|
* @new_area_size: size of memory range to avoid overlap with
|
|
*
|
|
* Double the size of the @type regions array. If memblock is being used to
|
|
* allocate memory for a new reserved regions array and there is a previously
|
|
* allocated memory range [@new_area_start, @new_area_start + @new_area_size]
|
|
* waiting to be reserved, ensure the memory used by the new array does
|
|
* not overlap.
|
|
*
|
|
* Return:
|
|
* 0 on success, -1 on failure.
|
|
*/
|
|
static int __init_memblock memblock_double_array(struct memblock_type *type,
|
|
phys_addr_t new_area_start,
|
|
phys_addr_t new_area_size)
|
|
{
|
|
struct memblock_region *new_array, *old_array;
|
|
phys_addr_t old_alloc_size, new_alloc_size;
|
|
phys_addr_t old_size, new_size, addr, new_end;
|
|
int use_slab = slab_is_available();
|
|
int *in_slab;
|
|
|
|
/* We don't allow resizing until we know about the reserved regions
|
|
* of memory that aren't suitable for allocation
|
|
*/
|
|
if (!memblock_can_resize)
|
|
return -1;
|
|
|
|
/* Calculate new doubled size */
|
|
old_size = type->max * sizeof(struct memblock_region);
|
|
new_size = old_size << 1;
|
|
/*
|
|
* We need to allocated new one align to PAGE_SIZE,
|
|
* so we can free them completely later.
|
|
*/
|
|
old_alloc_size = PAGE_ALIGN(old_size);
|
|
new_alloc_size = PAGE_ALIGN(new_size);
|
|
|
|
/* Retrieve the slab flag */
|
|
if (type == &memblock.memory)
|
|
in_slab = &memblock_memory_in_slab;
|
|
else
|
|
in_slab = &memblock_reserved_in_slab;
|
|
|
|
/* Try to find some space for it.
|
|
*
|
|
* WARNING: We assume that either slab_is_available() and we use it or
|
|
* we use MEMBLOCK for allocations. That means that this is unsafe to
|
|
* use when bootmem is currently active (unless bootmem itself is
|
|
* implemented on top of MEMBLOCK which isn't the case yet)
|
|
*
|
|
* This should however not be an issue for now, as we currently only
|
|
* call into MEMBLOCK while it's still active, or much later when slab
|
|
* is active for memory hotplug operations
|
|
*/
|
|
if (use_slab) {
|
|
new_array = kmalloc(new_size, GFP_KERNEL);
|
|
addr = new_array ? __pa(new_array) : 0;
|
|
} else {
|
|
/* only exclude range when trying to double reserved.regions */
|
|
if (type != &memblock.reserved)
|
|
new_area_start = new_area_size = 0;
|
|
|
|
addr = memblock_find_in_range(new_area_start + new_area_size,
|
|
memblock.current_limit,
|
|
new_alloc_size, PAGE_SIZE);
|
|
if (!addr && new_area_size)
|
|
addr = memblock_find_in_range(0,
|
|
min(new_area_start, memblock.current_limit),
|
|
new_alloc_size, PAGE_SIZE);
|
|
|
|
new_array = addr ? __va(addr) : NULL;
|
|
}
|
|
if (!addr) {
|
|
pr_err("memblock: Failed to double %s array from %ld to %ld entries !\n",
|
|
type->name, type->max, type->max * 2);
|
|
return -1;
|
|
}
|
|
|
|
new_end = addr + new_size - 1;
|
|
memblock_dbg("memblock: %s is doubled to %ld at [%pa-%pa]",
|
|
type->name, type->max * 2, &addr, &new_end);
|
|
|
|
/*
|
|
* Found space, we now need to move the array over before we add the
|
|
* reserved region since it may be our reserved array itself that is
|
|
* full.
|
|
*/
|
|
memcpy(new_array, type->regions, old_size);
|
|
memset(new_array + type->max, 0, old_size);
|
|
old_array = type->regions;
|
|
type->regions = new_array;
|
|
type->max <<= 1;
|
|
|
|
/* Free old array. We needn't free it if the array is the static one */
|
|
if (*in_slab)
|
|
kfree(old_array);
|
|
else if (old_array != memblock_memory_init_regions &&
|
|
old_array != memblock_reserved_init_regions)
|
|
memblock_free(__pa(old_array), old_alloc_size);
|
|
|
|
/*
|
|
* Reserve the new array if that comes from the memblock. Otherwise, we
|
|
* needn't do it
|
|
*/
|
|
if (!use_slab)
|
|
BUG_ON(memblock_reserve(addr, new_alloc_size));
|
|
|
|
/* Update slab flag */
|
|
*in_slab = use_slab;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* memblock_merge_regions - merge neighboring compatible regions
|
|
* @type: memblock type to scan
|
|
*
|
|
* Scan @type and merge neighboring compatible regions.
|
|
*/
|
|
static void __init_memblock memblock_merge_regions(struct memblock_type *type)
|
|
{
|
|
int i = 0;
|
|
|
|
/* cnt never goes below 1 */
|
|
while (i < type->cnt - 1) {
|
|
struct memblock_region *this = &type->regions[i];
|
|
struct memblock_region *next = &type->regions[i + 1];
|
|
|
|
if (this->base + this->size != next->base ||
|
|
memblock_get_region_node(this) !=
|
|
memblock_get_region_node(next) ||
|
|
this->flags != next->flags) {
|
|
BUG_ON(this->base + this->size > next->base);
|
|
i++;
|
|
continue;
|
|
}
|
|
|
|
this->size += next->size;
|
|
/* move forward from next + 1, index of which is i + 2 */
|
|
memmove(next, next + 1, (type->cnt - (i + 2)) * sizeof(*next));
|
|
type->cnt--;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* memblock_insert_region - insert new memblock region
|
|
* @type: memblock type to insert into
|
|
* @idx: index for the insertion point
|
|
* @base: base address of the new region
|
|
* @size: size of the new region
|
|
* @nid: node id of the new region
|
|
* @flags: flags of the new region
|
|
*
|
|
* Insert new memblock region [@base, @base + @size) into @type at @idx.
|
|
* @type must already have extra room to accommodate the new region.
|
|
*/
|
|
static void __init_memblock memblock_insert_region(struct memblock_type *type,
|
|
int idx, phys_addr_t base,
|
|
phys_addr_t size,
|
|
int nid,
|
|
enum memblock_flags flags)
|
|
{
|
|
struct memblock_region *rgn = &type->regions[idx];
|
|
|
|
BUG_ON(type->cnt >= type->max);
|
|
memmove(rgn + 1, rgn, (type->cnt - idx) * sizeof(*rgn));
|
|
rgn->base = base;
|
|
rgn->size = size;
|
|
rgn->flags = flags;
|
|
memblock_set_region_node(rgn, nid);
|
|
type->cnt++;
|
|
type->total_size += size;
|
|
}
|
|
|
|
/**
|
|
* memblock_add_range - add new memblock region
|
|
* @type: memblock type to add new region into
|
|
* @base: base address of the new region
|
|
* @size: size of the new region
|
|
* @nid: nid of the new region
|
|
* @flags: flags of the new region
|
|
*
|
|
* Add new memblock region [@base, @base + @size) into @type. The new region
|
|
* is allowed to overlap with existing ones - overlaps don't affect already
|
|
* existing regions. @type is guaranteed to be minimal (all neighbouring
|
|
* compatible regions are merged) after the addition.
|
|
*
|
|
* Return:
|
|
* 0 on success, -errno on failure.
|
|
*/
|
|
int __init_memblock memblock_add_range(struct memblock_type *type,
|
|
phys_addr_t base, phys_addr_t size,
|
|
int nid, enum memblock_flags flags)
|
|
{
|
|
bool insert = false;
|
|
phys_addr_t obase = base;
|
|
phys_addr_t end = base + memblock_cap_size(base, &size);
|
|
int idx, nr_new;
|
|
struct memblock_region *rgn;
|
|
|
|
if (!size)
|
|
return 0;
|
|
|
|
/* special case for empty array */
|
|
if (type->regions[0].size == 0) {
|
|
WARN_ON(type->cnt != 1 || type->total_size);
|
|
type->regions[0].base = base;
|
|
type->regions[0].size = size;
|
|
type->regions[0].flags = flags;
|
|
memblock_set_region_node(&type->regions[0], nid);
|
|
type->total_size = size;
|
|
return 0;
|
|
}
|
|
repeat:
|
|
/*
|
|
* The following is executed twice. Once with %false @insert and
|
|
* then with %true. The first counts the number of regions needed
|
|
* to accommodate the new area. The second actually inserts them.
|
|
*/
|
|
base = obase;
|
|
nr_new = 0;
|
|
|
|
for_each_memblock_type(idx, type, rgn) {
|
|
phys_addr_t rbase = rgn->base;
|
|
phys_addr_t rend = rbase + rgn->size;
|
|
|
|
if (rbase >= end)
|
|
break;
|
|
if (rend <= base)
|
|
continue;
|
|
/*
|
|
* @rgn overlaps. If it separates the lower part of new
|
|
* area, insert that portion.
|
|
*/
|
|
if (rbase > base) {
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
|
|
WARN_ON(nid != memblock_get_region_node(rgn));
|
|
#endif
|
|
WARN_ON(flags != rgn->flags);
|
|
nr_new++;
|
|
if (insert)
|
|
memblock_insert_region(type, idx++, base,
|
|
rbase - base, nid,
|
|
flags);
|
|
}
|
|
/* area below @rend is dealt with, forget about it */
|
|
base = min(rend, end);
|
|
}
|
|
|
|
/* insert the remaining portion */
|
|
if (base < end) {
|
|
nr_new++;
|
|
if (insert)
|
|
memblock_insert_region(type, idx, base, end - base,
|
|
nid, flags);
|
|
}
|
|
|
|
if (!nr_new)
|
|
return 0;
|
|
|
|
/*
|
|
* If this was the first round, resize array and repeat for actual
|
|
* insertions; otherwise, merge and return.
|
|
*/
|
|
if (!insert) {
|
|
while (type->cnt + nr_new > type->max)
|
|
if (memblock_double_array(type, obase, size) < 0)
|
|
return -ENOMEM;
|
|
insert = true;
|
|
goto repeat;
|
|
} else {
|
|
memblock_merge_regions(type);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* memblock_add_node - add new memblock region within a NUMA node
|
|
* @base: base address of the new region
|
|
* @size: size of the new region
|
|
* @nid: nid of the new region
|
|
*
|
|
* Add new memblock region [@base, @base + @size) to the "memory"
|
|
* type. See memblock_add_range() description for mode details
|
|
*
|
|
* Return:
|
|
* 0 on success, -errno on failure.
|
|
*/
|
|
int __init_memblock memblock_add_node(phys_addr_t base, phys_addr_t size,
|
|
int nid)
|
|
{
|
|
return memblock_add_range(&memblock.memory, base, size, nid, 0);
|
|
}
|
|
|
|
/**
|
|
* memblock_add - add new memblock region
|
|
* @base: base address of the new region
|
|
* @size: size of the new region
|
|
*
|
|
* Add new memblock region [@base, @base + @size) to the "memory"
|
|
* type. See memblock_add_range() description for mode details
|
|
*
|
|
* Return:
|
|
* 0 on success, -errno on failure.
|
|
*/
|
|
int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
phys_addr_t end = base + size - 1;
|
|
|
|
memblock_dbg("memblock_add: [%pa-%pa] %pF\n",
|
|
&base, &end, (void *)_RET_IP_);
|
|
|
|
return memblock_add_range(&memblock.memory, base, size, MAX_NUMNODES, 0);
|
|
}
|
|
|
|
/**
|
|
* memblock_isolate_range - isolate given range into disjoint memblocks
|
|
* @type: memblock type to isolate range for
|
|
* @base: base of range to isolate
|
|
* @size: size of range to isolate
|
|
* @start_rgn: out parameter for the start of isolated region
|
|
* @end_rgn: out parameter for the end of isolated region
|
|
*
|
|
* Walk @type and ensure that regions don't cross the boundaries defined by
|
|
* [@base, @base + @size). Crossing regions are split at the boundaries,
|
|
* which may create at most two more regions. The index of the first
|
|
* region inside the range is returned in *@start_rgn and end in *@end_rgn.
|
|
*
|
|
* Return:
|
|
* 0 on success, -errno on failure.
|
|
*/
|
|
static int __init_memblock memblock_isolate_range(struct memblock_type *type,
|
|
phys_addr_t base, phys_addr_t size,
|
|
int *start_rgn, int *end_rgn)
|
|
{
|
|
phys_addr_t end = base + memblock_cap_size(base, &size);
|
|
int idx;
|
|
struct memblock_region *rgn;
|
|
|
|
*start_rgn = *end_rgn = 0;
|
|
|
|
if (!size)
|
|
return 0;
|
|
|
|
/* we'll create at most two more regions */
|
|
while (type->cnt + 2 > type->max)
|
|
if (memblock_double_array(type, base, size) < 0)
|
|
return -ENOMEM;
|
|
|
|
for_each_memblock_type(idx, type, rgn) {
|
|
phys_addr_t rbase = rgn->base;
|
|
phys_addr_t rend = rbase + rgn->size;
|
|
|
|
if (rbase >= end)
|
|
break;
|
|
if (rend <= base)
|
|
continue;
|
|
|
|
if (rbase < base) {
|
|
/*
|
|
* @rgn intersects from below. Split and continue
|
|
* to process the next region - the new top half.
|
|
*/
|
|
rgn->base = base;
|
|
rgn->size -= base - rbase;
|
|
type->total_size -= base - rbase;
|
|
memblock_insert_region(type, idx, rbase, base - rbase,
|
|
memblock_get_region_node(rgn),
|
|
rgn->flags);
|
|
} else if (rend > end) {
|
|
/*
|
|
* @rgn intersects from above. Split and redo the
|
|
* current region - the new bottom half.
|
|
*/
|
|
rgn->base = end;
|
|
rgn->size -= end - rbase;
|
|
type->total_size -= end - rbase;
|
|
memblock_insert_region(type, idx--, rbase, end - rbase,
|
|
memblock_get_region_node(rgn),
|
|
rgn->flags);
|
|
} else {
|
|
/* @rgn is fully contained, record it */
|
|
if (!*end_rgn)
|
|
*start_rgn = idx;
|
|
*end_rgn = idx + 1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __init_memblock memblock_remove_range(struct memblock_type *type,
|
|
phys_addr_t base, phys_addr_t size)
|
|
{
|
|
int start_rgn, end_rgn;
|
|
int i, ret;
|
|
|
|
ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn);
|
|
if (ret)
|
|
return ret;
|
|
|
|
for (i = end_rgn - 1; i >= start_rgn; i--)
|
|
memblock_remove_region(type, i);
|
|
return 0;
|
|
}
|
|
|
|
int __init_memblock memblock_remove(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
phys_addr_t end = base + size - 1;
|
|
|
|
memblock_dbg("memblock_remove: [%pa-%pa] %pS\n",
|
|
&base, &end, (void *)_RET_IP_);
|
|
|
|
return memblock_remove_range(&memblock.memory, base, size);
|
|
}
|
|
|
|
|
|
int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
phys_addr_t end = base + size - 1;
|
|
|
|
memblock_dbg(" memblock_free: [%pa-%pa] %pF\n",
|
|
&base, &end, (void *)_RET_IP_);
|
|
|
|
if (base < memblock.current_limit)
|
|
kmemleak_free_part(__va(base), size);
|
|
return memblock_remove_range(&memblock.reserved, base, size);
|
|
}
|
|
EXPORT_SYMBOL_GPL(memblock_free);
|
|
|
|
int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
phys_addr_t end = base + size - 1;
|
|
|
|
memblock_dbg("memblock_reserve: [%pa-%pa] %pF\n",
|
|
&base, &end, (void *)_RET_IP_);
|
|
|
|
return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0);
|
|
}
|
|
|
|
/**
|
|
* memblock_setclr_flag - set or clear flag for a memory region
|
|
* @base: base address of the region
|
|
* @size: size of the region
|
|
* @set: set or clear the flag
|
|
* @flag: the flag to udpate
|
|
*
|
|
* This function isolates region [@base, @base + @size), and sets/clears flag
|
|
*
|
|
* Return: 0 on success, -errno on failure.
|
|
*/
|
|
static int __init_memblock memblock_setclr_flag(phys_addr_t base,
|
|
phys_addr_t size, int set, int flag)
|
|
{
|
|
struct memblock_type *type = &memblock.memory;
|
|
int i, ret, start_rgn, end_rgn;
|
|
|
|
ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn);
|
|
if (ret)
|
|
return ret;
|
|
|
|
for (i = start_rgn; i < end_rgn; i++)
|
|
if (set)
|
|
memblock_set_region_flags(&type->regions[i], flag);
|
|
else
|
|
memblock_clear_region_flags(&type->regions[i], flag);
|
|
|
|
memblock_merge_regions(type);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* memblock_mark_hotplug - Mark hotpluggable memory with flag MEMBLOCK_HOTPLUG.
|
|
* @base: the base phys addr of the region
|
|
* @size: the size of the region
|
|
*
|
|
* Return: 0 on success, -errno on failure.
|
|
*/
|
|
int __init_memblock memblock_mark_hotplug(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
return memblock_setclr_flag(base, size, 1, MEMBLOCK_HOTPLUG);
|
|
}
|
|
|
|
/**
|
|
* memblock_clear_hotplug - Clear flag MEMBLOCK_HOTPLUG for a specified region.
|
|
* @base: the base phys addr of the region
|
|
* @size: the size of the region
|
|
*
|
|
* Return: 0 on success, -errno on failure.
|
|
*/
|
|
int __init_memblock memblock_clear_hotplug(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
return memblock_setclr_flag(base, size, 0, MEMBLOCK_HOTPLUG);
|
|
}
|
|
|
|
/**
|
|
* memblock_mark_mirror - Mark mirrored memory with flag MEMBLOCK_MIRROR.
|
|
* @base: the base phys addr of the region
|
|
* @size: the size of the region
|
|
*
|
|
* Return: 0 on success, -errno on failure.
|
|
*/
|
|
int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
system_has_some_mirror = true;
|
|
|
|
return memblock_setclr_flag(base, size, 1, MEMBLOCK_MIRROR);
|
|
}
|
|
|
|
/**
|
|
* memblock_mark_nomap - Mark a memory region with flag MEMBLOCK_NOMAP.
|
|
* @base: the base phys addr of the region
|
|
* @size: the size of the region
|
|
*
|
|
* Return: 0 on success, -errno on failure.
|
|
*/
|
|
int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
return memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP);
|
|
}
|
|
|
|
/**
|
|
* memblock_clear_nomap - Clear flag MEMBLOCK_NOMAP for a specified region.
|
|
* @base: the base phys addr of the region
|
|
* @size: the size of the region
|
|
*
|
|
* Return: 0 on success, -errno on failure.
|
|
*/
|
|
int __init_memblock memblock_clear_nomap(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
return memblock_setclr_flag(base, size, 0, MEMBLOCK_NOMAP);
|
|
}
|
|
|
|
/**
|
|
* __next_reserved_mem_region - next function for for_each_reserved_region()
|
|
* @idx: pointer to u64 loop variable
|
|
* @out_start: ptr to phys_addr_t for start address of the region, can be %NULL
|
|
* @out_end: ptr to phys_addr_t for end address of the region, can be %NULL
|
|
*
|
|
* Iterate over all reserved memory regions.
|
|
*/
|
|
void __init_memblock __next_reserved_mem_region(u64 *idx,
|
|
phys_addr_t *out_start,
|
|
phys_addr_t *out_end)
|
|
{
|
|
struct memblock_type *type = &memblock.reserved;
|
|
|
|
if (*idx < type->cnt) {
|
|
struct memblock_region *r = &type->regions[*idx];
|
|
phys_addr_t base = r->base;
|
|
phys_addr_t size = r->size;
|
|
|
|
if (out_start)
|
|
*out_start = base;
|
|
if (out_end)
|
|
*out_end = base + size - 1;
|
|
|
|
*idx += 1;
|
|
return;
|
|
}
|
|
|
|
/* signal end of iteration */
|
|
*idx = ULLONG_MAX;
|
|
}
|
|
|
|
/**
|
|
* __next__mem_range - next function for for_each_free_mem_range() etc.
|
|
* @idx: pointer to u64 loop variable
|
|
* @nid: node selector, %NUMA_NO_NODE for all nodes
|
|
* @flags: pick from blocks based on memory attributes
|
|
* @type_a: pointer to memblock_type from where the range is taken
|
|
* @type_b: pointer to memblock_type which excludes memory from being taken
|
|
* @out_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
* @out_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
* @out_nid: ptr to int for nid of the range, can be %NULL
|
|
*
|
|
* Find the first area from *@idx which matches @nid, fill the out
|
|
* parameters, and update *@idx for the next iteration. The lower 32bit of
|
|
* *@idx contains index into type_a and the upper 32bit indexes the
|
|
* areas before each region in type_b. For example, if type_b regions
|
|
* look like the following,
|
|
*
|
|
* 0:[0-16), 1:[32-48), 2:[128-130)
|
|
*
|
|
* The upper 32bit indexes the following regions.
|
|
*
|
|
* 0:[0-0), 1:[16-32), 2:[48-128), 3:[130-MAX)
|
|
*
|
|
* As both region arrays are sorted, the function advances the two indices
|
|
* in lockstep and returns each intersection.
|
|
*/
|
|
void __init_memblock __next_mem_range(u64 *idx, int nid,
|
|
enum memblock_flags flags,
|
|
struct memblock_type *type_a,
|
|
struct memblock_type *type_b,
|
|
phys_addr_t *out_start,
|
|
phys_addr_t *out_end, int *out_nid)
|
|
{
|
|
int idx_a = *idx & 0xffffffff;
|
|
int idx_b = *idx >> 32;
|
|
|
|
if (WARN_ONCE(nid == MAX_NUMNODES,
|
|
"Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))
|
|
nid = NUMA_NO_NODE;
|
|
|
|
for (; idx_a < type_a->cnt; idx_a++) {
|
|
struct memblock_region *m = &type_a->regions[idx_a];
|
|
|
|
phys_addr_t m_start = m->base;
|
|
phys_addr_t m_end = m->base + m->size;
|
|
int m_nid = memblock_get_region_node(m);
|
|
|
|
/* only memory regions are associated with nodes, check it */
|
|
if (nid != NUMA_NO_NODE && nid != m_nid)
|
|
continue;
|
|
|
|
/* skip hotpluggable memory regions if needed */
|
|
if (movable_node_is_enabled() && memblock_is_hotpluggable(m))
|
|
continue;
|
|
|
|
/* if we want mirror memory skip non-mirror memory regions */
|
|
if ((flags & MEMBLOCK_MIRROR) && !memblock_is_mirror(m))
|
|
continue;
|
|
|
|
/* skip nomap memory unless we were asked for it explicitly */
|
|
if (!(flags & MEMBLOCK_NOMAP) && memblock_is_nomap(m))
|
|
continue;
|
|
|
|
if (!type_b) {
|
|
if (out_start)
|
|
*out_start = m_start;
|
|
if (out_end)
|
|
*out_end = m_end;
|
|
if (out_nid)
|
|
*out_nid = m_nid;
|
|
idx_a++;
|
|
*idx = (u32)idx_a | (u64)idx_b << 32;
|
|
return;
|
|
}
|
|
|
|
/* scan areas before each reservation */
|
|
for (; idx_b < type_b->cnt + 1; idx_b++) {
|
|
struct memblock_region *r;
|
|
phys_addr_t r_start;
|
|
phys_addr_t r_end;
|
|
|
|
r = &type_b->regions[idx_b];
|
|
r_start = idx_b ? r[-1].base + r[-1].size : 0;
|
|
r_end = idx_b < type_b->cnt ?
|
|
r->base : PHYS_ADDR_MAX;
|
|
|
|
/*
|
|
* if idx_b advanced past idx_a,
|
|
* break out to advance idx_a
|
|
*/
|
|
if (r_start >= m_end)
|
|
break;
|
|
/* if the two regions intersect, we're done */
|
|
if (m_start < r_end) {
|
|
if (out_start)
|
|
*out_start =
|
|
max(m_start, r_start);
|
|
if (out_end)
|
|
*out_end = min(m_end, r_end);
|
|
if (out_nid)
|
|
*out_nid = m_nid;
|
|
/*
|
|
* The region which ends first is
|
|
* advanced for the next iteration.
|
|
*/
|
|
if (m_end <= r_end)
|
|
idx_a++;
|
|
else
|
|
idx_b++;
|
|
*idx = (u32)idx_a | (u64)idx_b << 32;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* signal end of iteration */
|
|
*idx = ULLONG_MAX;
|
|
}
|
|
|
|
/**
|
|
* __next_mem_range_rev - generic next function for for_each_*_range_rev()
|
|
*
|
|
* @idx: pointer to u64 loop variable
|
|
* @nid: node selector, %NUMA_NO_NODE for all nodes
|
|
* @flags: pick from blocks based on memory attributes
|
|
* @type_a: pointer to memblock_type from where the range is taken
|
|
* @type_b: pointer to memblock_type which excludes memory from being taken
|
|
* @out_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
* @out_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
* @out_nid: ptr to int for nid of the range, can be %NULL
|
|
*
|
|
* Finds the next range from type_a which is not marked as unsuitable
|
|
* in type_b.
|
|
*
|
|
* Reverse of __next_mem_range().
|
|
*/
|
|
void __init_memblock __next_mem_range_rev(u64 *idx, int nid,
|
|
enum memblock_flags flags,
|
|
struct memblock_type *type_a,
|
|
struct memblock_type *type_b,
|
|
phys_addr_t *out_start,
|
|
phys_addr_t *out_end, int *out_nid)
|
|
{
|
|
int idx_a = *idx & 0xffffffff;
|
|
int idx_b = *idx >> 32;
|
|
|
|
if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))
|
|
nid = NUMA_NO_NODE;
|
|
|
|
if (*idx == (u64)ULLONG_MAX) {
|
|
idx_a = type_a->cnt - 1;
|
|
if (type_b != NULL)
|
|
idx_b = type_b->cnt;
|
|
else
|
|
idx_b = 0;
|
|
}
|
|
|
|
for (; idx_a >= 0; idx_a--) {
|
|
struct memblock_region *m = &type_a->regions[idx_a];
|
|
|
|
phys_addr_t m_start = m->base;
|
|
phys_addr_t m_end = m->base + m->size;
|
|
int m_nid = memblock_get_region_node(m);
|
|
|
|
/* only memory regions are associated with nodes, check it */
|
|
if (nid != NUMA_NO_NODE && nid != m_nid)
|
|
continue;
|
|
|
|
/* skip hotpluggable memory regions if needed */
|
|
if (movable_node_is_enabled() && memblock_is_hotpluggable(m))
|
|
continue;
|
|
|
|
/* if we want mirror memory skip non-mirror memory regions */
|
|
if ((flags & MEMBLOCK_MIRROR) && !memblock_is_mirror(m))
|
|
continue;
|
|
|
|
/* skip nomap memory unless we were asked for it explicitly */
|
|
if (!(flags & MEMBLOCK_NOMAP) && memblock_is_nomap(m))
|
|
continue;
|
|
|
|
if (!type_b) {
|
|
if (out_start)
|
|
*out_start = m_start;
|
|
if (out_end)
|
|
*out_end = m_end;
|
|
if (out_nid)
|
|
*out_nid = m_nid;
|
|
idx_a--;
|
|
*idx = (u32)idx_a | (u64)idx_b << 32;
|
|
return;
|
|
}
|
|
|
|
/* scan areas before each reservation */
|
|
for (; idx_b >= 0; idx_b--) {
|
|
struct memblock_region *r;
|
|
phys_addr_t r_start;
|
|
phys_addr_t r_end;
|
|
|
|
r = &type_b->regions[idx_b];
|
|
r_start = idx_b ? r[-1].base + r[-1].size : 0;
|
|
r_end = idx_b < type_b->cnt ?
|
|
r->base : PHYS_ADDR_MAX;
|
|
/*
|
|
* if idx_b advanced past idx_a,
|
|
* break out to advance idx_a
|
|
*/
|
|
|
|
if (r_end <= m_start)
|
|
break;
|
|
/* if the two regions intersect, we're done */
|
|
if (m_end > r_start) {
|
|
if (out_start)
|
|
*out_start = max(m_start, r_start);
|
|
if (out_end)
|
|
*out_end = min(m_end, r_end);
|
|
if (out_nid)
|
|
*out_nid = m_nid;
|
|
if (m_start >= r_start)
|
|
idx_a--;
|
|
else
|
|
idx_b--;
|
|
*idx = (u32)idx_a | (u64)idx_b << 32;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
/* signal end of iteration */
|
|
*idx = ULLONG_MAX;
|
|
}
|
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
|
|
/*
|
|
* Common iterator interface used to define for_each_mem_range().
|
|
*/
|
|
void __init_memblock __next_mem_pfn_range(int *idx, int nid,
|
|
unsigned long *out_start_pfn,
|
|
unsigned long *out_end_pfn, int *out_nid)
|
|
{
|
|
struct memblock_type *type = &memblock.memory;
|
|
struct memblock_region *r;
|
|
|
|
while (++*idx < type->cnt) {
|
|
r = &type->regions[*idx];
|
|
|
|
if (PFN_UP(r->base) >= PFN_DOWN(r->base + r->size))
|
|
continue;
|
|
if (nid == MAX_NUMNODES || nid == r->nid)
|
|
break;
|
|
}
|
|
if (*idx >= type->cnt) {
|
|
*idx = -1;
|
|
return;
|
|
}
|
|
|
|
if (out_start_pfn)
|
|
*out_start_pfn = PFN_UP(r->base);
|
|
if (out_end_pfn)
|
|
*out_end_pfn = PFN_DOWN(r->base + r->size);
|
|
if (out_nid)
|
|
*out_nid = r->nid;
|
|
}
|
|
|
|
/**
|
|
* memblock_set_node - set node ID on memblock regions
|
|
* @base: base of area to set node ID for
|
|
* @size: size of area to set node ID for
|
|
* @type: memblock type to set node ID for
|
|
* @nid: node ID to set
|
|
*
|
|
* Set the nid of memblock @type regions in [@base, @base + @size) to @nid.
|
|
* Regions which cross the area boundaries are split as necessary.
|
|
*
|
|
* Return:
|
|
* 0 on success, -errno on failure.
|
|
*/
|
|
int __init_memblock memblock_set_node(phys_addr_t base, phys_addr_t size,
|
|
struct memblock_type *type, int nid)
|
|
{
|
|
int start_rgn, end_rgn;
|
|
int i, ret;
|
|
|
|
ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn);
|
|
if (ret)
|
|
return ret;
|
|
|
|
for (i = start_rgn; i < end_rgn; i++)
|
|
memblock_set_region_node(&type->regions[i], nid);
|
|
|
|
memblock_merge_regions(type);
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
|
|
|
|
static phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size,
|
|
phys_addr_t align, phys_addr_t start,
|
|
phys_addr_t end, int nid,
|
|
enum memblock_flags flags)
|
|
{
|
|
phys_addr_t found;
|
|
|
|
if (!align)
|
|
align = SMP_CACHE_BYTES;
|
|
|
|
found = memblock_find_in_range_node(size, align, start, end, nid,
|
|
flags);
|
|
if (found && !memblock_reserve(found, size)) {
|
|
/*
|
|
* The min_count is set to 0 so that memblock allocations are
|
|
* never reported as leaks.
|
|
*/
|
|
if (found < memblock.current_limit)
|
|
kmemleak_alloc(__va(found), size, 0, 0);
|
|
|
|
return found;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align,
|
|
phys_addr_t start, phys_addr_t end,
|
|
enum memblock_flags flags)
|
|
{
|
|
memblock_dbg("%s: size: %llu align: %llu %pS\n",
|
|
__func__, (u64)size, (u64)align, (void *)_RET_IP_);
|
|
return memblock_alloc_range_nid(size, align, start, end, NUMA_NO_NODE,
|
|
flags);
|
|
}
|
|
|
|
phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size,
|
|
phys_addr_t align, phys_addr_t max_addr,
|
|
int nid, enum memblock_flags flags)
|
|
{
|
|
return memblock_alloc_range_nid(size, align, 0, max_addr, nid, flags);
|
|
}
|
|
|
|
phys_addr_t __init memblock_alloc_nid(phys_addr_t size, phys_addr_t align, int nid)
|
|
{
|
|
enum memblock_flags flags = choose_memblock_flags();
|
|
phys_addr_t ret;
|
|
|
|
again:
|
|
ret = memblock_alloc_base_nid(size, align, MEMBLOCK_ALLOC_ACCESSIBLE,
|
|
nid, flags);
|
|
|
|
if (!ret && (flags & MEMBLOCK_MIRROR)) {
|
|
flags &= ~MEMBLOCK_MIRROR;
|
|
goto again;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
phys_addr_t __init __memblock_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr)
|
|
{
|
|
memblock_dbg("%s: size: %llu align: %llu %pS\n",
|
|
__func__, (u64)size, (u64)align, (void *)_RET_IP_);
|
|
return memblock_alloc_base_nid(size, align, max_addr, NUMA_NO_NODE,
|
|
MEMBLOCK_NONE);
|
|
}
|
|
|
|
phys_addr_t __init memblock_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr)
|
|
{
|
|
phys_addr_t alloc;
|
|
|
|
alloc = __memblock_alloc_base(size, align, max_addr);
|
|
|
|
if (alloc == 0)
|
|
panic("ERROR: Failed to allocate %pa bytes below %pa.\n",
|
|
&size, &max_addr);
|
|
|
|
return alloc;
|
|
}
|
|
|
|
phys_addr_t __init memblock_alloc(phys_addr_t size, phys_addr_t align)
|
|
{
|
|
memblock_dbg("%s: size: %llu align: %llu %pS\n",
|
|
__func__, (u64)size, (u64)align, (void *)_RET_IP_);
|
|
return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
|
|
}
|
|
|
|
phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid)
|
|
{
|
|
phys_addr_t res = memblock_alloc_nid(size, align, nid);
|
|
|
|
if (res)
|
|
return res;
|
|
return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
|
|
}
|
|
|
|
#if defined(CONFIG_NO_BOOTMEM)
|
|
/**
|
|
* memblock_virt_alloc_internal - allocate boot memory block
|
|
* @size: size of memory block to be allocated in bytes
|
|
* @align: alignment of the region and block's size
|
|
* @min_addr: the lower bound of the memory region to allocate (phys address)
|
|
* @max_addr: the upper bound of the memory region to allocate (phys address)
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
|
*
|
|
* The @min_addr limit is dropped if it can not be satisfied and the allocation
|
|
* will fall back to memory below @min_addr. Also, allocation may fall back
|
|
* to any node in the system if the specified node can not
|
|
* hold the requested memory.
|
|
*
|
|
* The allocation is performed from memory region limited by
|
|
* memblock.current_limit if @max_addr == %BOOTMEM_ALLOC_ACCESSIBLE.
|
|
*
|
|
* The memory block is aligned on %SMP_CACHE_BYTES if @align == 0.
|
|
*
|
|
* The phys address of allocated boot memory block is converted to virtual and
|
|
* allocated memory is reset to 0.
|
|
*
|
|
* In addition, function sets the min_count to 0 using kmemleak_alloc for
|
|
* allocated boot memory block, so that it is never reported as leaks.
|
|
*
|
|
* Return:
|
|
* Virtual address of allocated memory block on success, NULL on failure.
|
|
*/
|
|
static void * __init memblock_virt_alloc_internal(
|
|
phys_addr_t size, phys_addr_t align,
|
|
phys_addr_t min_addr, phys_addr_t max_addr,
|
|
int nid)
|
|
{
|
|
phys_addr_t alloc;
|
|
void *ptr;
|
|
enum memblock_flags flags = choose_memblock_flags();
|
|
|
|
if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))
|
|
nid = NUMA_NO_NODE;
|
|
|
|
/*
|
|
* Detect any accidental use of these APIs after slab is ready, as at
|
|
* this moment memblock may be deinitialized already and its
|
|
* internal data may be destroyed (after execution of free_all_bootmem)
|
|
*/
|
|
if (WARN_ON_ONCE(slab_is_available()))
|
|
return kzalloc_node(size, GFP_NOWAIT, nid);
|
|
|
|
if (!align)
|
|
align = SMP_CACHE_BYTES;
|
|
|
|
if (max_addr > memblock.current_limit)
|
|
max_addr = memblock.current_limit;
|
|
again:
|
|
alloc = memblock_find_in_range_node(size, align, min_addr, max_addr,
|
|
nid, flags);
|
|
if (alloc && !memblock_reserve(alloc, size))
|
|
goto done;
|
|
|
|
if (nid != NUMA_NO_NODE) {
|
|
alloc = memblock_find_in_range_node(size, align, min_addr,
|
|
max_addr, NUMA_NO_NODE,
|
|
flags);
|
|
if (alloc && !memblock_reserve(alloc, size))
|
|
goto done;
|
|
}
|
|
|
|
if (min_addr) {
|
|
min_addr = 0;
|
|
goto again;
|
|
}
|
|
|
|
if (flags & MEMBLOCK_MIRROR) {
|
|
flags &= ~MEMBLOCK_MIRROR;
|
|
pr_warn("Could not allocate %pap bytes of mirrored memory\n",
|
|
&size);
|
|
goto again;
|
|
}
|
|
|
|
return NULL;
|
|
done:
|
|
ptr = phys_to_virt(alloc);
|
|
|
|
/* Skip kmemleak for kasan_init() due to high volume. */
|
|
if (max_addr != MEMBLOCK_ALLOC_KASAN)
|
|
/*
|
|
* The min_count is set to 0 so that bootmem allocated
|
|
* blocks are never reported as leaks. This is because many
|
|
* of these blocks are only referred via the physical
|
|
* address which is not looked up by kmemleak.
|
|
*/
|
|
kmemleak_alloc(ptr, size, 0, 0);
|
|
|
|
return ptr;
|
|
}
|
|
|
|
/**
|
|
* memblock_virt_alloc_try_nid_raw - allocate boot memory block without zeroing
|
|
* memory and without panicking
|
|
* @size: size of memory block to be allocated in bytes
|
|
* @align: alignment of the region and block's size
|
|
* @min_addr: the lower bound of the memory region from where the allocation
|
|
* is preferred (phys address)
|
|
* @max_addr: the upper bound of the memory region from where the allocation
|
|
* is preferred (phys address), or %BOOTMEM_ALLOC_ACCESSIBLE to
|
|
* allocate only from memory limited by memblock.current_limit value
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
|
*
|
|
* Public function, provides additional debug information (including caller
|
|
* info), if enabled. Does not zero allocated memory, does not panic if request
|
|
* cannot be satisfied.
|
|
*
|
|
* Return:
|
|
* Virtual address of allocated memory block on success, NULL on failure.
|
|
*/
|
|
void * __init memblock_virt_alloc_try_nid_raw(
|
|
phys_addr_t size, phys_addr_t align,
|
|
phys_addr_t min_addr, phys_addr_t max_addr,
|
|
int nid)
|
|
{
|
|
void *ptr;
|
|
|
|
memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pF\n",
|
|
__func__, (u64)size, (u64)align, nid, &min_addr,
|
|
&max_addr, (void *)_RET_IP_);
|
|
|
|
ptr = memblock_virt_alloc_internal(size, align,
|
|
min_addr, max_addr, nid);
|
|
#ifdef CONFIG_DEBUG_VM
|
|
if (ptr && size > 0)
|
|
memset(ptr, PAGE_POISON_PATTERN, size);
|
|
#endif
|
|
return ptr;
|
|
}
|
|
|
|
/**
|
|
* memblock_virt_alloc_try_nid_nopanic - allocate boot memory block
|
|
* @size: size of memory block to be allocated in bytes
|
|
* @align: alignment of the region and block's size
|
|
* @min_addr: the lower bound of the memory region from where the allocation
|
|
* is preferred (phys address)
|
|
* @max_addr: the upper bound of the memory region from where the allocation
|
|
* is preferred (phys address), or %BOOTMEM_ALLOC_ACCESSIBLE to
|
|
* allocate only from memory limited by memblock.current_limit value
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
|
*
|
|
* Public function, provides additional debug information (including caller
|
|
* info), if enabled. This function zeroes the allocated memory.
|
|
*
|
|
* Return:
|
|
* Virtual address of allocated memory block on success, NULL on failure.
|
|
*/
|
|
void * __init memblock_virt_alloc_try_nid_nopanic(
|
|
phys_addr_t size, phys_addr_t align,
|
|
phys_addr_t min_addr, phys_addr_t max_addr,
|
|
int nid)
|
|
{
|
|
void *ptr;
|
|
|
|
memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pF\n",
|
|
__func__, (u64)size, (u64)align, nid, &min_addr,
|
|
&max_addr, (void *)_RET_IP_);
|
|
|
|
ptr = memblock_virt_alloc_internal(size, align,
|
|
min_addr, max_addr, nid);
|
|
if (ptr)
|
|
memset(ptr, 0, size);
|
|
return ptr;
|
|
}
|
|
|
|
/**
|
|
* memblock_virt_alloc_try_nid - allocate boot memory block with panicking
|
|
* @size: size of memory block to be allocated in bytes
|
|
* @align: alignment of the region and block's size
|
|
* @min_addr: the lower bound of the memory region from where the allocation
|
|
* is preferred (phys address)
|
|
* @max_addr: the upper bound of the memory region from where the allocation
|
|
* is preferred (phys address), or %BOOTMEM_ALLOC_ACCESSIBLE to
|
|
* allocate only from memory limited by memblock.current_limit value
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
|
*
|
|
* Public panicking version of memblock_virt_alloc_try_nid_nopanic()
|
|
* which provides debug information (including caller info), if enabled,
|
|
* and panics if the request can not be satisfied.
|
|
*
|
|
* Return:
|
|
* Virtual address of allocated memory block on success, NULL on failure.
|
|
*/
|
|
void * __init memblock_virt_alloc_try_nid(
|
|
phys_addr_t size, phys_addr_t align,
|
|
phys_addr_t min_addr, phys_addr_t max_addr,
|
|
int nid)
|
|
{
|
|
void *ptr;
|
|
|
|
memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pF\n",
|
|
__func__, (u64)size, (u64)align, nid, &min_addr,
|
|
&max_addr, (void *)_RET_IP_);
|
|
ptr = memblock_virt_alloc_internal(size, align,
|
|
min_addr, max_addr, nid);
|
|
if (ptr) {
|
|
memset(ptr, 0, size);
|
|
return ptr;
|
|
}
|
|
|
|
panic("%s: Failed to allocate %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa\n",
|
|
__func__, (u64)size, (u64)align, nid, &min_addr, &max_addr);
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
/**
|
|
* __memblock_free_early - free boot memory block
|
|
* @base: phys starting address of the boot memory block
|
|
* @size: size of the boot memory block in bytes
|
|
*
|
|
* Free boot memory block previously allocated by memblock_virt_alloc_xx() API.
|
|
* The freeing memory will not be released to the buddy allocator.
|
|
*/
|
|
void __init __memblock_free_early(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
memblock_free(base, size);
|
|
}
|
|
|
|
/**
|
|
* __memblock_free_late - free bootmem block pages directly to buddy allocator
|
|
* @base: phys starting address of the boot memory block
|
|
* @size: size of the boot memory block in bytes
|
|
*
|
|
* This is only useful when the bootmem allocator has already been torn
|
|
* down, but we are still initializing the system. Pages are released directly
|
|
* to the buddy allocator, no bootmem metadata is updated because it is gone.
|
|
*/
|
|
void __init __memblock_free_late(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
phys_addr_t cursor, end;
|
|
|
|
end = base + size - 1;
|
|
memblock_dbg("%s: [%pa-%pa] %pF\n",
|
|
__func__, &base, &end, (void *)_RET_IP_);
|
|
kmemleak_free_part_phys(base, size);
|
|
cursor = PFN_UP(base);
|
|
end = PFN_DOWN(base + size);
|
|
|
|
for (; cursor < end; cursor++) {
|
|
__free_pages_bootmem(pfn_to_page(cursor), cursor, 0);
|
|
totalram_pages++;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Remaining API functions
|
|
*/
|
|
|
|
phys_addr_t __init_memblock memblock_phys_mem_size(void)
|
|
{
|
|
return memblock.memory.total_size;
|
|
}
|
|
|
|
phys_addr_t __init_memblock memblock_reserved_size(void)
|
|
{
|
|
return memblock.reserved.total_size;
|
|
}
|
|
|
|
phys_addr_t __init memblock_mem_size(unsigned long limit_pfn)
|
|
{
|
|
unsigned long pages = 0;
|
|
struct memblock_region *r;
|
|
unsigned long start_pfn, end_pfn;
|
|
|
|
for_each_memblock(memory, r) {
|
|
start_pfn = memblock_region_memory_base_pfn(r);
|
|
end_pfn = memblock_region_memory_end_pfn(r);
|
|
start_pfn = min_t(unsigned long, start_pfn, limit_pfn);
|
|
end_pfn = min_t(unsigned long, end_pfn, limit_pfn);
|
|
pages += end_pfn - start_pfn;
|
|
}
|
|
|
|
return PFN_PHYS(pages);
|
|
}
|
|
|
|
/* lowest address */
|
|
phys_addr_t __init_memblock memblock_start_of_DRAM(void)
|
|
{
|
|
return memblock.memory.regions[0].base;
|
|
}
|
|
|
|
phys_addr_t __init_memblock memblock_end_of_DRAM(void)
|
|
{
|
|
int idx = memblock.memory.cnt - 1;
|
|
|
|
return (memblock.memory.regions[idx].base + memblock.memory.regions[idx].size);
|
|
}
|
|
|
|
static phys_addr_t __init_memblock __find_max_addr(phys_addr_t limit)
|
|
{
|
|
phys_addr_t max_addr = PHYS_ADDR_MAX;
|
|
struct memblock_region *r;
|
|
|
|
/*
|
|
* translate the memory @limit size into the max address within one of
|
|
* the memory memblock regions, if the @limit exceeds the total size
|
|
* of those regions, max_addr will keep original value PHYS_ADDR_MAX
|
|
*/
|
|
for_each_memblock(memory, r) {
|
|
if (limit <= r->size) {
|
|
max_addr = r->base + limit;
|
|
break;
|
|
}
|
|
limit -= r->size;
|
|
}
|
|
|
|
return max_addr;
|
|
}
|
|
|
|
phys_addr_t __init_memblock memblock_max_addr(phys_addr_t limit)
|
|
{
|
|
return __find_max_addr(limit);
|
|
}
|
|
|
|
void __init memblock_enforce_memory_limit(phys_addr_t limit)
|
|
{
|
|
phys_addr_t max_addr = PHYS_ADDR_MAX;
|
|
|
|
if (!limit)
|
|
return;
|
|
|
|
max_addr = __find_max_addr(limit);
|
|
|
|
/* @limit exceeds the total size of the memory, do nothing */
|
|
if (max_addr == PHYS_ADDR_MAX)
|
|
return;
|
|
|
|
/* truncate both memory and reserved regions */
|
|
memblock_remove_range(&memblock.memory, max_addr,
|
|
PHYS_ADDR_MAX);
|
|
memblock_remove_range(&memblock.reserved, max_addr,
|
|
PHYS_ADDR_MAX);
|
|
}
|
|
|
|
void __init memblock_cap_memory_range(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
int start_rgn, end_rgn;
|
|
int i, ret;
|
|
|
|
if (!size)
|
|
return;
|
|
|
|
ret = memblock_isolate_range(&memblock.memory, base, size,
|
|
&start_rgn, &end_rgn);
|
|
if (ret)
|
|
return;
|
|
|
|
/* remove all the MAP regions */
|
|
for (i = memblock.memory.cnt - 1; i >= end_rgn; i--)
|
|
if (!memblock_is_nomap(&memblock.memory.regions[i]))
|
|
memblock_remove_region(&memblock.memory, i);
|
|
|
|
for (i = start_rgn - 1; i >= 0; i--)
|
|
if (!memblock_is_nomap(&memblock.memory.regions[i]))
|
|
memblock_remove_region(&memblock.memory, i);
|
|
|
|
/* truncate the reserved regions */
|
|
memblock_remove_range(&memblock.reserved, 0, base);
|
|
memblock_remove_range(&memblock.reserved,
|
|
base + size, PHYS_ADDR_MAX);
|
|
}
|
|
|
|
void __init memblock_mem_limit_remove_map(phys_addr_t limit)
|
|
{
|
|
phys_addr_t max_addr;
|
|
|
|
if (!limit)
|
|
return;
|
|
|
|
max_addr = __find_max_addr(limit);
|
|
|
|
/* @limit exceeds the total size of the memory, do nothing */
|
|
if (max_addr == PHYS_ADDR_MAX)
|
|
return;
|
|
|
|
memblock_cap_memory_range(0, max_addr);
|
|
}
|
|
|
|
static int __init_memblock memblock_search(struct memblock_type *type, phys_addr_t addr)
|
|
{
|
|
unsigned int left = 0, right = type->cnt;
|
|
|
|
do {
|
|
unsigned int mid = (right + left) / 2;
|
|
|
|
if (addr < type->regions[mid].base)
|
|
right = mid;
|
|
else if (addr >= (type->regions[mid].base +
|
|
type->regions[mid].size))
|
|
left = mid + 1;
|
|
else
|
|
return mid;
|
|
} while (left < right);
|
|
return -1;
|
|
}
|
|
|
|
bool __init memblock_is_reserved(phys_addr_t addr)
|
|
{
|
|
return memblock_search(&memblock.reserved, addr) != -1;
|
|
}
|
|
|
|
bool __init_memblock memblock_is_memory(phys_addr_t addr)
|
|
{
|
|
return memblock_search(&memblock.memory, addr) != -1;
|
|
}
|
|
|
|
bool __init_memblock memblock_is_map_memory(phys_addr_t addr)
|
|
{
|
|
int i = memblock_search(&memblock.memory, addr);
|
|
|
|
if (i == -1)
|
|
return false;
|
|
return !memblock_is_nomap(&memblock.memory.regions[i]);
|
|
}
|
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
|
|
int __init_memblock memblock_search_pfn_nid(unsigned long pfn,
|
|
unsigned long *start_pfn, unsigned long *end_pfn)
|
|
{
|
|
struct memblock_type *type = &memblock.memory;
|
|
int mid = memblock_search(type, PFN_PHYS(pfn));
|
|
|
|
if (mid == -1)
|
|
return -1;
|
|
|
|
*start_pfn = PFN_DOWN(type->regions[mid].base);
|
|
*end_pfn = PFN_DOWN(type->regions[mid].base + type->regions[mid].size);
|
|
|
|
return type->regions[mid].nid;
|
|
}
|
|
#endif
|
|
|
|
/**
|
|
* memblock_is_region_memory - check if a region is a subset of memory
|
|
* @base: base of region to check
|
|
* @size: size of region to check
|
|
*
|
|
* Check if the region [@base, @base + @size) is a subset of a memory block.
|
|
*
|
|
* Return:
|
|
* 0 if false, non-zero if true
|
|
*/
|
|
bool __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
int idx = memblock_search(&memblock.memory, base);
|
|
phys_addr_t end = base + memblock_cap_size(base, &size);
|
|
|
|
if (idx == -1)
|
|
return false;
|
|
return (memblock.memory.regions[idx].base +
|
|
memblock.memory.regions[idx].size) >= end;
|
|
}
|
|
|
|
bool __init_memblock memblock_overlaps_memory(phys_addr_t base,
|
|
phys_addr_t size)
|
|
{
|
|
memblock_cap_size(base, &size);
|
|
|
|
return memblock_overlaps_region(&memblock.memory, base, size);
|
|
}
|
|
EXPORT_SYMBOL_GPL(memblock_overlaps_memory);
|
|
|
|
/**
|
|
* memblock_is_region_reserved - check if a region intersects reserved memory
|
|
* @base: base of region to check
|
|
* @size: size of region to check
|
|
*
|
|
* Check if the region [@base, @base + @size) intersects a reserved
|
|
* memory block.
|
|
*
|
|
* Return:
|
|
* True if they intersect, false if not.
|
|
*/
|
|
bool __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size)
|
|
{
|
|
memblock_cap_size(base, &size);
|
|
return memblock_overlaps_region(&memblock.reserved, base, size);
|
|
}
|
|
|
|
void __init_memblock memblock_trim_memory(phys_addr_t align)
|
|
{
|
|
phys_addr_t start, end, orig_start, orig_end;
|
|
struct memblock_region *r;
|
|
|
|
for_each_memblock(memory, r) {
|
|
orig_start = r->base;
|
|
orig_end = r->base + r->size;
|
|
start = round_up(orig_start, align);
|
|
end = round_down(orig_end, align);
|
|
|
|
if (start == orig_start && end == orig_end)
|
|
continue;
|
|
|
|
if (start < end) {
|
|
r->base = start;
|
|
r->size = end - start;
|
|
} else {
|
|
memblock_remove_region(&memblock.memory,
|
|
r - memblock.memory.regions);
|
|
r--;
|
|
}
|
|
}
|
|
}
|
|
|
|
void __init_memblock memblock_set_current_limit(phys_addr_t limit)
|
|
{
|
|
memblock.current_limit = limit;
|
|
}
|
|
|
|
phys_addr_t __init_memblock memblock_get_current_limit(void)
|
|
{
|
|
return memblock.current_limit;
|
|
}
|
|
|
|
static void __init_memblock memblock_dump(struct memblock_type *type)
|
|
{
|
|
phys_addr_t base, end, size;
|
|
enum memblock_flags flags;
|
|
int idx;
|
|
struct memblock_region *rgn;
|
|
|
|
pr_info(" %s.cnt = 0x%lx\n", type->name, type->cnt);
|
|
|
|
for_each_memblock_type(idx, type, rgn) {
|
|
char nid_buf[32] = "";
|
|
|
|
base = rgn->base;
|
|
size = rgn->size;
|
|
end = base + size - 1;
|
|
flags = rgn->flags;
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
|
|
if (memblock_get_region_node(rgn) != MAX_NUMNODES)
|
|
snprintf(nid_buf, sizeof(nid_buf), " on node %d",
|
|
memblock_get_region_node(rgn));
|
|
#endif
|
|
pr_info(" %s[%#x]\t[%pa-%pa], %pa bytes%s flags: %#x\n",
|
|
type->name, idx, &base, &end, &size, nid_buf, flags);
|
|
}
|
|
}
|
|
|
|
void __init_memblock __memblock_dump_all(void)
|
|
{
|
|
pr_info("MEMBLOCK configuration:\n");
|
|
pr_info(" memory size = %pa reserved size = %pa\n",
|
|
&memblock.memory.total_size,
|
|
&memblock.reserved.total_size);
|
|
|
|
memblock_dump(&memblock.memory);
|
|
memblock_dump(&memblock.reserved);
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
|
|
memblock_dump(&memblock.physmem);
|
|
#endif
|
|
}
|
|
|
|
void __init memblock_allow_resize(void)
|
|
{
|
|
memblock_can_resize = 1;
|
|
}
|
|
|
|
static int __init early_memblock(char *p)
|
|
{
|
|
if (p && strstr(p, "debug"))
|
|
memblock_debug = 1;
|
|
return 0;
|
|
}
|
|
early_param("memblock", early_memblock);
|
|
|
|
#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_ARCH_DISCARD_MEMBLOCK)
|
|
|
|
static int memblock_debug_show(struct seq_file *m, void *private)
|
|
{
|
|
struct memblock_type *type = m->private;
|
|
struct memblock_region *reg;
|
|
int i;
|
|
phys_addr_t end;
|
|
|
|
for (i = 0; i < type->cnt; i++) {
|
|
reg = &type->regions[i];
|
|
end = reg->base + reg->size - 1;
|
|
|
|
seq_printf(m, "%4d: ", i);
|
|
seq_printf(m, "%pa..%pa\n", ®->base, &end);
|
|
}
|
|
return 0;
|
|
}
|
|
DEFINE_SHOW_ATTRIBUTE(memblock_debug);
|
|
|
|
static int __init memblock_init_debugfs(void)
|
|
{
|
|
struct dentry *root = debugfs_create_dir("memblock", NULL);
|
|
if (!root)
|
|
return -ENXIO;
|
|
debugfs_create_file("memory", 0444, root,
|
|
&memblock.memory, &memblock_debug_fops);
|
|
debugfs_create_file("reserved", 0444, root,
|
|
&memblock.reserved, &memblock_debug_fops);
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
|
|
debugfs_create_file("physmem", 0444, root,
|
|
&memblock.physmem, &memblock_debug_fops);
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
__initcall(memblock_init_debugfs);
|
|
|
|
#endif /* CONFIG_DEBUG_FS */
|