Merge remote-tracking branch 'char-misc/char-misc-next'

[deliverable/linux.git] / drivers / hwtracing / coresight / coresight-etm3x.c

diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c
index 2de4cad9c5ede9b5e2aa65f230dac8d446819adb..3fe368b23d158d56563285052df9aecb869d3ef2 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm3x.c
+++ b/drivers/hwtracing/coresight/coresight-etm3x.c
@@ -311,9 +311,10 @@ void etm_config_trace_mode(struct etm_config *config)
 #define ETM3X_SUPPORTED_OPTIONS (ETMCR_CYC_ACC | ETMCR_TIMESTAMP_EN)
 
 static int etm_parse_event_config(struct etm_drvdata *drvdata,
-                                 struct perf_event_attr *attr)
+                                 struct perf_event *event)
 {
        struct etm_config *config = &drvdata->config;
+       struct perf_event_attr *attr = &event->attr;
 
        if (!attr)
                return -EINVAL;
@@ -459,7 +460,7 @@ static int etm_trace_id(struct coresight_device *csdev)
 }
 
 static int etm_enable_perf(struct coresight_device *csdev,
-                          struct perf_event_attr *attr)
+                          struct perf_event *event)
 {
        struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
 
@@ -467,7 +468,7 @@ static int etm_enable_perf(struct coresight_device *csdev,
                return -EINVAL;
 
        /* Configure the tracer based on the session's specifics */
-       etm_parse_event_config(drvdata, attr);
+       etm_parse_event_config(drvdata, event);
        /* And enable it */
        etm_enable_hw(drvdata);
 
@@ -504,7 +505,7 @@ err:
 }
 
 static int etm_enable(struct coresight_device *csdev,
-                     struct perf_event_attr *attr, u32 mode)
+                     struct perf_event *event, u32 mode)
 {
        int ret;
        u32 val;
@@ -521,7 +522,7 @@ static int etm_enable(struct coresight_device *csdev,
                ret = etm_enable_sysfs(csdev);
                break;
        case CS_MODE_PERF:
-               ret = etm_enable_perf(csdev, attr);
+               ret = etm_enable_perf(csdev, event);
                break;
        default:
                ret = -EINVAL;
@@ -601,7 +602,8 @@ static void etm_disable_sysfs(struct coresight_device *csdev)
        dev_info(drvdata->dev, "ETM tracing disabled\n");
 }
 
-static void etm_disable(struct coresight_device *csdev)
+static void etm_disable(struct coresight_device *csdev,
+                       struct perf_event *event)
 {
        u32 mode;
        struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
@@ -756,13 +758,9 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id)
        struct coresight_platform_data *pdata = NULL;
        struct etm_drvdata *drvdata;
        struct resource *res = &adev->res;
-       struct coresight_desc *desc;
+       struct coresight_desc desc = { 0 };
        struct device_node *np = adev->dev.of_node;
 
-       desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);
-       if (!desc)
-               return -ENOMEM;
-
        drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
        if (!drvdata)
                return -ENOMEM;
@@ -825,13 +823,13 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id)
        etm_init_trace_id(drvdata);
        etm_set_default(&drvdata->config);
 
-       desc->type = CORESIGHT_DEV_TYPE_SOURCE;
-       desc->subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_PROC;
-       desc->ops = &etm_cs_ops;
-       desc->pdata = pdata;
-       desc->dev = dev;
-       desc->groups = coresight_etm_groups;
-       drvdata->csdev = coresight_register(desc);
+       desc.type = CORESIGHT_DEV_TYPE_SOURCE;
+       desc.subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_PROC;
+       desc.ops = &etm_cs_ops;
+       desc.pdata = pdata;
+       desc.dev = dev;
+       desc.groups = coresight_etm_groups;
+       drvdata->csdev = coresight_register(&desc);
        if (IS_ERR(drvdata->csdev)) {
                ret = PTR_ERR(drvdata->csdev);
                goto err_arch_supported;
@@ -893,6 +891,11 @@ static struct amba_id etm_ids[] = {
                .mask   = 0x0003ffff,
                .data   = "ETM 3.3",
        },
+       {       /* ETM 3.5 - Cortex-A5 */
+               .id     = 0x0003b955,
+               .mask   = 0x0003ffff,
+               .data   = "ETM 3.5",
+       },
        {       /* ETM 3.5 */
                .id     = 0x0003b956,
                .mask   = 0x0003ffff,