![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>
213 lines
5 KiB
C
213 lines
5 KiB
C
/*
|
|
* Copyright 2005-2008 Freescale Semiconductor, Inc. All Rights Reserved.
|
|
* Copyright 2008 Luotao Fu, kernel@pengutronix.de
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/io.h>
|
|
|
|
#include "../w1.h"
|
|
#include "../w1_int.h"
|
|
#include "../w1_log.h"
|
|
|
|
/* According to the mx27 Datasheet the reset procedure should take up to about
|
|
* 1350us. We set the timeout to 500*100us = 50ms for sure */
|
|
#define MXC_W1_RESET_TIMEOUT 500
|
|
|
|
/*
|
|
* MXC W1 Register offsets
|
|
*/
|
|
#define MXC_W1_CONTROL 0x00
|
|
#define MXC_W1_TIME_DIVIDER 0x02
|
|
#define MXC_W1_RESET 0x04
|
|
#define MXC_W1_COMMAND 0x06
|
|
#define MXC_W1_TXRX 0x08
|
|
#define MXC_W1_INTERRUPT 0x0A
|
|
#define MXC_W1_INTERRUPT_EN 0x0C
|
|
|
|
struct mxc_w1_device {
|
|
void __iomem *regs;
|
|
unsigned int clkdiv;
|
|
struct clk *clk;
|
|
struct w1_bus_master bus_master;
|
|
};
|
|
|
|
/*
|
|
* this is the low level routine to
|
|
* reset the device on the One Wire interface
|
|
* on the hardware
|
|
*/
|
|
static u8 mxc_w1_ds2_reset_bus(void *data)
|
|
{
|
|
u8 reg_val;
|
|
unsigned int timeout_cnt = 0;
|
|
struct mxc_w1_device *dev = data;
|
|
|
|
__raw_writeb(0x80, (dev->regs + MXC_W1_CONTROL));
|
|
|
|
while (1) {
|
|
reg_val = __raw_readb(dev->regs + MXC_W1_CONTROL);
|
|
|
|
if (((reg_val >> 7) & 0x1) == 0 ||
|
|
timeout_cnt > MXC_W1_RESET_TIMEOUT)
|
|
break;
|
|
else
|
|
timeout_cnt++;
|
|
|
|
udelay(100);
|
|
}
|
|
return (reg_val >> 7) & 0x1;
|
|
}
|
|
|
|
/*
|
|
* this is the low level routine to read/write a bit on the One Wire
|
|
* interface on the hardware. It does write 0 if parameter bit is set
|
|
* to 0, otherwise a write 1/read.
|
|
*/
|
|
static u8 mxc_w1_ds2_touch_bit(void *data, u8 bit)
|
|
{
|
|
struct mxc_w1_device *mdev = data;
|
|
void __iomem *ctrl_addr = mdev->regs + MXC_W1_CONTROL;
|
|
unsigned int timeout_cnt = 400; /* Takes max. 120us according to
|
|
* datasheet.
|
|
*/
|
|
|
|
__raw_writeb((1 << (5 - bit)), ctrl_addr);
|
|
|
|
while (timeout_cnt--) {
|
|
if (!((__raw_readb(ctrl_addr) >> (5 - bit)) & 0x1))
|
|
break;
|
|
|
|
udelay(1);
|
|
}
|
|
|
|
return ((__raw_readb(ctrl_addr)) >> 3) & 0x1;
|
|
}
|
|
|
|
static int __devinit mxc_w1_probe(struct platform_device *pdev)
|
|
{
|
|
struct mxc_w1_device *mdev;
|
|
struct resource *res;
|
|
int err = 0;
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!res)
|
|
return -ENODEV;
|
|
|
|
mdev = kzalloc(sizeof(struct mxc_w1_device), GFP_KERNEL);
|
|
if (!mdev)
|
|
return -ENOMEM;
|
|
|
|
mdev->clk = clk_get(&pdev->dev, "owire");
|
|
if (!mdev->clk) {
|
|
err = -ENODEV;
|
|
goto failed_clk;
|
|
}
|
|
|
|
mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1;
|
|
|
|
res = request_mem_region(res->start, resource_size(res),
|
|
"mxc_w1");
|
|
if (!res) {
|
|
err = -EBUSY;
|
|
goto failed_req;
|
|
}
|
|
|
|
mdev->regs = ioremap(res->start, resource_size(res));
|
|
if (!mdev->regs) {
|
|
printk(KERN_ERR "Cannot map frame buffer registers\n");
|
|
goto failed_ioremap;
|
|
}
|
|
|
|
clk_enable(mdev->clk);
|
|
__raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER);
|
|
|
|
mdev->bus_master.data = mdev;
|
|
mdev->bus_master.reset_bus = mxc_w1_ds2_reset_bus;
|
|
mdev->bus_master.touch_bit = mxc_w1_ds2_touch_bit;
|
|
|
|
err = w1_add_master_device(&mdev->bus_master);
|
|
|
|
if (err)
|
|
goto failed_add;
|
|
|
|
platform_set_drvdata(pdev, mdev);
|
|
return 0;
|
|
|
|
failed_add:
|
|
iounmap(mdev->regs);
|
|
failed_ioremap:
|
|
release_mem_region(res->start, resource_size(res));
|
|
failed_req:
|
|
clk_put(mdev->clk);
|
|
failed_clk:
|
|
kfree(mdev);
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* disassociate the w1 device from the driver
|
|
*/
|
|
static int __devexit mxc_w1_remove(struct platform_device *pdev)
|
|
{
|
|
struct mxc_w1_device *mdev = platform_get_drvdata(pdev);
|
|
struct resource *res;
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
|
w1_remove_master_device(&mdev->bus_master);
|
|
|
|
iounmap(mdev->regs);
|
|
release_mem_region(res->start, resource_size(res));
|
|
clk_disable(mdev->clk);
|
|
clk_put(mdev->clk);
|
|
|
|
platform_set_drvdata(pdev, NULL);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver mxc_w1_driver = {
|
|
.driver = {
|
|
.name = "mxc_w1",
|
|
},
|
|
.probe = mxc_w1_probe,
|
|
.remove = mxc_w1_remove,
|
|
};
|
|
|
|
static int __init mxc_w1_init(void)
|
|
{
|
|
return platform_driver_register(&mxc_w1_driver);
|
|
}
|
|
|
|
static void mxc_w1_exit(void)
|
|
{
|
|
platform_driver_unregister(&mxc_w1_driver);
|
|
}
|
|
|
|
module_init(mxc_w1_init);
|
|
module_exit(mxc_w1_exit);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Freescale Semiconductors Inc");
|
|
MODULE_DESCRIPTION("Driver for One-Wire on MXC");
|