Commit graph

889,703 commits

Author SHA1 Message Date
Blagovest Kolenichev
7546983cd7 Merge android11-5.4.58+ (33cc3e7) into msm-5.4
* refs/heads/tmp-33cc3e7:
  ANDROID: db845c: set BUILD_INITRAMFS=1
  ANDROID: GKI: Build CEC_{CORE,NOTIFIER,PIN} in
  ANDROID: GKI: Enable CEC support
  ANDROID: ABI: Update ABI snapshot after additions to struct io_pgtable_cfg
  ANDROID: iommu/io-pgtable: Allow IOMMU drivers to allocate/free page-table memory
  ANDROID: update ABI
  UPSTREAM: update to latest version of scripts/checkpatch.pl
  FROMLIST: ufs: change the way to complete fDeviceInit
  ANDROID: GKI: add built-in BCM Bluetooth driver
  Revert "Revert "genetlink: remove genl_bind""
  ANDROID: GKI: enable CONFIG_LEDS_TRIGGER_TIMER
  ANDROID: GKI: add abi_gki_aarch64_oplus
  ANDROID: GKI: fix up abi .xml file due to previous changes.
  ANDROID: GKI: add some padding to some driver core structures
  ANDROID: vendor_hooks: add waiting information for blocked tasks
  ANDROID: GKI: Update abi_gki_aarch64_exynos
  ANDROID: include/linux: add low power mode and fps to notifier
  BACKPORT: scsi: ufs: Fix and simplify setup_xfer_req variant operation
  ANDROID: GKI: enable USB UVC drivers
  ANDROID: GKI: enabled CONFIG_USB_CONFIGFS_NCM=y
  ANDROID: GKI: enable LEDS_CLASS_FLASH

Conflicts:
	drivers/iommu/io-pgtable-arm.c
	drivers/iommu/io-pgtable.c
	include/linux/io-pgtable.h
	scripts/checkpatch.pl

