![Linus Torvalds](/assets/img/avatar_default.png)
SoC updates, mostly refactorings and cleanups of old legacy platforms. Major themes this release: - Conversion of ixp4xx to a modern platform (drivers, DT, bindings) - Moving some of the ep93xx headers around to get it closer to multiplatform enabled. - Cleanups of Davinci This tag also contains a few patches that were queued up as fixes before 5.1 but I didn't get sent in before release. -----BEGIN PGP SIGNATURE----- iQJDBAABCAAtFiEElf+HevZ4QCAJmMQ+jBrnPN6EHHcFAlzc+sMPHG9sb2ZAbGl4 b20ubmV0AAoJEIwa5zzehBx3ygQP/3mxLFGJxgHk6m/41V4Tepv9F2ZZ3BW4Lcp7 vZtr6xiyhZXzIHOGzqQ4VGllfWhMWnjzZZe3iruSBY1gpJU7D4x054T3xVsIDs9F EIcbBm5fE0O0bdijfk7V8vBu7LOIP/KYdaD1n9WDhW0Hy4wTXN8NNLSKEU5Lq15p oz/A3QP5GcwhGAqaHyxx445La9yEKKWAsc2cOCRCdvfw6+n1GpoE6TI1YGjDvqbw xd73mIwXb0l0f7jhCV7OPyZ3t/aQgTD3ddr4gHUGNa8sSWmD5nupSVxj23FkbGby ejqJMxOfHpJJGIL/sxmR3+cFBYxyE+JNmrEq/kDW5ncWs/LY91juJxR1dkQKs6Mj 4Y9CWruftDz34DlFs/J33hF/rdZ73O91ldk7zqND41Fi5aLrIKvZBJlTuqyZ0tGV YNRxsjWF953h8TXimDV0KvBgO4+E8d5ype/kIYtEGYO9DVmXQGMxFx2Gt2I/NfoH 5tCtVFwDPpMxJShpXHLMzUT8sQL3mytg5L/MIPTGx+zAtDwx/qTLEEAElffG29oI vdzgJR0lrG/zzqQh25/M80UZYMdOrwtjAB42C+jAvlfQ0C4DtvSH+8OdcROOgj0b GbAJbTdHYTD6OpoxhSuRii7zzNxw+i7pQj+uLSt8s8ZReGkUk5a2wpRpoVoV2WxK RJHkMK95 =pUeO -----END PGP SIGNATURE----- Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc Pull ARM SoC platform updates from Olof Johansson: "SoC updates, mostly refactorings and cleanups of old legacy platforms. Major themes this release: - Conversion of ixp4xx to a modern platform (drivers, DT, bindings) - Moving some of the ep93xx headers around to get it closer to multiplatform enabled. - Cleanups of Davinci This also contains a few patches that were queued up as fixes before 5.1 but I didn't get sent in before release" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (123 commits) ARM: debug-ll: add default address for digicolor ARM: u300: regulator: add MODULE_LICENSE() ARM: ep93xx: move private headers out of mach/* ARM: ep93xx: move pinctrl interfaces into include/linux/soc ARM: ep93xx: keypad: stop using mach/platform.h ARM: ep93xx: move network platform data to separate header ARM: stm32: add AMBA support for stm32 family MAINTAINERS: update arch/arm/mach-davinci ARM: rockchip: add missing of_node_put in rockchip_smp_prepare_pmu ARM: dts: Add queue manager and NPE to the IXP4xx DTSI soc: ixp4xx: qmgr: Add DT probe code soc: ixp4xx: qmgr: Add DT bindings for IXP4xx qmgr soc: ixp4xx: npe: Add DT probe code soc: ixp4xx: Add DT bindings for IXP4xx NPE soc: ixp4xx: qmgr: Pass resources soc: ixp4xx: Remove unused functions soc: ixp4xx: Uninline several functions soc: ixp4xx: npe: Pass addresses as resources ARM: ixp4xx: Turn the QMGR into a platform device ARM: ixp4xx: Turn the NPE into a platform device ...
220 lines
4.9 KiB
C
220 lines
4.9 KiB
C
/*
|
|
* drivers/char/watchdog/ixp4xx_wdt.c
|
|
*
|
|
* Watchdog driver for Intel IXP4xx network processors
|
|
*
|
|
* Author: Deepak Saxena <dsaxena@plexity.net>
|
|
*
|
|
* Copyright 2004 (c) MontaVista, Software, Inc.
|
|
* Based on sa1100 driver, Copyright (C) 2000 Oleg Drokin <green@crimea.edu>
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/miscdevice.h>
|
|
#include <linux/of.h>
|
|
#include <linux/watchdog.h>
|
|
#include <linux/init.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/uaccess.h>
|
|
#include <mach/hardware.h>
|
|
|
|
static bool nowayout = WATCHDOG_NOWAYOUT;
|
|
static int heartbeat = 60; /* (secs) Default is 1 minute */
|
|
static unsigned long wdt_status;
|
|
static unsigned long boot_status;
|
|
static DEFINE_SPINLOCK(wdt_lock);
|
|
|
|
#define WDT_TICK_RATE (IXP4XX_PERIPHERAL_BUS_CLOCK * 1000000UL)
|
|
|
|
#define WDT_IN_USE 0
|
|
#define WDT_OK_TO_CLOSE 1
|
|
|
|
static void wdt_enable(void)
|
|
{
|
|
spin_lock(&wdt_lock);
|
|
*IXP4XX_OSWK = IXP4XX_WDT_KEY;
|
|
*IXP4XX_OSWE = 0;
|
|
*IXP4XX_OSWT = WDT_TICK_RATE * heartbeat;
|
|
*IXP4XX_OSWE = IXP4XX_WDT_COUNT_ENABLE | IXP4XX_WDT_RESET_ENABLE;
|
|
*IXP4XX_OSWK = 0;
|
|
spin_unlock(&wdt_lock);
|
|
}
|
|
|
|
static void wdt_disable(void)
|
|
{
|
|
spin_lock(&wdt_lock);
|
|
*IXP4XX_OSWK = IXP4XX_WDT_KEY;
|
|
*IXP4XX_OSWE = 0;
|
|
*IXP4XX_OSWK = 0;
|
|
spin_unlock(&wdt_lock);
|
|
}
|
|
|
|
static int ixp4xx_wdt_open(struct inode *inode, struct file *file)
|
|
{
|
|
if (test_and_set_bit(WDT_IN_USE, &wdt_status))
|
|
return -EBUSY;
|
|
|
|
clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
|
|
wdt_enable();
|
|
return stream_open(inode, file);
|
|
}
|
|
|
|
static ssize_t
|
|
ixp4xx_wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos)
|
|
{
|
|
if (len) {
|
|
if (!nowayout) {
|
|
size_t i;
|
|
|
|
clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
|
|
|
|
for (i = 0; i != len; i++) {
|
|
char c;
|
|
|
|
if (get_user(c, data + i))
|
|
return -EFAULT;
|
|
if (c == 'V')
|
|
set_bit(WDT_OK_TO_CLOSE, &wdt_status);
|
|
}
|
|
}
|
|
wdt_enable();
|
|
}
|
|
return len;
|
|
}
|
|
|
|
static const struct watchdog_info ident = {
|
|
.options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE |
|
|
WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
|
|
.identity = "IXP4xx Watchdog",
|
|
};
|
|
|
|
|
|
static long ixp4xx_wdt_ioctl(struct file *file, unsigned int cmd,
|
|
unsigned long arg)
|
|
{
|
|
int ret = -ENOTTY;
|
|
int time;
|
|
|
|
switch (cmd) {
|
|
case WDIOC_GETSUPPORT:
|
|
ret = copy_to_user((struct watchdog_info *)arg, &ident,
|
|
sizeof(ident)) ? -EFAULT : 0;
|
|
break;
|
|
|
|
case WDIOC_GETSTATUS:
|
|
ret = put_user(0, (int *)arg);
|
|
break;
|
|
|
|
case WDIOC_GETBOOTSTATUS:
|
|
ret = put_user(boot_status, (int *)arg);
|
|
break;
|
|
|
|
case WDIOC_KEEPALIVE:
|
|
wdt_enable();
|
|
ret = 0;
|
|
break;
|
|
|
|
case WDIOC_SETTIMEOUT:
|
|
ret = get_user(time, (int *)arg);
|
|
if (ret)
|
|
break;
|
|
|
|
if (time <= 0 || time > 60) {
|
|
ret = -EINVAL;
|
|
break;
|
|
}
|
|
|
|
heartbeat = time;
|
|
wdt_enable();
|
|
/* Fall through */
|
|
|
|
case WDIOC_GETTIMEOUT:
|
|
ret = put_user(heartbeat, (int *)arg);
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static int ixp4xx_wdt_release(struct inode *inode, struct file *file)
|
|
{
|
|
if (test_bit(WDT_OK_TO_CLOSE, &wdt_status))
|
|
wdt_disable();
|
|
else
|
|
pr_crit("Device closed unexpectedly - timer will not stop\n");
|
|
clear_bit(WDT_IN_USE, &wdt_status);
|
|
clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static const struct file_operations ixp4xx_wdt_fops = {
|
|
.owner = THIS_MODULE,
|
|
.llseek = no_llseek,
|
|
.write = ixp4xx_wdt_write,
|
|
.unlocked_ioctl = ixp4xx_wdt_ioctl,
|
|
.open = ixp4xx_wdt_open,
|
|
.release = ixp4xx_wdt_release,
|
|
};
|
|
|
|
static struct miscdevice ixp4xx_wdt_miscdev = {
|
|
.minor = WATCHDOG_MINOR,
|
|
.name = "watchdog",
|
|
.fops = &ixp4xx_wdt_fops,
|
|
};
|
|
|
|
static int __init ixp4xx_wdt_init(void)
|
|
{
|
|
int ret;
|
|
|
|
/*
|
|
* FIXME: we bail out on device tree boot but this really needs
|
|
* to be fixed in a nicer way: this registers the MDIO bus before
|
|
* even matching the driver infrastructure, we should only probe
|
|
* detected hardware.
|
|
*/
|
|
if (of_have_populated_dt())
|
|
return -ENODEV;
|
|
if (!(read_cpuid_id() & 0xf) && !cpu_is_ixp46x()) {
|
|
pr_err("Rev. A0 IXP42x CPU detected - watchdog disabled\n");
|
|
|
|
return -ENODEV;
|
|
}
|
|
boot_status = (*IXP4XX_OSST & IXP4XX_OSST_TIMER_WARM_RESET) ?
|
|
WDIOF_CARDRESET : 0;
|
|
ret = misc_register(&ixp4xx_wdt_miscdev);
|
|
if (ret == 0)
|
|
pr_info("timer heartbeat %d sec\n", heartbeat);
|
|
return ret;
|
|
}
|
|
|
|
static void __exit ixp4xx_wdt_exit(void)
|
|
{
|
|
misc_deregister(&ixp4xx_wdt_miscdev);
|
|
}
|
|
|
|
|
|
module_init(ixp4xx_wdt_init);
|
|
module_exit(ixp4xx_wdt_exit);
|
|
|
|
MODULE_AUTHOR("Deepak Saxena <dsaxena@plexity.net>");
|
|
MODULE_DESCRIPTION("IXP4xx Network Processor Watchdog");
|
|
|
|
module_param(heartbeat, int, 0);
|
|
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds (default 60s)");
|
|
|
|
module_param(nowayout, bool, 0);
|
|
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
|
|
|
|
MODULE_LICENSE("GPL");
|