Commit 5afa9d44 authored by Suganath Prabu S's avatar Suganath Prabu S Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: Rename and export interrupt mask/unmask functions 

Rename Function _base_unmask_interrupts() to
mpt3sas_base_unmask_interrupts() and _base_mask_interrupts() to
mpt3sas_base_mask_interrupts(). Also add function declarion to
mpt3sas_base.h

Link: https://lore.kernel.org/r/1596096229-3341-5-git-send-email-suganath-prabu.subramani@broadcom.com


Signed-off-by: default avatarSuganath Prabu S <suganath-prabu.subramani@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 9e73ed2e

drivers/scsi/mpt3sas/mpt3sas_base.c

+11 −13
Original line number Diff line number Diff line
@@ -129,8 +129,6 @@ _base_wait_on_iocstate(struct MPT3SAS_ADAPTER *ioc, 
static int

_base_get_ioc_facts(struct MPT3SAS_ADAPTER *ioc);

static void

_base_mask_interrupts(struct MPT3SAS_ADAPTER *ioc);

static void

_base_clear_outstanding_commands(struct MPT3SAS_ADAPTER *ioc);



/**
@@ -680,7 +678,7 @@ _base_fault_reset_work(struct work_struct *work) 
			ioc->shost_recovery = 1;

			spin_unlock_irqrestore(

			    &ioc->ioc_reset_in_progress_lock, flags);

			_base_mask_interrupts(ioc);

			mpt3sas_base_mask_interrupts(ioc);

			_base_clear_outstanding_commands(ioc);

		}
@@ -1466,13 +1464,13 @@ _base_get_cb_idx(struct MPT3SAS_ADAPTER *ioc, u16 smid) 
}



/**

 * _base_mask_interrupts - disable interrupts

 * mpt3sas_base_mask_interrupts - disable interrupts

 * @ioc: per adapter object

 *

 * Disabling ResetIRQ, Reply and Doorbell Interrupts

 */

static void

_base_mask_interrupts(struct MPT3SAS_ADAPTER *ioc)

void

mpt3sas_base_mask_interrupts(struct MPT3SAS_ADAPTER *ioc)

{

	u32 him_register;
@@ -1484,13 +1482,13 @@ _base_mask_interrupts(struct MPT3SAS_ADAPTER *ioc) 
}



/**

 * _base_unmask_interrupts - enable interrupts

 * mpt3sas_base_unmask_interrupts - enable interrupts

 * @ioc: per adapter object

 *

 * Enabling only Reply Interrupts

 */

static void

_base_unmask_interrupts(struct MPT3SAS_ADAPTER *ioc)

void

mpt3sas_base_unmask_interrupts(struct MPT3SAS_ADAPTER *ioc)

{

	u32 him_register;
@@ -3372,7 +3370,7 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) 
		goto out_fail;

	}



	_base_mask_interrupts(ioc);

	mpt3sas_base_mask_interrupts(ioc);



	r = _base_get_ioc_facts(ioc);

	if (r) {
@@ -7121,7 +7119,7 @@ _base_make_ioc_operational(struct MPT3SAS_ADAPTER *ioc) 


 skip_init_reply_post_host_index:



	_base_unmask_interrupts(ioc);

	mpt3sas_base_unmask_interrupts(ioc);



	if (ioc->hba_mpi_version_belonged != MPI2_VERSION) {

		r = _base_display_fwpkg_version(ioc);
@@ -7170,7 +7168,7 @@ mpt3sas_base_free_resources(struct MPT3SAS_ADAPTER *ioc) 
	/* synchronizing freeing resource with pci_access_mutex lock */

	mutex_lock(&ioc->pci_access_mutex);

	if (ioc->chip_phys && ioc->chip) {

		_base_mask_interrupts(ioc);

		mpt3sas_base_mask_interrupts(ioc);

		ioc->shost_recovery = 1;

		_base_make_ioc_ready(ioc, SOFT_RESET);

		ioc->shost_recovery = 0;
@@ -7736,7 +7734,7 @@ mpt3sas_base_hard_reset_handler(struct MPT3SAS_ADAPTER *ioc, 
	}

	_base_pre_reset_handler(ioc);

	mpt3sas_wait_for_commands_to_complete(ioc);

	_base_mask_interrupts(ioc);

	mpt3sas_base_mask_interrupts(ioc);

	r = _base_make_ioc_ready(ioc, type);

	if (r)

		goto out;

drivers/scsi/mpt3sas/mpt3sas_base.h

+2 −0
Original line number Diff line number Diff line
@@ -1529,6 +1529,8 @@ __le32 mpt3sas_base_get_sense_buffer_dma(struct MPT3SAS_ADAPTER *ioc, 
void *mpt3sas_base_get_pcie_sgl(struct MPT3SAS_ADAPTER *ioc, u16 smid);

dma_addr_t mpt3sas_base_get_pcie_sgl_dma(struct MPT3SAS_ADAPTER *ioc, u16 smid);

void mpt3sas_base_sync_reply_irqs(struct MPT3SAS_ADAPTER *ioc);

void mpt3sas_base_mask_interrupts(struct MPT3SAS_ADAPTER *ioc);

void mpt3sas_base_unmask_interrupts(struct MPT3SAS_ADAPTER *ioc);



void mpt3sas_base_put_smid_fast_path(struct MPT3SAS_ADAPTER *ioc, u16 smid,

	u16 handle);