Change-Id: I6cbac7d913653388280a4c58f4f98e6f8b6b29f7
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2020-08-28 11:58:00 -07:00
Blagovest Kolenichev
8d910feef8 Merge android11-5.4.58 (3a9b53b) into msm-5.4
* refs/heads/tmp-3a9b53b
  Revert "binder: Prevent context manager from incrementing ref 0"
  Revert "drm/drm_fb_helper: fix fbdev with sparc64"
  ANDROID: fix redefinition error for restricted vendor hooks
  Linux 5.4.58
  nfsd: Fix NFSv4 READ on RDMA when using readv
  ima: move APPRAISE_BOOTPARAM dependency on ARCH_POLICY to runtime
  tcp: apply a floor of 1 for RTT samples from TCP timestamps
  selftests/net: relax cpu affinity requirement in msg_zerocopy test
  Revert "vxlan: fix tos value before xmit"
  openvswitch: Prevent kernel-infoleak in ovs_ct_put_key()
  net: thunderx: use spin_lock_bh in nicvf_set_rx_mode_task()
  net: gre: recompute gre csum for sctp over gre tunnels
  hv_netvsc: do not use VF device if link is down
  dpaa2-eth: Fix passing zero to 'PTR_ERR' warning
  appletalk: Fix atalk_proc_init() return path
  net: lan78xx: replace bogus endpoint lookup
  vxlan: Ensure FDB dump is performed under RCU
  rxrpc: Fix race between recvmsg and sendmsg on immediate call failure
  net: ethernet: mtk_eth_soc: fix MTU warnings
  ipv6: Fix nexthop refcnt leak when creating ipv6 route info
  ipv6: fix memory leaks on IPV6_ADDRFORM path
  ipv4: Silence suspicious RCU usage warning
  PCI: tegra: Revert tegra124 raw_violation_fixup
  Revert "powerpc/kasan: Fix shadow pages allocation failure"
  xattr: break delegations in {set,remove}xattr
  Drivers: hv: vmbus: Ignore CHANNELMSG_TL_CONNECT_RESULT(23)
  tools lib traceevent: Fix memory leak in process_dynamic_array_len
  atm: fix atm_dev refcnt leaks in atmtcp_remove_persistent
  igb: reinit_locked() should be called with rtnl_lock
  cfg80211: check vendor command doit pointer before use
  firmware: Fix a reference count leak.
  ALSA: hda: fix NULL pointer dereference during suspend
  net: ethernet: mtk_eth_soc: Always call mtk_gmac0_rgmii_adjust() for mt7623
  usb: hso: check for return value in hso_serial_common_create()
  i2c: slave: add sanity check when unregistering
  i2c: slave: improve sanity check when registering
  drm/drm_fb_helper: fix fbdev with sparc64
  nvme-pci: prevent SK hynix PC400 from using Write Zeroes command
  drm/nouveau/fbcon: zero-initialise the mode_cmd2 structure
  drm/nouveau/fbcon: fix module unload when fbcon init has failed for some reason
  net/9p: validate fds in p9_fd_open
  leds: 88pm860x: fix use-after-free on unbind
  leds: lm3533: fix use-after-free on unbind
  leds: da903x: fix use-after-free on unbind
  leds: lm36274: fix use-after-free on unbind
  leds: wm831x-status: fix use-after-free on unbind
  mtd: properly check all write ioctls for permissions
  vgacon: Fix for missing check in scrollback handling
  scripts: add dummy report mode to add_namespace.cocci
  Smack: fix use-after-free in smk_write_relabel_self()
  binder: Prevent context manager from incrementing ref 0
  omapfb: dss: Fix max fclk divider for omap36xx
  Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_with_rssi_evt()
  Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_evt()
  Bluetooth: Fix slab-out-of-bounds read in hci_extended_inquiry_result_evt()
  Staging: rtl8188eu: rtw_mlme: Fix uninitialized variable authmode
  staging: rtl8712: handle firmware load failure
  staging: android: ashmem: Fix lockdep warning for write operation
  ALSA: seq: oss: Serialize ioctls
  ALSA: hda/ca0132 - Fix AE-5 microphone selection commands.
  ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value.
  ALSA: hda/ca0132 - Add new quirk ID for Recon3D.
  ALSA: hda/realtek: Add alc269/alc662 pin-tables for Loongson-3 laptops
  Revert "ALSA: hda: call runtime_allow() for all hda controllers"
  io_uring: Fix use-after-free in io_sq_wq_submit_work()
  io_uring: prevent re-read of sqe->opcode
  usb: xhci: Fix ASMedia ASM1142 DMA addressing
  usb: xhci: define IDs for various ASMedia host controllers
  USB: iowarrior: fix up report size handling for some devices
  perf/core: Fix endless multiplex timer
  USB: serial: qcserial: add EM7305 QDL product ID
  ANDROID: GKI: update abi based on wifi 6GHz changes
  BACKPORT: cfg80211: require HE capabilities for 6 GHz band
  BACKPORT: cfg80211: reject HT/VHT capabilities on 6 GHz band
  BACKPORT: cfg80211: treat 6 GHz channels as valid regardless of capability
  BACKPORT: mac80211: Add HE 6GHz capabilities element to probe request
  BACKPORT: mac80211: add HE 6 GHz Band Capability element
  BACKPORT: cfg80211: add and expose HE 6 GHz band capabilities
  BACKPORT: cfg80211: handle 6 GHz capability of new station
  BACKPORT: ieee80211: add HE ext EIDs and 6 GHz capability defines
  BACKPORT: ieee80211: add code to obtain and parse 6 GHz operation field
  BACKPORT: cfg80211: add a helper to identify 6 GHz PSCs
  BACKPORT: cfg80211: adapt to new channelization of the 6GHz band
  BACKPORT: cfg80211: fix 6 GHz frequencies to kHz
  BACKPORT: cfg80211: express channels with a KHz component
  Revert "Revert "Revert "ANDROID: ALSA: jack: Update supported ja..."
  UPSTREAM: loop: Fix wrong masking of status flags
  UPSTREAM: loop: Add LOOP_CONFIGURE ioctl
  UPSTREAM: loop: Clean up LOOP_SET_STATUS lo_flags handling
  UPSTREAM: loop: Rework lo_ioctl() __user argument casting
  UPSTREAM: loop: Move loop_set_status_from_info() and friends up
  BACKPORT: loop: Factor out configuring loop from status
  UPSTREAM: loop: Remove figure_loop_size()
  UPSTREAM: loop: Refactor loop_set_status() size calculation
  UPSTREAM: loop: Factor out setting loop device size
  UPSTREAM: loop: Remove sector_t truncation checks
  UPSTREAM: loop: Call loop_config_discard() only after new config is applied
  ANDROID: Revert "module: Refactor section attr into bin attribute"
  ANDROID: Revert "module: Do not expose section addresses to non-CAP_SYSLOG"
  FROMLIST: rpmsg: Guard against null endpoint ops in destroy
  ANDROID: GKI: Add some symbols to symbol list

Conflicts:
	android/abi_gki_aarch64_qcom

