Commit graph

889,574 commits

Author SHA1 Message Date
Martijn Coenen
ff939413a7 ANDROID: GKI: enable CONFIG_EXT4_FS_POSIX_ACL.
This is required on devices without sdcardfs.

Bug: 158733532
Test: manual
Change-Id: I21d6ee488b7e4a094260cffc654a4c9dc3392081
Signed-off-by: Martijn Coenen <maco@google.com>
2020-06-15 22:31:08 +00:00
Yu SI
db1e19beb1 msm: cvp:fix potential null ptr dereference msghdr
fix potential null ptr dereference on cvp_hfi_msg_session_hdr
ptr hdr if out is NULL.

Change-Id: Ic2c35ddc4438312cb03f0f346e27d0c0b631b95a
Signed-off-by: Yu SI <ysi@codeaurora.org>
2020-06-15 14:43:32 -07:00
Jordan Crouse
455046da21 msm: kgsl: Move RGMU to the a6xx target specific space
Much like the GMU code, the GMU code belongs in the a6xx target specific
space. Luckily, it is a lot easier to move. Move everything to
adreno_a6xx_rgmu.[ch] and rename the functions and structs.

Change-Id: Ic0dedbadf9f16f458f1cb1e540960a074464b348
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2020-06-15 15:37:29 -06:00
Jordan Crouse
4c11fb7793 msm: kgsl: Finish the GMU transition to a6xx
Finish the transition of the GMU code to a6xx. Rename the gmu_device to
a6xx_gmu_device and move the header files. All GMU code should now exist
entirely in the a6xx domain.

Change-Id: Ic0dedbad3640906599421373bef38217fafbf6dc
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2020-06-15 15:37:28 -06:00
Jordan Crouse
78ad235209 msm: kgsl: Move HFI to the a6xx space
The next step in the GMU transition is to move HFI to a6xx target specific
code. Rename the file, functions and kgsl_hfi struct.

Change-Id: Ic0dedbad7efcda12f03fbd37bb2267296ee7a5ac
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2020-06-15 15:37:27 -06:00
Jordan Crouse
c359b1dd27 msm: kgsl: Make all GMU code target specific
Move all the GMU code to a6xx target specific code. This is the first in
several steps to make the GMU code more modular and flexibile for
various usecases.

Change-Id: Ic0dedbad0e70771c301705a0eb4ed422efb4c80a
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2020-06-15 15:37:25 -06:00
Jordan Crouse
3c09b03d0c msm: kgsl: Remove gmu_core_regulator_isenabled()
Commit 0d44684cab ("msm: kgsl: Take GMU snapshot on GMU failures")
removed the only usage of gmu_core_regulator_isenabled().

Change-Id: Ic0dedbadb40e1faed4a9e0629e9d0babb718f6b3
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2020-06-15 15:37:23 -06:00
Jordan Crouse
4d0eb9d995 msm: kgsl: Add a6xx probe function
Add the a6xx specific probe function. With this we no longer
need the generic helper nor the platform_setup function so
they can be removed.

Change-Id: Ic0dedbadd317f8489f8451541dbb77a76c925719
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2020-06-15 15:37:22 -06:00
Jordan Crouse
f86d4770a8 msm: kgsl: Add a5xx probe function
Add the a5xx specific probe function.

Change-Id: Ic0dedbad38737fdea9e6f34dd791200e9e477ca7
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2020-06-15 15:37:21 -06:00
Jordan Crouse
2561b2928e msm: kgsl: Add a3xx probe function
Add a target specific function for a3xx probe and create a helper
function to set up the register offset array.

Change-Id: Ic0dedbad2f8f54ee2635da3cb8256fce531ab8dd
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2020-06-15 15:37:20 -06:00
Jordan Crouse
c96f021616 msm: kgsl: Add target specific probe functions
Add support for target specific probe functions to give individual
targets the flexibility to define their own device structs and do
other target specific setup that doesn't belong in the generic init.
To start all targets use a common helper probe function but that
is expected to change soon.

