Skip to contentSkip to conversation

ipipe-noarch: Revert arch/arm targeting commits

PATCH New Jan Kiszka 1 participant 5 messages Mar 1, 2019

Subsystems (4)
lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

cover ipipe-noarch: Revert arch/arm targeting commits

This commits should be present in the ARM tree only, the small change to arch_timer_set_cntkctl also in ARM64. By removing them from noarch, x86 will no longer touch any arch-alien folders.

Jan

Jan Kiszka (4):
ipipe: Revert changes to ARM arch_timer_set_cntkctl
Revert "clocksource: imx/imx53: ipipe: add support for user-visible
TSC"
Revert "clocksource: imx/imx51: ipipe: add support for user-visible
TSC"
Revert "clocksource: omap/dmtimer: ipipe: add support for user-visible
TSC"

 arch/arm/include/asm/arch_timer.h         |  4 ----
 arch/arm/mach-imx/mach-imx51.c            |  5 -----
 arch/arm/mach-imx/mach-imx53.c            |  5 -----
 arch/arm/plat-omap/dmtimer.c              | 17 ++---------------
 arch/arm/plat-omap/include/plat/dmtimer.h |  6 ------
 5 files changed, 2 insertions(+), 35 deletions(-)
Signature · 1 line
2.16.4
author
#1 lore raw

PATCH 1/4 ipipe: Revert changes to ARM arch_timer_set_cntkctl

From: Jan Kiszka <[email protected]>

This belongs into the ARM tree.

---
 arch/arm/include/asm/arch_timer.h | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/include/asm/arch_timer.h +0 -4
index e9e7656bc137..9327e3a101dc 100644
@@ -106,10 +106,6 @@ static inline u32 arch_timer_get_cntkctl(void)
 
 static inline void arch_timer_set_cntkctl(u32 cntkctl)
 {
-#ifdef CONFIG_IPIPE
-	/* Enable access to user-space (may not be needed) */
-	cntkctl |= ARCH_TIMER_USR_PCT_ACCESS_EN;
-#endif
 	asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl));
 }
 
Signature · 1 line
2.16.4
author
#2 lore raw

PATCH 2/4 Revert "clocksource: imx/imx53: ipipe: add support for user-visible TSC"

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

This reverts commit de53c9b26caa1c28785bb642350c07cfac6ebc3a.

Belongs into the ARM tree.

---
 arch/arm/mach-imx/mach-imx53.c | 5 -----
 1 file changed, 5 deletions(-)
arch/arm/mach-imx/mach-imx53.c +0 -5
index a02550b5ef7b..07c2e8dca494 100644
@@ -37,11 +37,6 @@ static void __init imx53_dt_init(void)
 
 static void __init imx53_init_late(void)
 {
-#ifdef CONFIG_IPIPE
-	/* Allow user-space access to emulated tsc */
-	imx_set_aips(IMX_IO_ADDRESS(0x53f00000));
-	imx_set_aips(IMX_IO_ADDRESS(0x63f00000));
-#endif
 	imx53_pm_init();
 }
 
Signature · 1 line
2.16.4
author
#3 lore raw

PATCH 3/4 Revert "clocksource: imx/imx51: ipipe: add support for user-visible TSC"

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

This reverts commit 2f8ff661dfbfa84b14571d1629f73455b2bd707b.

Belongs into the ARM tree.

---
 arch/arm/mach-imx/mach-imx51.c | 5 -----
 1 file changed, 5 deletions(-)
arch/arm/mach-imx/mach-imx51.c +0 -5
index 60975275ff88..3835b6a3423c 100644
@@ -59,11 +59,6 @@ static void __init imx51_dt_init(void)
 static void __init imx51_init_late(void)
 {
 	mx51_neon_fixup();
-#ifdef CONFIG_IPIPE
-	/* Allow user-space access to emulated tsc */
-	imx_set_aips(IMX_IO_ADDRESS(0x73f00000));
-	imx_set_aips(IMX_IO_ADDRESS(0x83f00000));
-#endif
 	imx51_pm_init();
 }
 
Signature · 1 line
2.16.4
author
#4 lore raw

PATCH 4/4 Revert "clocksource: omap/dmtimer: ipipe: add support for user-visible TSC"

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

This reverts commit d35c49508ea205e86de96b005021f46d4199a861.

Belongs into the ARM tree.

---
 arch/arm/plat-omap/dmtimer.c              | 17 ++---------------
 arch/arm/plat-omap/include/plat/dmtimer.h |  6 ------
 2 files changed, 2 insertions(+), 21 deletions(-)
arch/arm/plat-omap/dmtimer.c +2 -15
index 4e8cfc405974..ebef8aacea83 100644
@@ -395,18 +395,6 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer)
 }
 EXPORT_SYMBOL_GPL(omap_dm_timer_get_irq);
 
-#ifdef CONFIG_IPIPE
-unsigned long omap_dm_timer_get_phys_counter_addr(struct omap_dm_timer *timer)
-{
-	return timer->phys_base + (OMAP_TIMER_COUNTER_REG & 0xff);
-}
-
-unsigned long omap_dm_timer_get_virt_counter_addr(struct omap_dm_timer *timer)
-{
-	return (unsigned long)timer->io_base + (OMAP_TIMER_COUNTER_REG & 0xff);
-}
-#endif /* CONFIG_IPIPE */
-
 #if defined(CONFIG_ARCH_OMAP1)
 #include <mach/hardware.h>
 /**
@@ -584,7 +572,7 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
 EXPORT_SYMBOL_GPL(omap_dm_timer_set_source);
 
 int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,
-                            unsigned int load)
+			    unsigned int load)
 {
 	u32 l;
 
@@ -611,7 +599,7 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_set_load);
 
 /* Optimized set_load which removes costly spin wait in timer_start */
 int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload,
-			    unsigned int load)
+                            unsigned int load)
 {
 	u32 l;
 
@@ -876,7 +864,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
 	}
 
 	timer->fclk = ERR_PTR(-ENODEV);
-	timer->phys_base = mem->start;
 	timer->io_base = devm_ioremap_resource(dev, mem);
 	if (IS_ERR(timer->io_base))
 		return PTR_ERR(timer->io_base);
arch/arm/plat-omap/include/plat/dmtimer.h +0 -6
index ee368c414bb9..dd79f3005cdf 100644
@@ -104,7 +104,6 @@ struct omap_dm_timer {
 	int irq;
 	struct clk *fclk;
 
-	unsigned long	phys_base;
 	void __iomem	*io_base;
 	void __iomem	*irq_stat;	/* TISR/IRQSTATUS interrupt status */
 	void __iomem	*irq_ena;	/* irq enable */
@@ -416,9 +415,4 @@ static inline void __omap_dm_timer_write_status(struct omap_dm_timer *timer,
 	writel_relaxed(value, timer->irq_stat);
 }
 
-static inline unsigned long __omap_dm_timer_read_status(struct omap_dm_timer *timer)
-{
-	return __raw_readl(timer->irq_stat);
-}
-
 #endif /* __ASM_ARCH_DMTIMER_H */
Signature · 1 line
2.16.4