Commit Graph

992830 Commits

Author SHA1 Message Date
Elliot Berman
80b5ad0267 Android.bp: headers_install.sh: Use environment for unifdef tool
Tools used when generating headers_install.sh are run from within a
sandbox. The location of unifdef changes from headers_install.sh
generation time to usage time.

Instead, allow calling headers_install.py to specify the location of
unifdef with LOC_UNIFDEF environment variable. If this environment
variable is unset, unifdef is assumed to live in same directory as
generated headers_install.sh script. This assumption allows smooth
transition for users of headers_install.sh since main build is not
broken by this change.

Change-Id: Id23865dd3e25aa179e0bc6d3d6c549e0b93a6717
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
2021-02-18 09:36:58 -08:00
qctecmdr
2527bfe32d Merge "Merge android12-5.10.16 (a6310f1) into msm-5.10" 2021-02-18 00:03:54 -08:00
qctecmdr
4b7c2bd654 Merge "arm64: defconfig: Enable SLIMBUS config on Waipio" 2021-02-17 23:12:48 -08:00
qctecmdr
4d003a5ec3 Merge "smcinvoke: enable smcinvoke driver" 2021-02-17 19:55:07 -08:00
qctecmdr
6a48cc26cc Merge "remoteproc: qcom: Disable recovery by default" 2021-02-17 19:55:06 -08:00
qctecmdr
4a8206f819 Merge "defconfig: waipio-gki: Enable ZRAM on Waipio" 2021-02-17 19:55:06 -08:00
qctecmdr
a5caa4e5e7 Merge "haven: hh_ctrl: pass right function number for enabling hyp uart" 2021-02-17 18:58:55 -08:00
qctecmdr
7c7c7e0f88 Merge "soc: qcom: pmic_glink: Fix a race condition in accessing rx_list" 2021-02-17 18:58:55 -08:00
qctecmdr
2a4c62a0af Merge "mem-buf: Correct dma_buf_get refcount leak" 2021-02-17 18:58:54 -08:00
qctecmdr
62a934c2e8 Merge "Waipio: Enable CPU Pause driver" 2021-02-17 18:58:54 -08:00
qctecmdr
fcd0a66de7 Merge "qseecom: enable support for QSEECom" 2021-02-17 18:58:54 -08:00
qctecmdr
6c85218bad Merge "platform: msm-geni-se: Correct unit for ICC optimization" 2021-02-17 17:52:45 -08:00
qctecmdr
9e0f2d9c22 Merge "i2c-msm-geni: Register suspend_late instead of suspend_noirq" 2021-02-17 17:52:45 -08:00
qctecmdr
5d9301e473 Merge "i2c-msm-geni: Initialize completion variable before txfer request" 2021-02-17 17:52:45 -08:00
qctecmdr
c762614d25 Merge "serial: msm_geni_serial: Propagate missing fixes from 5.4" 2021-02-17 17:52:44 -08:00
qctecmdr
1b4d46f688 Merge "msm: kgsl: Remove ION_FLAG_CACHED check" 2021-02-17 17:52:44 -08:00
qctecmdr
0631387184 Merge "modules.blocklist: Remove WLAN protocol driver from block list" 2021-02-17 17:52:44 -08:00
qctecmdr
584e32093d Merge "ABI: add proc_remove symbol to QCOM whitelist" 2021-02-17 17:52:43 -08:00
qctecmdr
72fd5522b3 Merge "bus: mhi: controllers: Add debugfs entries for debug modes" 2021-02-17 17:52:43 -08:00
qctecmdr
1df6661b3f Merge "msm: kgsl: Update register access protection for Waipio" 2021-02-17 17:52:43 -08:00
Sudarshan Rajagopalan
33909cf028 defconfig: waipio-gki: Enable ZRAM on Waipio
Enable the configs necessary to enable ZRAM functionality
on waipio.

Change-Id: I21e5308c43eab7d604266cebf1f3670ff7fdac16
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
2021-02-17 17:42:54 -08:00
Sudarshan Rajagopalan
1d522b6029 GKI: Update abi_gki_aarch64_qcom for zram and zsmalloc
Update abi_gki_aarch64_qcom to include symbols used by
zram and zsmalloc modules.

Change-Id: I1427696610c64f99351350929da315724594b054
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
2021-02-17 17:41:49 -08:00
qctecmdr
f00f85c0c0 Merge "msm: kgsl: Correctly check for the presence of GBIF" 2021-02-17 16:58:15 -08:00
qctecmdr
d3ef4e92da Merge "usb: gadget: cser: Requeue OUT USB requests if ECONNRESET is received" 2021-02-17 16:58:14 -08:00
qctecmdr
7c89f9f684 Merge "input: touchscreen: focaltech: avoid registering for panel events" 2021-02-17 16:58:14 -08:00
qctecmdr
397964d440 Merge "qbt_handler: Add entry in GKI defconfig" 2021-02-17 16:58:14 -08:00
qctecmdr
ddfc309042 Merge "sched/walt: Fix !idle case in walt_get_idle_exit_latency" 2021-02-17 16:58:14 -08:00
qctecmdr
39510dc0e1 Merge "spi: spi-geni-msm: Return from resume without Touching Resources" 2021-02-17 16:58:13 -08:00
qctecmdr
554b06e034 Merge "sched/walt: Implement balance_rt vendor hook" 2021-02-17 16:58:13 -08:00
Siddharth Gupta
682dce2ca9 remoteproc: qcom: Disable recovery by default
This change disables recovery by default. This helps in debugging the
subsystems when they crash.

Change-Id: Ifac2102d5c0a22c575d4e30c7596993981a0b722
Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org>
2021-02-17 15:04:46 -08:00
qctecmdr
47883e1cce Merge "msm: kgsl: Add a thread control packets for GenC" 2021-02-17 14:57:12 -08:00
Subbaraman Narayanamurthy
5f3fc2ec60 soc: qcom: pmic_glink: Fix a race condition in accessing rx_list
Currently, rx_list is updated from pmic_glink_rpmsg_callback()
with the new message received and the workqueue is queued for
pmic_glink_rx_work() to deliver it to the client. However, there
is a possibility that a race condition can occur when this list
is manipulated from pmic_glink_rpmsg_callback() in interrupt
context and pmic_glink_rx_work() from process context. Fix it by
using rx_lock before using list_* in pmic_glink_rx_work().

Change-Id: Ib10671d89d60e4b33f1a9666f4af08bb09d1a53b
Suggested-by: Chris Lew <clew@codeaurora.org>
Suggested-by: David Collins <collinsd@codeaurora.org>
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2021-02-17 13:32:07 -08:00
Pavankumar Kondeti
be8c42bd00 sched/walt: Fix !idle case in walt_get_idle_exit_latency
When a CPU is not in idle state, the idle exit latency should be 0.
However walt_get_idle_exit_latency() returns UINT_MAX. Fix this.
Without this, the idle CPU that is serving an interrupt will not
win the battle against a CPU that is in a deep c-state.

Change-Id: Ic9ca36add5cd97cc7174c8e25b269ae40aadd451
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2021-02-17 15:03:47 +05:30
Pavankumar Kondeti
28316f0550 sched/walt: Remove left over references to cum_window_demand
The cum_window_demand tracking is not supported in WALT. Remove the
left over code and use the PELT signal based util_avg as replacement
in RT task placement. The CFS task placement is already using the
same.

