mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 21:21:47 +00:00
5a0e3ad6af
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>
208 lines
4.2 KiB
C
208 lines
4.2 KiB
C
/*
|
|
* linux/drivers/rtc/rtc-pl030.c
|
|
*
|
|
* Copyright (C) 2000-2001 Deep Blue Solutions Ltd.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/rtc.h>
|
|
#include <linux/init.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/amba/bus.h>
|
|
#include <linux/io.h>
|
|
#include <linux/slab.h>
|
|
|
|
#define RTC_DR (0)
|
|
#define RTC_MR (4)
|
|
#define RTC_STAT (8)
|
|
#define RTC_EOI (8)
|
|
#define RTC_LR (12)
|
|
#define RTC_CR (16)
|
|
#define RTC_CR_MIE (1 << 0)
|
|
|
|
struct pl030_rtc {
|
|
struct rtc_device *rtc;
|
|
void __iomem *base;
|
|
};
|
|
|
|
static irqreturn_t pl030_interrupt(int irq, void *dev_id)
|
|
{
|
|
struct pl030_rtc *rtc = dev_id;
|
|
writel(0, rtc->base + RTC_EOI);
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static int pl030_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
|
|
{
|
|
return -ENOIOCTLCMD;
|
|
}
|
|
|
|
static int pl030_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
|
|
{
|
|
struct pl030_rtc *rtc = dev_get_drvdata(dev);
|
|
|
|
rtc_time_to_tm(readl(rtc->base + RTC_MR), &alrm->time);
|
|
return 0;
|
|
}
|
|
|
|
static int pl030_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
|
|
{
|
|
struct pl030_rtc *rtc = dev_get_drvdata(dev);
|
|
unsigned long time;
|
|
int ret;
|
|
|
|
/*
|
|
* At the moment, we can only deal with non-wildcarded alarm times.
|
|
*/
|
|
ret = rtc_valid_tm(&alrm->time);
|
|
if (ret == 0)
|
|
ret = rtc_tm_to_time(&alrm->time, &time);
|
|
if (ret == 0)
|
|
writel(time, rtc->base + RTC_MR);
|
|
return ret;
|
|
}
|
|
|
|
static int pl030_read_time(struct device *dev, struct rtc_time *tm)
|
|
{
|
|
struct pl030_rtc *rtc = dev_get_drvdata(dev);
|
|
|
|
rtc_time_to_tm(readl(rtc->base + RTC_DR), tm);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Set the RTC time. Unfortunately, we can't accurately set
|
|
* the point at which the counter updates.
|
|
*
|
|
* Also, since RTC_LR is transferred to RTC_CR on next rising
|
|
* edge of the 1Hz clock, we must write the time one second
|
|
* in advance.
|
|
*/
|
|
static int pl030_set_time(struct device *dev, struct rtc_time *tm)
|
|
{
|
|
struct pl030_rtc *rtc = dev_get_drvdata(dev);
|
|
unsigned long time;
|
|
int ret;
|
|
|
|
ret = rtc_tm_to_time(tm, &time);
|
|
if (ret == 0)
|
|
writel(time + 1, rtc->base + RTC_LR);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static const struct rtc_class_ops pl030_ops = {
|
|
.ioctl = pl030_ioctl,
|
|
.read_time = pl030_read_time,
|
|
.set_time = pl030_set_time,
|
|
.read_alarm = pl030_read_alarm,
|
|
.set_alarm = pl030_set_alarm,
|
|
};
|
|
|
|
static int pl030_probe(struct amba_device *dev, struct amba_id *id)
|
|
{
|
|
struct pl030_rtc *rtc;
|
|
int ret;
|
|
|
|
ret = amba_request_regions(dev, NULL);
|
|
if (ret)
|
|
goto err_req;
|
|
|
|
rtc = kmalloc(sizeof(*rtc), GFP_KERNEL);
|
|
if (!rtc) {
|
|
ret = -ENOMEM;
|
|
goto err_rtc;
|
|
}
|
|
|
|
rtc->base = ioremap(dev->res.start, resource_size(&dev->res));
|
|
if (!rtc->base) {
|
|
ret = -ENOMEM;
|
|
goto err_map;
|
|
}
|
|
|
|
__raw_writel(0, rtc->base + RTC_CR);
|
|
__raw_writel(0, rtc->base + RTC_EOI);
|
|
|
|
amba_set_drvdata(dev, rtc);
|
|
|
|
ret = request_irq(dev->irq[0], pl030_interrupt, IRQF_DISABLED,
|
|
"rtc-pl030", rtc);
|
|
if (ret)
|
|
goto err_irq;
|
|
|
|
rtc->rtc = rtc_device_register("pl030", &dev->dev, &pl030_ops,
|
|
THIS_MODULE);
|
|
if (IS_ERR(rtc->rtc)) {
|
|
ret = PTR_ERR(rtc->rtc);
|
|
goto err_reg;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_reg:
|
|
free_irq(dev->irq[0], rtc);
|
|
err_irq:
|
|
iounmap(rtc->base);
|
|
err_map:
|
|
kfree(rtc);
|
|
err_rtc:
|
|
amba_release_regions(dev);
|
|
err_req:
|
|
return ret;
|
|
}
|
|
|
|
static int pl030_remove(struct amba_device *dev)
|
|
{
|
|
struct pl030_rtc *rtc = amba_get_drvdata(dev);
|
|
|
|
amba_set_drvdata(dev, NULL);
|
|
|
|
writel(0, rtc->base + RTC_CR);
|
|
|
|
free_irq(dev->irq[0], rtc);
|
|
rtc_device_unregister(rtc->rtc);
|
|
iounmap(rtc->base);
|
|
kfree(rtc);
|
|
amba_release_regions(dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct amba_id pl030_ids[] = {
|
|
{
|
|
.id = 0x00041030,
|
|
.mask = 0x000fffff,
|
|
},
|
|
{ 0, 0 },
|
|
};
|
|
|
|
static struct amba_driver pl030_driver = {
|
|
.drv = {
|
|
.name = "rtc-pl030",
|
|
},
|
|
.probe = pl030_probe,
|
|
.remove = pl030_remove,
|
|
.id_table = pl030_ids,
|
|
};
|
|
|
|
static int __init pl030_init(void)
|
|
{
|
|
return amba_driver_register(&pl030_driver);
|
|
}
|
|
|
|
static void __exit pl030_exit(void)
|
|
{
|
|
amba_driver_unregister(&pl030_driver);
|
|
}
|
|
|
|
module_init(pl030_init);
|
|
module_exit(pl030_exit);
|
|
|
|
MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
|
|
MODULE_DESCRIPTION("ARM AMBA PL030 RTC Driver");
|
|
MODULE_LICENSE("GPL");
|