Change-Id: Ic0dedbad9e159be724368c7d2a496af151226cc0
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2020-06-15 15:37:20 -06:00
Jaegeuk Kim
5ad12102f2 Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4-stable
* aosp/upstream-f2fs-stable-linux-5.4.y:
  f2fs: attach IO flags to the missing cases
  f2fs: add node_io_flag for bio flags likewise data_io_flag
  f2fs: remove unused parameter of f2fs_put_rpages_mapping()
  f2fs: handle readonly filesystem in f2fs_ioc_shutdown()
  f2fs: avoid utf8_strncasecmp() with unstable name
  f2fs: don't return vmalloc() memory from f2fs_kmalloc()
  f2fs: fix retry logic in f2fs_write_cache_pages()
  f2fs: fix wrong discard space
  f2fs: compress: don't compress any datas after cp stop
  f2fs: remove unneeded return value of __insert_discard_tree()
  f2fs: fix wrong value of tracepoint parameter
  f2fs: protect new segment allocation in expand_inode_data
  f2fs: code cleanup by removing ifdef macro surrounding
  writeback: Avoid skipping inode writeback
  f2fs: avoid inifinite loop to wait for flushing node pages at cp_error
  f2fs: compress: fix zstd data corruption
  f2fs: add compressed/gc data read IO stat
  f2fs: fix potential use-after-free issue
  f2fs: compress: don't handle non-compressed data in workqueue
  f2fs: remove redundant assignment to variable err
  f2fs: refactor resize_fs to avoid meta updates in progress
  f2fs: use round_up to enhance calculation
  f2fs: introduce F2FS_IOC_RESERVE_COMPRESS_BLOCKS
  f2fs: Avoid double lock for cp_rwsem during checkpoint
  f2fs: report delalloc reserve as non-free in statfs for project quota
  f2fs: Fix wrong stub helper update_sit_info
  f2fs: compress: let lz4 compressor handle output buffer budget properly
  f2fs: remove blk_plugging in block_operations
  f2fs: introduce F2FS_IOC_RELEASE_COMPRESS_BLOCKS
  f2fs: shrink spinlock coverage
  f2fs: correctly fix the parent inode number during fsync()
  f2fs: compress: support lzo-rle compress algorithm
  f2fs: introduce mempool for {,de}compress intermediate page allocation
  f2fs: introduce f2fs_bmap_compress()
  f2fs: support fiemap on compressed inode
  f2fs: support partial truncation on compressed inode
  f2fs: remove redundant compress inode check
  f2fs: use strcmp() in parse_options()
  f2fs: Use the correct style for SPDX License Identifier

 Conflicts:
	fs/f2fs/data.c
	fs/f2fs/dir.c

Bug: 154167995
Change-Id: I04ec97a9cafef2d7b8736f36a2a8d244965cae9a
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2020-06-15 13:22:44 -07:00
Trilok Soni
240299db4d scripts: headers_install: Turn CONFIG_* leak checker to report error
By default CONFIG_* user-space leak checker marks it as warning but
we should mark them as error so that we can catch such usage at the
compile time itself.

Change-Id: I5f14f7f881e46843f2e0cc0957fc0b730e76aa93
Signed-off-by: Trilok Soni <tsoni@codeaurora.org>
2020-06-15 12:37:25 -07:00
Trilok Soni
d14b0a93fa scripts: headers_install: Add sysstats.h and taskstats.h into the bypass list
Add sysstats.h taskstats.h into the temporary bypass list. It should be removed
later once the CONFIG_* checks gets merged.

CRs-Fixed: 2664401
Change-Id: Icfedb19b22dcf59d4ae0e8d7bd9fddfc762d9731
Signed-off-by: Trilok Soni <tsoni@codeaurora.org>
2020-06-15 12:36:28 -07:00
Manivannan Sadhasivam
609ac800d9 net: qrtr: Add tracepoint support
Add tracepoint support for QRTR with NS as the first candidate. Later on
this can be extended to core QRTR and transport drivers.

The trace_printk() used in NS has been replaced by tracepoints.

Change-Id: I9211c53cd8832e7438de7c244fa5d6528706347f
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-commit: dfddb54043f0a377f642bd0e6a28aa40769e2e65
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Chris Lew <clew@codeaurora.org>
2020-06-15 12:05:31 -07:00
Vijayavardhan Vennapusa
423f1612eb USB: f_accessory: Set manufacturer and model string to default value
Currently USB driver is resetting strings like manufacturer, model
to zero as part of handling control request for protocol version. Some
accessory docks may not send manufacturer and model strings before sending
control request to enable audiosource USB composition. This results in
userspace enabling audio source composition without accessory interface.
If accessory dock is connected during bootup, accessory timeouts in
configuring android device and results in detection failure. Userspace does
have recovery mechanism if incase accessory dock timeouts to configure
android device in accessory composition. Hence set manufacturer and model
strings to default value so that userspace enables accessory + audiosource
composition for userspace recovery to be working and detecting accessory
dock successfully during bootup.

