Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b42afa34 authored by Mika Westerberg's avatar Mika Westerberg Committed by Greg Kroah-Hartman
Browse files

watchdog: iTCO_wdt: Export vendorsupport 



commit 7ca6ee38909109751bfab79e9f6c570d2ed258c6 upstream.

In preparation for making ->smi_res optional the iTCO_wdt driver needs
to know whether vendorsupport is being set to non-zero. For this reason
export the variable.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4ebd1664

drivers/watchdog/iTCO_vendor.h

+2 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* iTCO Vendor Specific Support hooks */

#ifdef CONFIG_ITCO_VENDOR_SUPPORT

extern int iTCO_vendorsupport;

extern void iTCO_vendor_pre_start(struct resource *, unsigned int);

extern void iTCO_vendor_pre_stop(struct resource *);

extern int iTCO_vendor_check_noreboot_on(void);

#else

#define iTCO_vendorsupport				0

#define iTCO_vendor_pre_start(acpibase, heartbeat)	{}

#define iTCO_vendor_pre_stop(acpibase)			{}

#define iTCO_vendor_check_noreboot_on()			1

drivers/watchdog/iTCO_vendor_support.c

+9 −7
Original line number Diff line number Diff line
@@ -39,8 +39,10 @@ 
/* Broken BIOS */

#define BROKEN_BIOS		911



static int vendorsupport;

module_param(vendorsupport, int, 0);

int iTCO_vendorsupport;

EXPORT_SYMBOL(iTCO_vendorsupport);



module_param_named(vendorsupport, iTCO_vendorsupport, int, 0);

MODULE_PARM_DESC(vendorsupport, "iTCO vendor specific support mode, default="

			"0 (none), 1=SuperMicro Pent3, 911=Broken SMI BIOS");
@@ -152,7 +154,7 @@ static void broken_bios_stop(struct resource *smires) 
void iTCO_vendor_pre_start(struct resource *smires,

			   unsigned int heartbeat)

{

	switch (vendorsupport) {

	switch (iTCO_vendorsupport) {

	case SUPERMICRO_OLD_BOARD:

		supermicro_old_pre_start(smires);

		break;
@@ -165,7 +167,7 @@ EXPORT_SYMBOL(iTCO_vendor_pre_start); 


void iTCO_vendor_pre_stop(struct resource *smires)

{

	switch (vendorsupport) {

	switch (iTCO_vendorsupport) {

	case SUPERMICRO_OLD_BOARD:

		supermicro_old_pre_stop(smires);

		break;
@@ -178,7 +180,7 @@ EXPORT_SYMBOL(iTCO_vendor_pre_stop); 


int iTCO_vendor_check_noreboot_on(void)

{

	switch (vendorsupport) {

	switch (iTCO_vendorsupport) {

	case SUPERMICRO_OLD_BOARD:

		return 0;

	default:
@@ -189,13 +191,13 @@ EXPORT_SYMBOL(iTCO_vendor_check_noreboot_on); 


static int __init iTCO_vendor_init_module(void)

{

	if (vendorsupport == SUPERMICRO_NEW_BOARD) {

	if (iTCO_vendorsupport == SUPERMICRO_NEW_BOARD) {

		pr_warn("Option vendorsupport=%d is no longer supported, "

			"please use the w83627hf_wdt driver instead\n",

			SUPERMICRO_NEW_BOARD);

		return -EINVAL;

	}

	pr_info("vendor-support=%d\n", vendorsupport);

	pr_info("vendor-support=%d\n", iTCO_vendorsupport);

	return 0;

}