Skip to content
This repository has been archived by the owner on Dec 28, 2020. It is now read-only.

Commit

Permalink
Merge tag 'LE.UM.3.2.2.r1-00500-sdm845.0' into neutrino-msm-fajita-4.9
Browse files Browse the repository at this point in the history
"LE.UM.3.2.2.r1-00500-sdm845.0"

* tag 'LE.UM.3.2.2.r1-00500-sdm845.0':
  ANDROID: cpufreq: schedutil: add up/down frequency transition rate limits
  diag: Prevent out-of-bound access while processing mask commands
  diag: Prevent out-of-bound access while processing non-hdlc pkt
  diag: Prevent out-of-bound access while processing userspace data
  msm: vidc: Add support for setting dynamic QP range
  ARM: dts: msm: add support for rm67162 edo panel
  drm/msm/dsi-staging: Add range check in debugfs_dump_info_read
  ARM: dts: msm: increase modem size as per new memory map
  soc: qcom: smem: Validate heap size against smem area size
  arm64: Make sure permission updates happen for pmd/pud
  ARM: dts: remove modem node in sda845 RB3 HW
  defconfig: msm: Enable CONFIG_HID_SONY for SDM845 and SDM670
  power: qpnp-fg: Do not return -EAGAIN when handling IMA error during probe
  power: power_supply: Add REAL_CAPACITY power-supply property
  power: qpnp-qg/fg-gen3: Report the REAL_CAPACITY
  power: qpnp-smb5: Handle cc_soc jump in the overcharge WA
  ARM: decompressor: avoid speculative prefetch from protected regions
  usb: gadget: f_ecm: allocate/free net device upon driver bind/unbind
  mmc: sd: Set card state to removed upon ejection
  soc: qcom: bgrsb: avoids RSB disable command repetition
  defconfig: msm: Enable USB ECM function driver on SA415
  msm: adsprpc: legacy devices don't need shared context bank
  msm: vidc: Enable use ltr with constraints
  ARM: dts: msm: remove inline rotator support for qcs605
  iio: qcom-rradc: Force conversion for die_temp channel on RRADC
  Revert "ARM: dts: remove modem node in sda845 RB3 HW"
  net: sockev: avoid races between sockev and socket_close
  ARM: dts: msm: add camera dtsi for sdm429w
  usb: pd: Decrease FIRST_SOURCE_CAP_TIME to 100ms
  ARCH: arm: dts: add msm-id for sdxpoorwills v2 chipset
  msm: boot markers: Add boot markers driver
  defconfig: Enable OverlayFS for SDM670 and SDM845
  Documentation: DT: add definition for cy Company
  ARM: dts: msm: increase adsp firmware size for sdm429w
  arm: dts: msm: Update pmic revid and board-id for sdm450+pmi632
  msm: adsprpc: maintain local copy of rpra offloaded to DSP
  ARM: dts: msm: disable ssc-sensors node for sda845 RB3 HW

Signed-off-by: Adam W. Willis <return.of.octobot@gmail.com>

Conflicts:
	arch/arm64/configs/sdm845-perf_defconfig
	arch/arm64/configs/sdm845_defconfig
	drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_core.c
	drivers/power/supply/qcom/qpnp-fg-gen3.c
	kernel/sched/cpufreq_schedutil.c
  • Loading branch information
0ctobot committed Jul 13, 2019
2 parents 97506ba + 453b2ed commit 17c3d1d
Show file tree
Hide file tree
Showing 44 changed files with 1,068 additions and 115 deletions.
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/vendor-prefixes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -320,3 +320,4 @@ zii Zodiac Inflight Innovations
zte ZTE Corp.
zyxel ZyXEL Communications Corp.
inven InvenSense, Inc.
cy Parade.
11 changes: 11 additions & 0 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2176,6 +2176,17 @@ config AUTO_ZRELADDR
config EFI_STUB
bool

