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

Commit 1c37e5b6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "arm64: fpsimd: Enable FP(floating-point) settings for msm8996""

parents 96bd85a9 c14c8b7e

arch/arm64/Kconfig

+0 −31
Original line number Diff line number Diff line
@@ -513,37 +513,6 @@ config ARM64_64K_PAGES 


endchoice



config MSM_APP_API

	bool "API support to enable / disable app settings for MSM8996"

	depends on ARCH_MSM8996 && (ENABLE_FP_SIMD_SETTINGS || MSM_APP_SETTINGS)

	help

	  Add API support to enable / disable the app settings to be used

	  at runtime. These APIs are used to enable / disable app setting

	  when specific aarch32 or aarch64 processes are running.



	  If you are not sure what to do, select 'N' here.



config ENABLE_FP_SIMD_SETTINGS

	bool "Enable FP(Floating Point) Settings for Qualcomm MSM8996"

	depends on ARCH_MSM8996

	select MSM_APP_API

	help

	  Enable FP(Floating Point) and SIMD settings for the MSM8996 during

	  the execution of the aarch32 processes and disable these settings

	  when you switch to the aarch64 processes.



	  If you are not sure what to do, select 'N' here.



config MSM_APP_SETTINGS

	bool "Support to enable / disable app settings for MSM8996"

	depends on ARCH_MSM8996

	select MSM_APP_API

	help

	  Expose an interface used by the userspace at runtime to

	  enable / disable the app specific settings.



	  If you are not sure what to do, select 'N' here.



choice

	prompt "Virtual address space size"

	default ARM64_VA_BITS_39 if ARM64_4K_PAGES

arch/arm64/configs/msm-perf_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ CONFIG_ARCH_QCOM=y 
CONFIG_ARCH_MSM8996=y

CONFIG_PCI=y

CONFIG_PCI_MSM=y

CONFIG_ENABLE_FP_SIMD_SETTINGS=y

CONFIG_MSM_APP_SETTINGS=y

CONFIG_SCHED_MC=y

CONFIG_NR_CPUS=8

CONFIG_PREEMPT=y

arch/arm64/configs/msm_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ CONFIG_ARCH_QCOM=y 
CONFIG_ARCH_MSM8996=y

CONFIG_PCI=y

CONFIG_PCI_MSM=y

CONFIG_ENABLE_FP_SIMD_SETTINGS=y

CONFIG_MSM_APP_SETTINGS=y

CONFIG_SCHED_MC=y

CONFIG_NR_CPUS=8

CONFIG_PREEMPT=y

arch/arm64/include/asm/app_api.h

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/* Copyright (c) 2016, 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.

 */



#ifndef __ASM_APP_API_H

#define __ASM_APP_API_H



#include <linux/types.h>

#include <linux/sched.h>

#include <linux/fs.h>



#define APP_SETTING_BIT		30

#define MAX_ENTRIES		10



/*

 * APIs to set / clear the app setting bits

 * in the register.

 */

#ifdef CONFIG_MSM_APP_API

extern void set_app_setting_bit(uint32_t bit);

extern void clear_app_setting_bit(uint32_t bit);

#else

static inline void set_app_setting_bit(uint32_t bit) {}

static inline void clear_app_setting_bit(uint32_t bit) {}

#endif



#ifdef CONFIG_MSM_APP_SETTINGS

extern void switch_app_setting_bit(struct task_struct *prev,

				   struct task_struct *next);

extern void apply_app_setting_bit(struct file *file);

extern bool use_app_setting;

#endif



#endif

arch/arm64/include/asm/elf.h

+1 −6
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
 */

#include <asm/ptrace.h>

#include <asm/user.h>

#include <asm/fpsimd.h>



typedef unsigned long elf_greg_t;
@@ -178,11 +177,7 @@ typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG]; 
					 ((x)->e_flags & EF_ARM_EABI_MASK))



#define compat_start_thread		compat_start_thread

#define COMPAT_SET_PERSONALITY(ex)					\

do {									\

	set_thread_flag(TIF_32BIT);					\

} while (0)



#define COMPAT_SET_PERSONALITY(ex)	set_thread_flag(TIF_32BIT);

#define COMPAT_ARCH_DLINFO

extern int aarch32_setup_vectors_page(struct linux_binprm *bprm,

				      int uses_interp);