Commit 6e736c60 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

coresight: Introduce device access abstraction 

We are about to introduce support for sysreg access to ETMv4.4+
component. Since there are generic routines that access the
registers (e.g, CS_LOCK/UNLOCK , claim/disclaim operations, timeout)
and in order to preserve the logic of these operations at a
single place we introduce an abstraction layer for the accesses
to a given device.

Link: https://lore.kernel.org/r/20210110224850.1880240-4-suzuki.poulose@arm.com


Cc: Mike Leach <mike.leach@linaro.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/20210201181351.1475223-6-mathieu.poirier@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df81b438

drivers/hwtracing/coresight/coresight-catu.c

+1 −0
Original line number Diff line number Diff line
@@ -551,6 +551,7 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id) 
	dev->platform_data = pdata;



	drvdata->base = base;

	catu_desc.access = CSDEV_ACCESS_IOMEM(base);

	catu_desc.pdata = pdata;

	catu_desc.dev = dev;

	catu_desc.groups = catu_groups;

drivers/hwtracing/coresight/coresight-core.c

+43 −0
Original line number Diff line number Diff line
@@ -1458,6 +1458,48 @@ int coresight_timeout(void __iomem *addr, u32 offset, int position, int value) 
}

EXPORT_SYMBOL_GPL(coresight_timeout);



u32 coresight_relaxed_read32(struct coresight_device *csdev, u32 offset)

{

	return csdev_access_relaxed_read32(&csdev->access, offset);

}



u32 coresight_read32(struct coresight_device *csdev, u32 offset)

{

	return csdev_access_read32(&csdev->access, offset);

}



void coresight_relaxed_write32(struct coresight_device *csdev,

			       u32 val, u32 offset)

{

	csdev_access_relaxed_write32(&csdev->access, val, offset);

}



void coresight_write32(struct coresight_device *csdev, u32 val, u32 offset)

{

	csdev_access_write32(&csdev->access, val, offset);

}



u64 coresight_relaxed_read64(struct coresight_device *csdev, u32 offset)

{

	return csdev_access_relaxed_read64(&csdev->access, offset);

}



u64 coresight_read64(struct coresight_device *csdev, u32 offset)

{

	return csdev_access_read64(&csdev->access, offset);

}



void coresight_relaxed_write64(struct coresight_device *csdev,

			       u64 val, u32 offset)

{

	csdev_access_relaxed_write64(&csdev->access, val, offset);

}



void coresight_write64(struct coresight_device *csdev, u64 val, u32 offset)

{

	csdev_access_write64(&csdev->access, val, offset);

}



/*

 * coresight_release_platform_data: Release references to the devices connected

 * to the output port of this device.
@@ -1522,6 +1564,7 @@ struct coresight_device *coresight_register(struct coresight_desc *desc) 
	csdev->type = desc->type;

	csdev->subtype = desc->subtype;

	csdev->ops = desc->ops;

	csdev->access = desc->access;

	csdev->orphan = false;



	csdev->dev.type = &coresight_dev_type[desc->type];

drivers/hwtracing/coresight/coresight-cti-core.c

+1 −0
Original line number Diff line number Diff line
@@ -870,6 +870,7 @@ static int cti_probe(struct amba_device *adev, const struct amba_id *id) 
		return PTR_ERR(base);



	drvdata->base = base;

	cti_desc.access = CSDEV_ACCESS_IOMEM(base);



	dev_set_drvdata(dev, drvdata);

drivers/hwtracing/coresight/coresight-etb10.c

+1 −0
Original line number Diff line number Diff line
@@ -757,6 +757,7 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) 
		return PTR_ERR(base);



	drvdata->base = base;

	desc.access = CSDEV_ACCESS_IOMEM(base);



	spin_lock_init(&drvdata->spinlock);

drivers/hwtracing/coresight/coresight-etm3x-core.c

+1 −0
Original line number Diff line number Diff line
@@ -839,6 +839,7 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) 
		return PTR_ERR(base);



	drvdata->base = base;

	desc.access = CSDEV_ACCESS_IOMEM(base);



	spin_lock_init(&drvdata->spinlock);