Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit b9bec2db authored by hmtheboy154's avatar hmtheboy154
Browse files

Merge commit '65e66f3b' into lineage-22.2

parents 72107221 65e66f3b

arch/arm64/configs/vendor/bengal-perf_defconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,7 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_IOSCHED_BFQ=y

CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_GKI_HIDDEN_GPU_CONFIGS=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y

CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
@@ -120,6 +121,7 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_INTERFACE=y

CONFIG_XFRM_INTERFACE=y

CONFIG_XFRM_MIGRATE=y

CONFIG_XFRM_STATISTICS=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_INET=y
@@ -440,6 +442,7 @@ CONFIG_HID_MULTITOUCH=y 
CONFIG_HID_NINTENDO=y

CONFIG_HID_NINTENDO=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_SONY=y

CONFIG_HID_SONY=y

CONFIG_SONY_FF=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_HCD=y
@@ -652,6 +655,7 @@ CONFIG_STATIC_USERMODEHELPER_PATH="" 
CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_CHACHA20POLY1305=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_ANSI_CPRNG=y

arch/arm64/configs/vendor/kona-perf_defconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -112,6 +112,7 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_IOSCHED_BFQ=y

CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_GKI_HIDDEN_GPU_CONFIGS=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

#ifdef OPLUS_DEBUG_STABILITY

#ifdef OPLUS_DEBUG_STABILITY

##CONFIG_MEMORY_HOTPLUG=y

##CONFIG_MEMORY_HOTPLUG=y
@@ -131,6 +132,7 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_INTERFACE=y

CONFIG_XFRM_INTERFACE=y

CONFIG_XFRM_MIGRATE=y

CONFIG_XFRM_STATISTICS=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_INET=y
@@ -810,6 +812,7 @@ CONFIG_SECURITY_APPARMOR=y 
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0

CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0

CONFIG_CRYPTO_CCM=y

CONFIG_CRYPTO_CCM=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_CHACHA20POLY1305=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_ANSI_CPRNG=y

arch/arm64/configs/vendor/lito-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -534,6 +534,7 @@ CONFIG_HID_MULTITOUCH=y 
CONFIG_HID_NINTENDO=y

CONFIG_HID_NINTENDO=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_SONY=y

CONFIG_HID_SONY=y

CONFIG_SONY_FF=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_HCD=y

arch/arm64/include/asm/kvm_asm.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -40,9 +40,9 @@ 
/* Translate a kernel address of @sym into its equivalent linear mapping */

/* Translate a kernel address of @sym into its equivalent linear mapping */

#define kvm_ksym_ref(sym)						\

#define kvm_ksym_ref(sym)						\

	({								\

	({								\

		void *val = &sym;					\

		void *val = __va_function(sym);				\

		if (!is_kernel_in_hyp_mode())				\

		if (!is_kernel_in_hyp_mode())				\

			val = lm_alias(&sym);				\

			val = lm_alias(val);				\

		val;							\

		val;							\

	 })

	 })

arch/arm64/include/asm/memory.h

+9 −4
Original line number Original line Diff line number Diff line
@@ -62,8 +62,11 @@ 
#define PAGE_OFFSET		(UL(0xffffffffffffffff) - \

#define PAGE_OFFSET		(UL(0xffffffffffffffff) - \

	(UL(1) << (VA_BITS - 1)) + 1)

	(UL(1) << (VA_BITS - 1)) + 1)

#define KIMAGE_VADDR		(MODULES_END)

#define KIMAGE_VADDR		(MODULES_END)

#define BPF_JIT_REGION_START	(VA_START + KASAN_SHADOW_SIZE)

#define BPF_JIT_REGION_SIZE	(SZ_128M)

#define BPF_JIT_REGION_END	(BPF_JIT_REGION_START + BPF_JIT_REGION_SIZE)

#define MODULES_END		(MODULES_VADDR + MODULES_VSIZE)

#define MODULES_END		(MODULES_VADDR + MODULES_VSIZE)

#define MODULES_VADDR		(VA_START + KASAN_SHADOW_SIZE)

#define MODULES_VADDR		(BPF_JIT_REGION_END)

#define MODULES_VSIZE		(SZ_128M)

#define MODULES_VSIZE		(SZ_128M)

#define VMEMMAP_START		(PAGE_OFFSET - VMEMMAP_SIZE)

#define VMEMMAP_START		(PAGE_OFFSET - VMEMMAP_SIZE)

#define PCI_IO_END		(VMEMMAP_START - SZ_2M)

#define PCI_IO_END		(VMEMMAP_START - SZ_2M)
@@ -323,13 +326,15 @@ static inline void *phys_to_virt(phys_addr_t x) 
 * virtual address. Therefore, use inline assembly to ensure we are

 * virtual address. Therefore, use inline assembly to ensure we are

 * always taking the address of the actual function.

 * always taking the address of the actual function.

 */

 */

#define __pa_function(x) ({						\

#define __va_function(x) ({						\

	unsigned long addr;						\

	void *addr;							\

	asm("adrp %0, " __stringify(x) "\n\t"				\

	asm("adrp %0, " __stringify(x) "\n\t"				\

	    "add  %0, %0, :lo12:" __stringify(x) : "=r" (addr));	\

	    "add  %0, %0, :lo12:" __stringify(x) : "=r" (addr));	\

	__pa_symbol(addr);						\

	addr;								\

})

})





#define __pa_function(x) 	__pa_symbol(__va_function(x))



/*

/*

 *  virt_to_page(k)	convert a _valid_ virtual address to struct page *

 *  virt_to_page(k)	convert a _valid_ virtual address to struct page *

 *  virt_addr_valid(k)	indicates whether a virtual address is valid

 *  virt_addr_valid(k)	indicates whether a virtual address is valid