Change-Id: I626db7277bb4eb964d24336294e6a2a5ce3fab0a
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2020-08-28 10:11:12 -07:00
Blagovest Kolenichev
e4904ae047 Revert "binder: Prevent context manager from incrementing ref 0"
This reverts commit c5665cafbe.

This is a preparation change for merging android-5.4.58 into
msm-5.4 branch. The reverted change is causing UI unresponsive
issue.

Change-Id: I00a837a8706c3625ef736a4de8ce501df233f9a0
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2020-08-28 08:32:28 -07:00
Veerendranath Jakkam
3290a9818c BACKPORT: cfg80211: Squash of all 6GHz changes
Add support for Wi-Fi 6GHz band. squash of commits listed below.

ad8b601 BACKPORT: cfg80211: express channels with a KHz component
666ce0c BACKPORT: cfg80211: fix 6 GHz frequencies to kHz
a4d60a7 BACKPORT: cfg80211: adapt to new channelization of the 6GHz band
2ed68ba BACKPORT: cfg80211: add a helper to identify 6 GHz PSCs
6f5ad8f BACKPORT: ieee80211: add code to obtain and parse 6 GHz operation field
e66b8b1c BACKPORT: ieee80211: add HE ext EIDs and 6 GHz capability defines
bc79097 BACKPORT: cfg80211: handle 6 GHz capability of new station
e3a7357 BACKPORT: cfg80211: add and expose HE 6 GHz band capabilities
b8318c9 BACKPORT: mac80211: add HE 6 GHz Band Capability element
df67878 BACKPORT: mac80211: Add HE 6GHz capabilities element to probe request
0403f9c BACKPORT: cfg80211: treat 6 GHz channels as valid regardless of capability
92a570f BACKPORT: cfg80211: reject HT/VHT capabilities on 6 GHz band
dd5425c BACKPORT: cfg80211: require HE capabilities for 6 GHz band

CRs-Fixed: 2760276
Change-Id: Icecbe2587aba927dcb83bc4a574249dbe408d311
Signed-off-by: Vamsi Krishna <vamsin@codeaurora.org>
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
Git-commit: 934f4c7dd3a544bb8000f7436f1f0e12e04ebc37
Git-commit: 5e9cf0f0a3e98992184442de24253fe1b9c40f2e
Git-commit: d1a1646c0de7b0083d42a1ada72a3ec243bfcc6d
Git-commit: afbc9c9e8bfe71e8bd12a8c01bedd969fbab8f0e
Git-commit: 821273a5a502eebaae005557907d122d1e9b7b98
Git-commit: 8b30808d9be4183fab17f0b0e68eea88c94ff15a
Git-commit: 43e64bf301fd8c54f0082d91c6ffd4de861baf96
Git-commit: 223952177296c34d9c8de9cde33204caffe55725
Git-commit: 24a2042cb22fdfc7feef0df9622f0d9d71b8ced1
Git-commit: 2ad2274c58ee2dcaf9ccde5c63ff30f59b138f77
Git-commit: ba8f6a037f790147438173029799f54c9d3065f2
Git-commit: 461ce35d5535c1479384f67fcf4bfc3f3610edca
Git-commit: f438136528482f98535889c9a6f99bbacdd92870
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
Signed-off-by: Veerendranath Jakkam <vjakkam@codeaurora.org>
2020-08-28 13:44:28 +05:30
qctecmdr
4141c87590 Merge "ANDROID: kernel: cgroup: cpuset: Clear cpus_requested for empty buf" 2020-08-27 07:36:29 -07:00
qctecmdr
8a8f1bc057 Merge "defconfig: lahaina-gki: enable PMIC PON log parser driver" 2020-08-27 07:36:29 -07:00
qctecmdr
f1ca04cd4f Merge "drivers: soc: qcom: update sct table for LLCC on Shima" 2020-08-27 07:36:29 -07:00
qctecmdr
99a483720b Merge "i2c: i2c-msm-geni: Avoid usage of dma chan_id in case of GSI transfer" 2020-08-27 07:36:28 -07:00
qctecmdr
f431103bbb Merge "interconnect: qcom: Add L3 support for Holi" 2020-08-27 04:10:55 -07:00
qctecmdr
2059691c06 Merge "msm: adsprpc: store glink transaction history in global buffer" 2020-08-27 04:10:54 -07:00
qctecmdr
31f38cb506 Merge "sched: Cleanup allowed cpus in task placement" 2020-08-27 04:10:54 -07:00
qctecmdr
e9ea070923 Merge "leds: qti-flash: Fix early return in qti_flash_led_disable()" 2020-08-27 04:10:53 -07:00
qctecmdr
0649f39174 Merge "sched: Enable latency sensitive feature" 2020-08-27 04:10:53 -07:00
qctecmdr
50ddda0136 Merge "leds: qti-flash: Show on_time and off_time in microseconds" 2020-08-27 04:10:53 -07:00
qctecmdr
4ac26a7bf5 Merge "cnss2: Set PCIe link state in proper state during resume" 2020-08-27 04:10:52 -07:00
qctecmdr
9f15b033b8 Merge "msm: cvp: Print detail NOC error info" 2020-08-27 04:10:52 -07:00
qctecmdr
67847f22f2 Merge "cpuidle: menu: trace menu governor decisions" 2020-08-27 00:31:45 -07:00
qctecmdr
3d48305c26 Merge "cnss2: Add prefix to firmware name based on device ID" 2020-08-27 00:31:45 -07:00
qctecmdr
4be08dcbe9 Merge "mmc: core: Fix uninitialized clock scaling's freq table" 2020-08-27 00:31:44 -07:00
qctecmdr
6c9cb4c4f7 Merge "cnss2: set high 32bit of MSI addr only when device is 64 bit capable" 2020-08-27 00:31:44 -07:00
qctecmdr
d3ad4ca78e Merge "debug-pagealloc: Panic on pagealloc corruption" 2020-08-27 00:31:43 -07:00
qctecmdr
fdf561d7c8 Merge "Delay opening slimbus ports for A2DP for Apache" 2020-08-27 00:31:41 -07:00
qctecmdr
f6ed83af50 Merge "Revert "mmc: sdhci-msm: skip eMMC slot probe if eMMC isn't a bootdevice"" 2020-08-27 00:31:41 -07:00
qctecmdr
77eb6919f3 Merge "pinctrl: qcom: Update reserved GPIOs for Shima" 2020-08-27 00:31:40 -07:00
Mukesh Ojha
35c2fef8bf drivers: soc: qcom: update sct table for LLCC on Shima
Update the LLCC SCT table for Shima for clients to request
slices from system cache.

