* [GIT PULL] clockevents / clocksource changes for 4.18
@ 2018-05-29 18:25 Daniel Lezcano
2018-05-29 18:26 ` [PATCH 1/7] clocksource/drivers/sprd: Fix Kconfig dependency Daniel Lezcano
0 siblings, 1 reply; 8+ messages in thread
From: Daniel Lezcano @ 2018-05-29 18:25 UTC (permalink / raw)
To: Thomas Gleixner
Cc: Chunyan Zhang, Eugeniy.Paltsev, Matt Redfearn, Linux Kernel Mailing List
Hi Thomas,
this pull request contains the following changes:
- Fix Kconfig dependency on the spreadtrum timer (Chunyan Zhang)
- Add comment describing in details the reason why the local interrupt
is disabled (Eugeniy Paltsev)
- Fix outdated file path and add the SPDX tag for the imx timers family
(Fabio Estevam)
- Add pr_fmt and reword pr_* messages (Matt Redfearn)
Thanks!
-- Daniel
The following changes since commit db6f9e55c8d80a4a1a329b9b68a1d370bffb6aad:
clocksource: Move inline keyword to the beginning of function
declarations (2018-05-16 22:21:32 +0200)
are available in the git repository at:
https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/4.18
for you to fetch changes up to e45e778f078efaac085e50366fe06d7b83c8b881:
clocksource/drivers/mxs_timer: Switch to SPDX identifier (2018-05-23
07:39:09 +0200)
----------------------------------------------------------------
Chunyan Zhang (1):
clocksource/drivers/sprd: Fix Kconfig dependency
Eugeniy Paltsev (1):
clocksource/drivers/arc_timer: Add comments about locking while
read GFRC
Fabio Estevam (4):
clocksource/drivers/timer-imx-gpt: Remove outdated file path
clocksource/drivers/timer-imx-gpt: Switch to SPDX identifier
clocksource/drivers/timer-imx-tpm: Switch to SPDX identifier
clocksource/drivers/mxs_timer: Switch to SPDX identifier
Matt Redfearn (1):
clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_*
messages
drivers/clocksource/Kconfig | 4 +++-
drivers/clocksource/arc_timer.c | 14 ++++++++++++++
drivers/clocksource/mips-gic-timer.c | 18 ++++++++++--------
drivers/clocksource/mxs_timer.c | 28 +++++++---------------------
drivers/clocksource/timer-imx-gpt.c | 28 ++++++----------------------
drivers/clocksource/timer-imx-tpm.c | 13 ++++---------
6 files changed, 44 insertions(+), 61 deletions(-)
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/7] clocksource/drivers/sprd: Fix Kconfig dependency
2018-05-29 18:25 [GIT PULL] clockevents / clocksource changes for 4.18 Daniel Lezcano
@ 2018-05-29 18:26 ` Daniel Lezcano
2018-05-29 18:26 ` [PATCH 2/7] clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages Daniel Lezcano
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Daniel Lezcano @ 2018-05-29 18:26 UTC (permalink / raw)
To: tglx; +Cc: linux-kernel, Chunyan Zhang
From: Chunyan Zhang <chunyan.zhang@spreadtrum.com>
SPRD arch doesn't select SPRD_TIMER, so this config would not
appear even if ARCH_SPRD is set but COMPILE_TEST not.
Fix the dependency of this config with SPRD arch, and set a
default value for it, also leave other choices for EXPERT.
Signed-off-by: Chunyan Zhang <chunyan.zhang@spreadtrum.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/Kconfig | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 8e8a097..dec0dd8 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -450,8 +450,10 @@ config MTK_TIMER
Support for Mediatek timer driver.
config SPRD_TIMER
- bool "Spreadtrum timer driver" if COMPILE_TEST
+ bool "Spreadtrum timer driver" if EXPERT
depends on HAS_IOMEM
+ depends on (ARCH_SPRD || COMPILE_TEST)
+ default ARCH_SPRD
select TIMER_OF
help
Enables support for the Spreadtrum timer driver.
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/7] clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages
2018-05-29 18:26 ` [PATCH 1/7] clocksource/drivers/sprd: Fix Kconfig dependency Daniel Lezcano
@ 2018-05-29 18:26 ` Daniel Lezcano
2018-05-29 18:26 ` [PATCH 3/7] clocksource/drivers/arc_timer: Add comments about locking while read GFRC Daniel Lezcano
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Daniel Lezcano @ 2018-05-29 18:26 UTC (permalink / raw)
To: tglx; +Cc: linux-kernel, Matt Redfearn
From: Matt Redfearn <matt.redfearn@mips.com>
Several messages from the MIPS GIC driver include the text "GIC", "GIC
timer", etc, but the format is not standard. Add a pr_fmt of
"mips-gic-timer: " and reword the messages now that they will be
prefixed with the driver name.
Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/mips-gic-timer.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 986b679..54f8a33 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -5,6 +5,9 @@
*
* Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved.
*/
+
+#define pr_fmt(fmt) "mips-gic-timer: " fmt
+
#include <linux/clk.h>
#include <linux/clockchips.h>
#include <linux/cpu.h>
@@ -136,8 +139,7 @@ static int gic_clockevent_init(void)
ret = setup_percpu_irq(gic_timer_irq, &gic_compare_irqaction);
if (ret < 0) {
- pr_err("GIC timer IRQ %d setup failed: %d\n",
- gic_timer_irq, ret);
+ pr_err("IRQ %d setup failed (%d)\n", gic_timer_irq, ret);
return ret;
}
@@ -176,7 +178,7 @@ static int __init __gic_clocksource_init(void)
ret = clocksource_register_hz(&gic_clocksource, gic_frequency);
if (ret < 0)
- pr_warn("GIC: Unable to register clocksource\n");
+ pr_warn("Unable to register clocksource\n");
return ret;
}
@@ -188,7 +190,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
if (!mips_gic_present() || !node->parent ||
!of_device_is_compatible(node->parent, "mti,gic")) {
- pr_warn("No DT definition for the mips gic driver\n");
+ pr_warn("No DT definition\n");
return -ENXIO;
}
@@ -196,7 +198,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
if (!IS_ERR(clk)) {
ret = clk_prepare_enable(clk);
if (ret < 0) {
- pr_err("GIC failed to enable clock\n");
+ pr_err("Failed to enable clock\n");
clk_put(clk);
return ret;
}
@@ -204,12 +206,12 @@ static int __init gic_clocksource_of_init(struct device_node *node)
gic_frequency = clk_get_rate(clk);
} else if (of_property_read_u32(node, "clock-frequency",
&gic_frequency)) {
- pr_err("GIC frequency not specified.\n");
+ pr_err("Frequency not specified\n");
return -EINVAL;
}
gic_timer_irq = irq_of_parse_and_map(node, 0);
if (!gic_timer_irq) {
- pr_err("GIC timer IRQ not specified.\n");
+ pr_err("IRQ not specified\n");
return -EINVAL;
}
@@ -220,7 +222,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
ret = gic_clockevent_init();
if (!ret && !IS_ERR(clk)) {
if (clk_notifier_register(clk, &gic_clk_nb) < 0)
- pr_warn("GIC: Unable to register clock notifier\n");
+ pr_warn("Unable to register clock notifier\n");
}
/* And finally start the counter */
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/7] clocksource/drivers/arc_timer: Add comments about locking while read GFRC
2018-05-29 18:26 ` [PATCH 1/7] clocksource/drivers/sprd: Fix Kconfig dependency Daniel Lezcano
2018-05-29 18:26 ` [PATCH 2/7] clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages Daniel Lezcano
@ 2018-05-29 18:26 ` Daniel Lezcano
2018-05-29 18:26 ` [PATCH 4/7] clocksource/drivers/timer-imx-gpt: Remove outdated file path Daniel Lezcano
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Daniel Lezcano @ 2018-05-29 18:26 UTC (permalink / raw)
To: tglx
Cc: linux-kernel, Eugeniy Paltsev, Vineet Gupta,
open list:SYNOPSYS ARC ARCHITECTURE
From: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
This came to light in some internal discussions and it is nice to have
this documented rather than digging up the PRM (Prog Ref Manual) again.
Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Acked-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/arc_timer.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/clocksource/arc_timer.c b/drivers/clocksource/arc_timer.c
index 471b428..20da9b1 100644
--- a/drivers/clocksource/arc_timer.c
+++ b/drivers/clocksource/arc_timer.c
@@ -61,6 +61,20 @@ static u64 arc_read_gfrc(struct clocksource *cs)
unsigned long flags;
u32 l, h;
+ /*
+ * From a programming model pov, there seems to be just one instance of
+ * MCIP_CMD/MCIP_READBACK however micro-architecturally there's
+ * an instance PER ARC CORE (not per cluster), and there are dedicated
+ * hardware decode logic (per core) inside ARConnect to handle
+ * simultaneous read/write accesses from cores via those two registers.
+ * So several concurrent commands to ARConnect are OK if they are
+ * trying to access two different sub-components (like GFRC,
+ * inter-core interrupt, etc...). HW also supports simultaneously
+ * accessing GFRC by multiple cores.
+ * That's why it is safe to disable hard interrupts on the local CPU
+ * before access to GFRC instead of taking global MCIP spinlock
+ * defined in arch/arc/kernel/mcip.c
+ */
local_irq_save(flags);
__mcip_cmd(CMD_GFRC_READ_LO, 0);
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/7] clocksource/drivers/timer-imx-gpt: Remove outdated file path
2018-05-29 18:26 ` [PATCH 1/7] clocksource/drivers/sprd: Fix Kconfig dependency Daniel Lezcano
2018-05-29 18:26 ` [PATCH 2/7] clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages Daniel Lezcano
2018-05-29 18:26 ` [PATCH 3/7] clocksource/drivers/arc_timer: Add comments about locking while read GFRC Daniel Lezcano
@ 2018-05-29 18:26 ` Daniel Lezcano
2018-05-29 18:26 ` [PATCH 5/7] clocksource/drivers/timer-imx-gpt: Switch to SPDX identifier Daniel Lezcano
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Daniel Lezcano @ 2018-05-29 18:26 UTC (permalink / raw)
To: tglx; +Cc: linux-kernel, Fabio Estevam
From: Fabio Estevam <fabio.estevam@nxp.com>
imx gpt timer driver has been moved from arch/arm/mach-imx to
drivers/clocksource/ a long time ago, so remove the reference
to the old file path.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/timer-imx-gpt.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 6ec6d79..b63b834 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -1,6 +1,4 @@
/*
- * linux/arch/arm/plat-mxc/time.c
- *
* Copyright (C) 2000-2001 Deep Blue Solutions
* Copyright (C) 2002 Shane Nay (shane@minirl.com)
* Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/7] clocksource/drivers/timer-imx-gpt: Switch to SPDX identifier
2018-05-29 18:26 ` [PATCH 1/7] clocksource/drivers/sprd: Fix Kconfig dependency Daniel Lezcano
` (2 preceding siblings ...)
2018-05-29 18:26 ` [PATCH 4/7] clocksource/drivers/timer-imx-gpt: Remove outdated file path Daniel Lezcano
@ 2018-05-29 18:26 ` Daniel Lezcano
2018-05-29 18:26 ` [PATCH 6/7] clocksource/drivers/timer-imx-tpm: " Daniel Lezcano
2018-05-29 18:26 ` [PATCH 7/7] clocksource/drivers/mxs_timer: " Daniel Lezcano
5 siblings, 0 replies; 8+ messages in thread
From: Daniel Lezcano @ 2018-05-29 18:26 UTC (permalink / raw)
To: tglx; +Cc: linux-kernel, Fabio Estevam
From: Fabio Estevam <fabio.estevam@nxp.com>
Adopt the SPDX license identifier headers to ease license compliance
management.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/timer-imx-gpt.c | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index b63b834..165fbbb 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -1,23 +1,9 @@
-/*
- * Copyright (C) 2000-2001 Deep Blue Solutions
- * Copyright (C) 2002 Shane Nay (shane@minirl.com)
- * Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
- * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (C) 2000-2001 Deep Blue Solutions
+// Copyright (C) 2002 Shane Nay (shane@minirl.com)
+// Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
+// Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
#include <linux/interrupt.h>
#include <linux/irq.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/7] clocksource/drivers/timer-imx-tpm: Switch to SPDX identifier
2018-05-29 18:26 ` [PATCH 1/7] clocksource/drivers/sprd: Fix Kconfig dependency Daniel Lezcano
` (3 preceding siblings ...)
2018-05-29 18:26 ` [PATCH 5/7] clocksource/drivers/timer-imx-gpt: Switch to SPDX identifier Daniel Lezcano
@ 2018-05-29 18:26 ` Daniel Lezcano
2018-05-29 18:26 ` [PATCH 7/7] clocksource/drivers/mxs_timer: " Daniel Lezcano
5 siblings, 0 replies; 8+ messages in thread
From: Daniel Lezcano @ 2018-05-29 18:26 UTC (permalink / raw)
To: tglx; +Cc: linux-kernel, Fabio Estevam
From: Fabio Estevam <fabio.estevam@nxp.com>
Adopt the SPDX license identifier headers to ease license compliance
management.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/timer-imx-tpm.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/clocksource/timer-imx-tpm.c b/drivers/clocksource/timer-imx-tpm.c
index 6c83184..b7aa2b8 100644
--- a/drivers/clocksource/timer-imx-tpm.c
+++ b/drivers/clocksource/timer-imx-tpm.c
@@ -1,12 +1,7 @@
-/*
- * Copyright 2016 Freescale Semiconductor, Inc.
- * Copyright 2017 NXP
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- */
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright 2016 Freescale Semiconductor, Inc.
+// Copyright 2017 NXP
#include <linux/clk.h>
#include <linux/clockchips.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 7/7] clocksource/drivers/mxs_timer: Switch to SPDX identifier
2018-05-29 18:26 ` [PATCH 1/7] clocksource/drivers/sprd: Fix Kconfig dependency Daniel Lezcano
` (4 preceding siblings ...)
2018-05-29 18:26 ` [PATCH 6/7] clocksource/drivers/timer-imx-tpm: " Daniel Lezcano
@ 2018-05-29 18:26 ` Daniel Lezcano
5 siblings, 0 replies; 8+ messages in thread
From: Daniel Lezcano @ 2018-05-29 18:26 UTC (permalink / raw)
To: tglx; +Cc: linux-kernel, Fabio Estevam
From: Fabio Estevam <fabio.estevam@nxp.com>
Adopt the SPDX license identifier headers to ease license compliance
management.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/mxs_timer.c | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c
index a03434e..f6ddae3 100644
--- a/drivers/clocksource/mxs_timer.c
+++ b/drivers/clocksource/mxs_timer.c
@@ -1,24 +1,10 @@
-/*
- * Copyright (C) 2000-2001 Deep Blue Solutions
- * Copyright (C) 2002 Shane Nay (shane@minirl.com)
- * Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
- * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
- * Copyright (C) 2010 Freescale Semiconductor, Inc. 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
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright (C) 2000-2001 Deep Blue Solutions
+// Copyright (C) 2002 Shane Nay (shane@minirl.com)
+// Copyright (C) 2006-2007 Pavel Pisa (ppisa@pikron.com)
+// Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
+// Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
#include <linux/err.h>
#include <linux/interrupt.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-05-29 18:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-29 18:25 [GIT PULL] clockevents / clocksource changes for 4.18 Daniel Lezcano
2018-05-29 18:26 ` [PATCH 1/7] clocksource/drivers/sprd: Fix Kconfig dependency Daniel Lezcano
2018-05-29 18:26 ` [PATCH 2/7] clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages Daniel Lezcano
2018-05-29 18:26 ` [PATCH 3/7] clocksource/drivers/arc_timer: Add comments about locking while read GFRC Daniel Lezcano
2018-05-29 18:26 ` [PATCH 4/7] clocksource/drivers/timer-imx-gpt: Remove outdated file path Daniel Lezcano
2018-05-29 18:26 ` [PATCH 5/7] clocksource/drivers/timer-imx-gpt: Switch to SPDX identifier Daniel Lezcano
2018-05-29 18:26 ` [PATCH 6/7] clocksource/drivers/timer-imx-tpm: " Daniel Lezcano
2018-05-29 18:26 ` [PATCH 7/7] clocksource/drivers/mxs_timer: " Daniel Lezcano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).