Skip to content
This repository has been archived by the owner on Nov 14, 2021. It is now read-only.

Commit

Permalink
Merge tag 'LA.UM.9.12.r1-11800-SMxx50.QSSI12.0' into neutrino-msm-keb…
Browse files Browse the repository at this point in the history 
…ab-4.19

"LA.UM.9.12.r1-11800-SMxx50.QSSI12.0"

* tag 'LA.UM.9.12.r1-11800-SMxx50.QSSI12.0':
  defconfig: Enable config for msm8937_64
  msm: camera: QM215 delay during power up sequence
  soc: qcom: pil: Reuse carveout region for mdt header
  max31760: add support for additional registers
  defconfig: Enable config for msm8937_32
  ARM: defconfig: Enable config for msm8937_32go
  msm: kgsl: Flush mem workqueue and retry if failed to find SVM region
  msm: kgsl: Fix snapshot collection for ib1
  msm: ipa3: Fix to copy num of rules from user space
  scsi: ufs-qcom: Add one vendor specific sysfs group
  sysfs: ufs-qcom: Add sysfs entries for flashpvl
  clk: qcom: clk-alpha-pll: Add support for FSM legacy mode
  defconfig: Enable config CONFIG_DEBUG_FS for msm8937_64
  msm: Add initial support for Khaje in Kconfig platform
  defconfig: Enable ARCH_KHAJE
  msm: ipa2: free the skb
  usb: f_qdss: Avoid wait_for_completion if qdss_disable is called
  vidc_3x: Use static table governor for bus voting
  wil6210: AP should not forward eapol packets
  wil6210: Drop plaintext frames on secure network
  wil6210: check integrity of received AMSDU packets
  Add support for new comanche 1.3 soc ID
  ipa: Remove overwrite copy
  msm: camera: Update SDM439 csiphy driver
  vidc_3x: Change to avoid unloading firmware
  msm: drm: uapi: add rounded corner uapi
  dt-bindings: clock: Add support for KHAJE clock ids
  usb_bam: Set default BAM type as DWC3 if not specified
  msm: ipa: Fix considering prefetch buf size when mapping
  msm: camera: Add reset logic for snps phy
  clk: qcom: mdss: fix blank / un-blank issue for DSI 12nm pll
  power: smb1398: Add support for SMB1394
  USB: dwc3: gadget: Increase TX fifo size for isochronous endpoint
  USB: uvc: Fix video quality issues for streaming video over USB
  USB: dwc3: gadget: Queue data for 16 micro frames ahead in future
  defconfig: Enable SDM429 configs
  f_uac2: increase number of requests to 32 for UAC2
  defconfig: Enable config CONFIG_UTS_NS for msm8937_32
  tty: serial: msm: Add suspend resume support
  defconfig: Enable SDM429 configs
  msm: mdss: clear fences in ESD panel dead scenario
  fbdev: msm: Increment commit count during null commit
  clk: qcom: Add enable_safe_config for gfx3d_clk_src
  mmc: sdhci-msm: Skip PWRSAVE_DLL setting for sdcc minor verion 0x4D
  mmc: cmdq_hci: Notify sdhci for enhanced strobe
  defconfig: Enable SDM429 configs
  serial: msm_geni_serial: Add ioctl for sending uart error codes to BT host
  power: supply: smb1398-charger: disable WIN_OV deglitch for SMB1394
  msm: ipa3: Fix to change the tag process timeout value in cleanup
  dt-bindings: clock: gcc-khaje: Add support for USB3 MUX and BCR
  clk: qcom: gcc-khaje: Add GCC support for KHAJE
  clk: qcom: gpucc: Add Graphics Clock controller for KHAJE
  wil6210: Drop unicast sub frame if part of a multicast amsdu
  msm: kgsl: Fix nr_removed calculation while reducing pools
  msm: npu: Use spinlock for ipc write to avoid context switch

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

Conflicts:
	drivers/gpu/msm/kgsl.c
  • Loading branch information