Change-Id: Ibe4dd9d951a9615ae100e68dc15b3614e9834848
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2020-06-15 11:44:03 -07:00
Asutosh Das
ab3e3b4bed scsi: ufs: Fixes line-reset and adapt sequence
Fix adapt sequence for G4 and don't dump registers
on Line-reset.

Change-Id: Ibbe09d75c1655d2400878305e7b38e7e2f744e52
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
2020-06-15 11:39:09 -07:00
Alistair Delva
11e8c6dc44 ANDROID: arch: arm: Increase kernel command line size
Android passes a lot of arguments via kernel command line.
Current kernel command line is close to limit on a lot of devices.

Increase kernel command line size to avoid cases when arguments
are trimmed.

Bug: 158450572
Change-Id: I998ce98b4d875e8bb435ba1dfd84d94506ac0319
Signed-off-by: Alistair Delva <adelva@google.com>
2020-06-15 17:18:50 +00:00
Syuan Yang
7039f35498 ANDROID: arch: arm64: Increase kernel command line size
Android passes a lot of arguments via kernel command line.
Current kernel command line is close to limit on a lot of devices.

Increase kernel command line size to avoid cases when arguments
are trimmed.

Bug: 120817253
Change-Id: I18fc3a066273718fce021d85ca31e3f755706a13
Signed-off-by: Syuan Yang <syuanyang@google.com>
2020-06-15 17:18:43 +00:00
qctecmdr
bbc7f2d3ed Merge "ion: Add support for the display non-secure CMA heap" 2020-06-15 09:59:41 -07:00
qctecmdr
46c87ffa77 Merge "msm: kgsl: Use BW_STEP as 50 for AB voting" 2020-06-15 09:59:40 -07:00
qctecmdr
57af170498 Merge "arm64: enable internal regdb for lahaina" 2020-06-15 09:59:40 -07:00
qctecmdr
0dce8a9d5e Merge "Use data format as unspecified for voice" 2020-06-15 09:59:40 -07:00
Gaurav Kashyap
9e7a7ecdc7 ANDROID: scsi: ufs: Handle clocks when lrbp fails
Release UFS clocks when ufshcd_prepare_lrbp_crypto fails
for any reason.
Bug: 157284579.

Change-Id: I1dd28ffea9379b58c55a948a6365e0b153249516
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Gaurav Kashyap <gaurkash@codeaurora.org>
2020-06-15 09:32:17 -07:00
Satish Kodishala
30b53d277a Use data format as unspecified for voice
For voice usecases, while opening the slimbus
slave ports, currently data format LPCM(1) is used.
SB master uses data format as unspecified(0). SB master's
data format overwrites the slave side configuration.
In the rare cases, this mismatch may lead to pop sound
in SCO Tx(BT FW->LPASS) at the very beginning when
voice is switched from speaker/handset to BT from call UI.
To fix this, use the data format as unspecified during
opening of the slimbus slave ports for voice cases.

CRs-Fixed: 2710472
Change-Id: Ia9b1d23cbf04d1b8056d7b7f7c84a066437e1682
Signed-off-by: Satish Kodishala <skodisha@codeaurora.org>
2020-06-15 07:12:03 -07:00
Maciej Żenczykowski
705e3783b7 ANDROID: net: bpf: permit redirect from ingress L3 to egress L2 devices at near max mtu
__bpf_skb_max_len(skb) is used from:
  bpf_skb_adjust_room
  __bpf_skb_change_tail
  __bpf_skb_change_head

but in the case of forwarding we're likely calling these functions
during receive processing on ingress and bpf_redirect()'ing at
a later point in time to egress on another interface, thus these
mtu checks are for the wrong device (input instead of output).

This is particularly problematic if we're receiving on an L3 1500 mtu
cellular interface, trying to add an L2 header and forwarding to
an L3 mtu 1500 mtu wifi/ethernet device (which is thus L2 1514).

The mtu check prevents us from adding the 14 byte ethernet header prior
to forwarding the packet.

After the packet has already been redirected, we'd need to add
an additional 2nd ebpf program on the target device's egress tc hook,
but then we'd also see non-redirected traffic and have no easy
way to tell apart normal egress with ethernet header packets
from forwarded ethernet headerless packets.

Link: https://patchwork.ozlabs.org/project/netdev/patch/20200507023606.111650-1-zenczykowski@gmail.com/
But note that a more thorough solution will be pursued.