- Added new entries for cpuss1 and cpu_hwt.
- Changed the priority for modemhp_grow and display.
- Change the alignment of the table column to look readable.

Change-Id: I9289a9cc8a029d51429aeb44453e0620021daf75
Signed-off-by: Mukesh Ojha <mojha@codeaurora.org>
2020-08-26 23:35:22 -07:00
qctecmdr
d12f827442 Merge "msm: kgsl: Save and restore the power ctrl_flags during recovery" 2020-08-26 20:58:49 -07:00
qctecmdr
8097d6d615 Merge "defconfig: Cleanup of wlan related config flags for holi" 2020-08-26 20:58:49 -07:00
qctecmdr
08dfe9aa1f Merge "msm: pcie: fix race between DRV suspend/resume and RPMSG operations" 2020-08-26 20:58:48 -07:00
qctecmdr
dbd09eb095 Merge "mhi: core: prioritize BHI error debug registers set dump" 2020-08-26 20:58:48 -07:00
qctecmdr
7831531dd4 Merge "arm64: defconfig: Enable selinux config" 2020-08-26 20:58:48 -07:00
qctecmdr
5a3c177b1e Merge "soc: qcom: ramdump: Fix 'complete ramdump' collection" 2020-08-26 20:58:47 -07:00
qctecmdr
032d9702eb Merge "mhi: core: Make sure to powerdown if mhi_sync_power_up fails" 2020-08-26 20:58:47 -07:00
qctecmdr
34715bc934 Merge "cnss2: Notify MSM PCIe bus driver when detect link down" 2020-08-26 17:22:52 -07:00
qctecmdr
c1d2ca05ee Merge "block: Fix a race in the runtime power management code" 2020-08-26 17:22:51 -07:00
qctecmdr
f575f7eefa Merge "power: supply: qti_battery_charger: allow setting ICL for USB_PD charger" 2020-08-26 17:22:51 -07:00
qctecmdr
bbc10f107e Merge "soc: qcom: hyp_core_ctl: Catch uninitialized freq QOS object" 2020-08-26 17:22:51 -07:00
qctecmdr
e45a6c183b Merge "scsi: ufs: Remove ufshcd-qti driver" 2020-08-26 17:22:50 -07:00
qctecmdr
042b36b17b Merge "sched/cpupri: skip isolated cpus" 2020-08-26 17:22:50 -07:00
qctecmdr
0544515468 Merge "cfg80211: Indicate support for AKM advertisement per interface" 2020-08-26 17:22:50 -07:00
qctecmdr
21eb7ccbc4 Merge "arm64: defconfig: Add qcom debug config for perf build in HOLI" 2020-08-26 17:22:49 -07:00
qctecmdr
c786d5a718 Merge "usb: gadget: u_ether: Add skb check in eth_start_xmit" 2020-08-26 17:22:49 -07:00
George Shen
f0e6e63dcc msm: cvp: Print detail NOC error info
It helps debugging CVP NOC error.

