Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[LA.UM.7.1.r1] Merge tag 'LA.UM.7.1.r1-16300-sm8150.0' #2156

Open
wants to merge 30 commits into
base: aosp/LA.UM.7.1.r1
Choose a base branch
from
Open

[LA.UM.7.1.r1] Merge tag 'LA.UM.7.1.r1-16300-sm8150.0' #2156

wants to merge 30 commits into from

Conversation

tomgus1
Copy link

@tomgus1 tomgus1 commented Jan 8, 2020

PLEASE BUILD AND TEST

Sahil Chandna and others added 29 commits July 7, 2019 23:48
power: qpnp-fg: qpnp-qg: fg-alg: Improve code readability of TTF algo…
86cee62 
…rithm

For voltage based step charging, used in TTF algorithm, improve the code
readability by changing ttf_mode from TTF_MODE_V_STEP_CHG to
TTF_MODE_VBAT_STEP_CHG.

Change-Id: Ia3b7dd0f2fc1b354c5afaa745c1117719fb9df66
Signed-off-by: Sahil Chandna <chandna@codeaurora.org>
drm/msm/sde: avoid connector state mode update in commit thread
60aae8c 
There is a race condition where connector state mode info is updated
in sde_encoder_virt_mode_set in crtc_commit thread and mode info
getting copied to new connector state in connector_atomic_duplicate_state
in hwbinder thread. This is causing new connector state to be in
invalid state leading to wrong dsc config and further leading
to ping pong timeouts.
Removed connector state mode info update in crtc_commit thread as
connector state mode info is updated in mode_fixup and does not need
updation in sde_encoder_virt_mode_set in crtc_commit thread.

Change-Id: Idb05948f7ad0a6af9846a7e1e90c7f934a072815
Signed-off-by: Jayaprakash <jmadiset@codeaurora.org>
Merge commit '40c77ca69b266c88ebbfdfdf806ed3033f40840e' into dev/msm-…
abf5597 
…4.14.c2-display

