![Tejun Heo](/assets/img/avatar_default.png)
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
149 lines
3.3 KiB
C
149 lines
3.3 KiB
C
/*
|
|
* Hardware Random Number Generator support for Cavium Networks
|
|
* Octeon processor family.
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 2009 Cavium Networks
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/device.h>
|
|
#include <linux/hw_random.h>
|
|
#include <linux/io.h>
|
|
#include <linux/gfp.h>
|
|
|
|
#include <asm/octeon/octeon.h>
|
|
#include <asm/octeon/cvmx-rnm-defs.h>
|
|
|
|
struct octeon_rng {
|
|
struct hwrng ops;
|
|
void __iomem *control_status;
|
|
void __iomem *result;
|
|
};
|
|
|
|
static int octeon_rng_init(struct hwrng *rng)
|
|
{
|
|
union cvmx_rnm_ctl_status ctl;
|
|
struct octeon_rng *p = container_of(rng, struct octeon_rng, ops);
|
|
|
|
ctl.u64 = 0;
|
|
ctl.s.ent_en = 1; /* Enable the entropy source. */
|
|
ctl.s.rng_en = 1; /* Enable the RNG hardware. */
|
|
cvmx_write_csr((u64)p->control_status, ctl.u64);
|
|
return 0;
|
|
}
|
|
|
|
static void octeon_rng_cleanup(struct hwrng *rng)
|
|
{
|
|
union cvmx_rnm_ctl_status ctl;
|
|
struct octeon_rng *p = container_of(rng, struct octeon_rng, ops);
|
|
|
|
ctl.u64 = 0;
|
|
/* Disable everything. */
|
|
cvmx_write_csr((u64)p->control_status, ctl.u64);
|
|
}
|
|
|
|
static int octeon_rng_data_read(struct hwrng *rng, u32 *data)
|
|
{
|
|
struct octeon_rng *p = container_of(rng, struct octeon_rng, ops);
|
|
|
|
*data = cvmx_read64_uint32((u64)p->result);
|
|
return sizeof(u32);
|
|
}
|
|
|
|
static int __devinit octeon_rng_probe(struct platform_device *pdev)
|
|
{
|
|
struct resource *res_ports;
|
|
struct resource *res_result;
|
|
struct octeon_rng *rng;
|
|
int ret;
|
|
struct hwrng ops = {
|
|
.name = "octeon",
|
|
.init = octeon_rng_init,
|
|
.cleanup = octeon_rng_cleanup,
|
|
.data_read = octeon_rng_data_read
|
|
};
|
|
|
|
rng = devm_kzalloc(&pdev->dev, sizeof(*rng), GFP_KERNEL);
|
|
if (!rng)
|
|
return -ENOMEM;
|
|
|
|
res_ports = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!res_ports)
|
|
goto err_ports;
|
|
|
|
res_result = platform_get_resource(pdev, IORESOURCE_MEM, 1);
|
|
if (!res_result)
|
|
goto err_ports;
|
|
|
|
|
|
rng->control_status = devm_ioremap_nocache(&pdev->dev,
|
|
res_ports->start,
|
|
sizeof(u64));
|
|
if (!rng->control_status)
|
|
goto err_ports;
|
|
|
|
rng->result = devm_ioremap_nocache(&pdev->dev,
|
|
res_result->start,
|
|
sizeof(u64));
|
|
if (!rng->result)
|
|
goto err_r;
|
|
|
|
rng->ops = ops;
|
|
|
|
dev_set_drvdata(&pdev->dev, &rng->ops);
|
|
ret = hwrng_register(&rng->ops);
|
|
if (ret)
|
|
goto err;
|
|
|
|
dev_info(&pdev->dev, "Octeon Random Number Generator\n");
|
|
|
|
return 0;
|
|
err:
|
|
devm_iounmap(&pdev->dev, rng->control_status);
|
|
err_r:
|
|
devm_iounmap(&pdev->dev, rng->result);
|
|
err_ports:
|
|
devm_kfree(&pdev->dev, rng);
|
|
return -ENOENT;
|
|
}
|
|
|
|
static int __exit octeon_rng_remove(struct platform_device *pdev)
|
|
{
|
|
struct hwrng *rng = dev_get_drvdata(&pdev->dev);
|
|
|
|
hwrng_unregister(rng);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver octeon_rng_driver = {
|
|
.driver = {
|
|
.name = "octeon_rng",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
.probe = octeon_rng_probe,
|
|
.remove = __exit_p(octeon_rng_remove),
|
|
};
|
|
|
|
static int __init octeon_rng_mod_init(void)
|
|
{
|
|
return platform_driver_register(&octeon_rng_driver);
|
|
}
|
|
|
|
static void __exit octeon_rng_mod_exit(void)
|
|
{
|
|
platform_driver_unregister(&octeon_rng_driver);
|
|
}
|
|
|
|
module_init(octeon_rng_mod_init);
|
|
module_exit(octeon_rng_mod_exit);
|
|
|
|
MODULE_AUTHOR("David Daney");
|
|
MODULE_LICENSE("GPL");
|