Commit b8a51443 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Martin K. Petersen
Browse files

scsi: message: fusion: Remove in_interrupt() usage in mpt_config() 

in_interrupt() is referenced all over the place in these drivers. Most of
these references are comments which are outdated and wrong.

Aside of that in_interrupt() is deprecated as it does not provide what the
name suggests. It covers more than hard/soft interrupt servicing context
and is semantically ill defined.

>From reading the mpt_config() code and the history this is clearly a debug
mechanism and should probably be replaced by might_sleep() or completely
removed because such checks are already in the subsequent functions.

Remove the in_interrupt() references and replace the usage in mpt_config()
with might_sleep().

Link: https://lore.kernel.org/r/20201126132952.2287996-14-bigeasy@linutronix.de


Cc: Sathya Prakash <sathya.prakash@broadcom.com>
Cc: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
Cc: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
Cc: MPT-FusionLinux.pdl@broadcom.com
Reviewed-by: default avatarDaniel Wagner <dwagner@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ca685369

drivers/message/fusion/mptbase.c

+2 −12
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#include <linux/kdev_t.h>

#include <linux/blkdev.h>

#include <linux/delay.h>

#include <linux/interrupt.h>		/* needed for in_interrupt() proto */

#include <linux/interrupt.h>

#include <linux/dma-mapping.h>

#include <linux/kthread.h>

#include <scsi/scsi_host.h>
@@ -6335,7 +6335,6 @@ SendEventAck(MPT_ADAPTER *ioc, EventNotificationReply_t *evnp) 
 *		Page header is updated.

 *

 *	Returns 0 for success

 *	-EPERM if not allowed due to ISR context

 *	-EAGAIN if no msg frames currently available

 *	-EFAULT for non-successful reply or no reply (timeout)

 */
@@ -6353,19 +6352,10 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg) 
	u8		 page_type = 0, extend_page;

	unsigned long 	 timeleft;

	unsigned long	 flags;

	int		 in_isr;

	u8		 issue_hard_reset = 0;

	u8		 retry_count = 0;



	/*	Prevent calling wait_event() (below), if caller happens

	 *	to be in ISR context, because that is fatal!

	 */

	in_isr = in_interrupt();

	if (in_isr) {

		dcprintk(ioc, printk(MYIOC_s_WARN_FMT "Config request not allowed in ISR context!\n",

				ioc->name));

		return -EPERM;

    }

	might_sleep();



	/* don't send a config page during diag reset */

	spin_lock_irqsave(&ioc->taskmgmt_lock, flags);

drivers/message/fusion/mptfc.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#include <linux/kdev_t.h>

#include <linux/blkdev.h>

#include <linux/delay.h>	/* for mdelay */

#include <linux/interrupt.h>	/* needed for in_interrupt() proto */

#include <linux/interrupt.h>

#include <linux/reboot.h>	/* notifier code */

#include <linux/workqueue.h>

#include <linux/sort.h>

drivers/message/fusion/mptscsih.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#include <linux/kdev_t.h>

#include <linux/blkdev.h>

#include <linux/delay.h>	/* for mdelay */

#include <linux/interrupt.h>	/* needed for in_interrupt() proto */

#include <linux/interrupt.h>

#include <linux/reboot.h>	/* notifier code */

#include <linux/workqueue.h>

drivers/message/fusion/mptspi.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#include <linux/kdev_t.h>

#include <linux/blkdev.h>

#include <linux/delay.h>	/* for mdelay */

#include <linux/interrupt.h>	/* needed for in_interrupt() proto */

#include <linux/interrupt.h>

#include <linux/reboot.h>	/* notifier code */

#include <linux/workqueue.h>

#include <linux/raid_class.h>