* commit '40c77ca69b266c88ebbfdfdf806ed3033f40840e':
  cpufreq: schedutil: Fix for limits update with fast switch enabled
  cpufreq: schedutil: Add fast switch to sugov_limits path
  soc: qcom: wda: Disable powersave work on deinitialization
  msm: kgsl: Change data type for GPU ib vote
  disp: msm: sde: add SSPP CP features to dirty list during IPC
  msm: ipa3: Fix to recycle buffers
  diag: Prevent using uninitialized mdlog session mask
  msm: kgsl: Ignore rgmu disable GDSC error
  power: smb5-lib: Report liquid presence status
  msm: kgsl: Add missing check for snapshot IB dump
  msm: kgsl: Snapshot all GMU memory blocks
  msm: kgsl: Snapshot GMU TCM registers separetely
  net: qrtr: mhi: Register for early notifications
  msm: kgsl: Fix drawqueue timer race condition
  msm: kgsl: Ensure GMU memory regions don't leak memory
  msm: kgsl: Update GMU snapshot section IDs
  ARM: dts: msm: Update GPU snapshot size
  msm: kgsl: Omit referencing pointers in traces
  arm64/iommu: handle atomic pool addresses in ->get_sgtable and ->mmap
  arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable
  ARM: dts: msm: register IPCR for early MHI notification
  mhi: cntrl: qcom: register for early error fatal notification
  mhi: core: add support for early error notifications
  diag: Update diag get log request structure
  msm: kgsl: Change throttling counter weight from 15% to 5%
  NFC: Fix device node probing issue
  mhi: core: add missing macro for MHI device vote
  msm: kgsl: show max gpu temperature
  soc: qcom: qmi_interface: Remove ineffective mutex lock from txn struct
  soc: qcom: qmi_interface: use qmi txn_lock to avoid use after free of txn
  sched/fair: Prevent tick path active migration to the same CPU
  msm: camera: isp: Halt device with the command parsed
  msm: vidc: add check to avoid out-of-buffer write
  usb: f_gsi: Don't enable IPA data path if connect channel fails
  mhi: core: expand MHI vote api to take optional parameter
  sched: fair: Add strict skip buddy support
  sched/fair: Allow load bigger task load balance when nr_running is 2
  msm: vidc: add additional check to avoid out of bound access
  USB: configfs: Send DISCONNECT uevent during UDC bind
  usb: dwc3-msm: Program MSB of doorbell register when using dummy_addr
  msm: ipa3: Drop WAN TX packets when pipe is down in ssr
  usb: dwc3-msm: Use dummy buffer as doorbell until GSI is ready
  ARM: msm: dts: modify rotator line width for sm8150
  Revert "drm/msm/sde: fix crtc enable check"
  ARM: dts: msm: add thermal zone names to sm8150
  msm: adsprpc: Fix integer overflow in refcount of map
  msm: kgsl: Ensure _free_pt() gets called on error case
  diag: dci: Correct out of bounds check in processing dci pkt rsp
  usb: dwc3: Flush bh work before disabling dwc3_irq
  power: step-chg-jeita: update jeita/step ranges to support signed threshold
  slim-msm-ngd: Create a IPC error logging file
  soc: qcom: dfc: Purge packets on flow delete
  Revert "diag: Clear memory device entries during mhi disconnect"
  ARM: dts: msm: Add GPU coresight properties for SM8150
  drm/msm/sde: fix crtc enable check
  usb: misc: nb7vpq904m: fix possible array overflow
  msm: ipa3: Handle missing cleanup in IMP_READY state on shutdown
  msm: npu: update performance mode during load network
  msm: npu: Allow user app to retrieve NPU version via get_property
  fbdev: msm: check the length of the external input buffer properly
  msm: kgsl: Ensure that thermal power level restrictions are enforced
  net: qrtr: Use skb with fragments in memory failure case
  media: uvcvideo: Fix 'type' check leading to overflow
  power: qpnp-qg: Add range checks to FIFO length
  msm: kgsl: Don't attempt the LLM/GLM handshake for a640 targets
  power: qpnp-smb5: Do not use ibatt based termination for QG PMICs
  msm: camera: sensor: Increase the eeprom map buffer count
  msm: vidc: refine clock calculation for both encoder and decoder
  msm: vidc: consider pipeline overhead factor for clock calculation
  msm: camera: reqmgr: Reset previous skipped slot if valid request
  drm/msm/sde: update mixercount check in writeback usecase
  msm: camera: crm: Increasing the device handles to 128
  f2fs: fix to avoid deadlock in f2fs_read_inline_dir()
  msm: kgsl: Correct snapshot over-write policy
  msm: camera: Adding device type to track device handles
  msm: camera: isp: Add support for initial frame drop
  esoc: Add mdm error-fatal notifier hook
  ARM: dts: msm: Increasing shared mem region size for SM6150 and sdmmagpie
  msm: camera: icp: Prevent out of bound access in acquire
  msm: camera: mem: Mutex before cpu_begin_access & cpu_end_access
  msm: camera: cpas: Check the HW state before accessing register
  msm: camera: cci: Add rd_done to handle read done operation
  msm: camera: crm: Increase the device handles to 128
  ARM: dts: msm: Increase camnoc bw margin for sdmmagpie
  msm: camera: fd: Remove duplicate "qcom,fd501" property
  msm: camera: reqmgr: Fix CRM shift one req issue
  msm: camera: icp: Mapping fw error numbers with error names
  msm: camera: isp: Prevent out of bounds read
  msm: camera: csiphy: correct DPHY bring up sequence
  msm: camera: Fix cpas axi clk rate overflow
  msm: kgsl: Correctly identify page faulting process
  msm: camera: reqmgr: Skip reset if no request from UMD

Change-Id: I7fb1713ebe3d786c7134db39033860114baa3df9
Signed-off-by: Abhijith Desai <desaia@codeaurora.org>
diag: Update hdlc mode for peripherals after mdlog exit
6f8f44c 
Presently hdlc mode is not getting updated for a peripheral after
multimode mdlog exit. Update the peripheral's hdlc mode while
closing the mdlog session.

Change-Id: I255db98b592648df00e779027232a55c4585de6a
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
Merge "drm/msm/sde: avoid connector state mode update in commit thread"
a09e96a
@vgarodia
msm: vidc: reset axi during firmware unload
88502c5 
Ensure that the V-NOC module is reset for
1 All types of system error from firmware.
2 Specific video hardware version.

Change-Id: I534cdefd11ebb9217081c2c840f332f7ed7c450d
Signed-off-by: Vikash Garodia <vgarodia@codeaurora.org>
Merge remote-tracking branch 'quic/dev/msm-4.14.c2-display' into msm-…
7aa0ac1 
…4.14.c2

