[SRU][N][PATCH v2 2/6] UBUNTU: SAUCE: Revert "coresight: catu: Move ACPI support from AMBA driver to platform driver"
Noah Wager
noah.wager at canonical.com
Wed Feb 25 16:53:58 UTC 2026
BugLink: https://bugs.launchpad.net/bugs/2142337
This reverts commit cf08211db65c4e7d900e1cbe0ebddc56a816eaf6.
This commit depends on the upstream commit
075b7cd7ad7d ("coresight: Add helpers registering/removing both AMBA and platform drivers")
which is not ported to this kernel. This breaks coresight builds, so
revert the change.
This patch is a dependency of
0b88e5c14c2f ("coresight: catu: Support atclk")
which we also need to revert.
This revert is acceptable because the generic kernel has not
demonstrated any need for this atclk fix.
Signed-off-by: Noah Wager <noah.wager at canonical.com>
---
drivers/acpi/arm64/amba.c | 1 +
drivers/hwtracing/coresight/coresight-catu.c | 138 +++----------------
drivers/hwtracing/coresight/coresight-catu.h | 1 -
3 files changed, 20 insertions(+), 120 deletions(-)
diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c
index 5463d97875a5..d9811b1934e0 100644
--- a/drivers/acpi/arm64/amba.c
+++ b/drivers/acpi/arm64/amba.c
@@ -26,6 +26,7 @@ static const struct acpi_device_id amba_id_list[] = {
{"ARMHC503", 0}, /* ARM CoreSight Debug */
{"ARMHC979", 0}, /* ARM CoreSight TPIU */
{"ARMHC98D", 0}, /* ARM CoreSight Dynamic Replicator */
+ {"ARMHC9CA", 0}, /* ARM CoreSight CATU */
{"ARMHC9FF", 0}, /* ARM CoreSight Dynamic Funnel */
{"", 0},
};
diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c
index 49ee8526f35a..6d6879f1e092 100644
--- a/drivers/hwtracing/coresight/coresight-catu.c
+++ b/drivers/hwtracing/coresight/coresight-catu.c
@@ -7,13 +7,11 @@
* Author: Suzuki K Poulose <suzuki.poulose at arm.com>
*/
-#include <linux/acpi.h>
#include <linux/amba/bus.h>
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/io.h>
#include <linux/kernel.h>
-#include <linux/platform_device.h>
#include <linux/slab.h>
#include "coresight-catu.h"
@@ -512,20 +510,28 @@ static const struct coresight_ops catu_ops = {
.helper_ops = &catu_helper_ops,
};
-static int __catu_probe(struct device *dev, struct resource *res)
+static int catu_probe(struct amba_device *adev, const struct amba_id *id)
{
int ret = 0;
u32 dma_mask;
- struct catu_drvdata *drvdata = dev_get_drvdata(dev);
+ struct catu_drvdata *drvdata;
struct coresight_desc catu_desc;
struct coresight_platform_data *pdata = NULL;
+ struct device *dev = &adev->dev;
void __iomem *base;
catu_desc.name = coresight_alloc_device_name(&catu_devs, dev);
if (!catu_desc.name)
return -ENOMEM;
- base = devm_ioremap_resource(dev, res);
+ drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
+ if (!drvdata) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ dev_set_drvdata(dev, drvdata);
+ base = devm_ioremap_resource(dev, &adev->res);
if (IS_ERR(base)) {
ret = PTR_ERR(base);
goto out;
@@ -570,39 +576,19 @@ static int __catu_probe(struct device *dev, struct resource *res)
drvdata->csdev = coresight_register(&catu_desc);
if (IS_ERR(drvdata->csdev))
ret = PTR_ERR(drvdata->csdev);
-out:
- return ret;
-}
-
-static int catu_probe(struct amba_device *adev, const struct amba_id *id)
-{
- struct catu_drvdata *drvdata;
- int ret;
-
- drvdata = devm_kzalloc(&adev->dev, sizeof(*drvdata), GFP_KERNEL);
- if (!drvdata)
- return -ENOMEM;
-
- amba_set_drvdata(adev, drvdata);
- ret = __catu_probe(&adev->dev, &adev->res);
- if (!ret)
+ else
pm_runtime_put(&adev->dev);
-
+out:
return ret;
}
-static void __catu_remove(struct device *dev)
+static void catu_remove(struct amba_device *adev)
{
- struct catu_drvdata *drvdata = dev_get_drvdata(dev);
+ struct catu_drvdata *drvdata = dev_get_drvdata(&adev->dev);
coresight_unregister(drvdata->csdev);
}
-static void catu_remove(struct amba_device *adev)
-{
- __catu_remove(&adev->dev);
-}
-
static struct amba_id catu_ids[] = {
CS_AMBA_ID(0x000bb9ee),
{},
@@ -621,99 +607,13 @@ static struct amba_driver catu_driver = {
.id_table = catu_ids,
};
-static int catu_platform_probe(struct platform_device *pdev)
-{
- struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- struct catu_drvdata *drvdata;
- int ret = 0;
-
- drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);
- if (!drvdata)
- return -ENOMEM;
-
- drvdata->pclk = coresight_get_enable_apb_pclk(&pdev->dev);
- if (IS_ERR(drvdata->pclk))
- return -ENODEV;
-
- pm_runtime_get_noresume(&pdev->dev);
- pm_runtime_set_active(&pdev->dev);
- pm_runtime_enable(&pdev->dev);
-
- dev_set_drvdata(&pdev->dev, drvdata);
- ret = __catu_probe(&pdev->dev, res);
- pm_runtime_put(&pdev->dev);
- if (ret) {
- pm_runtime_disable(&pdev->dev);
- if (!IS_ERR_OR_NULL(drvdata->pclk))
- clk_put(drvdata->pclk);
- }
-
- return ret;
-}
-
-static int catu_platform_remove(struct platform_device *pdev)
-{
- struct catu_drvdata *drvdata = dev_get_drvdata(&pdev->dev);
-
- if (WARN_ON(!drvdata))
- return -ENODEV;
-
- __catu_remove(&pdev->dev);
- pm_runtime_disable(&pdev->dev);
- if (!IS_ERR_OR_NULL(drvdata->pclk))
- clk_put(drvdata->pclk);
- return 0;
-}
-
-#ifdef CONFIG_PM
-static int catu_runtime_suspend(struct device *dev)
-{
- struct catu_drvdata *drvdata = dev_get_drvdata(dev);
-
- if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk))
- clk_disable_unprepare(drvdata->pclk);
- return 0;
-}
-
-static int catu_runtime_resume(struct device *dev)
-{
- struct catu_drvdata *drvdata = dev_get_drvdata(dev);
-
- if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk))
- clk_prepare_enable(drvdata->pclk);
- return 0;
-}
-#endif
-
-static const struct dev_pm_ops catu_dev_pm_ops = {
- SET_RUNTIME_PM_OPS(catu_runtime_suspend, catu_runtime_resume, NULL)
-};
-
-#ifdef CONFIG_ACPI
-static const struct acpi_device_id catu_acpi_ids[] = {
- {"ARMHC9CA", 0, 0, 0}, /* ARM CoreSight CATU */
- {},
-};
-
-MODULE_DEVICE_TABLE(acpi, catu_acpi_ids);
-#endif
-
-static struct platform_driver catu_platform_driver = {
- .probe = catu_platform_probe,
- .remove = catu_platform_remove,
- .driver = {
- .name = "coresight-catu-platform",
- .acpi_match_table = ACPI_PTR(catu_acpi_ids),
- .suppress_bind_attrs = true,
- .pm = &catu_dev_pm_ops,
- },
-};
-
static int __init catu_init(void)
{
int ret;
- ret = coresight_init_driver("catu", &catu_driver, &catu_platform_driver);
+ ret = amba_driver_register(&catu_driver);
+ if (ret)
+ pr_info("Error registering catu driver\n");
tmc_etr_set_catu_ops(&etr_catu_buf_ops);
return ret;
}
@@ -721,7 +621,7 @@ static int __init catu_init(void)
static void __exit catu_exit(void)
{
tmc_etr_remove_catu_ops();
- coresight_remove_driver(&catu_driver, &catu_platform_driver);
+ amba_driver_unregister(&catu_driver);
}
module_init(catu_init);
diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h
index 755776cd19c5..577b65ed8f7f 100644
--- a/drivers/hwtracing/coresight/coresight-catu.h
+++ b/drivers/hwtracing/coresight/coresight-catu.h
@@ -61,7 +61,6 @@
#define CATU_IRQEN_OFF 0x0
struct catu_drvdata {
- struct clk *pclk;
void __iomem *base;
struct coresight_device *csdev;
int irq;
--
2.43.0
More information about the kernel-team
mailing list