lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hwrng: timeriomem - Use phys address rather than virt

Browse Source 
There is no ioremap'ing or anything in timeriomem-rng.c as I foolishly
used already remapped virtual addresses instead of passing the physical
address to be polled.

This patch fixes this flaw and lets developers do the Right Thing(tm).

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Alexander Clouter
2009-03-27 12:59:54 +08:00
committed by Herbert Xu
parent be0ea69674
commit 3341323bb4
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/char/hw_random/timeriomem-rng.c
View File

@@ -90,10 +90,30 @@ static struct hwrng timeriomem_rng_ops = {
static int __init timeriomem_rng_probe(struct platform_device *pdev) static int __init timeriomem_rng_probe(struct platform_device *pdev)
{ {
struct resource *res, *mem;
int ret; int ret;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
return -ENOENT;
mem = request_mem_region(res->start, res->end - res->start + 1,
pdev->name);
if (mem == NULL)
return -EBUSY;
dev_set_drvdata(&pdev->dev, mem);
timeriomem_rng_data = pdev->dev.platform_data; timeriomem_rng_data = pdev->dev.platform_data;
timeriomem_rng_data->address = ioremap(res->start,
res->end - res->start + 1);
if (!timeriomem_rng_data->address) {
ret = -ENOMEM;
goto err_ioremap;
}
if (timeriomem_rng_data->period != 0 if (timeriomem_rng_data->period != 0
&& usecs_to_jiffies(timeriomem_rng_data->period) > 0) { && usecs_to_jiffies(timeriomem_rng_data->period) > 0) {
timeriomem_rng_timer.expires = jiffies; timeriomem_rng_timer.expires = jiffies;
@@ -104,23 +124,34 @@ static int __init timeriomem_rng_probe(struct platform_device *pdev)
timeriomem_rng_data->present = 1; timeriomem_rng_data->present = 1;
ret = hwrng_register(&timeriomem_rng_ops); ret = hwrng_register(&timeriomem_rng_ops);
if (ret) { if (ret)
dev_err(&pdev->dev, "problem registering\n"); goto err_register;
return ret;
}
dev_info(&pdev->dev, "32bits from 0x%p @ %dus\n", dev_info(&pdev->dev, "32bits from 0x%p @ %dus\n",
timeriomem_rng_data->address, timeriomem_rng_data->address,
timeriomem_rng_data->period); timeriomem_rng_data->period);
return 0; return 0;
err_register:
dev_err(&pdev->dev, "problem registering\n");
iounmap(timeriomem_rng_data->address);
err_ioremap:
release_resource(mem);
return ret;
} }
static int __devexit timeriomem_rng_remove(struct platform_device *pdev) static int __devexit timeriomem_rng_remove(struct platform_device *pdev)
{ {
struct resource *mem = dev_get_drvdata(&pdev->dev);
del_timer_sync(&timeriomem_rng_timer); del_timer_sync(&timeriomem_rng_timer);
hwrng_unregister(&timeriomem_rng_ops); hwrng_unregister(&timeriomem_rng_ops);
iounmap(timeriomem_rng_data->address);
release_resource(mem);
return 0; return 0;
} }

2
include/linux/timeriomem-rng.h
View File

@@ -14,7 +14,7 @@ struct timeriomem_rng_data {
struct completion completion; struct completion completion;
unsigned int present:1; unsigned int present:1;
u32 __iomem *address; void __iomem *address;
/* measures in usecs */ /* measures in usecs */
unsigned int period; unsigned int period;