* quic/dev/msm-4.14.c2-display:
  drm/msm/sde: avoid connector state mode update in commit thread

Change-Id: Ic413e8d9eaadbe30e160bfd4348f60fe4410ba39
Signed-off-by: Abhijith Desai <desaia@codeaurora.org>
usb: dwc3-msm: Fix maximum_speed determination
43f5ff9 
Currently driver is setting the user override speed to
maximum speed by checking if override speed is less than
the maximum speed. But this check will fail if the maximum
speed supported by the controller is super-speed and user
is trying to set it to super-speed from a lower speed. Fix
this by checking if override speed is equal to or less than
maximum speed.

Change-Id: Id71cf163548e213ec0180d7f3107395feed2f483
Signed-off-by: Pratham Pratap <prathampratap@codeaurora.org>
Merge "usb: dwc3-msm: Fix maximum_speed determination"
8849200
Merge "power: qpnp-fg: qpnp-qg: fg-alg: Improve code readability of T…
a82e3f9 
…TF algorithm"
drm/msm/sde: Fix NULL pointer dereferencing
20c5e69 
Plane count maybe passed to sort function as argument without
being checked against NULL value in crtc atomic check and blend
setup mixer. Add check to use plane count as argument only
when it has a valid value.

Change-Id: Ibddd9a630fd5afe55c861975d5fce6985daf1401
Signed-off-by: Shubhashree Dhar <dhar@codeaurora.org>
drm/msm/sde: check for ppsplit topology from current state
4ecdf5c 
During pm suspend-resume cases, topology is reset and ppsplit
flag is set to false based on previous connector state. This
leads to incorrect interface config resulting in pptimeout.
Made changes to update the ppsplit flag based on current
connector state to avoid this.

Change-Id: Id42313036eda98e5109083b0d57a778f1262f3fd
Signed-off-by: Shubhashree Dhar <dhar@codeaurora.org>
icnss: Skip removing WLAN host driver during recovery
b6f62dc 
Add the necessary checks to skip the invalid operation
of driver remove during the recovery.

Change-Id: I12d755b3b19eb4b8a7cc09e3893d778d88201cae
Signed-off-by: Naman Padhiar <npadhiar@codeaurora.org>
diag: Donot queue read in error case during mhi diag open
e21a447 
Donot queue any mhi diag read work when there is an error while
opening mhi diag channels.

Change-Id: Ie4a058b755dbdba7a3d12a19aebdc8f2e059e8ae
Signed-off-by: Sreelakshmi Gownipalli <sgownipa@codeaurora.org>
diag: Initialize peripheral mask properly before log switch
a07b047 
Prevent the possibility of passing invalid peripheral mask value
as parameter to switch logging function by initializing peripheral
mask.

Change-Id: Ied6e33febe9824f69c68ee191d659041ad79d6d8
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
rpmsg: glink: Resource cleanup on glink smem probe fail
ad317a3 
When glink smem probe fails before completion, allocated resources
are not freed properly before return.

Freeing up allocated resources before return, in case of glink smem
probe failure before completion.

CRs-Fixed: 2482441
Change-Id: Ia3834fe7a9555b4e4a9e225fe3002400523f0f1e
Signed-off-by: Deepak Kumar Singh <deesin@codeaurora.org>
Merge "diag: Update hdlc mode for peripherals after mdlog exit"
f9bce27
Merge "diag: Donot queue read in error case during mhi diag open"
b986d30
Merge "rpmsg: glink: Resource cleanup on glink smem probe fail"
d3f1671
Merge "diag: Initialize peripheral mask properly before log switch"
1afee1a
qseecom: correct range check in __qseecom_update_qteec_req_buf
ff536c6 
Make change to validate if there exists enough space to write a
struct qseecom_param_memref instead of a unit32 value, in the
request buffer in __qseecom_update_qteec_req_buf.

Change-Id: I4e092f7aa2b23648c2cedfada311828b9ceb35dc
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Merge "qseecom: correct range check in __qseecom_update_qteec_req_buf"
5c7d2a9
Merge remote-tracking branch 'quic/dev/msm-4.14.c2-display' into msm-…
4812055 
…4.14.c2

* quic/dev/msm-4.14.c2-display:
  drm/msm/sde: check for ppsplit topology from current state
  drm/msm/sde: Fix NULL pointer dereferencing

