microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

coresight: etb10: Clean up device specific data 

Track the coresight device instead of the real device.

Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Suzuki K Poulose 2019-06-19 11:29:17 -06:00 коммит произвёл Greg Kroah-Hartman
Родитель aaff762328
Коммит 7f84712a0d
1 изменённых файлов: 16 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

32
drivers/hwtracing/coresight/coresight-etb10.c
Просмотреть файл

@ -66,7 +66,6 @@
/** /**
* struct etb_drvdata - specifics associated to an ETB component * struct etb_drvdata - specifics associated to an ETB component
* @base: memory mapped base address for this component. * @base: memory mapped base address for this component.
* @dev: the device entity associated to this component.
* @atclk: optional clock for the core parts of the ETB. * @atclk: optional clock for the core parts of the ETB.
* @csdev: component vitals needed by the framework. * @csdev: component vitals needed by the framework.
* @miscdev: specifics to handle "/dev/xyz.etb" entry. * @miscdev: specifics to handle "/dev/xyz.etb" entry.
@ -81,7 +80,6 @@
*/ */
struct etb_drvdata { struct etb_drvdata {
void __iomem *base; void __iomem *base;
struct device *dev;
struct clk *atclk; struct clk *atclk;
struct coresight_device *csdev; struct coresight_device *csdev;
struct miscdevice miscdev; struct miscdevice miscdev;
@ -227,7 +225,6 @@ out:
static int etb_enable(struct coresight_device *csdev, u32 mode, void *data) static int etb_enable(struct coresight_device *csdev, u32 mode, void *data)
{ {
int ret; int ret;
struct etb_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
switch (mode) { switch (mode) {
case CS_MODE_SYSFS: case CS_MODE_SYSFS:
@ -244,13 +241,14 @@ static int etb_enable(struct coresight_device *csdev, u32 mode, void *data)
if (ret) if (ret)
return ret; return ret;
dev_dbg(drvdata->dev, "ETB enabled\n"); dev_dbg(&csdev->dev, "ETB enabled\n");
return 0; return 0;
} }
static void __etb_disable_hw(struct etb_drvdata *drvdata) static void __etb_disable_hw(struct etb_drvdata *drvdata)
{ {
u32 ffcr; u32 ffcr;
struct device *dev = &drvdata->csdev->dev;
CS_UNLOCK(drvdata->base); CS_UNLOCK(drvdata->base);
@ -263,7 +261,7 @@ static void __etb_disable_hw(struct etb_drvdata *drvdata)
writel_relaxed(ffcr, drvdata->base + ETB_FFCR); writel_relaxed(ffcr, drvdata->base + ETB_FFCR);
if (coresight_timeout(drvdata->base, ETB_FFCR, ETB_FFCR_BIT, 0)) { if (coresight_timeout(drvdata->base, ETB_FFCR, ETB_FFCR_BIT, 0)) {
dev_err(drvdata->dev, dev_err(dev,
"timeout while waiting for completion of Manual Flush\n"); "timeout while waiting for completion of Manual Flush\n");
} }
@ -271,7 +269,7 @@ static void __etb_disable_hw(struct etb_drvdata *drvdata)
writel_relaxed(0x0, drvdata->base + ETB_CTL_REG); writel_relaxed(0x0, drvdata->base + ETB_CTL_REG);
if (coresight_timeout(drvdata->base, ETB_FFSR, ETB_FFSR_BIT, 1)) { if (coresight_timeout(drvdata->base, ETB_FFSR, ETB_FFSR_BIT, 1)) {
dev_err(drvdata->dev, dev_err(dev,
"timeout while waiting for Formatter to Stop\n"); "timeout while waiting for Formatter to Stop\n");
} }
@ -286,6 +284,7 @@ static void etb_dump_hw(struct etb_drvdata *drvdata)
u32 read_data, depth; u32 read_data, depth;
u32 read_ptr, write_ptr; u32 read_ptr, write_ptr;
u32 frame_off, frame_endoff; u32 frame_off, frame_endoff;
struct device *dev = &drvdata->csdev->dev;
CS_UNLOCK(drvdata->base); CS_UNLOCK(drvdata->base);
@ -295,10 +294,10 @@ static void etb_dump_hw(struct etb_drvdata *drvdata)
frame_off = write_ptr % ETB_FRAME_SIZE_WORDS; frame_off = write_ptr % ETB_FRAME_SIZE_WORDS;
frame_endoff = ETB_FRAME_SIZE_WORDS - frame_off; frame_endoff = ETB_FRAME_SIZE_WORDS - frame_off;
if (frame_off) { if (frame_off) {
dev_err(drvdata->dev, dev_err(dev,
"write_ptr: %lu not aligned to formatter frame size\n", "write_ptr: %lu not aligned to formatter frame size\n",
(unsigned long)write_ptr); (unsigned long)write_ptr);
dev_err(drvdata->dev, "frameoff: %lu, frame_endoff: %lu\n", dev_err(dev, "frameoff: %lu, frame_endoff: %lu\n",
(unsigned long)frame_off, (unsigned long)frame_endoff); (unsigned long)frame_off, (unsigned long)frame_endoff);
write_ptr += frame_endoff; write_ptr += frame_endoff;
} }
@ -365,7 +364,7 @@ static int etb_disable(struct coresight_device *csdev)
drvdata->mode = CS_MODE_DISABLED; drvdata->mode = CS_MODE_DISABLED;
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
dev_dbg(drvdata->dev, "ETB disabled\n"); dev_dbg(&csdev->dev, "ETB disabled\n");
return 0; return 0;
} }
@ -460,7 +459,7 @@ static unsigned long etb_update_buffer(struct coresight_device *csdev,
* chance to fix things. * chance to fix things.
*/ */
if (write_ptr % ETB_FRAME_SIZE_WORDS) { if (write_ptr % ETB_FRAME_SIZE_WORDS) {
dev_err(drvdata->dev, dev_err(&csdev->dev,
"write_ptr: %lu not aligned to formatter frame size\n", "write_ptr: %lu not aligned to formatter frame size\n",
(unsigned long)write_ptr); (unsigned long)write_ptr);
@ -594,7 +593,7 @@ static void etb_dump(struct etb_drvdata *drvdata)
} }
spin_unlock_irqrestore(&drvdata->spinlock, flags); spin_unlock_irqrestore(&drvdata->spinlock, flags);
dev_dbg(drvdata->dev, "ETB dumped\n"); dev_dbg(&drvdata->csdev->dev, "ETB dumped\n");
} }
static int etb_open(struct inode *inode, struct file *file) static int etb_open(struct inode *inode, struct file *file)
@ -605,7 +604,7 @@ static int etb_open(struct inode *inode, struct file *file)
if (local_cmpxchg(&drvdata->reading, 0, 1)) if (local_cmpxchg(&drvdata->reading, 0, 1))
return -EBUSY; return -EBUSY;
dev_dbg(drvdata->dev, "%s: successfully opened\n", __func__); dev_dbg(&drvdata->csdev->dev, "%s: successfully opened\n", __func__);
return 0; return 0;
} }
@ -615,6 +614,7 @@ static ssize_t etb_read(struct file *file, char __user *data,
u32 depth; u32 depth;
struct etb_drvdata *drvdata = container_of(file->private_data, struct etb_drvdata *drvdata = container_of(file->private_data,
struct etb_drvdata, miscdev); struct etb_drvdata, miscdev);
struct device *dev = &drvdata->csdev->dev;
etb_dump(drvdata); etb_dump(drvdata);
@ -623,13 +623,14 @@ static ssize_t etb_read(struct file *file, char __user *data,
len = depth * 4 - *ppos; len = depth * 4 - *ppos;
if (copy_to_user(data, drvdata->buf + *ppos, len)) { if (copy_to_user(data, drvdata->buf + *ppos, len)) {
dev_dbg(drvdata->dev, "%s: copy_to_user failed\n", __func__); dev_dbg(dev,
"%s: copy_to_user failed\n", __func__);
return -EFAULT; return -EFAULT;
} }
*ppos += len; *ppos += len;
dev_dbg(drvdata->dev, "%s: %zu bytes copied, %d bytes left\n", dev_dbg(dev, "%s: %zu bytes copied, %d bytes left\n",
__func__, len, (int)(depth * 4 - *ppos)); __func__, len, (int)(depth * 4 - *ppos));
return len; return len;
} }
@ -640,7 +641,7 @@ static int etb_release(struct inode *inode, struct file *file)
struct etb_drvdata, miscdev); struct etb_drvdata, miscdev);
local_set(&drvdata->reading, 0); local_set(&drvdata->reading, 0);
dev_dbg(drvdata->dev, "%s: released\n", __func__); dev_dbg(&drvdata->csdev->dev, "%s: released\n", __func__);
return 0; return 0;
} }
@ -744,7 +745,6 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id)
if (!drvdata) if (!drvdata)
return -ENOMEM; return -ENOMEM;
drvdata->dev = &adev->dev;
drvdata->atclk = devm_clk_get(&adev->dev, "atclk"); /* optional */ drvdata->atclk = devm_clk_get(&adev->dev, "atclk"); /* optional */
if (!IS_ERR(drvdata->atclk)) { if (!IS_ERR(drvdata->atclk)) {
ret = clk_prepare_enable(drvdata->atclk); ret = clk_prepare_enable(drvdata->atclk);