From: minyard@acm.org To: linux-watchdog@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>, Wim Van Sebroeck <wim@linux-watchdog.org> Cc: Corey Minyard <cminyard@mvista.com> Subject: [PATCH 05/12] watchdog:ipmi: Move the IPMI watchdog to drivers/watchdog Date: Mon, 19 Aug 2019 15:37:04 -0500 Message-ID: <20190819203711.32599-6-minyard@acm.org> (raw) In-Reply-To: <20190819203711.32599-1-minyard@acm.org> From: Corey Minyard <cminyard@mvista.com> It probably belongs there, and it will need access to the watchdog_pretimeout.h file when converted over to the standard watchdog interface. Signed-off-by: Corey Minyard <cminyard@mvista.com> --- MAINTAINERS | 1 + drivers/char/ipmi/Kconfig | 5 ----- drivers/char/ipmi/Makefile | 1 - drivers/watchdog/Kconfig | 6 ++++++ drivers/watchdog/Makefile | 1 + drivers/{char/ipmi => watchdog}/ipmi_watchdog.c | 0 6 files changed, 8 insertions(+), 6 deletions(-) rename drivers/{char/ipmi => watchdog}/ipmi_watchdog.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 6426db5198f0..760bcf92fde1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8456,6 +8456,7 @@ F: Documentation/IPMI.txt F: drivers/char/ipmi/ F: include/linux/ipmi* F: include/uapi/linux/ipmi* +F: drivers/watchdog/ipmi_watchdog.c IPS SCSI RAID DRIVER M: Adaptec OEM Raid Solutions <aacraid@microsemi.com> diff --git a/drivers/char/ipmi/Kconfig b/drivers/char/ipmi/Kconfig index 4bad0614109b..5f310ff0bd89 100644 --- a/drivers/char/ipmi/Kconfig +++ b/drivers/char/ipmi/Kconfig @@ -81,11 +81,6 @@ config IPMI_POWERNV help Provides a driver for OPAL firmware-based IPMI interfaces. -config IPMI_WATCHDOG - tristate 'IPMI Watchdog Timer' - help - This enables the IPMI watchdog timer. - config IPMI_POWEROFF tristate 'IPMI Poweroff' help diff --git a/drivers/char/ipmi/Makefile b/drivers/char/ipmi/Makefile index 0822adc2ec41..a9edcd473615 100644 --- a/drivers/char/ipmi/Makefile +++ b/drivers/char/ipmi/Makefile @@ -20,7 +20,6 @@ obj-$(CONFIG_IPMI_DMI_DECODE) += ipmi_dmi.o obj-$(CONFIG_IPMI_PLAT_DATA) += ipmi_plat_data.o obj-$(CONFIG_IPMI_SSIF) += ipmi_ssif.o obj-$(CONFIG_IPMI_POWERNV) += ipmi_powernv.o -obj-$(CONFIG_IPMI_WATCHDOG) += ipmi_watchdog.o obj-$(CONFIG_IPMI_POWEROFF) += ipmi_poweroff.o obj-$(CONFIG_IPMI_KCS_BMC) += kcs_bmc.o obj-$(CONFIG_ASPEED_BT_IPMI_BMC) += bt-bmc.o diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 3578b7bc863c..de462f995329 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -960,6 +960,12 @@ config STPMIC1_WATCHDOG To compile this driver as a module, choose M here: the module will be called spmic1_wdt. +config IPMI_WATCHDOG + tristate 'IPMI Watchdog Timer' + depends on IPMI_HANDLER + help + This enables the IPMI watchdog timer. + config UNIPHIER_WATCHDOG tristate "UniPhier watchdog support" depends on ARCH_UNIPHIER || COMPILE_TEST diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 9cfe4ad32dc4..5840773bf2b4 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -225,3 +225,4 @@ obj-$(CONFIG_MENF21BMC_WATCHDOG) += menf21bmc_wdt.o obj-$(CONFIG_MENZ069_WATCHDOG) += menz69_wdt.o obj-$(CONFIG_RAVE_SP_WATCHDOG) += rave-sp-wdt.o obj-$(CONFIG_STPMIC1_WATCHDOG) += stpmic1_wdt.o +obj-$(CONFIG_IPMI_WATCHDOG) += ipmi_watchdog.o diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/watchdog/ipmi_watchdog.c similarity index 100% rename from drivers/char/ipmi/ipmi_watchdog.c rename to drivers/watchdog/ipmi_watchdog.c -- 2.17.1
next prev parent reply index Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20190819203711.32599-1-minyard@acm.org> 2019-08-19 20:37 ` [PATCH 01/12] watchdog: NULL the default governor if it is unregistered minyard 2019-08-19 22:35 ` Guenter Roeck 2019-08-19 20:37 ` [PATCH 02/12] watchdog: Add the ability to provide data to read minyard 2019-08-19 21:50 ` Guenter Roeck 2019-08-19 22:43 ` Guenter Roeck 2019-08-20 0:23 ` Corey Minyard 2019-08-20 1:09 ` Jerry Hoemann 2019-08-20 12:12 ` Corey Minyard 2019-08-20 13:53 ` Guenter Roeck 2019-08-20 15:58 ` Corey Minyard 2019-08-20 17:14 ` Guenter Roeck 2019-08-20 18:16 ` Corey Minyard 2019-08-19 20:37 ` [PATCH 03/12] watchdog: Add a pretimeout governor to provide read data minyard 2019-08-19 20:37 ` [PATCH 04/12] watchdog: Allow pretimeout governor setting to be accessed from modules minyard 2019-08-19 21:49 ` Guenter Roeck 2019-08-20 0:24 ` Corey Minyard 2019-08-19 20:37 ` minyard [this message] 2019-08-19 20:37 ` [PATCH 06/12] watchdog:ipmi: Convert over to the standard watchdog infrastructure minyard 2019-08-19 20:37 ` [PATCH 07/12] watchdog:ipmi: Add the ability to fetch the current time left minyard 2019-08-19 20:37 ` [PATCH 08/12] watchdog: Add the ability to set the action of a timeout minyard 2019-08-19 21:58 ` Guenter Roeck 2019-08-20 0:39 ` Corey Minyard 2019-08-20 14:17 ` Guenter Roeck 2019-08-20 19:39 ` Corey Minyard 2019-08-19 20:37 ` [PATCH 09/12] watchdog:ipmi: Implement action and preaction functions minyard 2019-08-19 20:37 ` [PATCH 10/12] watchdog: Add a way to set the governor through the ioctl minyard 2019-08-19 20:37 ` [PATCH 11/12] watchdog: Add a sample program that can fully use the watchdog interface minyard 2019-08-19 20:37 ` [PATCH 12/12] watchdog: Set the preaction fields for drivers supporting pretimeout minyard
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190819203711.32599-6-minyard@acm.org \ --to=minyard@acm.org \ --cc="[PATCH 00/12]"@minyard.net \ --cc=Convert@minyard.net \ --cc=IPMI@minyard.net \ --cc=cminyard@mvista.com \ --cc=interface@minyard.net \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=standard@minyard.net \ --cc=the@minyard.net \ --cc=to@minyard.net \ --cc=watchdog@minyard.net \ --cc=wim@linux-watchdog.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-Watchdog Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-watchdog/0 linux-watchdog/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-watchdog linux-watchdog/ https://lore.kernel.org/linux-watchdog \ linux-watchdog@vger.kernel.org public-inbox-index linux-watchdog Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-watchdog AGPL code for this site: git clone https://public-inbox.org/public-inbox.git