Change-Id: I078353ed33729b7bf4eab324c7ec861982a3bc57
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2021-02-17 15:03:47 +05:30
Pavankumar Kondeti
156c579a9a sched/walt: Add fair task check in tick path load balance
The tick path load balance is meant for fair tasks. Add a check
for the same before considering the task for migration. The
fair_policy() check alone does not work as it returns true
for idle task and also for RT boosted tasks. Add a wrapper
based on priority check.

Change-Id: I05cc996cb15051e4f6bb1a73005234e4d5188d19
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2021-02-17 14:07:50 +05:30
Chandana Kishori Chiluveru
806d7b3d65 arm64: defconfig: Enable SLIMBUS config on Waipio
Enable Slimbus driver as module in defconfig on Waipio.

Change-Id: Id9a0e1794db88309484c687cad935d776e617d33
Signed-off-by: Chandana Kishori Chiluveru <cchiluve@codeaurora.org>
2021-02-17 11:19:20 +05:30
Abir Ghosh
fcbb2ed728 qbt_handler: Add entry in GKI defconfig
Add entry for qbt handler in GKI defconfig.

Change-Id: I50be144626d2b49e5045f13a556cd1079ae91dc8
Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
2021-02-17 09:53:20 +05:30
Wesley Cheng
51ada3a994 usb: gadget: cser: Requeue OUT USB requests if ECONNRESET is received
During enumeration, the host can send a clear feature EP_HALT.  When
the UDC receives this command, it will cancel any pending requests and
return -ECONNRESET to the function driver.  Since the clear EP_HALT
occurs after the cser driver has already submitted the OUT USB reqs,
there is no other method to restart these transfers.  Resubmit OUT
reqs specifically when ECONNRESET is seen.

Change-Id: I925170d389048f84579c9b53128effdbef5c9d6a
Signed-off-by: Wesley Cheng <wcheng@codeaurora.org>
2021-02-16 20:15:28 -08:00
Raghu Ananya Arabolu
d2fd28e728 msm: kgsl: Correctly check for the presence of GBIF
GBIF is present in Waipio which is a Gen C target. adreno_has_gbif is
returing false instead of true for Waipio. Get rid of adreno_has_gbif
function and check for the presence of GBIF if required.

Change-Id: I88c76ce07eed87d97f8e3f593beda9f34316f9d6
Signed-off-by: Raghu Ananya Arabolu <rarabolu@codeaurora.org>
2021-02-16 18:26:06 -08:00
Shashank Babu Chinta Venkata
271050ca38 input: touchscreen: focaltech: avoid registering for panel events
Avoid registering for panel blank/unblank events.