config ARM_DECOMPRESSOR_LIMIT
hex "Limit the decompressor memory area"
default 0x3200000
help
Allows overriding of the memory size that decompressor maps with
read, write and execute permissions to avoid speculative prefetch.

By default ARM_DECOMPRESSOR_LIMIT maps first 1GB of memory
with read, write and execute permissions and reset of the memory
as strongly ordered.

config EFI
bool "UEFI runtime support"
depends on OF && !CPU_BIG_ENDIAN && MMU && AUTO_ZRELADDR && !XIP_KERNEL
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/compressed/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ __setup_mmu: sub r3, r4, #16384 @ Page directory size
mov r0, r3
mov r9, r0, lsr #18
mov r9, r9, lsl #18 @ start of RAM
add r10, r9, #0x10000000 @ a reasonable RAM size
add r10, r9, #CONFIG_ARM_DECOMPRESSOR_LIMIT
mov r1, #0x12 @ XN|U + section mapping
orr r1, r1, #3 << 10 @ AP=11
add r2, r3, #16384
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/qcom/sdxpoorwills-adp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@
&blsp1_uart2b_hs {
status = "okay";
};

&mss_mem {
reg = <0x86400000 0x9300000>;
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/qcom/sdxpoorwills-v2.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
/ {
model = "Qualcomm Technologies, Inc. SDXPOORWILLS V2";
compatible = "qcom,sdxpoorwills";
qcom,msm-id = <334 0x20000>, <335 0x20000>;
qcom,msm-id = <334 0x20000>, <335 0x20000>, <408 0x20000>;
};

&emac_hw {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/configs/sdxpoorwills-auto-perf_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ CONFIG_USB_GADGET_DEBUG_FILES=y
CONFIG_USB_GADGET_VBUS_DRAW=500
CONFIG_USB_CONFIGFS=y
CONFIG_USB_CONFIGFS_SERIAL=y
CONFIG_USB_CONFIGFS_ECM=y
CONFIG_USB_CONFIGFS_RNDIS=y
CONFIG_USB_CONFIGFS_MASS_STORAGE=y
CONFIG_USB_CONFIGFS_F_FS=y
Expand Down
1 change: 1 addition & 0 deletions arch/arm/configs/sdxpoorwills-auto_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ CONFIG_USB_GADGET_DEBUG_FS=y
CONFIG_USB_GADGET_VBUS_DRAW=500
CONFIG_USB_CONFIGFS=y
CONFIG_USB_CONFIGFS_SERIAL=y
CONFIG_USB_CONFIGFS_ECM=y
CONFIG_USB_CONFIGFS_RNDIS=y
CONFIG_USB_CONFIGFS_MASS_STORAGE=y
CONFIG_USB_CONFIGFS_F_FS=y
Expand Down
79 changes: 79 additions & 0 deletions arch/arm64/boot/dts/qcom/dsi-panel-edo-rm67162-qvga-cmd.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/

&mdss_mdp {
dsi_edo_rm67162_qvga_cmd: qcom,mdss_dsi_edo_rm67162_qvga_cmd {
qcom,mdss-dsi-panel-name = "rm67162 qvga cmd mode dsi panel";
qcom,mdss-dsi-panel-controller = <&mdss_dsi0>;
qcom,mdss-dsi-panel-type = "dsi_cmd_mode";
qcom,mdss-dsi-panel-destination = "display_1";
qcom,mdss-dsi-panel-framerate = <60>;
qcom,mdss-dsi-virtual-channel-id = <0>;
qcom,mdss-dsi-stream = <0>;
qcom,mdss-dsi-panel-width = <320>;
qcom,mdss-dsi-panel-height = <360>;
qcom,mdss-dsi-h-front-porch = <140>;
qcom,mdss-dsi-h-back-porch = <164>;
qcom,mdss-dsi-h-pulse-width = <8>;
qcom,mdss-dsi-h-sync-skew = <0>;
qcom,mdss-dsi-v-back-porch = <1>;
qcom,mdss-dsi-v-front-porch = <6>;
qcom,mdss-dsi-v-pulse-width = <1>;
qcom,mdss-dsi-h-left-border = <0>;
qcom,mdss-dsi-h-right-border = <0>;
qcom,mdss-dsi-v-top-border = <0>;
qcom,mdss-dsi-v-bottom-border = <0>;
qcom,mdss-dsi-bpp = <24>;
qcom,mdss-dsi-color-order = "rgb_swap_rgb";
qcom,mdss-dsi-underflow-color = <0xff>;
qcom,mdss-dsi-border-color = <0>;
qcom,mdss-dsi-pixel-packing = "tight";
qcom,mdss-dsi-pixel-alignment = <0>;
qcom,mdss-dsi-on-command = [29 01 00 00 00 00 02 FE 0A
29 01 00 00 00 00 02 29 90
29 01 00 00 00 00 02 FE 05
29 01 00 00 00 00 02 05 00
29 01 00 00 00 00 02 FE 00
29 01 00 00 00 00 02 35 00
29 01 00 00 00 00 02 51 00
29 01 00 00 00 00 02 53 20
29 01 00 00 78 00 02 11 00
29 01 00 00 05 00 02 29 00];
qcom,mdss-dsi-off-command = [05 01 00 00 05 00 02 51 00
05 01 00 00 14 00 02 28 00
05 01 00 00 78 00 02 10 00
05 01 00 00 14 00 02 4F 01];
qcom,mdss-dsi-on-command-state = "dsi_lp_mode";
qcom,mdss-dsi-off-command-state = "dsi_hs_mode";
qcom,mdss-dsi-h-sync-pulse = <1>;
qcom,mdss-dsi-traffic-mode = "burst_mode";
qcom,mdss-dsi-lane-map = "lane_map_0123";
qcom,mdss-dsi-bllp-eof-power-mode;
qcom,mdss-dsi-bllp-power-mode;
qcom,mdss-dsi-lane-0-state;
qcom,mdss-dsi-te-pin-select = <1>;
qcom,mdss-dsi-te-v-sync-rd-ptr-irq-line = <0x2c>;
qcom,mdss-dsi-te-dcs-command = <1>;
qcom,mdss-dsi-te-check-enable;
qcom,mdss-dsi-te-using-te-pin;
qcom,mdss-dsi-panel-timings = [7d 25 1d 00 37 33 22 27
1e 03 04 00];
qcom,mdss-dsi-t-clk-post = <0x20>;
qcom,mdss-dsi-t-clk-pre = <0x2c>;
qcom,mdss-dsi-bl-min-level = <1>;
qcom,mdss-dsi-bl-max-level = <255>;
qcom,mdss-dsi-dma-trigger = "trigger_sw";
qcom,mdss-dsi-mdp-trigger = "none";
qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
qcom,mdss-dsi-reset-sequence = <1 1>, <0 12>, <1 12>;
};
};
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/qcom/qcs605.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@
compatible = "qcom,qcs605-llcc";
};

&mdss_mdp {
/delete-property/ qcom,sde-inline-rotator;
};

&ipa_hw {
status = "disabled";
};
Expand Down
5 changes: 3 additions & 2 deletions arch/arm64/boot/dts/qcom/sdm429-qrd-spyro-evt.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

#include "sdm439-qrd.dtsi"
#include "sdm429w-pm660.dtsi"
#include "sdm429w-camera-sensor-spyro.dtsi"

&mdss_dsi0 {
qcom,dsi-pref-prim-pan = <&dsi_hx8399c_hd_vid>;
Expand Down Expand Up @@ -129,9 +130,9 @@
};

&adsp_fw_mem {
reg = <0x0 0x8b800000 0x0 0x1100000>;
reg = <0x0 0x8b800000 0x0 0x1400000>;
};

&wcnss_fw_mem {
reg = <0x0 0x8c900000 0x0 0x700000>;
reg = <0x0 0x8cc00000 0x0 0x700000>;
};
Loading

0 comments on commit 17c3d1d

Please sign in to comment.