Change-Id: I401df641d66b7b96309b4c12b106d07f55dfd0f0
Signed-off-by: Saikumar Kurapati <saikk@codeaurora.org>
Merge "msm: vidc: reset axi during firmware unload"
8cbcc15
Merge "Merge remote-tracking branch 'quic/dev/msm-4.14.c2-display' in…
259bd41 
…to msm-4.14.c2"
msm: ipa3: Update channel start as success in flow control state
eb922cd 
Observing race condition when we are starting the channel and
modem trying to offload flow_control on same channel. Add changes
to retrun success if channel state is flow control when trying to
start the channel.

Change-Id: Id254cd0e3e17c74e931d27cb96577224559c091e
Signed-off-by: Praveen Kurapati <pkurapat@codeaurora.org>
Merge "msm: ipa3: Update channel start as success in flow control state"
a3c036f
Merge a3c036f on remote branch
e0463d3 
Change-Id: I4a418bf5cd379b55e70ce5fb1a63c53117ac1643
pci: framework: skip PCI restore in pci_pm_resume if no_d3hot is set
4dc5db4 
PCI devices with no_d3hot set do not need its configuration
space restored in pci_pm_resume.

Change-Id: Ia92f5278bfbd35d082fce53d9b2de9397a69b942
Signed-off-by: Tony Truong <truong@codeaurora.org>
@MarijnS95
Copy link
Contributor

MarijnS95 commented Jan 8, 2020 •
edited

PLEASE BUILD AND TEST

Any reason for not at least build-testing it yourself?

For example the conflict introduced by 88502c5 will not compile; the previous argument halt_axi is now undefined and will result in a failed compilation.

@tomgus1
Copy link
Author

tomgus1 commented Jan 8, 2020

PLEASE BUILD AND TEST

Any reason for not at least build-testing it yourself?

For example the conflict introduced by 88502c5 will not compile; the previous argument halt_axi is now undefined and will result in a failed compilation.

I had connection issues with the build server and I don't have any local HW currently. Should be okay now.

@MarijnS95
Copy link
Contributor

Should be okay now.

Checking the force-push doesn't seem like it. This will only compile, but remember that commit also changes the arguments to __venus_power_off, effectively stuffing a valid value for axi_reset in halt_axi.

Please check whether either commit is necessary, and if so combine them by passing both arguments.

@jerpelea jerpelea force-pushed the aosp/LA.UM.7.1.r1 branch 2 times, most recently from aba0ffb to f7042ec Compare February 17, 2020 15:12
@kholk
Copy link
Contributor

kholk commented May 6, 2020 •
edited

Tim, we discussed about the venus driver issue before.
By the way, things are changed now, since for devices on imem we are now using the vidc_3x driver... So you can safely revert this commit:
879e493

So that you get no more merge issues.

@tomgus1
Copy link
Author

tomgus1 commented May 6, 2020

Sorry, I can't keep trackc of all conversations.

I've added the revert and merged on top.

@pablomh
Copy link

pablomh commented Jun 12, 2020

Hi @tomgus1, I hope everything is fine at home :)

Can you please rebase?

@stefanhh0
Copy link

@tomgus1 There is still a merge conflict. Is there something I could help with here, to get this integrated?

Additionally there is as well a newer tag available:
https://source.codeaurora.org/quic/la/kernel/msm-4.14/tag/?h=LA.UM.7.1.r1-17400-sm8150.0

Does it make sense to integrate that one as well, maybe after this one has been integrated?

@tomgus1
Copy link
Author

tomgus1 commented Jul 29, 2020

Been a busy few months, updated and added the 16600 tag in a new PR

@stefanhh0
Copy link

Cool, thanks for having that pushed, and nice that you are back. Since you told us this PR is superseded by #2327 please close this one. There is no reason to keep it open, correct? Additionally closing it, prevents this PR from being merged back accidentally + we then have a cleaner open PR list.

@tomgus1
Copy link
Author

tomgus1 commented Jul 29, 2020

Personally we're better merging incrementally rather than jumping. It makes tracing any regressions a lot easier and faster.

@kholk
Copy link
Contributor

kholk commented Jul 29, 2020

Commit 4ecdf5c is very interesting for Yoshino Maple.

@stefanhh0 stefanhh0 mentioned this pull request Aug 1, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@tomgus1 @MarijnS95 @kholk @pablomh @stefanhh0 @vgarodia