Change-Id: Ib2ac73826c1405edb9e9a86b0164729fa5a5a8d5
Signed-off-by: Shashank Babu Chinta Venkata <sbchin@codeaurora.org>
2021-02-16 18:26:06 -08:00
Ivaylo Georgiev
0c808a6c34 Merge android12-5.10.16 (a6310f1) into msm-5.10
* refs/heads/tmp-a6310f1:
  Linux 5.10.16
  squashfs: add more sanity checks in xattr id lookup
  squashfs: add more sanity checks in inode lookup
  squashfs: add more sanity checks in id lookup
  squashfs: avoid out of bounds writes in decompressors
  Revert "mm: memcontrol: avoid workload stalls when lowering memory.high"
  nilfs2: make splice write available again
  drm/i915: Skip vswing programming for TBT
  drm/i915: Fix ICL MG PHY vswing handling
  bpf: Fix verifier jsgt branch analysis on max bound
  bpf: Fix 32 bit src register truncation on div/mod
  bpf: Fix verifier jmp32 pruning decision logic
  regulator: Fix lockdep warning resolving supplies
  blk-cgroup: Use cond_resched() when destroy blkgs
  i2c: mediatek: Move suspend and resume handling to NOIRQ phase
  SUNRPC: Handle 0 length opaque XDR object data properly
  SUNRPC: Move simple_get_bytes and simple_get_netobj into private header
  iwlwifi: queue: bail out on invalid freeing
  iwlwifi: mvm: guard against device removal in reprobe
  iwlwifi: pcie: add rules to match Qu with Hr2
  iwlwifi: mvm: invalidate IDs of internal stations at mvm start
  iwlwifi: pcie: fix context info memory leak
  iwlwifi: pcie: add a NULL check in iwl_pcie_txq_unmap
  iwlwifi: mvm: take mutex for calling iwl_mvm_get_sync_time()
  iwlwifi: mvm: skip power command when unbinding vif during CSA
  ASoC: Intel: sof_sdw: set proper flags for Dell TGL-H SKU 0A5E
  ASoC: ak4458: correct reset polarity
  ALSA: hda: intel-dsp-config: add PCI id for TGL-H
  pNFS/NFSv4: Improve rejection of out-of-order layouts
  pNFS/NFSv4: Try to return invalid layout in pnfs_layout_process()
  chtls: Fix potential resource leak
  ASoC: Intel: Skylake: Zero snd_ctl_elem_value
  mac80211: 160MHz with extended NSS BW in CSA
  drm/nouveau/nvif: fix method count when pushing an array
  ASoC: wm_adsp: Fix control name parsing for multi-fw
  regulator: core: avoid regulator_resolve_supply() race condition
  af_key: relax availability checks for skb size calculation
  powerpc/64/signal: Fix regression in __kernel_sigtramp_rt64() semantics
  gpiolib: cdev: clear debounce period if line set to output
  io_uring: drop mm/files between task_work_submit
  io_uring: reinforce cancel on flush during exit
  io_uring: fix sqo ownership false positive warning
  io_uring: fix list corruption for splice file_get
  io_uring: fix flush cqring overflow list while TASK_INTERRUPTIBLE
  io_uring: fix cancellation taking mutex while TASK_UNINTERRUPTIBLE
  io_uring: replace inflight_wait with tctx->wait
  io_uring: fix __io_uring_files_cancel() with TASK_UNINTERRUPTIBLE
  io_uring: if we see flush on exit, cancel related tasks
  io_uring: account io_uring internal files as REQ_F_INFLIGHT
  io_uring: fix files cancellation
  io_uring: always batch cancel in *cancel_files()
  io_uring: pass files into kill timeouts/poll
  io_uring: don't iterate io_uring_cancel_files()
  io_uring: add a {task,files} pair matching helper
  io_uring: simplify io_task_match()
  UPSTREAM: Documentation: connector: Update the description of sink-vdos
  ANDROID: GKI: enable CONFIG_FAIR_GROUP_SCHED
  Revert "ANDROID: gki_defconfig: enable CONFIG_KASAN_HW_TAGS"
  ANDROID: GKI: bring WPAN into GKI
  FROMGIT: arm64: cpufeatures: Allow disabling of Pointer Auth from the command-line
  FROMGIT: arm64: Defer enabling pointer authentication on boot core
  FROMGIT: arm64: cpufeatures: Allow disabling of BTI from the command-line
  FROMGIT: arm64: Move "nokaslr" over to the early cpufeature infrastructure
  FROMGIT: KVM: arm64: Document HVC_VHE_RESTART stub hypercall
  FROMGIT: arm64: Make kvm-arm.mode={nvhe, protected} an alias of id_aa64mmfr1.vh=0
  FROMGIT: arm64: Add an aliasing facility for the idreg override
  FROMGIT: arm64: Honor VHE being disabled from the command-line
  FROMGIT: arm64: Allow ID_AA64MMFR1_EL1.VH to be overridden from the command line
  FROMGIT: arm64: cpufeature: Add an early command-line cpufeature override facility
  FROMGIT: arm64: Extract early FDT mapping from kaslr_early_init()
  FROMGIT: arm64: cpufeature: Use IDreg override in __read_sysreg_by_encoding()
  FROMGIT: arm64: cpufeature: Add global feature override facility
  FROMGIT: arm64: Move SCTLR_EL1 initialisation to EL-agnostic code
  FROMGIT: arm64: Simplify init_el2_state to be non-VHE only
  FROMGIT: arm64: Move VHE-specific SPE setup to mutate_to_vhe()
  FROMGIT: arm64: Drop early setting of MDSCR_EL2.TPMS
  FROMGIT: arm64: Initialise as nVHE before switching to VHE
  FROMGIT: arm64: Provide an 'upgrade to VHE' stub hypercall
  FROMGIT: arm64: Turn the MMU-on sequence into a macro
  FROMGIT: arm64: Fix outdated TCR setup comment
  FROMGIT: arm64: Fix labels in el2_setup macros
  UPSTREAM: arm64: Extend the kernel command line from the bootloader
  Revert "ANDROID: arm64: copy CONFIG_CMDLINE_EXTEND from ARM"
  UPSTREAM: arm64: kaslr: Refactor early init command line parsing
  ANDROID: GKI: amlogic: add DTB overlays
  ANDROID: GKI: add support for Amlogic SoCs, everything as modules
  ANDROID: GKI: Kconfig.gki: add hidden PHY configs
  ANDROID: GKI: enable networking; add hidden network configs
  ANDROID: GKI: Enable CONFIG_CMA_DEBUGFS
  ANDROID: dmabuf: Add mmap_count to struct dmabuf
  FROMLIST: arm64: meson: remove MESON_IRQ_GPIO selection
  FROMLIST: irqchip: irq-meson-gpio: make it possible to build as a module
  UPSTREAM: tty: serial: meson: enable console as module
  UPSTREAM: arm64: Kconfig: meson: drop pinctrl
  UPSTREAM: firmware: meson-sm: enable build as module
  UPSTREAM: soc: meson: enable building drivers as modules
  UPSTREAM: soc: amlogic: socinfo: build for specific arch
  UPSTREAM: arm64: meson: ship only the necessary clock controllers
  UPSTREAM: clk: meson: enable building as modules
  UPSTREAM: clk: avoid devm_clk_release name clash
  UPSTREAM: clk: meson: g12: use devm variant to register notifiers
  UPSTREAM: clk: add devm variant of clk_notifier_register
  UPSTREAM: clk: meson: g12: drop use of __clk_lookup()
  UPSTREAM: clk: add api to get clk consumer from clk_hw
  UPSTREAM: reset: meson: make it possible to build as a module
  UPSTREAM: pinctrl/meson: enable building as modules
  BACKPORT: FROMGIT: mm: filemap: Fix microblaze build failure with 'mmu_defconfig'
  BACKPORT: FROMGIT:  mm/nommu: Fix return type of filemap_map_pages()
  BACKPORT: FROMGIT:  Mark anonymous struct field of 'struct vm_fault' as 'const'
  BACKPORT: FROMGIT: mm: Use static initialisers for immutable fields of 'struct vm_fault'
  BACKPORT: FROMGIT: mm: Avoid modifying vmf.address in __collapse_huge_page_swapin()
  BACKPORT: FROMGIT: mm: Pass 'address' to map to do_set_pte() and drop FAULT_FLAG_PREFAULT
  BACKPORT: FROMGIT: mm: Move immutable fields of 'struct vm_fault' into anonymous struct
  BACKPORT: FROMGIT: arm64: mm: Implement arch_wants_old_prefaulted_pte()
  BACKPORT: FROMGIT:  mm: Allow architectures to request 'old' entries when prefaulting
  BACKPORT: FROMGIT: mm: Cleanup faultaround and finish_fault() codepaths
  UPSTREAM: regulator: Fix lockdep warning resolving supplies
  UPSTREAM: regulator: core: avoid regulator_resolve_supply() race condition
  ANDROID: Add EXPORT_SYMBOL_GPL for dma_heap_get_name
  FROMLIST: dma-buf: heaps: Fix the name used when exporting dmabufs to be the actual heap name
  BACKPORT: FROMLIST: dma-buf: dma-heap: Provide accessor to get heap name
  FROMLIST: BACKPORT: procfs/dmabuf: Add inode number to /proc/*/fdinfo
  FROMLIST: procfs: Allow reading fdinfo with PTRACE_MODE_READ
  FROMGIT: sched/deadline: Reduce rq lock contention in dl_add_task_root_domain()

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/connector/usb-connector.yaml

Change-Id: Ife47d25dbe24585c11ba139ab884115edeeda4c9
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-02-16 15:18:32 -08:00
Pavankumar Kondeti
96c201cb4a sched/walt: Remove duplicate restricted vendor hook registration
WALT core module register for android_rvh_update_misfit_status
restricted vendor hook. Remove the duplicate registration from
WALT CFS module. The later registered function has a compilation
issue when FAIR_GROUP_SCHED is enabled.

Change-Id: I2d89efa92ca704941f12263ee4994dc389202d5f
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2021-02-16 15:11:39 -08:00
Ivaylo Georgiev
0fc19ea22d Merge android12-5.10.15 (1092f69) into msm-5.10
* refs/heads/tmp-1092f69:
  Linux 5.10.15
  net: sched: replaced invalid qdisc tree flush helper in qdisc_replace
  net: dsa: mv88e6xxx: override existent unicast portvec in port_fdb_add
  udp: ipv4: manipulate network header of NATed UDP GRO fraglist
  net: ip_tunnel: fix mtu calculation
  neighbour: Prevent a dead entry from updating gc_list
  igc: Report speed and duplex as unknown when device is runtime suspended
  md: Set prev_flush_start and flush_bio in an atomic way
  Input: ili210x - implement pressure reporting for ILI251x
  Input: xpad - sync supported devices with fork on GitHub
  Input: goodix - add support for Goodix GT9286 chip
  x86/apic: Add extra serialization for non-serializing MSRs
  x86/debug: Prevent data breakpoints on cpu_dr7
  x86/debug: Prevent data breakpoints on __per_cpu_offset
  x86/debug: Fix DR6 handling
  x86/build: Disable CET instrumentation in the kernel
  mm/filemap: add missing mem_cgroup_uncharge() to __add_to_page_cache_locked()
  mm: thp: fix MADV_REMOVE deadlock on shmem THP
  mm/vmalloc: separate put pages and flush VM flags
  mm, compaction: move high_pfn to the for loop scope
  mm: hugetlb: remove VM_BUG_ON_PAGE from page_huge_active
  mm: hugetlb: fix a race between isolating and freeing page
  mm: hugetlb: fix a race between freeing and dissolving the page
  mm: hugetlbfs: fix cannot migrate the fallocated HugeTLB page
  ARM: 9043/1: tegra: Fix misplaced tegra_uart_config in decompressor
  ARM: footbridge: fix dc21285 PCI configuration accessors
  ARM: dts; gta04: SPI panel chip select is active low
  DTS: ARM: gta04: remove legacy spi-cs-high to make display work again
  KVM: x86: Set so called 'reserved CR3 bits in LM mask' at vCPU reset
  KVM: x86: Update emulator context mode if SYSENTER xfers to 64-bit mode
  KVM: x86: fix CPUID entries returned by KVM_GET_CPUID2 ioctl
  KVM: x86: Allow guests to see MSR_IA32_TSX_CTRL even if tsx=off
  KVM: x86/mmu: Fix TDP MMU zap collapsible SPTEs
  KVM: SVM: Treat SVM as unsupported when running as an SEV guest
  nvme-pci: avoid the deepest sleep state on Kingston A2000 SSDs
  io_uring: don't modify identity's files uncess identity is cowed
  drm/amd/display: Revert "Fix EDID parsing after resume from suspend"
  drm/i915: Power up combo PHY lanes for for HDMI as well
  drm/i915: Extract intel_ddi_power_up_lanes()
  drm/i915/display: Prevent double YUV range correction on HDR planes
  drm/i915/gt: Close race between enable_breadcrumbs and cancel_breadcrumbs
  drm/i915/gem: Drop lru bumping on display unpinning
  drm/i915: Fix the MST PBN divider calculation
  drm/dp/mst: Export drm_dp_get_vc_payload_bw()
  Fix unsynchronized access to sev members through svm_register_enc_region
  mmc: core: Limit retries when analyse of SDIO tuples fails
  mmc: sdhci-pltfm: Fix linking err for sdhci-brcmstb
  smb3: fix crediting for compounding when only one request in flight
  smb3: Fix out-of-bounds bug in SMB2_negotiate()
  iommu: Check dev->iommu in dev_iommu_priv_get() before dereferencing it
  cifs: report error instead of invalid when revalidating a dentry fails
  RISC-V: Define MAXPHYSMEM_1GB only for RV32
  xhci: fix bounce buffer usage for non-sg list case
  scripts: use pkg-config to locate libcrypto
  genirq/msi: Activate Multi-MSI early when MSI_FLAG_ACTIVATE_EARLY is set
  genirq: Prevent [devm_]irq_alloc_desc from returning irq 0
  libnvdimm/dimm: Avoid race between probe and available_slots_show()
  libnvdimm/namespace: Fix visibility of namespace resource attribute
  tracepoint: Fix race between tracing and removing tracepoint
  tracing: Use pause-on-trace with the latency tracers
  kretprobe: Avoid re-registration of the same kretprobe earlier
  tracing/kprobe: Fix to support kretprobe events on unloaded modules
  fgraph: Initialize tracing_graph_pause at task creation
  gpiolib: free device name on error path to fix kmemleak
  mac80211: fix station rate table updates on assoc
  ovl: implement volatile-specific fsync error behaviour
  ovl: avoid deadlock on directory ioctl
  ovl: fix dentry leak in ovl_get_redirect
  thunderbolt: Fix possible NULL pointer dereference in tb_acpi_add_link()
  kbuild: fix duplicated flags in DEBUG_CFLAGS
  memblock: do not start bottom-up allocations with kernel_end
  vdpa/mlx5: Restore the hardware used index after change map
  nvmet-tcp: fix out-of-bounds access when receiving multiple h2cdata PDUs
  ARM: dts: sun7i: a20: bananapro: Fix ethernet phy-mode
  net: ipa: pass correct dma_handle to dma_free_coherent()
  r8169: fix WoL on shutdown if CONFIG_DEBUG_SHIRQ is set
  net: mvpp2: TCAM entry enable should be written after SRAM data
  net: lapb: Copy the skb before sending a packet
  net/mlx5e: Release skb in case of failure in tc update skb
  net/mlx5e: Update max_opened_tc also when channels are closed
  net/mlx5: Fix leak upon failure of rule creation
  net/mlx5: Fix function calculation for page trees
  ibmvnic: device remove has higher precedence over reset
  i40e: Revert "i40e: don't report link up for a VF who hasn't enabled queues"
  igc: check return value of ret_val in igc_config_fc_after_link_up
  igc: set the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr
  SUNRPC: Fix NFS READs that start at non-page-aligned offsets
  arm64: dts: ls1046a: fix dcfg address range
  rxrpc: Fix deadlock around release of dst cached on udp tunnel
  r8169: work around RTL8125 UDP hw bug
  arm64: dts: meson: switch TFLASH_VDD_EN pin to open drain on Odroid-C4
  bpf, preload: Fix build when $(O) points to a relative path
  um: virtio: free vu_dev only with the contained struct device
  bpf, inode_storage: Put file handler if no storage was found
  bpf, cgroup: Fix problematic bounds check
  bpf, cgroup: Fix optlen WARN_ON_ONCE toctou
  vdpa/mlx5: Fix memory key MTT population
  ARM: dts: stm32: Fix GPIO hog flags on DHCOM DRC02
  ARM: dts: stm32: Disable optional TSC2004 on DRC02 board
  ARM: dts: stm32: Disable WP on DHCOM uSD slot
  ARM: dts: stm32: Connect card-detect signal on DHCOM
  ARM: dts: stm32: Fix polarity of the DH DRC02 uSD card detect
  arm64: dts: rockchip: Use only supported PCIe link speed on Pinebook Pro
  arm64: dts: rockchip: fix vopl iommu irq on px30
  arm64: dts: amlogic: meson-g12: Set FL-adj property value
  Input: i8042 - unbreak Pegatron C15B
  arm64: dts: qcom: c630: keep both touchpad devices enabled
  ARM: OMAP1: OSK: fix ohci-omap breakage
  usb: xhci-mtk: break loop when find the endpoint to drop
  usb: xhci-mtk: skip dropping bandwidth of unchecked endpoints
  usb: xhci-mtk: fix unreleased bandwidth data
  usb: dwc3: fix clock issue during resume in OTG mode
  usb: dwc2: Fix endpoint direction check in ep_from_windex
  usb: renesas_usbhs: Clear pipe running flag in usbhs_pkt_pop()
  USB: usblp: don't call usb_set_interface if there's a single alt
  usb: gadget: aspeed: add missing of_node_put
  USB: gadget: legacy: fix an error code in eth_bind()
  usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720
  USB: serial: option: Adding support for Cinterion MV31
  USB: serial: cp210x: add new VID/PID for supporting Teraoka AD2000
  USB: serial: cp210x: add pid/vid for WSDA-200-USB
  ANDROID: db845c: Use FRAGMENT_CONFIG
  ANDROID: gki_defconfig: enable CONFIG_KASAN_HW_TAGS
  ANDROID: x86/mm: fix vm_area_struct leak in speculative pagefault handling
  ANDROID: iommu: Add vendor hook
  ANDROID: abi_gki_aarch64_db845c: KMI update for dmabuf heaps deferred-free/pagepool functionality
  ANDROID: dma-buf: system_heap: Add deferred freeing to the system heap
  ANDROID: dma-buf: system_heap: Add pagepool support to system heap
  ANDROID: dma-buf: heaps: Add a shrinker controlled page pool
  ANDROID: dma-buf: heaps: Add deferred-free-helper library code
  ANDROID: sched: Fix wake_q length tracking
  ANDROID: GKI: update .xml file
  ANDROID: net: introduce ip_local_unbindable_ports sysctl
  UPSTREAM: dt-bindings: connector: Add SVDM VDO properties
  UPSTREAM: dt-bindings: connector: Add property to set initial current cap for FRS
  UPSTREAM: usb: typec: tcpm: Get Sink VDO from fwnode
  UPSTREAM: usb: typec: displayport: Fill the negotiated SVDM Version in the header
  UPSTREAM: usb: typec: ucsi: Determine common SVDM Version
  UPSTREAM: usb: typec: tcpm: Determine common SVDM Version
  UPSTREAM: usb: pd: Make SVDM Version configurable in VDM header
  UPSTREAM: usb: typec: Manage SVDM version
  UPSTREAM: usb: dwc3: gadget: Fix dep->interval for fullspeed interrupt
  UPSTREAM: usb: dwc3: gadget: Fix setting of DEPCFG.bInterval_m1
  Revert "ANDROID: configs: GKI: disable ARMv8.3 PAC"

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/connector/usb-connector.yaml

Change-Id: I0191f30199dd8929c37159b0c6977f51fc4e9bcb
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-02-16 15:09:33 -08:00
Ivaylo Georgiev
2a3dbbd786 Merge android12-5.10.14 (d0d8327) into msm-5.10
* refs/heads/tmp-d0d8327:
  ANDROID: mm/memory_hotplug: fix check for proper subsection removal
  Revert "FROMLIST: dt-bindings: reserved-memory: Make DMA-BUF CMA heap DT-configurable"
  Revert "FROMLIST: dma-buf: heaps: add chunk heap to dmabuf heaps"
  ANDROID: gki_defconfig: Enable NL80211_TESTMODE
  UPSTREAM: dt-binding: usb: Include USB SSP rates in GenXxY
  UPSTREAM: dt-bindings: usb: Add generic "usb-phy" property
  UPSTREAM: dt-bindings: usb: Add "ulpi/serial/hsic" PHY types
  UPSTREAM: dt-bindings: usb: Convert generic USB properties to DT schemas
  UPSTREAM: dt-bindings: usb: usb-hcd: Detach generic USB controller properties
  UPSTREAM: usb: dwc3: gadget: Set speed only up to the max supported
  UPSTREAM: usb: dwc3: gadget: Track connected SSP rate and lane count
  UPSTREAM: usb: dwc3: gadget: Implement setting of SSP rate
  UPSTREAM: usb: dwc3: core: Check maximum_speed SSP genXxY
  UPSTREAM: usb: common: Parse for USB SSP genXxY
  FROMGIT: kasan: untag addresses for KFENCE
  BACKPORT: kasan: remove redundant config option
  FROMGIT: kasan: don't run tests when KASAN is not enabled
  FROMGIT: kasan: add a test for kmem_cache_alloc/free_bulk
  FROMGIT: kasan: add proper page allocator tests
  FROMGIT: kasan: fix bug detection via ksize for HW_TAGS mode
  FROMGIT: kasan: move _RET_IP_ to inline wrappers
  FROMGIT: kasan: fix memory corruption in kasan_bitops_tags test
  FROMGIT: kasan: adapt kmalloc_uaf2 test to HW_TAGS mode
  FROMGIT: kasan: add compiler barriers to KUNIT_EXPECT_KASAN_FAIL
  FROMGIT: kasan: rename CONFIG_TEST_KASAN_MODULE
  FROMGIT: kasan, arm64: allow using KUnit tests with HW_TAGS mode
  FROMGIT: kasan: add match-all tag tests
  FROMGIT: kasan: add macros to simplify checking test constraints
  FROMGIT: kasan: clean up comments in tests
  FROMGIT: kasan: clarify HW_TAGS impact on TBI
  FROMGIT: kasan: prefix global functions with kasan_
  Linux 5.10.14
  workqueue: Restrict affinity change to rescuer
  kthread: Extract KTHREAD_IS_PER_CPU
  x86/cpu: Add another Alder Lake CPU to the Intel family
  objtool: Don't fail the kernel build on fatal errors
  habanalabs: disable FW events on device removal
  habanalabs: fix backward compatibility of idle check
  habanalabs: zero pci counters packet before submit to FW
  drm/amd/display: Fixed corruptions on HPDRX link loss restore
  drm/amd/display: Use hardware sequencer functions for PG control
  drm/amd/display: Change function decide_dp_link_settings to avoid infinite looping
  drm/amd/display: Allow PSTATE chnage when no displays are enabled
  drm/amd/display: Update dram_clock_change_latency for DCN2.1
  selftests/powerpc: Only test lwm/stmw on big endian
  platform/x86: thinkpad_acpi: Add P53/73 firmware to fan_quirk_table for dual fan control
  nvmet: set right status on error in id-ns handler
  nvme-pci: allow use of cmb on v1.4 controllers
  nvme-tcp: avoid request double completion for concurrent nvme_tcp_timeout
  nvme-rdma: avoid request double completion for concurrent nvme_rdma_timeout
  nvme: check the PRINFO bit before deciding the host buffer length
  udf: fix the problem that the disc content is not displayed
  i2c: tegra: Create i2c_writesl_vi() to use with VI I2C for filling TX FIFO
  ALSA: hda: Add Cometlake-R PCI ID
  scsi: ibmvfc: Set default timeout to avoid crash during migration
  mac80211: fix encryption key selection for 802.3 xmit
  mac80211: fix fast-rx encryption check
  mac80211: fix incorrect strlen of .write in debugfs
  objtool: Don't add empty symbols to the rbtree
  ALSA: hda: Add AlderLake-P PCI ID and HDMI codec vid
  ASoC: SOF: Intel: hda: Resume codec to do jack detection
  scsi: fnic: Fix memleak in vnic_dev_init_devcmd2
  scsi: libfc: Avoid invoking response handler twice if ep is already completed
  scsi: scsi_transport_srp: Don't block target in failfast state
  x86: __always_inline __{rd,wr}msr()
  locking/lockdep: Avoid noinstr warning for DEBUG_LOCKDEP
  habanalabs: fix dma_addr passed to dma_mmap_coherent
  platform/x86: intel-vbtn: Support for tablet mode on Dell Inspiron 7352
  platform/x86: touchscreen_dmi: Add swap-x-y quirk for Goodix touchscreen on Estar Beauty HD tablet
  tools/power/x86/intel-speed-select: Set higher of cpuinfo_max_freq or base_frequency
  tools/power/x86/intel-speed-select: Set scaling_max_freq to base_frequency
  phy: cpcap-usb: Fix warning for missing regulator_disable
  iommu/vt-d: Do not use flush-queue when caching-mode is on
  ARM: 9025/1: Kconfig: CPU_BIG_ENDIAN depends on !LD_IS_LLD
  Revert "x86/setup: don't remove E820_TYPE_RAM for pfn 0"
  arm64: Do not pass tagged addresses to __is_lm_address()
  arm64: Fix kernel address detection of __is_lm_address()
  arm64: dts: meson: Describe G12b GPU as coherent
  drm/panfrost: Support cache-coherent integrations
  iommu/io-pgtable-arm: Support coherency for Mali LPAE
  ibmvnic: Ensure that CRQ entry read are correctly ordered
  net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP
  net: dsa: bcm_sf2: put device node before return
  mlxsw: spectrum_span: Do not overwrite policer configuration
  stmmac: intel: Configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA addressing
  net: octeontx2: Make sure the buffer is 128 byte aligned
  net: fec: put child node on error path
  net: stmmac: dwmac-intel-plat: remove config data on error
  net: dsa: microchip: Adjust reset release timing to match reference reset circuit
  ANDROID: usb: gadget: configfs: Move CONFIGFS_UEVENT #endif
  ANDROID: GKI: Enable KFENCE
  FROMGIT: KVM: arm64: Move __hyp_set_vectors out of .hyp.text
  FROMGIT: KVM: arm64: Stub EXPORT_SYMBOL for nVHE EL2 code
  FROMGIT: asm-generic: export: Stub EXPORT_SYMBOL with __DISABLE_EXPORTS
  FROMGIT: KVM: arm64: Correct spelling of DBGDIDR register
  FROMGIT: KVM: arm64: Use symbolic names for the PMU versions
  FROMGIT: KVM: arm64: Upgrade PMU support to ARMv8.4
  FROMGIT: KVM: arm64: Limit the debug architecture to ARMv8.0
  FROMGIT: KVM: arm64: Refactor filtering of ID registers
  FROMGIT: KVM: arm64: Add handling of AArch32 PCMEID{2,3} PMUv3 registers
  FROMGIT: KVM: arm64: Fix AArch32 PMUv3 capping
  FROMGIT: KVM: arm64: Fix missing RES1 in emulation of DBGBIDR
  FROMGIT: KVM: arm64: Make gen-hyprel endianness agnostic
  FROMGIT: KVM: arm64: Implement the TRNG hypervisor call
  FROMGIT: KVM: arm64: Mark the page dirty only if the fault is handled successfully
  FROMGIT: KVM: arm64: Filter out the case of only changing permissions from stage-2 map path
  FROMGIT: KVM: arm64: Adjust partial code of hyp stage-1 map and guest stage-2 map
  FROMGIT: KVM: arm64: Simplify __kvm_hyp_init HVC detection
  FROMGIT: KVM: arm64: Remove hyp_symbol_addr
  FROMGIT: KVM: arm64: Remove patching of fn pointers in hyp
  FROMGIT: KVM: arm64: Fix constant-pool users in hyp
  FROMGIT: KVM: arm64: Apply hyp relocations at runtime
  FROMGIT: KVM: arm64: Generate hyp relocation data
  FROMGIT: KVM: arm64: Add symbol at the beginning of each hyp section
  FROMGIT: KVM: arm64: Set up .hyp.rodata ELF section
  FROMGIT: KVM: arm64: Rename .idmap.text in hyp linker script
  FROMGIT: firmware: smccc: Add SMCCC TRNG function call IDs
  BACKPORT: arm64: Work around broken GCC 4.9 handling of "S" constraint
  FROMGIT: kasan: use error_report_end tracepoint
  FROMGIT: kfence: use error_report_end tracepoint
  FROMGIT: tracing: add error_report_end trace point
  FROMGIT: kfence: show access type in report
  FROMGIT: kfence: fix typo in test
  FROMGIT: kfence: add test suite
  FROMGIT: kfence: add missing copyright header to documentation
  FROMGIT: kfence, Documentation: add KFENCE documentation
  FROMGIT: kfence, kasan: make KFENCE compatible with KASAN
  FROMGIT: mm, kfence: insert KFENCE hooks for SLUB
  BACKPORT: mm, kfence: insert KFENCE hooks for SLAB
  FROMGIT: mm/slab: rerform init_on_free earlier
  FROMGIT: kfence: use pt_regs to generate stack trace on faults
  FROMGIT: kfence, arm64: add missing copyright and description header
  FROMGIT: arm64, kfence: enable KFENCE for ARM64
  FROMGIT: kfence, x86: add missing copyright and description header
  FROMGIT: x86, kfence: enable KFENCE for x86
  FROMGIT: kfence: add missing copyright and description headers
  FROMGIT: kfence: add option to use KFENCE without static keys
  FROMGIT: kfence: fix potential deadlock due to wake_up()
  FROMGIT: kfence: avoid stalling work queue task without allocations
  FROMGIT: kfence: Fix parameter description for kfence_object_start()
  BACKPORT: mm: add Kernel Electric-Fence infrastructure
  FROMLIST: fuse: Fix crediantials leak in passthrough read_iter
  UPSTREAM: userfaultfd: add user-mode only option to unprivileged_userfaultfd sysctl knob
  UPSTREAM: userfaultfd: add UFFD_USER_MODE_ONLY
  UPSTREAM: userfaultfd: use secure anon inodes for userfaultfd
  BACKPORT: selinux: teach SELinux about anonymous inodes
  UPSTREAM: fs: add LSM-supporting anon-inode interface
  UPSTREAM: security: add inode_init_security_anon() LSM hook
  UPSTREAM: cfg80211: Add support to calculate and report 4096-QAM HE rates
  UPSTREAM: cfg80211: Add support to configure SAE PWE value to drivers
  UPSTREAM: usb: dwc3: fix clock issue during resume in OTG mode

Conflicts:
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/usb/usb-hcd.yaml
	drivers/dma-buf/heaps/Kconfig
	drivers/dma-buf/heaps/Makefile

Change-Id: I3726725889da6ae622c1e319388831e7f99d14c5
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-02-16 13:52:48 -08:00
Ivaylo Georgiev
75dc4d9433 Merge android12-5.10.13 (cf5b248) into msm-5.10
* refs/heads/tmp-cf5b248:
  BACKPORT: FROMLIST: arm64: Remove logic to kill 32-bit tasks on 64-bit-only cores
  FROMLIST: arm64: Hook up cmdline parameter to allow mismatched 32-bit EL0
  FROMLIST: arm64: Prevent offlining first CPU with 32-bit EL0 on mismatched system
  FROMLIST: arm64: exec: Adjust affinity for compat tasks with mismatched 32-bit EL0
  FROMLIST: arm64: Implement task_cpu_possible_mask()
  FROMLIST: sched: Introduce force_compatible_cpus_allowed_ptr() to limit CPU affinity
  FROMLIST: sched: Reject CPU affinity changes based on task_cpu_possible_mask()
  BACKPORT: FROMLIST: cpuset: Honour task_cpu_possible_mask() in guarantee_online_cpus()
  FROMLIST: cpuset: Don't use the cpu_possible_mask as a last resort for cgroup v1
  FROMLIST: sched: Introduce task_cpu_possible_mask() to limit fallback rq selection
  FROMLIST: arm64: Advertise CPUs capable of running 32-bit applications in sysfs
  BACKPORT: FROMLIST: arm64: Kill 32-bit applications scheduled on 64-bit-only CPUs
  FROMLIST: KVM: arm64: Kill 32-bit vCPUs on systems with mismatched EL0 support
  BACKPORT: FROMLIST: arm64: Allow mismatched 32-bit EL0 support
  FROMLIST: arm64: cpuinfo: Split AArch32 registers out into a separate struct
  Revert "ANDROID: arm64: Add support for asymmetric AArch32 EL0 configurations"
  Revert "ANDROID: arm64: Handle AArch32 tasks running on non AArch32 cpu"
  Revert "ANDROID: arm64: Disallow offlining the last aarch32 cpu"
  Revert "ANDROID: arm64: kvm: Hide asym aarch32 systems from KVM"
  Revert "ANDROID: arm64: Enable KVM for Asym AArch32"
  ANDROID: gki_defconfig: Remove CONFIG_ASYMMETRIC_AARCH32=y
  UPSTREAM: usb: pd: Reland VDO definitions of PD2.0
  ANDROID: sched: Add PELT cmdline arg
  ANDROID: psci: use __pa_function for cpu_resume
  ANDROID: arm64: kernel: use __pa_function for secondary_entry
  ANDROID: arm64: add vendor hooks for kernel fault cases
  ANDROID: sched: add vendor hooks for bad scheduling
  ANDROID: power: add vendor hooks for try_to_freeze fail
  ANDROID: softlockup: add vendor hook for a softlockup task
  ANDROID: Fix sparse warning in __handle_speculative_fault caused by SPF
  ANDROID: mm, oom: Fix select_bad_process customization
  ANDROID: mm: sync rss in speculative page fault path
  ANDROID: GKI: Update ABI XML report
  ANDROID: dma-buf: heaps: Add a sysfs file to report total pool size.
  ANDROID: GKI: enable CONFIG_USB_DUMMY_HCD
  ANDROID: GKI: Update ABI XML report
  ANDROID: GKI: defconfig: Enable DMA-BUF sysfs stats
  ANDROID: zram: allow zram to allocate CMA pages
  Linux 5.10.13
  vsock: fix the race conditions in multi-transport support
  tcp: fix TLP timer not set when CA_STATE changes from DISORDER to OPEN
  tcp: make TCP_USER_TIMEOUT accurate for zero window probes
  team: protect features update by RCU to avoid deadlock
  scsi: qla2xxx: Fix description for parameter ql2xenforce_iocb_limit
  ASoC: topology: Fix memory corruption in soc_tplg_denum_create_values()
  ASoC: topology: Properly unregister DAI on removal
  ASoC: mediatek: mt8183-mt6358: ignore TDM DAI link by default
  ASoC: mediatek: mt8183-da7219: ignore TDM DAI link by default
  NFC: fix possible resource leak
  NFC: fix resource leak when target index is invalid
  rxrpc: Fix memory leak in rxrpc_lookup_local
  selftests: forwarding: Specify interface when invoking mausezahn
  nvme-multipath: Early exit if no path is available
  iommu/vt-d: Correctly check addr alignment in qi_flush_dev_iotlb_pasid()
  iommu/amd: Use IVHD EFR for early initialization of IOMMU features
  of/device: Update dma_range_map only when dev has valid dma-ranges
  ACPI/IORT: Do not blindly trust DMA masks from firmware
  can: dev: prevent potential information leak in can_fill_info()
  net/mlx5: CT: Fix incorrect removal of tuple_nat_node from nat rhashtable
  net/mlx5e: Revert parameters on errors when changing MTU and LRO state without reset
  net/mlx5e: Revert parameters on errors when changing trust state without reset
  net/mlx5e: Correctly handle changing the number of queues when the interface is down
  net/mlx5e: Fix CT rule + encap slow path offload and deletion
  net/mlx5e: Disable hw-tc-offload when MLX5_CLS_ACT config is disabled
  net/mlx5: Maintain separate page trees for ECPF and PF functions
  net/mlx5e: Reduce tc unsupported key print level
  net/mlx5e: free page before return
  net/mlx5e: E-switch, Fix rate calculation for overflow
  net/mlx5: Fix memory leak on flow table creation error flow
  igc: fix link speed advertising
  i40e: acquire VSI pointer only after VF is initialized
  ice: Fix MSI-X vector fallback logic
  ice: Don't allow more channels than LAN MSI-X available
  ice: update dev_addr in ice_set_mac_address even if HW filter exists
  ice: Implement flow for IPv6 next header (extension header)
  ice: fix FDir IPv6 flexbyte
  mac80211: pause TX while changing interface type
  iwlwifi: pcie: reschedule in long-running memory reads
  iwlwifi: pcie: use jiffies for memory read spin time limit
  iwlwifi: pcie: set LTR on more devices
  iwlwifi: pnvm: don't try to load after failures
  iwlwifi: pnvm: don't skip everything when not reloading
  iwlwifi: pcie: avoid potential PNVM leaks
  ASoC: qcom: lpass: Fix out-of-bounds DAI ID lookup
  ASoC: SOF: Intel: soundwire: fix select/depend unmet dependencies
  pNFS/NFSv4: Update the layout barrier when we schedule a layoutreturn
  pNFS/NFSv4: Fix a layout segment leak in pnfs_layout_process()
  powerpc/64s: prevent recursive replay_soft_interrupts causing superfluous interrupt
  ASoC: Intel: Skylake: skl-topology: Fix OOPs ib skl_tplg_complete
  spi: altera: Fix memory leak on error path
  ASoC: qcom: lpass-ipq806x: fix bitwidth regmap field
  ASoC: qcom: Fix broken support to MI2S TERTIARY and QUATERNARY
  ASoC: qcom: Fix incorrect volatile registers
  ASoC: dt-bindings: lpass: Fix and common up lpass dai ids
  RDMA/cxgb4: Fix the reported max_recv_sge value
  firmware: imx: select SOC_BUS to fix firmware build
  arm64: dts: imx8mp: Correct the gpio ranges of gpio3
  ARM: dts: imx6qdl-sr-som: fix some cubox-i platforms
  ARM: dts: imx6qdl-kontron-samx6i: fix i2c_lcd/cam default status
  ARM: imx: fix imx8m dependencies
  arm64: dts: ls1028a: fix the offset of the reset register
  xfrm: Fix wraparound in xfrm_policy_addr_delta()
  selftests: xfrm: fix test return value override issue in xfrm_policy.sh
  xfrm: fix disable_xfrm sysctl when used on xfrm interfaces
  xfrm: Fix oops in xfrm_replay_advance_bmp
  Revert "block: simplify set_init_blocksize" to regain lost performance
  Revert "RDMA/mlx5: Fix devlink deadlock on net namespace deletion"
  netfilter: nft_dynset: add timeout extension to template
  ARM: zImage: atags_to_fdt: Fix node names on added root nodes
  ARM: imx: build suspend-imx6.S with arm instruction set
  clk: qcom: gcc-sm250: Use floor ops for sdcc clks
  clk: mmp2: fix build without CONFIG_PM
  clk: imx: fix Kconfig warning for i.MX SCU clk
  blk-mq: test QUEUE_FLAG_HCTX_ACTIVE for sbitmap_shared in hctx_may_queue
  xen-blkfront: allow discard-* nodes to be optional
  tee: optee: replace might_sleep with cond_resched
  KVM: Documentation: Fix spec for KVM_CAP_ENABLE_CAP_VM
  uapi: fix big endian definition of ipv6_rpl_sr_hdr
  drm/i915/selftest: Fix potential memory leak
  drm/i915: Check for all subplatform bits
  drm/nouveau/dispnv50: Restore pushing of all data.
  drm/vc4: Correct POS1_SCL for hvs5
  drm/vc4: Correct lbm size and calculation
  drm/nouveau/svm: fail NOUVEAU_SVM_INIT ioctl on unsupported devices
  ARM: dts: imx6qdl-kontron-samx6i: fix pwms for lcd-backlight
  net/mlx5e: Fix IPSEC stats
  drm/i915/pmu: Don't grab wakeref when enabling events
  drm/i915/gt: Clear CACHE_MODE prior to clearing residuals
  iwlwifi: Fix IWL_SUBDEVICE_NO_160 macro to use the correct bit.
  mt7601u: fix rx buffer refcounting
  mt76: mt7663s: fix rx buffer refcounting
  mt7601u: fix kernel crash unplugging the device
  arm64: dts: broadcom: Fix USB DMA address translation for Stingray
  leds: trigger: fix potential deadlock with libata
  xen: Fix XenStore initialisation for XS_LOCAL
  io_uring: fix wqe->lock/completion_lock deadlock
  KVM: Forbid the use of tagged userspace addresses for memslots
  KVM: x86: get smi pending status correctly
  KVM: nVMX: Sync unsync'd vmcs02 state to vmcs12 on migration
  KVM: x86: allow KVM_REQ_GET_NESTED_STATE_PAGES outside guest mode for VMX
  KVM: nSVM: cancel KVM_REQ_GET_NESTED_STATE_PAGES on nested vmexit
  KVM: arm64: Filter out v8.1+ events on v8.0 HW
  KVM: x86/pmu: Fix UBSAN shift-out-of-bounds warning in intel_pmu_refresh()
  KVM: x86/pmu: Fix HW_REF_CPU_CYCLES event pseudo-encoding in intel_arch_events[]
  btrfs: fix possible free space tree corruption with online conversion
  btrfs: fix lockdep warning due to seqcount_mutex on 32bit arch
  drivers: soc: atmel: add null entry at the end of at91_soc_allowed_list[]
  drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs
  crypto: marvel/cesa - Fix tdma descriptor on 64-bit
  efi/apple-properties: Reinstate support for boolean properties
  x86/entry: Emit a symbol for register restoring thunk
  PM: hibernate: flush swap writer after marking
  s390/vfio-ap: No need to disable IRQ after queue reset
  s390: uv: Fix sysfs max number of VCPUs reporting
  net: usb: qmi_wwan: added support for Thales Cinterion PLSx3 modem family
  bcache: only check feature sets when sb->version >= BCACHE_SB_VERSION_CDEV_WITH_FEATURES
  drivers/nouveau/kms/nv50-: Reject format modifiers for cursor planes
  drm/i915/gt: Always try to reserve GGTT address 0x0
  drm/i915: Always flush the active worker before returning from the wait
  drm/nouveau/kms/gk104-gp1xx: Fix > 64x64 cursors
  Revert "drm/amdgpu/swsmu: drop set_fan_speed_percent (v2)"
  ASoC: AMD Renoir - refine DMI entries for some Lenovo products
  x86/xen: avoid warning in Xen pv guest with CONFIG_AMD_MEM_ENCRYPT enabled
  wext: fix NULL-ptr-dereference with cfg80211's lack of commit()
  ARM: dts: imx6qdl-gw52xx: fix duplicate regulator naming
  ARM: dts: ux500: Reserve memory carveouts
  ARM: dts: tbs2910: rename MMC node aliases
  media: rc: ensure that uevent can be read directly after rc device register
  media: rc: ite-cir: fix min_timeout calculation
  media: rc: fix timeout handling after switch to microsecond durations
  media: hantro: Fix reset_raw_fmt initialization
  media: cedrus: Fix H264 decoding
  media: cec: add stm32 driver
  parisc: Enable -mlong-calls gcc option by default when !CONFIG_MODULES
  ALSA: hda/via: Apply the workaround generically for Clevo machines
  ALSA: hda/realtek: Enable headset of ASUS B1400CEPE with ALC256
  kernel: kexec: remove the lock operation of system_transition_mutex
  ACPI: thermal: Do not call acpi_thermal_check() directly
  ACPI: sysfs: Prefer "compatible" modalias
  tty: avoid using vfs_iocb_iter_write() for redirected console writes
  nbd: freeze the queue while we're adding connections
  iwlwifi: provide gso_type to GSO packets
  ANDROID: Add filp_open_block() for zram
  UPSTREAM: usb: pd: Update VDO definitions
  UPSTREAM: xhci: fix bounce buffer usage for non-sg list case
  UPSTREAM: usb: host: xhci: mvebu: make USB 3.0 PHY optional for Armada 3720
  UPSTREAM: usb: xhci-mtk: break loop when find the endpoint to drop
  UPSTREAM: usb: typec: Return void in typec_partner_set_pd_revision
  ANDROID: GKI: Update ABI with virtual_device symbols
  ANDROID: make per-cgroup PSI tracking configurable
  BACKPORT: FROMLIST: dmabuf: Add the capability to expose DMA-BUF stats in sysfs
  UPSTREAM: usb: typec: tcpci_maxim: Enable data path when partner is USB Comm capable
  UPSTREAM: usb: typec: tcpci: Add Callback to Usb Communication capable partner
  UPSTREAM: usb: typec: tcpm: Add Callback to Usb Communication capable partner
  UPSTREAM: usb: typec: tcpm: Set in_ams flag when Source caps have been received
  UPSTREAM: usb: typec: tcpm: Handle vbus shutoff when in source mode
  ANDROID: GKI: Update virtual_device symbol list
  ANDROID: timer: Add vendor hook for timer calc index
  ANDROID: Make vsock virtio packet buff size configurable
  ANDROID: ipi: Add function to return nr_ipi and ipi_desc
  UPSTREAM: usb: typec: Add typec_partner_set_pd_revision
  UPSTREAM: usb: typec: Provide PD Specification Revision for cable and partner
  UPSTREAM: usb: typec: Standardize PD Revision format with Type-C Revision
  UPSTREAM: usb: xhci-mtk: skip dropping bandwidth of unchecked endpoints
  UPSTREAM: modpost: turn static exports into error
  Revert "FROMLIST: modpost: Make static exports fatal"
  UPSTREAM: modpost: turn section mismatches to error from fatal()
  UPSTREAM: modpost: change license incompatibility to error() from fatal()
  UPSTREAM: modpost: turn missing MODULE_LICENSE() into error
  UPSTREAM: modpost: refactor error handling and clarify error/fatal difference
  UPSTREAM: modpost: rename merror() to error()
  Revert "ANDROID: GKI: bring WPAN into GKI"
  ANDROID: GKI: update .xml file
  ANDROID: GKI: bring WPAN into GKI
  ANDROID: db845c_gki.fragment: Drop CONFIG_USB_XHCI_HCD
  Revert "ANDROID: Update db845c KMI symbol list for DWC3 changes"
  Revert "Revert "ANDROID: GKI: Enable CONFIG_USB_XHCI_HCD""
  Revert "Revert "ANDROID: db845c_gki.fragment: Drop CONFIG_USB_DWC3 from config frament""
  Revert "Revert "ANDROID: GKI: enable CONFIG_USB_DWC3 to be build in""

Conflicts:
	arch/arm64/Kconfig
	init/Kconfig

Change-Id: I931bd41521892079722e6b8211d4864a685d3cb8
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2021-02-16 13:24:30 -08:00
Dinesh K Garg
8734ac2d25 smcinvoke: enable smcinvoke driver
Porting SMCInvoke driver to kernel msm-5.10

Change-Id: I2ad581350a8a2b48d653488b4bdbbeb840f00cd2
Signed-off-by: Dinesh K Garg <dineshg@codeaurora.org>
2021-02-16 11:32:23 -08:00
Dinesh K Garg
ce21cb3900 qseecom: enable support for QSEECom
Adding changes to port QSEECom driver to kernel 5.10

Change-Id: I840b485439b9fd8872e9411238ac07c89ac588f5
Signed-off-by: Dinesh K Garg <dineshg@codeaurora.org>
2021-02-16 11:30:11 -08:00
Dinesh K Garg
eb4eadf52a tzlog: enable TZ log driver
Adding required changes to make tzlog driver functional on kernel 5.10

Change-Id: Ia4a28c73f545ca5ae0fa795e1aae608a1b03f9a1
Signed-off-by: Dinesh K Garg <dineshg@codeaurora.org>
2021-02-16 11:24:09 -08:00
Murali Nalajala
d560c5200a haven: hh_ctrl: pass right function number for enabling hyp uart
Send correct function number to hypervisor for enabling hyp uart
functionality.

Change-Id: Idf071279cfb27016510d8d5b5908d0c8d66a489e
Signed-off-by: Murali Nalajala <mnalajal@codeaurora.org>
2021-02-16 11:12:38 -08:00
Murali Nalajala
93a7096405 defconfig: disable watchdog on VM
Disable watchdog until all the functionaliy of the drivers
are verified for VM.

Change-Id: I20c7393e83976162042e71870792c8b6014123a0
Signed-off-by: Murali Nalajala <mnalajal@codeaurora.org>
2021-02-16 11:12:33 -08:00