Change-Id: I7f7e2b37ff7c404414e483f1ded36d3e521121d1
Signed-off-by: George Shen <sqiao@codeaurora.org>
2020-08-26 16:39:09 -07:00
David Collins
23a4d8c850 defconfig: lahaina-gki: enable PMIC PON log parser driver
Enable the PMIC PON log parser driver so that PMIC power-on,
power-off, and fault information is logged within the kernel for
easy access when debugging.

Change-Id: I986fe6896f1612440d462c96e27c27723e742b1d
Signed-off-by: David Collins <collinsd@codeaurora.org>
2020-08-26 15:52:30 -07:00
David Collins
5bfa3a1d07 soc: qcom: add PMIC PON log parser driver
Add a driver which can parse PMIC PON data into a human readable
format.  This log is stored in a binary data structure in PMIC
NVMEM starting with PMIC PMK8350.  It contains PMIC power-on,
power-off, fault, and other information through multiple power-
cycle events.

Change-Id: I5d2d48ba22ed8a6c666581f0730f8350bb722a08
Signed-off-by: David Collins <collinsd@codeaurora.org>
2020-08-26 15:52:29 -07:00
Yue Ma
915f8f9e3c cnss2: Set PCIe link state in proper state during resume
pci_link_state is meant to track if CNSS driver suspends/resumes
PCIe link by calling PCIe bus suspend/resume APIs. Hence set it
in proper state during resume path to reflect accurate state change.

Change-Id: I638357e8a48d52796ac604dcea734056eb03ee54
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2020-08-26 15:42:49 -07:00
Roman Kiryanov
2dae2bb212 ANDROID: kernel: cgroup: cpuset: Clear cpus_requested for empty buf
update_cpumask had a special case for empty buf which
did not update cpus_requested. This change reduces
differences (only to parsing) in empty/non-empty codepaths
to make them consistent.

Bug: 120444281
Fixes: 4803def4e0b2 ("ANDROID: cpuset: Make cpusets restore on hotplug")
Test: check that writes to /dev/cpuset/background/tasks
Test: work as expected, e.g.:
Test: echo $$ > /dev/cpuset/background/tasks
Test: echo > /dev/cpuset/background/tasks
Signed-off-by: Roman Kiryanov <rkir@google.com>
Git-commit: 4a80327652a261138225722b179f21b7eac21d86
Git-repo: https://android.googlesource.com/kernel/common
Change-Id: I49d320ea046636ec38bd23f053317abc59f64f8e
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2020-08-27 02:50:39 +05:30
Riley Andrews
bef69267b4 ANDROID: cpuset: Make cpusets restore on hotplug
This deliberately changes the behavior of the per-cpuset
cpus file to not be effected by hotplug. When a cpu is offlined,
it will be removed from the cpuset/cpus file. When a cpu is onlined,
if the cpuset originally requested that that cpu was part of the cpuset,
that cpu will be restored to the cpuset. The cpus files still
have to be hierachical, but the ranges no longer have to be out of
the currently online cpus, just the physically present cpus.

Bug: 120444281
Change-Id: I22cdf33e7d312117bcefba1aeb0125e1ada289a9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
[AmitP: Refactored original changes to align with upstream commit
        201af4c0fa ("cgroup: move cgroup files under kernel/cgroup/")]
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Git-commit: ea7de80972bb2243f64b8db99c07eca49518b197
Git-repo: https://android.googlesource.com/kernel/common
[pkondeti@codeaurora.org: Ported to 5.4 kernel]
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2020-08-27 02:50:39 +05:30
qctecmdr
aeafb18287 Merge "scsi: ufs-qcom: Increase ah8 timeout to 5ms" 2020-08-26 13:02:19 -07:00
qctecmdr
432d1461eb Merge "mailbox: msm_qmp: Assert on timeout" 2020-08-26 13:02:18 -07:00
qctecmdr
b14de778e8 Merge "cnss2: Try to recover PCIe link to collect dump after link down" 2020-08-26 13:02:18 -07:00