powerpc: export ppc_proc_freq and ppc_tb_freq as GPL symbols
Subsystems (2)
PATCH v2 1/2 powerpc: export ppc_proc_freq and ppc_tb_freq as GPL symbols
Export the global variable 'ppc_tb_freq', so that modules (like the Book-E watchdog driver) can use it. To maintain consistency, ppc_proc_freq is changed to a GPL-only export. This is okay, because any module that needs this symbol should be an actual Linux driver, which must be GPL-licensed.
---
This export is necessary for the Book-E watchdog driver to be compiled as a module.
arch/powerpc/kernel/time.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/powerpc/kernel/time.c +2 -1
@@ -161,8 +161,9 @@ extern struct timezone sys_tz;static long timezone_offset;unsigned long ppc_proc_freq; -EXPORT_SYMBOL (ppc_proc_freq); +EXPORT_SYMBOL_GPL (ppc_proc_freq);unsigned long ppc_tb_freq; +EXPORT_SYMBOL_GPL (ppc_tb_freq); static DEFINE_PER_CPU(u64, last_jiffy);
Signature · 1 line
1.7.2.3
PATCH v2 2/2 powerpc/watchdog: allow the e500 watchdog driver to be compiled as a module
Register the __init and __exit functions in the PowerPC e500 watchdog driver as module entry/exit functions, and modify the Kconfig entry.
Add a .release method for the PowerPC e500 watchdog driver, so that the watchdog is disabled when the driver is closed.
Loosely based on original code from Jiang Yutang <[email protected]>.
---
This patch requires:
powerpc: export ppc_proc_freq and ppc_tb_freq as GPL symbols
drivers/watchdog/Kconfig | 5 ++++- drivers/watchdog/booke_wdt.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 3 deletions(-)
drivers/watchdog/Kconfig +4 -1
@@ -957,9 +957,12 @@ config PIKA_WDT the Warp platform. config BOOKE_WDT - bool "PowerPC Book-E Watchdog Timer" + tristate "PowerPC Book-E Watchdog Timer" depends on BOOKE || 4xx ---help--- + Watchdog driver for PowerPC Book-E chips, such as the Freescale + MPC85xx SOCs and the IBM PowerPC 440. + Please see Documentation/watchdog/watchdog-api.txt for more information.
drivers/watchdog/booke_wdt.c +37 -2
@@ -4,7 +4,7 @@* Author: Matthew McClintock * Maintainer: Kumar Gala <[email protected]> * -* Copyright 2005, 2008 Freescale Semiconductor Inc. +* Copyright 2005, 2008, 2010 Freescale Semiconductor Inc. * * 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
@@ -114,6 +114,27 @@ static void __booke_wdt_enable(void *data)mtspr (SPRN_TCR , val); } +/** +* booke_wdt_disable - disable the watchdog on the given CPU +* +* This function is called on each CPU. It disables the watchdog on that CPU. +* +* TCR[WRC] cannot be changed once it has been set to non-zero, but we can +* effectively disable the watchdog by setting its period to the maximum value. +*/ +static void __booke_wdt_disable (void *data) +{ +u32 val; + + val =mfspr (SPRN_TCR ); + val &= ~(TCR_WIE |WDTP_MASK ); +mtspr (SPRN_TCR , val); + +/* clear status to make sure nothing is pending */ +__booke_wdt_ping (NULL ); + +} +static ssize_t booke_wdt_write (struct file *file,const char __user *buf,size_t count,loff_t *ppos) {
@@ -193,12 +214,21 @@ static int booke_wdt_open(struct inode *inode, struct file *file)return nonseekable_open (inode, file); } +static int booke_wdt_release (struct inode *inode,struct file *file) +{ +on_each_cpu (__booke_wdt_disable,NULL ,0 ); + booke_wdt_enabled =0 ; + +return 0 ; +} +static const struct file_operations booke_wdt_fops = { .owner =THIS_MODULE , .llseek = no_llseek, .write = booke_wdt_write, .unlocked_ioctl = booke_wdt_ioctl, .open = booke_wdt_open, + .release = booke_wdt_release, };static struct miscdevice booke_wdt_miscdev = {
@@ -237,4 +267,9 @@ static int __init booke_wdt_init(void)return ret; } -device_initcall (booke_wdt_init); + +module_init (booke_wdt_init); +module_exit (booke_wdt_exit); + +MODULE_DESCRIPTION ("PowerPC Book-E watchdog driver" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
1.7.2.3
Kumar Gala
AppliedRe: [PATCH 2/2] [v2] powerpc/watchdog: allow the e500 watchdog driver to be compiled as a module
Quoted 1 line · Timur Tabi
Register the
__initand__exitfunctions in the PowerPC e500 watchdog =
driver
Quoted 3 lines
as module entry/exit functions, and modify the
Kconfigentry. =20
Add a .release method for the PowerPC e500 watchdog driver, so that =
the
Quoted 3 lines
watchdog is disabled when the driver is closed. =20
Loosely based on original code from Jiang Yutang =
Quoted 10 lines
=20
Signed-off-by Timur Tabi <[email protected]>---
=20
This patch requires:
=20
powerpc: exportppc_proc_freqandppc_tb_freqas GPL symbols
=20drivers/watchdog/Kconfig| 5 ++++-drivers/watchdog/booke_wdt.c| 39 =
+++++++++++++++++++++++++++++++++++++--
Quoted 1 line
2 files changed, 41 insertions(+), 3 deletions(-)
applied to next [fixed comment message to say Book-E instead of e500]
- k=
Quoted 6 lines · Timur Tabi
Export the global variable '
ppc_tb_freq', so that modules (like the Book-E watchdog driver) can use it. To maintain consistency,ppc_proc_freqis changed to a GPL-only export. This is okay, because any module that needs this symbol should be an actual Linux driver, which must be GPL-licensed.Signed-off-by Timur Tabi <[email protected]>
Quoted 31 lines
---
This export is necessary for the Book-E watchdog driver to be compiled as a module.
arch/powerpc/kernel/time.c| 3 ++-1 files changed, 2 insertions(+), 1 deletions(-)arch/powerpc/kernel/time.c +2
-1@@ -161,8 +161,9 @@ extern struct timezone sys_tz;static long timezone_offset;unsigned long ppc_proc_freq; -EXPORT_SYMBOL (ppc_proc_freq); +EXPORT_SYMBOL_GPL (ppc_proc_freq);unsigned long ppc_tb_freq; +EXPORT_SYMBOL_GPL (ppc_tb_freq); static DEFINE_PER_CPU(u64, last_jiffy);Signature · 7 lines
1.7.2.3 _______________________________________________ Linuxppc-dev mailing list [email protected] https://lists.ozlabs.org/listinfo/linuxppc-dev
Kumar Gala
AppliedQuoted 5 lines · Timur Tabi
Export the global variable '
ppc_tb_freq', so that modules (like the Book-E watchdog driver) can use it. To maintain consistency,ppc_proc_freqis changed to a GPL-only export. This is okay, because any module that needs this symbol should be an actual Linux driver, which must be GPL-licensed.
Quoted 8 lines
Signed-off-by Timur Tabi <[email protected]>---
This export is necessary for the Book-E watchdog driver to be compiled as a module.
arch/powerpc/kernel/time.c| 3 ++-1 files changed, 2 insertions(+), 1 deletions(-)
applied to next
- k