CRs-Fixed: 2662725
Bug: 149816401
Change-Id: If55a144d7822e23bce85f65897bca7de4e0f9b24
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Git-commit: af2b56c502d697a237757aa36b5d5523b29702fa
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-06-15 08:09:10 -06:00
qctecmdr
19a5a7fa3b Merge "iommu: arm-smmu: Add support for new attributes" 2020-06-15 06:15:40 -07:00
qctecmdr
df997bf3be Merge "cnss2: Ignore debugfs non availability during init" 2020-06-15 06:15:39 -07:00
qctecmdr
766387ed99 Merge "power: qti_battery_charger: call power_supply_changed() if fake_soc is set" 2020-06-15 06:15:39 -07:00
qctecmdr
c8bbc5bda6 Merge "msm: kgsl: Enable IFPC on A660 target" 2020-06-15 06:15:39 -07:00
qctecmdr
9a94640833 Merge "lib: stackdepot: Add support to configure STACK_HASH_SIZE" 2020-06-15 06:15:38 -07:00
qctecmdr
da16bbb59f Merge "soc: qcom: mem-buf: Add support for consumers to import dma-bufs" 2020-06-15 06:15:37 -07:00
qctecmdr
514fa165a3 Merge "taskstats: handle NULL nla case in taskstats2" 2020-06-15 02:08:40 -07:00
qctecmdr
3309ec470b Merge "clk: qcom: videocc: Update frequency table of video_cc_mvs0_clk_src" 2020-06-15 02:08:39 -07:00
qctecmdr
1806fc87aa Merge "ABI: Update internal whitelist with debugfs symbols" 2020-06-15 02:08:39 -07:00
qctecmdr
5655d2b2cc Merge "genirq/cpuhotplug: Reduce logging level for couple of prints" 2020-06-15 02:08:39 -07:00
qctecmdr
eac6ffcdf1 Merge "uapi: sound: add support for TTP render mode" 2020-06-15 02:08:38 -07:00
qctecmdr
c122110c39 Merge "build.config: Add build.config files for Lahaina" 2020-06-15 02:08:38 -07:00
qctecmdr
8b9a1aa61f Merge "dma-mapping-fast: reduce TLBI during map" 2020-06-15 02:08:38 -07:00
qctecmdr
1b86a92815 Merge "scsi: ufs-qcom: Remove unnecessary devm_kfree" 2020-06-15 02:08:37 -07:00
Deepak Kumar
04ec9fc196 msm: kgsl: Use BW_STEP as 50 for AB voting
AB voting is done in multiples of BW_STEP. Using a big
BW_STEP can result in AB overvoting because of roundup.
Use BW_STEP as 50 instead of 160. This will reduce AB
overvoting and will improve power.

Change-Id: Ieff338685be9650218fd7accc4ed3bcf0d2756ec
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
2020-06-15 13:03:22 +05:30
qctecmdr
acc5971e09 Merge "mmc: sdhci_msm: keep a reference to the sdhc host instance" 2020-06-14 20:37:55 -07:00
qctecmdr
773bbee1f1 Merge "msm: kgsl: PERFCNTR_CTRL needs to be at end of restore list" 2020-06-14 20:37:55 -07:00
qctecmdr
978ed221d8 Merge "qcom: whitelist: Remove symbol from whitelist" 2020-06-14 20:37:54 -07:00
qctecmdr
a925659342 Merge "msm: synx: default user callback fix" 2020-06-14 20:37:54 -07:00
qctecmdr
acaddaaadd Merge "defconfig: Update initial defconfig fragments for Holi" 2020-06-14 20:37:54 -07:00
qctecmdr
55235dfe2c Merge "pci: controller: msm: Remove support for loopback" 2020-06-14 20:37:54 -07:00
Meng Wang
abe8606bca Revert "ALSA: PCM: volume API implementation"
This reverts commit a1682a646a.
This change has been moved out of ASoC framework.

Change-Id: I9903cace676569d3d045760a77a864687e402bb9
Signed-off-by: Meng Wang <mengw@codeaurora.org>
2020-06-15 07:51:28 +08:00
qctecmdr
e69d2cded7 Merge "ABI: Update rmnet_ctl symbols" 2020-06-14 11:32:34 -07:00
qctecmdr
cdfa64e6ac Merge "arm64: defconfig: enable USB redriver on Lahaina QRD" 2020-06-14 11:32:34 -07:00