Commit graph

884,600 commits

Author SHA1 Message Date
Blagovest Kolenichev
72fdae88b0 Merge android-5.4-stable.32 (724ffa0) into msm-5.4
* refs/heads/tmp-724ffa0:
  Linux 5.4.32
  iommu/vt-d: Allow devices with RMRRs to use identity domain
  drm/i915: Fix ref->mutex deadlock in i915_active_wait()
  fbcon: fix null-ptr-deref in fbcon_switch
  blk-mq: Keep set->nr_hw_queues and set->map[].nr_queues in sync
  RDMA/cm: Update num_paths in cma_resolve_iboe_route error flow
  Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl
  RDMA/siw: Fix passive connection establishment
  RDMA/cma: Teach lockdep about the order of rtnl and lock
  RDMA/ucma: Put a lock around every call to the rdma_cm layer
  include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap
  ceph: canonicalize server path in place
  ceph: remove the extra slashes in the server path
  ARM: imx: only select ARM_ERRATA_814220 for ARMv7-A
  ARM: imx: Enable ARM_ERRATA_814220 for i.MX6UL and i.MX7D
  IB/mlx5: Replace tunnel mpls capability bits for tunnel_offloads
  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
  platform/x86: intel_int0002_vgpio: Use acpi_register_wakeup_handler()
  ACPI: PM: Add acpi_[un]register_wakeup_handler()
  hwrng: imx-rngc - fix an error path
  tools/accounting/getdelays.c: fix netlink attribute length
  slub: improve bit diffusion for freelist ptr obfuscation
  uapi: rename ext2_swab() to swab() and share globally in swab.h
  usb: dwc3: gadget: Wrap around when skip TRBs
  random: always use batched entropy for get_random_u{32,64}
  s390: prevent leaking kernel address in BEAR
  r8169: change back SG and TSO to be disabled by default
  mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE
  tun: Don't put_page() for all negative return values from XDP program
  slcan: Don't transmit uninitialized stack data in padding
  net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting
  net_sched: fix a missing refcnt in tcindex_init()
  net_sched: add a temporary refcnt for struct tcindex_data
  net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers
  net: dsa: mt7530: fix null pointer dereferencing in port5 setup
  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
  cxgb4: fix MPS index overwrite when setting MAC address
  net: phy: realtek: fix handling of RTL8105e-integrated PHY
  ANDROID: ABI/Whitelist: add display whitelist to unisoc whitelist
  ANDROID: Kconfig.gki Add SND_SOC_TOPOLOGY
  ANDROID: GKI: enable CONFIG_ARM_PSCI_CPUIDLE
  ANDROID: power: wakeup_reason: wake reason enhancements
  UPSTREAM: cpufreq: Make cpufreq_global_kobject static
  ANDROID: staging: ion: implement vmap for built-in heaps
  ANDROID: KABI: Update kABI after dropping CONFIG_PCIEPORTBUS from gki_defconfig
  ANDROID: gki_defconfig: Drop CONFIG_PCIEPORTBUS
  FROMLIST: power_supply: Add additional health properties to the header
  UPSTREAM: power: supply: core: Update sysfs-class-power ABI document
  ANDROID: GKI: update ABI for mmc changes
  UPSTREAM: mmc: sdhci-sprd: Set the missing MMC_CAP_WAIT_WHILE_BUSY flag
  UPSTREAM: mmc: host: hsq: Add missing MODULE_LICENSE() and MODULE_DESCRIPTION()
  UPSTREAM: mmc: host: sdhci-sprd: Add software queue support
  UPSTREAM: mmc: host: sdhci: Add a variable to defer to complete requests if needed
  UPSTREAM: mmc: host: sdhci: Add request_done ops for struct sdhci_ops
  UPSTREAM: mmc: core: Enable the MMC host software queue for the SD card
  UPSTREAM: mmc: Add MMC host software queue support
  FROMGIT: kbuild: mkcompile_h: Include $LD version in /proc/version
  ANDROID: ignore compiler tag __must_check for GENKSYMS
  UPSTREAM: mfd: sc27xx: Add USB charger type detection support
  UPSTREAM: Revert "gpio: eic-sprd: Use devm_platform_ioremap_resource()"
  UPSTREAM: pinctrl: sprd: Add pin high impedance mode support
  UPSTREAM: pinctrl: sprd: Use the correct pin output configuration
  UPSTREAM: nvmem: sprd: Determine double data programming from device data
  UPSTREAM: nvmem: sprd: Optimize the block lock operation
  UPSTREAM: nvmem: sprd: Fix the block lock operation
  UPSTREAM: dmaengine: sprd: Set request pending flag when DMA controller is active
  Linux 5.4.31
  mm: mempolicy: require at least one nodeid for MPOL_PREFERRED
  padata: always acquire cpu_hotplug_lock before pinst->lock
  net: Fix Tx hash bound checking
  i2c: i801: Do not add ICH_RES_IO_SMI for the iTCO_wdt device
  watchdog: iTCO_wdt: Make ICH_RES_IO_SMI optional
  watchdog: iTCO_wdt: Export vendorsupport
  tcp: fix TFO SYNACK undo to avoid double-timestamp-undo
  IB/hfi1: Ensure pq is not left on waitlist
  rxrpc: Fix sendmsg(MSG_WAITALL) handling
  iwlwifi: dbg: don't abort if sending DBGC_SUSPEND_RESUME fails
  iwlwifi: yoyo: don't add TLV offset when reading FIFOs
  iwlwifi: consider HE capability when setting LDPC
  net/mlx5e: kTLS, Fix wrong value in record tracker enum
  soc: mediatek: knows_txdone needs to be set in Mediatek CMDQ helper
  ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard
  Revert "dm: always call blk_queue_split() in dm_process_bio()"
  power: supply: axp288_charger: Add special handling for HP Pavilion x2 10
  extcon: axp288: Add wakeup support
  nvmem: check for NULL reg_read and reg_write before dereferencing
  mei: me: add cedar fork device ids
  coresight: do not use the BIT() macro in the UAPI header
  PCI: sysfs: Revert "rescan" file renames
  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
  brcmfmac: abort and release host after error
  padata: fix uninitialized return value in padata_replace()
  XArray: Fix xa_find_next for large multi-index entries
  net/mlx5e: kTLS, Fix TCP seq off-by-1 issue in TX resync flow
  tools/power turbostat: Fix 32-bit capabilities warning
  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
  kconfig: introduce m32-flag and m64-flag
  nvme-rdma: Avoid double freeing of async event data
  ANDROID: GKI: update ABI for SCHED_AUTOGROUP removal
  ANDROID: GKI: Remove SCHED_AUTOGROUP
  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: defconfig: modify debug configs
  ANDROID: kbuild: ensure __cfi_check is correctly aligned
  FROMLIST: kmod: make request_module() return an error when autoloading is disabled
  UPSTREAM: loop: Only freeze block queue when needed.
  UPSTREAM: loop: Only change blocksize when needed.
  ANDROID: GKI: Fix ABI for CMA page allocation
  ANDROID: GKI: mm: add cma pcp list
  ANDROID: GKI: cma: redirect page allocation to CMA
  ANDROID: Fix wq fp check for CFI builds
  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
  UPSTREAM: sched/rt: cpupri_find: Trigger a full search as fallback
  UPSTREAM: sched/rt: Remove unnecessary push for unfit tasks
  UPSTREAM: sched/rt: Allow pulling unfitting task
  UPSTREAM: sched/rt: Optimize cpupri_find() on non-heterogenous systems
  UPSTREAM: sched/rt: Re-instate old behavior in select_task_rq_rt()
  UPSTREAM: sched/rt: cpupri_find: Implement fallback mechanism for !fit case
  ANDROID: staging: ion: move definition of attachment
  ANDROID: Incremental fs: Fix four resource bugs
  ANDROID: GKI: Removed cuttlefish configs

