Merge branch mp into fairphone (29108d24) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/common/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -17,7 +17,3 @@ config SHARP_PARAM

		config SHARP_SCOOP
		bool

		config FIQ_GLUE
		bool
		select FIQ

arch/arm/common/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@

		obj-y += firmware.o

		obj-$(CONFIG_FIQ_GLUE) += fiq_glue.o fiq_glue_setup.o
		obj-$(CONFIG_ICST) += icst.o
		obj-$(CONFIG_SA1111) += sa1111.o
		obj-$(CONFIG_DMABOUNCE) += dmabounce.o

arch/arm/common/fiq_glue.S

deleted100644 → 0

+0 −118

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 Google, Inc.
		*
		* This software is licensed under the terms of the GNU General Public
		* License version 2, as published by the Free Software Foundation, and
		* may be copied, distributed, and modified under those terms.
		*
		* 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.
		*
		*/

		#include <linux/linkage.h>
		#include <asm/assembler.h>

		.text

		.global fiq_glue_end

		/* fiq stack: r0-r15,cpsr,spsr of interrupted mode */

		ENTRY(fiq_glue)
		/* store pc, cpsr from previous mode, reserve space for spsr */
		mrs r12, spsr
		sub lr, lr, #4
		subs r10, #1
		bne nested_fiq

		str r12, [sp, #-8]!
		str lr, [sp, #-4]!

		/* store r8-r14 from previous mode */
		sub sp, sp, #(7 * 4)
		stmia sp, {r8-r14}^
		nop

		/* store r0-r7 from previous mode */
		stmfd sp!, {r0-r7}

		/* setup func(data,regs) arguments */
		mov r0, r9
		mov r1, sp
		mov r3, r8

		mov r7, sp

		/* Get sp and lr from non-user modes */
		and r4, r12, #MODE_MASK
		cmp r4, #USR_MODE
		beq fiq_from_usr_mode

		mov r7, sp
		orr r4, r4, #(PSR_I_BIT \| PSR_F_BIT)
		msr cpsr_c, r4
		str sp, [r7, #(4 * 13)]
		str lr, [r7, #(4 * 14)]
		mrs r5, spsr
		str r5, [r7, #(4 * 17)]

		cmp r4, #(SVC_MODE \| PSR_I_BIT \| PSR_F_BIT)
		/* use fiq stack if we reenter this mode */
		subne sp, r7, #(4 * 3)

		fiq_from_usr_mode:
		msr cpsr_c, #(SVC_MODE \| PSR_I_BIT \| PSR_F_BIT)
		mov r2, sp
		sub sp, r7, #12
		stmfd sp!, {r2, ip, lr}
		/* call func(data,regs) */
		blx r3
		ldmfd sp, {r2, ip, lr}
		mov sp, r2

		/* restore/discard saved state */
		cmp r4, #USR_MODE
		beq fiq_from_usr_mode_exit

		msr cpsr_c, r4
		ldr sp, [r7, #(4 * 13)]
		ldr lr, [r7, #(4 * 14)]
		msr spsr_cxsf, r5

		fiq_from_usr_mode_exit:
		msr cpsr_c, #(FIQ_MODE \| PSR_I_BIT \| PSR_F_BIT)

		ldmfd sp!, {r0-r7}
		ldr lr, [sp, #(4 * 7)]
		ldr r12, [sp, #(4 * 8)]
		add sp, sp, #(10 * 4)
		exit_fiq:
		msr spsr_cxsf, r12
		add r10, #1
		cmp r11, #0
		moveqs pc, lr
		bx r11 /* jump to custom fiq return function */

		nested_fiq:
		orr r12, r12, #(PSR_F_BIT)
		b exit_fiq

		fiq_glue_end:

		ENTRY(fiq_glue_setup) /* func, data, sp, smc call number */
		stmfd sp!, {r4}
		mrs r4, cpsr
		msr cpsr_c, #(FIQ_MODE \| PSR_I_BIT \| PSR_F_BIT)
		movs r8, r0
		mov r9, r1
		mov sp, r2
		mov r11, r3
		moveq r10, #0
		movne r10, #1
		msr cpsr_c, r4
		ldmfd sp!, {r4}
		bx lr

arch/arm/common/fiq_glue_setup.c

deleted100644 → 0

+0 −147

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 Google, Inc.
		*
		* This software is licensed under the terms of the GNU General Public
		* License version 2, as published by the Free Software Foundation, and
		* may be copied, distributed, and modified under those terms.
		*
		* 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.
		*/

		#include <linux/kernel.h>
		#include <linux/percpu.h>
		#include <linux/slab.h>
		#include <asm/fiq.h>
		#include <asm/fiq_glue.h>

		extern unsigned char fiq_glue, fiq_glue_end;
		extern void fiq_glue_setup(void func, void data, void *sp,
		fiq_return_handler_t fiq_return_handler);

		static struct fiq_handler fiq_debbuger_fiq_handler = {
		.name = "fiq_glue",
		};
		DEFINE_PER_CPU(void *, fiq_stack);
		static struct fiq_glue_handler *current_handler;
		static fiq_return_handler_t fiq_return_handler;
		static DEFINE_MUTEX(fiq_glue_lock);

		static void fiq_glue_setup_helper(void *info)
		{
		struct fiq_glue_handler *handler = info;
		fiq_glue_setup(handler->fiq, handler,
		__get_cpu_var(fiq_stack) + THREAD_START_SP,
		fiq_return_handler);
		}

		int fiq_glue_register_handler(struct fiq_glue_handler *handler)
		{
		int ret;
		int cpu;

		if (!handler \|\| !handler->fiq)
		return -EINVAL;

		mutex_lock(&fiq_glue_lock);
		if (fiq_stack) {
		ret = -EBUSY;
		goto err_busy;
		}

		for_each_possible_cpu(cpu) {
		void *stack;
		stack = (void *)__get_free_pages(GFP_KERNEL, THREAD_SIZE_ORDER);
		if (WARN_ON(!stack)) {
		ret = -ENOMEM;
		goto err_alloc_fiq_stack;
		}
		per_cpu(fiq_stack, cpu) = stack;
		}

		ret = claim_fiq(&fiq_debbuger_fiq_handler);
		if (WARN_ON(ret))
		goto err_claim_fiq;

		current_handler = handler;
		on_each_cpu(fiq_glue_setup_helper, handler, true);
		set_fiq_handler(&fiq_glue, &fiq_glue_end - &fiq_glue);

		mutex_unlock(&fiq_glue_lock);
		return 0;

		err_claim_fiq:
		err_alloc_fiq_stack:
		for_each_possible_cpu(cpu) {
		__free_pages(per_cpu(fiq_stack, cpu), THREAD_SIZE_ORDER);
		per_cpu(fiq_stack, cpu) = NULL;
		}
		err_busy:
		mutex_unlock(&fiq_glue_lock);
		return ret;
		}

		static void fiq_glue_update_return_handler(void (*fiq_return)(void))
		{
		fiq_return_handler = fiq_return;
		if (current_handler)
		on_each_cpu(fiq_glue_setup_helper, current_handler, true);
		}

		int fiq_glue_set_return_handler(void (*fiq_return)(void))
		{
		int ret;

		mutex_lock(&fiq_glue_lock);
		if (fiq_return_handler) {
		ret = -EBUSY;
		goto err_busy;
		}
		fiq_glue_update_return_handler(fiq_return);
		ret = 0;
		err_busy:
		mutex_unlock(&fiq_glue_lock);

		return ret;
		}
		EXPORT_SYMBOL(fiq_glue_set_return_handler);

		int fiq_glue_clear_return_handler(void (*fiq_return)(void))
		{
		int ret;

		mutex_lock(&fiq_glue_lock);
		if (WARN_ON(fiq_return_handler != fiq_return)) {
		ret = -EINVAL;
		goto err_inval;
		}
		fiq_glue_update_return_handler(NULL);
		ret = 0;
		err_inval:
		mutex_unlock(&fiq_glue_lock);

		return ret;
		}
		EXPORT_SYMBOL(fiq_glue_clear_return_handler);

		/**
		* fiq_glue_resume - Restore fiqs after suspend or low power idle states
		*
		* This must be called before calling local_fiq_enable after returning from a
		* power state where the fiq mode registers were lost. If a driver provided
		* a resume hook when it registered the handler it will be called.
		*/

		void fiq_glue_resume(void)
		{
		if (!current_handler)
		return;
		fiq_glue_setup(current_handler->fiq, current_handler,
		__get_cpu_var(fiq_stack) + THREAD_START_SP,
		fiq_return_handler);
		if (current_handler->resume)
		current_handler->resume(current_handler);
		}

arch/arm64/boot/dts/qcom/pmi632.dtsi

+10 −1

Original line number	Diff line number	Diff line
		@@ -332,6 +332,11 @@
		500000 500000>;
		//-->[FairPhone][Charging][JasonHsing] Add condition of charging current for thermal-mitigation 20190327 END --

		//<2019/11/28-JessicaTseng, modify charging termination current
		qcom,chg-term-src = <1>;
		qcom,chg-term-current-ma = <(-100)>;
		//>2019/11/28-JessicaTseng

		qcom,chgr@1000 {
		reg = <0x1000 0x100>;
		interrupts =
		@@ -488,7 +493,11 @@
		#address-cells = <1>;
		#size-cells = <1>;

		qcom,qg-iterm-ma = <100>;
		//<2019/11/28-JessicaTseng, modify charging termination current
		//qcom,qg-iterm-ma = <100>;
		qcom,qg-iterm-ma = <150>;
		//>2019/11/28-JessicaTseng

		//<--[Fairphone][Charging][JasonHsing] Re-charge condition for battery to 4.3V 20190103 BEGIN -
		//qcom,hold-soc-while-full;
		//qcom,linearize-soc;