* [PATCH 01/11] coresight-etm: unlock on error paths in mode_store()
2015-01-09 23:57 [PATCH 00/11] coresight: next mathieu.poirier at linaro.org
@ 2015-01-09 23:57 ` mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 02/11] coresight-etb: use module_amba_driver to simplify the code mathieu.poirier at linaro.org
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: mathieu.poirier at linaro.org @ 2015-01-09 23:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Dan Carpenter <dan.carpenter@oracle.com>
There are some missing unlocks on the error paths.
Fixes: a939fc5a71ad ('coresight-etm: add CoreSight ETM/PTM driver')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/coresight/coresight-etm3x.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/coresight/coresight-etm3x.c b/drivers/coresight/coresight-etm3x.c
index d9e3ed6aa857..369cac00afaa 100644
--- a/drivers/coresight/coresight-etm3x.c
+++ b/drivers/coresight/coresight-etm3x.c
@@ -573,7 +573,8 @@ static ssize_t mode_store(struct device *dev,
if (drvdata->mode & ETM_MODE_STALL) {
if (!(drvdata->etmccr & ETMCCR_FIFOFULL)) {
dev_warn(drvdata->dev, "stall mode not supported\n");
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_unlock;
}
drvdata->ctrl |= ETMCR_STALL_MODE;
} else
@@ -582,7 +583,8 @@ static ssize_t mode_store(struct device *dev,
if (drvdata->mode & ETM_MODE_TIMESTAMP) {
if (!(drvdata->etmccer & ETMCCER_TIMESTAMP)) {
dev_warn(drvdata->dev, "timestamp not supported\n");
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_unlock;
}
drvdata->ctrl |= ETMCR_TIMESTAMP_EN;
} else
@@ -595,6 +597,10 @@ static ssize_t mode_store(struct device *dev,
spin_unlock(&drvdata->spinlock);
return size;
+
+err_unlock:
+ spin_unlock(&drvdata->spinlock);
+ return ret;
}
static DEVICE_ATTR_RW(mode);
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 02/11] coresight-etb: use module_amba_driver to simplify the code
2015-01-09 23:57 [PATCH 00/11] coresight: next mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 01/11] coresight-etm: unlock on error paths in mode_store() mathieu.poirier at linaro.org
@ 2015-01-09 23:57 ` mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 03/11] coresight-funnel: " mathieu.poirier at linaro.org
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: mathieu.poirier at linaro.org @ 2015-01-09 23:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
module_amba_driver() makes the code simpler by eliminating
boilerplate code.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/coresight/coresight-etb10.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/coresight/coresight-etb10.c b/drivers/coresight/coresight-etb10.c
index c922d4aded8a..a1da7020201b 100644
--- a/drivers/coresight/coresight-etb10.c
+++ b/drivers/coresight/coresight-etb10.c
@@ -521,17 +521,7 @@ static struct amba_driver etb_driver = {
.id_table = etb_ids,
};
-static int __init etb_init(void)
-{
- return amba_driver_register(&etb_driver);
-}
-module_init(etb_init);
-
-static void __exit etb_exit(void)
-{
- amba_driver_unregister(&etb_driver);
-}
-module_exit(etb_exit);
+module_amba_driver(etb_driver);
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("CoreSight Embedded Trace Buffer driver");
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 03/11] coresight-funnel: use module_amba_driver to simplify the code
2015-01-09 23:57 [PATCH 00/11] coresight: next mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 01/11] coresight-etm: unlock on error paths in mode_store() mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 02/11] coresight-etb: use module_amba_driver to simplify the code mathieu.poirier at linaro.org
@ 2015-01-09 23:57 ` mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 04/11] coresight-tmc: " mathieu.poirier at linaro.org
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: mathieu.poirier at linaro.org @ 2015-01-09 23:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
module_amba_driver() makes the code simpler by eliminating
boilerplate code.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/coresight/coresight-funnel.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/coresight/coresight-funnel.c b/drivers/coresight/coresight-funnel.c
index 2108edffe1f4..3db36f70b666 100644
--- a/drivers/coresight/coresight-funnel.c
+++ b/drivers/coresight/coresight-funnel.c
@@ -252,17 +252,7 @@ static struct amba_driver funnel_driver = {
.id_table = funnel_ids,
};
-static int __init funnel_init(void)
-{
- return amba_driver_register(&funnel_driver);
-}
-module_init(funnel_init);
-
-static void __exit funnel_exit(void)
-{
- amba_driver_unregister(&funnel_driver);
-}
-module_exit(funnel_exit);
+module_amba_driver(funnel_driver);
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("CoreSight Funnel driver");
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 04/11] coresight-tmc: use module_amba_driver to simplify the code
2015-01-09 23:57 [PATCH 00/11] coresight: next mathieu.poirier at linaro.org
` (2 preceding siblings ...)
2015-01-09 23:57 ` [PATCH 03/11] coresight-funnel: " mathieu.poirier at linaro.org
@ 2015-01-09 23:57 ` mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 05/11] coresight-tpiu: " mathieu.poirier at linaro.org
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: mathieu.poirier at linaro.org @ 2015-01-09 23:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
module_amba_driver() makes the code simpler by eliminating
boilerplate code.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/coresight/coresight-tmc.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/coresight/coresight-tmc.c b/drivers/coresight/coresight-tmc.c
index ce2c293f1707..3ff232f9ddf7 100644
--- a/drivers/coresight/coresight-tmc.c
+++ b/drivers/coresight/coresight-tmc.c
@@ -760,17 +760,7 @@ static struct amba_driver tmc_driver = {
.id_table = tmc_ids,
};
-static int __init tmc_init(void)
-{
- return amba_driver_register(&tmc_driver);
-}
-module_init(tmc_init);
-
-static void __exit tmc_exit(void)
-{
- amba_driver_unregister(&tmc_driver);
-}
-module_exit(tmc_exit);
+module_amba_driver(tmc_driver);
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("CoreSight Trace Memory Controller driver");
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 05/11] coresight-tpiu: use module_amba_driver to simplify the code
2015-01-09 23:57 [PATCH 00/11] coresight: next mathieu.poirier at linaro.org
` (3 preceding siblings ...)
2015-01-09 23:57 ` [PATCH 04/11] coresight-tmc: " mathieu.poirier at linaro.org
@ 2015-01-09 23:57 ` mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 06/11] coresight-etm: Fix initial trace ID value mathieu.poirier at linaro.org
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: mathieu.poirier at linaro.org @ 2015-01-09 23:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
module_amba_driver() makes the code simpler by eliminating
boilerplate code.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/coresight/coresight-tpiu.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/coresight/coresight-tpiu.c b/drivers/coresight/coresight-tpiu.c
index ae101082791a..3b33af2416bb 100644
--- a/drivers/coresight/coresight-tpiu.c
+++ b/drivers/coresight/coresight-tpiu.c
@@ -201,17 +201,7 @@ static struct amba_driver tpiu_driver = {
.id_table = tpiu_ids,
};
-static int __init tpiu_init(void)
-{
- return amba_driver_register(&tpiu_driver);
-}
-module_init(tpiu_init);
-
-static void __exit tpiu_exit(void)
-{
- amba_driver_unregister(&tpiu_driver);
-}
-module_exit(tpiu_exit);
+module_amba_driver(tpiu_driver);
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("CoreSight Trace Port Interface Unit driver");
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 06/11] coresight-etm: Fix initial trace ID value
2015-01-09 23:57 [PATCH 00/11] coresight: next mathieu.poirier at linaro.org
` (4 preceding siblings ...)
2015-01-09 23:57 ` [PATCH 05/11] coresight-tpiu: " mathieu.poirier at linaro.org
@ 2015-01-09 23:57 ` mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 07/11] coresight: remove the unused macro CORESIGHT_DEBUGFS_ENTRY mathieu.poirier at linaro.org
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: mathieu.poirier at linaro.org @ 2015-01-09 23:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Mathieu Poirier <mathieu.poirier@linaro.org>
The coresight TRM specify that a component's trace ID should
be other than 0.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/coresight/coresight-etm3x.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/coresight/coresight-etm3x.c b/drivers/coresight/coresight-etm3x.c
index 369cac00afaa..73c36696f1b6 100644
--- a/drivers/coresight/coresight-etm3x.c
+++ b/drivers/coresight/coresight-etm3x.c
@@ -1749,7 +1749,11 @@ static void etm_init_arch_data(void *info)
static void etm_init_default_data(struct etm_drvdata *drvdata)
{
- static int etm3x_traceid;
+ /*
+ * A trace ID of value 0 is invalid, so let's start at some
+ * random value that fits in 7 bits and will be just as good.
+ */
+ static int etm3x_traceid = 0x10;
u32 flags = (1 << 0 | /* instruction execute*/
3 << 3 | /* ARM instruction */
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 07/11] coresight: remove the unused macro CORESIGHT_DEBUGFS_ENTRY
2015-01-09 23:57 [PATCH 00/11] coresight: next mathieu.poirier at linaro.org
` (5 preceding siblings ...)
2015-01-09 23:57 ` [PATCH 06/11] coresight-etm: Fix initial trace ID value mathieu.poirier at linaro.org
@ 2015-01-09 23:57 ` mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 08/11] coresight: fix typo in comment in of_coresight.c mathieu.poirier at linaro.org
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: mathieu.poirier at linaro.org @ 2015-01-09 23:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Xia Kaixu <xiakaixu@huawei.com>
Debugfs isn't used for coresight configuration, so the macro
CORESIGHT_DEBUGFS_ENTRY is unnecessary, just remove it.
Signed-off-by: Xia Kaixu <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
include/linux/coresight.h | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 5d3c54311f7a..7cbfecbfa643 100644
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -179,15 +179,6 @@ struct coresight_device {
#define sink_ops(csdev) csdev->ops->sink_ops
#define link_ops(csdev) csdev->ops->link_ops
-#define CORESIGHT_DEBUGFS_ENTRY(__name, __entry_name, \
- __mode, __get, __set, __fmt) \
-DEFINE_SIMPLE_ATTRIBUTE(__name ## _ops, __get, __set, __fmt); \
-static const struct coresight_ops_entry __name ## _entry = { \
- .name = __entry_name, \
- .mode = __mode, \
- .ops = &__name ## _ops \
-}
-
/**
* struct coresight_ops_sink - basic operations for a sink
* Operations available for sinks
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 08/11] coresight: fix typo in comment in of_coresight.c
2015-01-09 23:57 [PATCH 00/11] coresight: next mathieu.poirier at linaro.org
` (6 preceding siblings ...)
2015-01-09 23:57 ` [PATCH 07/11] coresight: remove the unused macro CORESIGHT_DEBUGFS_ENTRY mathieu.poirier at linaro.org
@ 2015-01-09 23:57 ` mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 09/11] coresight: Fixing wrong #ifdef/#endif placement mathieu.poirier at linaro.org
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: mathieu.poirier at linaro.org @ 2015-01-09 23:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Kaixu Xia <xiakaixu@huawei.com>
Debugfs isn't used for coresight configuration, so the corresponding
comments should be changed.
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/coresight/of_coresight.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/coresight/of_coresight.c b/drivers/coresight/of_coresight.c
index 5030c0734508..8bd524e49518 100644
--- a/drivers/coresight/of_coresight.c
+++ b/drivers/coresight/of_coresight.c
@@ -126,7 +126,7 @@ struct coresight_platform_data *of_get_coresight_platform_data(
if (!pdata)
return ERR_PTR(-ENOMEM);
- /* Use device name as debugfs handle */
+ /* Use device name as sysfs handle */
pdata->name = dev_name(dev);
/* Get the number of input and output port for this component */
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 09/11] coresight: Fixing wrong #ifdef/#endif placement
2015-01-09 23:57 [PATCH 00/11] coresight: next mathieu.poirier at linaro.org
` (7 preceding siblings ...)
2015-01-09 23:57 ` [PATCH 08/11] coresight: fix typo in comment in of_coresight.c mathieu.poirier at linaro.org
@ 2015-01-09 23:57 ` mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 10/11] coresight: fix comment in of_coresight.c mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 11/11] coresight: fixing validity check on remote device mathieu.poirier at linaro.org
10 siblings, 0 replies; 12+ messages in thread
From: mathieu.poirier at linaro.org @ 2015-01-09 23:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Mathieu Poirier <mathieu.poirier@linaro.org>
Fixing problem reported by:
https://lkml.org/lkml/2015/1/6/86
The #ifdef/#endif is wrong and prevents the stub of function
of_get_coresight_platform_data() from being visible when
CONFIG_OF is not defined.
Moving CONFIG_OF condition out of CONFIG_CORESIGHT, making
them both independent.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
include/linux/coresight.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 7cbfecbfa643..cd6d4c384ca3 100644
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -230,10 +230,6 @@ extern void coresight_disable(struct coresight_device *csdev);
extern int coresight_is_bit_set(u32 val, int position, int value);
extern int coresight_timeout(void __iomem *addr, u32 offset,
int position, int value);
-#ifdef CONFIG_OF
-extern struct coresight_platform_data *of_get_coresight_platform_data(
- struct device *dev, struct device_node *node);
-#endif
#else
static inline struct coresight_device *
coresight_register(struct coresight_desc *desc) { return NULL; }
@@ -245,10 +241,14 @@ static inline int coresight_is_bit_set(u32 val, int position, int value)
{ return 0; }
static inline int coresight_timeout(void __iomem *addr, u32 offset,
int position, int value) { return 1; }
+#endif
+
#ifdef CONFIG_OF
+extern struct coresight_platform_data *of_get_coresight_platform_data(
+ struct device *dev, struct device_node *node);
+#else
static inline struct coresight_platform_data *of_get_coresight_platform_data(
struct device *dev, struct device_node *node) { return NULL; }
#endif
-#endif
#endif
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 10/11] coresight: fix comment in of_coresight.c
2015-01-09 23:57 [PATCH 00/11] coresight: next mathieu.poirier at linaro.org
` (8 preceding siblings ...)
2015-01-09 23:57 ` [PATCH 09/11] coresight: Fixing wrong #ifdef/#endif placement mathieu.poirier at linaro.org
@ 2015-01-09 23:57 ` mathieu.poirier at linaro.org
2015-01-09 23:57 ` [PATCH 11/11] coresight: fixing validity check on remote device mathieu.poirier at linaro.org
10 siblings, 0 replies; 12+ messages in thread
From: mathieu.poirier at linaro.org @ 2015-01-09 23:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Kaixu Xia <xiakaixu@huawei.com>
Outports is a member of the struct pdata and should be
a better choice.
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/coresight/of_coresight.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/coresight/of_coresight.c b/drivers/coresight/of_coresight.c
index 8bd524e49518..89ebbe29ac97 100644
--- a/drivers/coresight/of_coresight.c
+++ b/drivers/coresight/of_coresight.c
@@ -93,7 +93,7 @@ static int of_coresight_alloc_memory(struct device *dev,
if (!pdata->outports)
return -ENOMEM;
- /* Children connected to this component via @outport */
+ /* Children connected to this component via @outports */
pdata->child_names = devm_kzalloc(dev, pdata->nr_outport *
sizeof(*pdata->child_names),
GFP_KERNEL);
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 11/11] coresight: fixing validity check on remote device
2015-01-09 23:57 [PATCH 00/11] coresight: next mathieu.poirier at linaro.org
` (9 preceding siblings ...)
2015-01-09 23:57 ` [PATCH 10/11] coresight: fix comment in of_coresight.c mathieu.poirier at linaro.org
@ 2015-01-09 23:57 ` mathieu.poirier at linaro.org
10 siblings, 0 replies; 12+ messages in thread
From: mathieu.poirier at linaro.org @ 2015-01-09 23:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Kaixu Xia <xiakaixu@huawei.com>
A validity check should be made on the remote device, i.e rdev,
rather than the current device.
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/coresight/of_coresight.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/coresight/of_coresight.c b/drivers/coresight/of_coresight.c
index 89ebbe29ac97..9a5ff56f34d9 100644
--- a/drivers/coresight/of_coresight.c
+++ b/drivers/coresight/of_coresight.c
@@ -174,7 +174,7 @@ struct coresight_platform_data *of_get_coresight_platform_data(
continue;
rdev = of_coresight_get_endpoint_device(rparent);
- if (!dev)
+ if (!rdev)
continue;
pdata->child_names[i] = dev_name(rdev);
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread