Skip to content

Commit

Permalink
Kernel: Xiaomi kernel changes for MIX 2S (Android O)
Browse files Browse the repository at this point in the history
The Patch based on QualComm release version: LA.UM.6.3.r1_r00455
The kernel config file used is polaris_user_defconfig

Change-Id: Idb946ca0603b0f1a358cc2dfd222fe3a77a90188
Signed-off-by: hehao <hehao@xiaomi.com>
  • Loading branch information
mi-code committed Apr 18, 2018
1 parent a1590df commit 8642441
Show file tree
Hide file tree
Showing 850 changed files with 407,142 additions and 4,416 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,8 @@ all.config
# Kdevelop4
*.kdev4

#audio-kernel
techpack/audio/

# fetched Android config fragments
kernel/configs/android-*.cfg
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/arm/msm/msm_watchdog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Optional properties:
- qcom,ipi-ping : (boolean) send keep alive ping to other cpus if present
- qcom,wakeup-enable : (boolean) enable non secure watchdog to freeze / unfreeze
automatically across suspend / resume path.
- qcom,scandump-size : size of scan dump memory region

Example:

Expand Down
18 changes: 0 additions & 18 deletions Documentation/devicetree/bindings/arm/msm/rpmh-master-stat.txt

This file was deleted.

17 changes: 17 additions & 0 deletions Documentation/devicetree/bindings/leds/leds-qpnp-flash-v2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,23 @@ Example:
pinctrl-1 = <&led_disable>;
};

pmi8998_flashlight: qcom,flashlight {
label = "flash";
qcom,led-name = "flashlight";
qcom,max-current = <750>;
qcom,default-led-trigger =
"flashlight_trigger";
qcom,id = <3>;
qcom,current-ma = <500>;
qcom,duration-ms = <1280>;
qcom,ires-ua = <12500>;
qcom,hdrm-voltage-mv = <325>;
qcom,hdrm-vol-hi-lo-win-mv = <100>;
pinctrl-names = "led_enable","led_disable";
pinctrl-0 = <&led_enable>;
pinctrl-1 = <&led_disable>;
};

pmi8998_torch0: qcom,torch_0 {
label = "torch";
qcom,led-name = "led:torch_0";
Expand Down
149 changes: 0 additions & 149 deletions Documentation/devicetree/bindings/media/video/msm-cam-lrme.txt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ First Level Node - FG Gen3 device
this property is not specified, then the default value used
will be 75mA.

- qcom,fg-cutoff-current
Usage: optional
Value type: <u32>
Definition: Minimum Battery current (in mA) used for cutoff SOC
estimate. If this property is not specified, then a default
value of 500 mA will be applied.

- qcom,fg-delta-soc-thr
Usage: optional
Value type: <u32>
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/vendor-prefixes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -315,3 +315,5 @@ zarlink Zarlink Semiconductor
zii Zodiac Inflight Innovations
zte ZTE Corp.
zyxel ZyXEL Communications Corp.
ssp Bcm4775
ssp,bcm4775 broadcom 4775 gps chip
8 changes: 6 additions & 2 deletions arch/arm/include/asm/elf.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,12 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
#define CORE_DUMP_USE_REGSET
#define ELF_EXEC_PAGESIZE 4096

/* This is the base location for PIE (ET_DYN with INTERP) loads. */
#define ELF_ET_DYN_BASE 0x400000UL
/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
use of this is to invoke "./ld.so someprog" to test out a new version of
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */

#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)

/* When the program starts, a1 contains a pointer to a function to be
registered with atexit, as per the SVR4 ABI. A value of 0 means we
Expand Down
10 changes: 0 additions & 10 deletions arch/arm/include/asm/kvm_mmu.h
Original file line number Diff line number Diff line change
Expand Up @@ -223,16 +223,6 @@ static inline unsigned int kvm_get_vmid_bits(void)
return 8;
}

static inline void *kvm_get_hyp_vector(void)
{
return kvm_ksym_ref(__kvm_hyp_vector);
}

static inline int kvm_map_vectors(void)
{
return 0;
}

#endif /* !__ASSEMBLY__ */

#endif /* __ARM_KVM_MMU_H__ */
35 changes: 7 additions & 28 deletions arch/arm64/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -781,34 +781,6 @@ config FORCE_MAX_ZONEORDER
However for 4K, we choose a higher default value, 11 as opposed to 10, giving us
4M allocations matching the default size used by generic code.

config UNMAP_KERNEL_AT_EL0
bool "Unmap kernel when running in userspace (aka \"KAISER\")" if EXPERT
default y
help
Speculation attacks against some high-performance processors can
be used to bypass MMU permission checks and leak kernel data to
userspace. This can be defended against by unmapping the kernel
when running in userspace, mapping it back in on exception entry
via a trampoline page in the vector table.

If unsure, say Y.

config HARDEN_BRANCH_PREDICTOR
bool "Harden the branch predictor against aliasing attacks" if EXPERT
help
Speculation attacks against some high-performance processors rely on
being able to manipulate the branch predictor for a victim context by
executing aliasing branches in the attacker context. Such attacks
can be partially mitigated against by clearing internal branch
predictor state and limiting the prediction logic in some situations.

This config option will take CPU-specific actions to harden the
branch predictor against aliasing attacks and may rely on specific
instruction sequences or control bits being set by the system
firmware.

If unsure, say Y.

menuconfig ARMV8_DEPRECATED
bool "Emulate deprecated/obsolete ARMv8 instructions"
depends on COMPAT
Expand Down Expand Up @@ -1218,3 +1190,10 @@ source "arch/arm64/crypto/Kconfig"
endif

source "lib/Kconfig"

config BOOT_INFO
bool "Boot information from bootloader"
default y
help
On embedded linux device, we try to collect more information from
bootloader to kernel. eg. powerup reason.
Loading

0 comments on commit 8642441

Please sign in to comment.