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

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

Merge "defconfig: msm: Enable MSM_TIMER_LEAP"

parents 7366c639 15074fff

arch/arm64/configs/msmcortex-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -496,6 +496,7 @@ CONFIG_SEEMP_CORE=y 
CONFIG_USB_BAM=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_TIMER_LEAP=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_ARM_SMMU=y

CONFIG_IOMMU_DEBUG=y

arch/arm64/configs/msmcortex_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ CONFIG_SEEMP_CORE=y 
CONFIG_USB_BAM=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_TIMER_LEAP=y

CONFIG_IOMMU_IO_PGTABLE_FAST=y

CONFIG_IOMMU_IO_PGTABLE_FAST_SELFTEST=y

CONFIG_ARM_SMMU=y

arch/arm64/include/asm/arch_timer.h

+7 −0
Original line number Diff line number Diff line
@@ -119,7 +119,14 @@ static inline u64 arch_counter_get_cntvct(void) 
	u64 cval;



	isb();

#if IS_ENABLED(CONFIG_MSM_TIMER_LEAP)

#define L32_BITS	0x00000000FFFFFFFF

	do {

		asm volatile("mrs %0, cntvct_el0" : "=r" (cval));

	} while ((cval & L32_BITS) == L32_BITS);

#else

	asm volatile("mrs %0, cntvct_el0" : "=r" (cval));

#endif



	return cval;

}

drivers/clocksource/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -158,6 +158,15 @@ config ARM_ARCH_TIMER_EVTSTREAM 
	  This must be disabled for hardware validation purposes to detect any

	  hardware anomalies of missing events.



config MSM_TIMER_LEAP

        bool "ARCH TIMER counter rollover"

        default n

        depends on ARM_ARCH_TIMER && ARM64

        help

          This option enables a check for least significant 32 bits of

          counter rollover. On every counter read if least significant

          32 bits are set, reread counter.



config ARM_GLOBAL_TIMER

	bool

	select CLKSRC_OF if OF