@0ctobot
0ctobot committed Jun 28, 2021
2 parents 7e96470 + a23549c commit 535e9a7
Show file tree
Hide file tree
Showing 75 changed files with 5,602 additions and 692 deletions.
10 changes: 5 additions & 5 deletions arch/arm/configs/vendor/msm8937-perf_defconfig
View file
Expand Up @@ -16,18 +16,17 @@ CONFIG_RCU_FAST_NO_HZ=y
CONFIG_RCU_NOCB_CPU=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_IKHEADERS=y
CONFIG_LOG_CPU_MAX_BUF_SHIFT=17
CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
CONFIG_BLK_CGROUP=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_BPF=y
CONFIG_SCHED_CORE_CTL=y
CONFIG_NAMESPACES=y
# CONFIG_UTS_NS is not set
# CONFIG_PID_NS is not set
CONFIG_SCHED_AUTOGROUP=y
CONFIG_SCHED_TUNE=y
Expand All @@ -50,6 +49,7 @@ CONFIG_ARCH_QM215=y
CONFIG_ARCH_MSM8917=y
CONFIG_ARCH_MSM8937=y
CONFIG_ARCH_SDM439=y
CONFIG_ARCH_SDM429=y
# CONFIG_VDSO is not set
CONFIG_SMP=y
CONFIG_SCHED_MC=y
Expand Down Expand Up @@ -85,7 +85,6 @@ CONFIG_ARCH_MMAP_RND_BITS=16
CONFIG_PANIC_ON_REFCOUNT_ERROR=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SIG=y
CONFIG_MODULE_SIG_FORCE=y
Expand Down Expand Up @@ -244,6 +243,7 @@ CONFIG_NET_CLS_ACT=y
CONFIG_DNS_RESOLVER=y
CONFIG_QRTR=y
CONFIG_QRTR_SMD=y
CONFIG_BPF_JIT=y
CONFIG_BT=y
# CONFIG_BT_BREDR is not set
# CONFIG_BT_LE is not set
Expand Down Expand Up @@ -293,6 +293,7 @@ CONFIG_DM_BOW=y
CONFIG_NETDEVICES=y
CONFIG_DUMMY=y
CONFIG_TUN=y
CONFIG_VETH=y
# CONFIG_NET_VENDOR_AMAZON is not set
CONFIG_MSM_RMNET_BAM=y
# CONFIG_NET_VENDOR_EZCHIP is not set
Expand Down Expand Up @@ -336,6 +337,7 @@ CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_JOYSTICK=y
CONFIG_JOYSTICK_XPAD=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_HBTP_INPUT=y
CONFIG_INPUT_QPNP_POWER_ON=y
Expand Down Expand Up @@ -450,7 +452,6 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_MULTITOUCH=y
CONFIG_HID_SONY=y
CONFIG_USB_HIDDEV=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_MON=y
CONFIG_USB_EHCI_HCD=y
Expand Down Expand Up @@ -635,7 +636,6 @@ CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SMACK=y
CONFIG_CRYPTO_GCM=y
CONFIG_CRYPTO_XCBC=y
CONFIG_CRYPTO_MD4=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_LZ4=y
CONFIG_CRYPTO_ANSI_CPRNG=y
Expand Down
10 changes: 5 additions & 5 deletions arch/arm/configs/vendor/msm8937_32go-perf_defconfig
View file
Expand Up @@ -16,18 +16,17 @@ CONFIG_RCU_FAST_NO_HZ=y
CONFIG_RCU_NOCB_CPU=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_IKHEADERS=y
CONFIG_LOG_CPU_MAX_BUF_SHIFT=17
CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
CONFIG_BLK_CGROUP=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_BPF=y
CONFIG_SCHED_CORE_CTL=y
CONFIG_NAMESPACES=y
# CONFIG_UTS_NS is not set
# CONFIG_PID_NS is not set
CONFIG_SCHED_AUTOGROUP=y
CONFIG_SCHED_TUNE=y
Expand All @@ -51,6 +50,7 @@ CONFIG_ARCH_QM215=y
CONFIG_ARCH_MSM8917=y
CONFIG_ARCH_MSM8937=y
CONFIG_ARCH_SDM439=y
CONFIG_ARCH_SDM429=y
# CONFIG_VDSO is not set
CONFIG_SMP=y
CONFIG_SCHED_MC=y
Expand Down Expand Up @@ -86,7 +86,6 @@ CONFIG_ARCH_MMAP_RND_BITS=16
CONFIG_PANIC_ON_REFCOUNT_ERROR=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SIG=y
CONFIG_MODULE_SIG_FORCE=y
Expand Down Expand Up @@ -243,6 +242,7 @@ CONFIG_NET_CLS_ACT=y
CONFIG_DNS_RESOLVER=y
CONFIG_QRTR=y
CONFIG_QRTR_SMD=y
CONFIG_BPF_JIT=y
CONFIG_BT=y
# CONFIG_BT_BREDR is not set
# CONFIG_BT_LE is not set
Expand Down Expand Up @@ -292,6 +292,7 @@ CONFIG_DM_BOW=y
CONFIG_NETDEVICES=y
CONFIG_DUMMY=y
CONFIG_TUN=y
CONFIG_VETH=y
# CONFIG_NET_VENDOR_AMAZON is not set
CONFIG_MSM_RMNET_BAM=y
# CONFIG_NET_VENDOR_EZCHIP is not set
Expand Down Expand Up @@ -335,6 +336,7 @@ CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_JOYSTICK=y
CONFIG_JOYSTICK_XPAD=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_HBTP_INPUT=y
CONFIG_INPUT_QPNP_POWER_ON=y
Expand Down Expand Up @@ -451,7 +453,6 @@ CONFIG_HID_MULTITOUCH=y
CONFIG_HID_NINTENDO=y
CONFIG_HID_SONY=y
CONFIG_USB_HIDDEV=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_MON=y
CONFIG_USB_EHCI_HCD=y
Expand Down Expand Up @@ -639,7 +640,6 @@ CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SMACK=y
CONFIG_CRYPTO_GCM=y
CONFIG_CRYPTO_XCBC=y
CONFIG_CRYPTO_MD4=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_LZ4=y
CONFIG_CRYPTO_ANSI_CPRNG=y
Expand Down
10 changes: 5 additions & 5 deletions arch/arm/configs/vendor/msm8937_32go_defconfig
View file
Expand Up @@ -16,20 +16,19 @@ CONFIG_RCU_FAST_NO_HZ=y
CONFIG_RCU_NOCB_CPU=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_IKHEADERS=y
CONFIG_LOG_CPU_MAX_BUF_SHIFT=17
CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
CONFIG_BLK_CGROUP=y
CONFIG_DEBUG_BLK_CGROUP=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_DEBUG=y
CONFIG_SCHED_CORE_CTL=y
CONFIG_NAMESPACES=y
# CONFIG_UTS_NS is not set
# CONFIG_PID_NS is not set
CONFIG_SCHED_AUTOGROUP=y
CONFIG_SCHED_TUNE=y
Expand All @@ -52,6 +51,7 @@ CONFIG_ARCH_QM215=y
CONFIG_ARCH_MSM8917=y
CONFIG_ARCH_MSM8937=y
CONFIG_ARCH_SDM439=y
CONFIG_ARCH_SDM429=y
# CONFIG_VDSO is not set
CONFIG_SMP=y
CONFIG_SCHED_MC=y
Expand Down Expand Up @@ -90,7 +90,6 @@ CONFIG_ARCH_MMAP_RND_BITS=16
CONFIG_PANIC_ON_REFCOUNT_ERROR=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SIG=y
CONFIG_MODULE_SIG_FORCE=y
Expand Down Expand Up @@ -247,6 +246,7 @@ CONFIG_NET_CLS_ACT=y
CONFIG_DNS_RESOLVER=y
CONFIG_QRTR=y
CONFIG_QRTR_SMD=y
CONFIG_BPF_JIT=y
CONFIG_BT=y
# CONFIG_BT_BREDR is not set
# CONFIG_BT_LE is not set
Expand Down Expand Up @@ -297,6 +297,7 @@ CONFIG_DM_BOW=y
CONFIG_NETDEVICES=y
CONFIG_DUMMY=y
CONFIG_TUN=y
CONFIG_VETH=y
# CONFIG_NET_VENDOR_AMAZON is not set
CONFIG_MSM_RMNET_BAM=y
# CONFIG_NET_VENDOR_EZCHIP is not set
Expand Down Expand Up @@ -340,6 +341,7 @@ CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_JOYSTICK=y
CONFIG_JOYSTICK_XPAD=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_HBTP_INPUT=y
CONFIG_INPUT_QPNP_POWER_ON=y
Expand Down Expand Up @@ -458,7 +460,6 @@ CONFIG_HID_MULTITOUCH=y
CONFIG_HID_NINTENDO=y
CONFIG_HID_SONY=y
CONFIG_USB_HIDDEV=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_MON=y
CONFIG_USB_EHCI_HCD=y
Expand Down Expand Up @@ -651,7 +652,6 @@ CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SMACK=y
CONFIG_CRYPTO_GCM=y
CONFIG_CRYPTO_XCBC=y
CONFIG_CRYPTO_MD4=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_LZ4=y
CONFIG_CRYPTO_ANSI_CPRNG=y
Expand Down
10 changes: 5 additions & 5 deletions arch/arm/configs/vendor/msm8937_defconfig
View file
Expand Up @@ -16,20 +16,19 @@ CONFIG_RCU_FAST_NO_HZ=y
CONFIG_RCU_NOCB_CPU=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_IKHEADERS=y
CONFIG_LOG_CPU_MAX_BUF_SHIFT=17
CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
CONFIG_BLK_CGROUP=y
CONFIG_DEBUG_BLK_CGROUP=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_DEBUG=y
CONFIG_SCHED_CORE_CTL=y
CONFIG_NAMESPACES=y
# CONFIG_UTS_NS is not set
# CONFIG_PID_NS is not set
CONFIG_SCHED_AUTOGROUP=y
CONFIG_SCHED_TUNE=y
Expand All @@ -51,6 +50,7 @@ CONFIG_ARCH_QM215=y
CONFIG_ARCH_MSM8917=y
CONFIG_ARCH_MSM8937=y
CONFIG_ARCH_SDM439=y
CONFIG_ARCH_SDM429=y
# CONFIG_VDSO is not set
CONFIG_SMP=y
CONFIG_SCHED_MC=y
Expand Down Expand Up @@ -89,7 +89,6 @@ CONFIG_ARCH_MMAP_RND_BITS=16
CONFIG_PANIC_ON_REFCOUNT_ERROR=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SIG=y
CONFIG_MODULE_SIG_FORCE=y
Expand Down Expand Up @@ -248,6 +247,7 @@ CONFIG_NET_CLS_ACT=y
CONFIG_DNS_RESOLVER=y
CONFIG_QRTR=y
CONFIG_QRTR_SMD=y
CONFIG_BPF_JIT=y
CONFIG_BT=y
# CONFIG_BT_BREDR is not set
# CONFIG_BT_LE is not set
Expand Down Expand Up @@ -298,6 +298,7 @@ CONFIG_DM_BOW=y
CONFIG_NETDEVICES=y
CONFIG_DUMMY=y
CONFIG_TUN=y
CONFIG_VETH=y
# CONFIG_NET_VENDOR_AMAZON is not set
CONFIG_MSM_RMNET_BAM=y
# CONFIG_NET_VENDOR_EZCHIP is not set
Expand Down Expand Up @@ -341,6 +342,7 @@ CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_JOYSTICK=y
CONFIG_JOYSTICK_XPAD=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_HBTP_INPUT=y
CONFIG_INPUT_QPNP_POWER_ON=y
Expand Down Expand Up @@ -459,7 +461,6 @@ CONFIG_HID_MICROSOFT=y
CONFIG_HID_MULTITOUCH=y
CONFIG_HID_SONY=y
CONFIG_USB_HIDDEV=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_MON=y
CONFIG_USB_EHCI_HCD=y
Expand Down Expand Up @@ -648,7 +649,6 @@ CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SMACK=y
CONFIG_CRYPTO_GCM=y
CONFIG_CRYPTO_XCBC=y
CONFIG_CRYPTO_MD4=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_LZ4=y
CONFIG_CRYPTO_ANSI_CPRNG=y
Expand Down
8 changes: 8 additions & 0 deletions arch/arm64/Kconfig.platforms
View file
Expand Up @@ -183,6 +183,14 @@ config ARCH_BENGAL
This enables support for the BENGAL chipset. If you do not
wish to build a kernel that runs on this chipset, say 'N' here.