Conflicts:
	drivers/base/power/wakeup.c
	drivers/irqchip/irq-gic-v3.c
	include/linux/gfp.h
	include/linux/highmem.h
	include/linux/mmc/host.h
	include/linux/mmzone.h
	include/uapi/linux/coresight-stm.h
	kernel/sched/cpupri.c
	kernel/sched/rt.c
	mm/page_alloc.c
	scripts/module-lto.lds.S

Change-Id: I1845fe7d1d0cd48d91f689565324a794b1a29f10
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2020-06-24 11:39:32 -07:00
qctecmdr
8be0640752 Merge "net: qrtr: ns: Add ipc logging to ns" 2020-06-22 20:50:37 -07:00
qctecmdr
a9e028c82c Merge "ANDROID: kbuild: ensure __cfi_check is correctly aligned" 2020-06-22 20:50:37 -07:00
qctecmdr
5f30feb7a6 Merge "sched: use wake_q length only when WALT is enabled" 2020-06-22 20:50:36 -07:00
qctecmdr
a543b4c83b Merge "drivers: soc: Add devcoredump based ramdump APIs" 2020-06-22 18:20:36 -07:00
qctecmdr
888edf7bb4 Merge "clk: qcom: lahaina: Lucid PLL 5LPE config and frequency plan update" 2020-06-22 18:20:36 -07:00
Jeevan Shriram
7bd4f1b732 sched: use wake_q length only when WALT is enabled
Upstream commit aa8b37baac ("FROMLIST: sched/fair: Use wake_q
length as a hint for wake_wide") that is being carried in msm-5.4
kernel caused CRC checks failures when GKI boot image is used for
verification as the commit adds extra argument to select_task_rq().
Fix this issue by wrapping extra argument under CONFIG_SCHED_WALT.

Change-Id: Ie41a36a334efbcd2030f7c3caee31883ee84718e
Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>
2020-06-22 17:33:30 -07:00
qctecmdr
6a5a6eb724 Merge "usb: gadget: Fix double free of device descriptor pointers" 2020-06-22 15:53:18 -07:00
Jay Jayanna
65b0fd0c9a net: qrtr: ns: Add ipc logging to ns
Log packets processed by ns using ipc logging framework.

Change-Id: I08e9b8551efb4a58cf899835cfac25c1952bd4b8
Signed-off-by: Jay Jayanna <jayanna@codeaurora.org>
2020-06-22 15:10:14 -07:00
qctecmdr
3ddd3c6ec2 Merge "cnss2: Add synchronized force wake support" 2020-06-22 04:57:01 -07:00
qctecmdr
cfd44d03d1 Merge "ABI: Add cnss2 symbol" 2020-06-22 04:57:00 -07:00
qctecmdr
589098c6c2 Merge "clk: qcom: gcc: Make gcc_ddrss_gpu_axi_clk as always ON" 2020-06-22 04:57:00 -07:00
qctecmdr
699da85287 Merge "clk: qcom: alpha-pll: Add odd/even support for Trion PLL" 2020-06-22 04:57:00 -07:00
qctecmdr
6eb808b19f Merge "defconfig: arm64: Enable SMD-RPM clock for HOLI" 2020-06-22 04:56:59 -07:00
qctecmdr
81da2f2a77 Merge "pinctrl: qcom: Expose ufs_reset as gpio on holi" 2020-06-22 04:56:59 -07:00
Taniya Das
750833aa7e defconfig: arm64: Enable SMD-RPM clock for HOLI
HOLI requires the SMD-RPM clocks for the clocks dependent on RPM.

Change-Id: I69309227b99b2ff49542b9d3a355490aa1d6702c
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2020-06-22 10:45:37 +05:30
Taniya Das
8abaf48b20 clk: qcom: clk-smd-rpm: Refactor the code for HOLI
Add support for RPM-SMD and PMIC clocks for HOLI which are required for
the clients to enable/disable.

Change-Id: Ic00f84760f2bc2c4ec4521a4b5abebb5788127ca
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2020-06-22 10:45:10 +05:30
Nitin Rawat
b46eae7dad pinctrl: qcom: Expose ufs_reset as gpio on holi
The ufs_reset pin is expected to be wired to the reset pin of the
primary UFS memory but is pretty much just a general purpose output pin.
Reorder the pins and expose it as gpio 156, so that the UFS driver can
toggle it.

Change-Id: I566196bd2ab6629c2761b47ed844022cf9ffb458
Signed-off-by: Nitin Rawat <nitirawa@codeaurora.org>
2020-06-22 02:47:47 +05:30
qctecmdr
ead4c53fbb Merge "bluetooth: fix the gpio names in devicetree" 2020-06-21 11:17:28 -07:00
qctecmdr
b22d0ea027 Merge "arm64: defconfig: Enable CONFIG_PSI_FTRACE on Lahaina" 2020-06-20 13:12:14 -07:00
qctecmdr
d5bf014032 Merge "sched/walt: Improve the scheduler" 2020-06-20 10:46:39 -07:00
Hemant Kumar
fc3b874e7c usb: gadget: Fix double free of device descriptor pointers
Upon driver unbind usb_free_all_descriptors() function frees all
speed descriptor pointers without setting them to NULL. In case
gadget speed changes (i.e from super speed plus to super speed)
after driver unbind only upto super speed descriptor pointers get
populated. Super speed plus desc still holds the stale (already
freed) pointer. As a result next composition switch results into
double free of super speed plus descriptor. Fix this issue by
setting all descriptor pointers to NULL after freeing them in
usb_free_all_descriptors(). Also clean up gsi_unbind() which is
setting up descriptor pointers to NULL already.

Change-Id: I4f28294c165bb3b5dc9feb4f22d819f527ad4d50
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2020-06-19 18:50:58 -07:00
Mayank Rana
37084ff13d dwc3: gadget: Separate out top and bottom half based logging
Currently USB top and bottom half are using same index to update
number of events posted/handled, and updating relevant time. As
top half is not guaranteed to be prevented when bottom half is
running those index based logging doesn't allow to relate information.
Also start logging bh_start_time and increase existing buffer size
from 10 to 25 to get more data of USB interrupt processing.

Also get count how many cancelled requqest being given back from
bottom half context, and log any update/start cmd failure.

Change-Id: Iefc883cb5a2259f256f30c9727db8a68ddd41af7
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2020-06-19 18:15:41 -07:00
Pavankumar Kondeti
82fea0f9dc sched/walt: Improve the scheduler
This change is for general scheduler improvements.

Change-Id: I80606a09c3d09c65b7bcdf3940bee5e155d6318c
Co-developed-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
[satyap@codeaurora.org: fix trivial merge conflicts]
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2020-06-19 10:14:20 -07:00
Pavankumar Kondeti
961c3a5fc3 sched/walt: Improve the scheduler
This change is for general scheduler improvements.

Change-Id: Ica36bb6ccd4c2d8897dab62614eadb5a060d5390
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2020-06-19 10:14:11 -07:00
Pavankumar Kondeti
d0a6a9b767 sched/walt: Improve the scheduler
This change is for general scheduler improvements.

Change-Id: I5f19453ec1a19c71d67a02c3f0ec9967e7673a4b
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
[satyap@codeaurora.org: fix trivial merge conflicts]
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2020-06-19 10:14:07 -07:00
Pavankumar Kondeti
b1250b5cf6 sched: Improve the scheduler
This change is for general scheduler improvements.

Change-Id: I3a220142f08a9664845b4d0e9918ec7c48bb11f7
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2020-06-19 10:14:01 -07:00
qctecmdr
04fda4c2c5 Merge "coresight: tpdm: add an option "qcom,cmb-msr-skip" for tpdm" 2020-06-19 09:50:06 -07:00
qctecmdr
61b129b0a6 Merge "taskstats: remove redundant MM_STAT config check" 2020-06-19 09:50:06 -07:00
qctecmdr
e399dc502d Merge "net: qrtr: Add tracepoint support" 2020-06-19 09:50:06 -07:00
qctecmdr
30e36e954d Merge "net: qrtr: haven: Add svm device tree parsing" 2020-06-19 09:50:06 -07:00
qctecmdr
e10b49be7b Merge "coresight: tmc-etr: Fix deadlock issue while reading from ETR" 2020-06-19 09:50:05 -07:00
qctecmdr
6c409bb596 Merge "coresight: byte-cnter: Replace dev_err with ratelimited API" 2020-06-19 09:50:05 -07:00
Isaac J. Manjarres
e0237ca515 arm64: defconfig: Enable CONFIG_PSI_FTRACE on Lahaina
Enable PSI ftrace logging to collect ftrace information about
PSI events.

Change-Id: Ia4d786f5cbc242991fd0e0ecdb63d16714bffeb8
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-06-19 09:41:58 -07:00
Yuanfang Zhang
1f9a3b55de coresight: tpdm: add an option "qcom,cmb-msr-skip" for tpdm
Some tpdm don't support cmb msr, add an option "qcom,cmb-msr-skip"
to indicate whether MSR is supported.

Change-Id: I8ae66e639fe68b236ad8a268b18acbda737a9d93
Signed-off-by: Yuanfang Zhang <zhangyuanfang@codeaurora.org>
2020-06-19 14:00:57 +08:00
Lin Bai
81faa0846d ABI: Add cnss2 symbol
New CNSS2 symbol introduced for CLD build.

Change-Id: Ic7700f07417172c679ec3da19dcca268106fea67
Signed-off-by: Lin Bai <lbai@codeaurora.org>
2020-06-19 11:51:20 +08:00
qctecmdr
b982c53bc3 Merge "usb: dwc3: trace: print enqueue/dequeue pointers too" 2020-06-18 18:45:15 -07:00
qctecmdr
b0380a354f Merge "power: supply: qti_battery_charger: support wireless firmware update" 2020-06-18 18:45:15 -07:00
qctecmdr
0a28c83f4e Merge "defconfig: Add support for compiling sdxlemur target" 2020-06-18 18:45:15 -07:00
qctecmdr
2f2ac06609 Merge "USB: f_accessory: Set manufacturer and model string to default value" 2020-06-18 18:45:14 -07:00
qctecmdr
eaba670acb Merge "mmc: sdhci-msm: Ensure SD card power isn't ON when card removed" 2020-06-18 18:45:14 -07:00
qctecmdr
4bc6723b0c Merge "net: qrtr: haven: Read peer name from device tree" 2020-06-18 15:30:54 -07:00
Umesh Vats
46738d8f90 bluetooth: fix the gpio names in devicetree
Fixed the names of the SW_CTRL and Debug GPIOs in devicetree.

Change-Id: Ibdcc1164cd88a65fe5b33927f2b0f0098c15af1f
Signed-off-by: Umesh Vats <uvats@codeaurora.org>
2020-06-18 15:29:01 -07:00
qctecmdr
4f34190efb Merge "driver: pinctrl: Add reserved GPIOs for Shima" 2020-06-18 10:42:14 -07:00
qctecmdr
bac8eddf4a Merge "defconfig: arm64: Enable SDPM clock monitor for Lahaina" 2020-06-18 10:42:14 -07:00
qctecmdr
0a1e159645 Merge "defconfig: lahaina: Enable LIMIT_MOVABLE_ZONE_ALLOC" 2020-06-18 10:42:14 -07:00
qctecmdr
a91e5519be Merge "usb: dwc3: gadget: Remove unnecessary checks" 2020-06-18 10:42:13 -07:00
qctecmdr
b84282aee9 Merge "mm: process_reclaim: consider compound pages" 2020-06-18 07:41:45 -07:00
qctecmdr
9d579d774a Merge "pinctrl: qcom: Update configuration for Shima" 2020-06-18 07:41:44 -07:00
Mukesh Ojha
5a08ead3da driver: pinctrl: Add reserved GPIOs for Shima
Certain GPIOs are reserved for secure world and cannot be accessed by HLOS.
Supply "reserved_gpios" to msm_pinctrl to mark these pins as invalid.

Change-Id: Ic8f45181b2210a6295bba1bdec45d24e607bede9
Signed-off-by: Mukesh Ojha <mojha@codeaurora.org>
2020-06-18 05:10:51 -07:00