config ARCH_KHAJE
bool "Enable Support for Qualcomm Technologies, Inc. KHAJE"
depends on ARCH_QCOM
select COMMON_CLK_QCOM
help
This enables support for the KHAJE chipset. If you do not
wish to build a kernel that runs on this chipset, say 'N' here.

config ARCH_SCUBA
bool "Enable Support for Qualcomm Technologies, Inc. SCUBA"
depends on ARCH_QCOM
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/configs/vendor/bengal-perf_defconfig
View file
Expand Up @@ -50,6 +50,7 @@ CONFIG_PROFILING=y
CONFIG_HOTPLUG_SIZE_BITS=29
CONFIG_ARCH_QCOM=y
CONFIG_ARCH_BENGAL=y
CONFIG_ARCH_KHAJE=y
CONFIG_ARCH_SCUBA=y
CONFIG_SCHED_MC=y
CONFIG_NR_CPUS=8
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/configs/vendor/bengal_defconfig
View file
Expand Up @@ -51,6 +51,7 @@ CONFIG_PROFILING=y
CONFIG_HOTPLUG_SIZE_BITS=29
CONFIG_ARCH_QCOM=y
CONFIG_ARCH_BENGAL=y
CONFIG_ARCH_KHAJE=y
CONFIG_ARCH_SCUBA=y
CONFIG_SCHED_MC=y
CONFIG_NR_CPUS=8
Expand Down

0 comments on commit 535e9a7

Please sign in to comment.