[PATCH 4.14 27/54] scsi: megaraid_sas: replace instance->ctrl_context checks with instance->adapter_type

16 Jul 2018

4.14-stable review patch.  If anyone has any objections, please let me know.
------------------
From: Shivasharan S shivasharan.srikanteshwara@broadcom.com
commit e7d36b88435077847e1ea992919c600f3fa9321c upstream.
Increase code readability. No functional change.
Signed-off-by: Kashyap Desai kashyap.desai@broadcom.com
Signed-off-by: Shivasharan S shivasharan.srikanteshwara@broadcom.com
Signed-off-by: Martin K. Petersen martin.petersen@oracle.com
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
---
 drivers/scsi/megaraid/megaraid_sas_base.c |   64 +++++++++++++++++-------------
 1 file changed, 37 insertions(+), 27 deletions(-)

--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -2023,7 +2023,7 @@ void megaraid_sas_kill_hba(struct megasa
    msleep(1000);
    if ((instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0073SKINNY) ||
    	(instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0071SKINNY) ||
-		(instance->ctrl_context)) {
+		(instance->adapter_type != MFI_SERIES)) {
    	writel(MFI_STOP_ADP, &instance->reg_set->doorbell);
    	/* Flush */
    	readl(&instance->reg_set->doorbell);
@@ -2494,7 +2494,8 @@ int megasas_sriov_start_heartbeat(struct
    dev_warn(&instance->pdev->dev, "SR-IOV: Starting heartbeat for scsi%d\n",
           instance->host->host_no);
-	if (instance->ctrl_context && !instance->mask_interrupts)
+	if ((instance->adapter_type != MFI_SERIES) &&
+	    !instance->mask_interrupts)
    	retval = megasas_issue_blocked_cmd(instance, cmd,
    		MEGASAS_ROUTINE_WAIT_TIME_VF);
    else
@@ -2790,7 +2791,9 @@ static int megasas_reset_bus_host(struct
    /*
     * First wait for all commands to complete
     */
-	if (instance->ctrl_context) {
+	if (instance->adapter_type == MFI_SERIES) {
+		ret = megasas_generic_reset(scmd);
+	} else {
    	struct megasas_cmd_fusion *cmd;
    	cmd = (struct megasas_cmd_fusion *)scmd->SCp.ptr;
    	if (cmd)
@@ -2798,8 +2801,7 @@ static int megasas_reset_bus_host(struct
    			MEGA_MPI2_RAID_DEFAULT_IO_FRAME_SIZE);
    	ret = megasas_reset_fusion(scmd->device->host,
    			SCSIIO_TIMEOUT_OCR);
-	} else
-		ret = megasas_generic_reset(scmd);
+	}
return ret;
 }
@@ -2816,7 +2818,7 @@ static int megasas_task_abort(struct scs
instance = (struct megasas_instance *)scmd->device->host->hostdata;
-	if (instance->ctrl_context)
+	if (instance->adapter_type != MFI_SERIES)
    	ret = megasas_task_abort_fusion(scmd);
    else {
    	sdev_printk(KERN_NOTICE, scmd->device, "TASK ABORT not supported\n");
@@ -2838,7 +2840,7 @@ static int megasas_reset_target(struct s
instance = (struct megasas_instance *)scmd->device->host->hostdata;
-	if (instance->ctrl_context)
+	if (instance->adapter_type != MFI_SERIES)
    	ret = megasas_reset_target_fusion(scmd);
    else {
    	sdev_printk(KERN_NOTICE, scmd->device, "TARGET RESET not supported\n");
@@ -3715,7 +3717,7 @@ megasas_transition_to_ready(struct megas
    			PCI_DEVICE_ID_LSI_SAS0073SKINNY) ||
    			(instance->pdev->device ==
    			 PCI_DEVICE_ID_LSI_SAS0071SKINNY) ||
-				(instance->ctrl_context))
+				(instance->adapter_type != MFI_SERIES))
    			writel(
    			  MFI_INIT_CLEAR_HANDSHAKE|MFI_INIT_HOTPLUG,
    			  &instance->reg_set->doorbell);
@@ -3733,7 +3735,7 @@ megasas_transition_to_ready(struct megas
    		     PCI_DEVICE_ID_LSI_SAS0073SKINNY) ||
    			(instance->pdev->device ==
    			 PCI_DEVICE_ID_LSI_SAS0071SKINNY) ||
-				(instance->ctrl_context))
+				(instance->adapter_type != MFI_SERIES))
    			writel(MFI_INIT_HOTPLUG,
    			       &instance->reg_set->doorbell);
    		else
@@ -3753,11 +3755,11 @@ megasas_transition_to_ready(struct megas
    			PCI_DEVICE_ID_LSI_SAS0073SKINNY) ||
    			(instance->pdev->device ==
    			PCI_DEVICE_ID_LSI_SAS0071SKINNY)  ||
-				(instance->ctrl_context)) {
+				(instance->adapter_type != MFI_SERIES)) {
    			writel(MFI_RESET_FLAGS,
    				&instance->reg_set->doorbell);
-				if (instance->ctrl_context) {
+				if (instance->adapter_type != MFI_SERIES) {
    				for (i = 0; i < (10 * 1000); i += 20) {
    					if (readl(
    						    &instance->
@@ -3924,7 +3926,8 @@ static int megasas_create_frame_pool(str
     * max_sge_sz  = 12 byte (sizeof  megasas_sge64)
     * Total 192 byte (3 MFI frame of 64 byte)
     */
-	frame_count = instance->ctrl_context ? (3 + 1) : (15 + 1);
+	frame_count = (instance->adapter_type == MFI_SERIES) ?
+			(15 + 1) : (3 + 1);
    instance->mfi_frame_size = MEGAMFI_FRAME_SIZE * frame_count;
    /*
     * Use DMA pool facility provided by PCI layer
@@ -3979,7 +3982,7 @@ static int megasas_create_frame_pool(str
    	memset(cmd->frame, 0, instance->mfi_frame_size);
    	cmd->frame->io.context = cpu_to_le32(cmd->index);
    	cmd->frame->io.pad_0 = 0;
-		if (!instance->ctrl_context && reset_devices)
+		if ((instance->adapter_type == MFI_SERIES) && reset_devices)
    		cmd->frame->hdr.cmd = MFI_CMD_INVALID;
    }
@@ -4099,7 +4102,7 @@ int megasas_alloc_cmds(struct megasas_in
 inline int
 dcmd_timeout_ocr_possible(struct megasas_instance *instance) {
-	if (!instance->ctrl_context)
+	if (instance->adapter_type == MFI_SERIES)
    	return KILL_ADAPTER;
    else if (instance->unload ||
    		test_bit(MEGASAS_FUSION_IN_RESET, &instance->reset_flags))
@@ -4143,7 +4146,8 @@ megasas_get_pd_info(struct megasas_insta
    dcmd->sgl.sge32[0].phys_addr = cpu_to_le32(instance->pd_info_h);
    dcmd->sgl.sge32[0].length = cpu_to_le32(sizeof(struct MR_PD_INFO));
-	if (instance->ctrl_context && !instance->mask_interrupts)
+	if ((instance->adapter_type != MFI_SERIES) &&
+	    !instance->mask_interrupts)
    	ret = megasas_issue_blocked_cmd(instance, cmd, MFI_IO_TIMEOUT_SECS);
    else
    	ret = megasas_issue_polled(instance, cmd);
@@ -4240,7 +4244,8 @@ megasas_get_pd_list(struct megasas_insta
    dcmd->sgl.sge32[0].phys_addr = cpu_to_le32(ci_h);
    dcmd->sgl.sge32[0].length = cpu_to_le32(MEGASAS_MAX_PD * sizeof(struct MR_PD_LIST));
-	if (instance->ctrl_context && !instance->mask_interrupts)
+	if ((instance->adapter_type != MFI_SERIES) &&
+	    !instance->mask_interrupts)
    	ret = megasas_issue_blocked_cmd(instance, cmd,
    		MFI_IO_TIMEOUT_SECS);
    else
@@ -4251,7 +4256,7 @@ megasas_get_pd_list(struct megasas_insta
    	dev_info(&instance->pdev->dev, "MR_DCMD_PD_LIST_QUERY "
    		"failed/not supported by firmware\n");
-		if (instance->ctrl_context)
+		if (instance->adapter_type != MFI_SERIES)
    		megaraid_sas_kill_hba(instance);
    	else
    		instance->pd_list_not_supported = 1;
@@ -4372,7 +4377,8 @@ megasas_get_ld_list(struct megasas_insta
    dcmd->sgl.sge32[0].length = cpu_to_le32(sizeof(struct MR_LD_LIST));
    dcmd->pad_0  = 0;
-	if (instance->ctrl_context && !instance->mask_interrupts)
+	if ((instance->adapter_type != MFI_SERIES) &&
+	    !instance->mask_interrupts)
    	ret = megasas_issue_blocked_cmd(instance, cmd,
    		MFI_IO_TIMEOUT_SECS);
    else
@@ -4491,7 +4497,8 @@ megasas_ld_list_query(struct megasas_ins
    dcmd->sgl.sge32[0].length = cpu_to_le32(sizeof(struct MR_LD_TARGETID_LIST));
    dcmd->pad_0  = 0;
-	if (instance->ctrl_context && !instance->mask_interrupts)
+	if ((instance->adapter_type != MFI_SERIES) &&
+	    !instance->mask_interrupts)
    	ret = megasas_issue_blocked_cmd(instance, cmd, MFI_IO_TIMEOUT_SECS);
    else
    	ret = megasas_issue_polled(instance, cmd);
@@ -4664,7 +4671,8 @@ megasas_get_ctrl_info(struct megasas_ins
    dcmd->sgl.sge32[0].length = cpu_to_le32(sizeof(struct megasas_ctrl_info));
    dcmd->mbox.b[0] = 1;
-	if (instance->ctrl_context && !instance->mask_interrupts)
+	if ((instance->adapter_type != MFI_SERIES) &&
+	    !instance->mask_interrupts)
    	ret = megasas_issue_blocked_cmd(instance, cmd, MFI_IO_TIMEOUT_SECS);
    else
    	ret = megasas_issue_polled(instance, cmd);
@@ -4783,7 +4791,8 @@ int megasas_set_crash_dump_params(struct
    dcmd->sgl.sge32[0].phys_addr = cpu_to_le32(instance->crash_dump_h);
    dcmd->sgl.sge32[0].length = cpu_to_le32(CRASH_DMA_BUF_SIZE);
-	if (instance->ctrl_context && !instance->mask_interrupts)
+	if ((instance->adapter_type != MFI_SERIES) &&
+	    !instance->mask_interrupts)
    	ret = megasas_issue_blocked_cmd(instance, cmd, MFI_IO_TIMEOUT_SECS);
    else
    	ret = megasas_issue_polled(instance, cmd);
@@ -5170,7 +5179,7 @@ static int megasas_init_fw(struct megasa
reg_set = instance->reg_set;
-	if (fusion)
+	if (instance->adapter_type != MFI_SERIES)
    	instance->instancet = &megasas_instance_template_fusion;
    else {
    	switch (instance->pdev->device) {
@@ -5805,7 +5814,8 @@ megasas_get_target_prop(struct megasas_i
    dcmd->sgl.sge32[0].length =
    	cpu_to_le32(sizeof(struct MR_TARGET_PROPERTIES));
-	if (instance->ctrl_context && !instance->mask_interrupts)
+	if ((instance->adapter_type != MFI_SERIES) &&
+	    !instance->mask_interrupts)
    	ret = megasas_issue_blocked_cmd(instance,
    					cmd, MFI_IO_TIMEOUT_SECS);
    else
@@ -6186,7 +6196,7 @@ static int megasas_probe_one(struct pci_
    instance->disableOnlineCtrlReset = 1;
    instance->UnevenSpanSupport = 0;
-	if (instance->ctrl_context) {
+	if (instance->adapter_type != MFI_SERIES) {
    	INIT_WORK(&instance->work_init, megasas_fusion_ocr_wq);
    	INIT_WORK(&instance->crash_init, megasas_fusion_crash_dump_wq);
    } else
@@ -6266,7 +6276,7 @@ fail_io_attach:
    instance->instancet->disable_intr(instance);
    megasas_destroy_irqs(instance);
-	if (instance->ctrl_context)
+	if (instance->adapter_type != MFI_SERIES)
    	megasas_release_fusion(instance);
    else
    	megasas_release_mfi(instance);
@@ -6500,7 +6510,7 @@ megasas_resume(struct pci_dev *pdev)
    if (rval < 0)
    	goto fail_reenable_msix;
-	if (instance->ctrl_context) {
+	if (instance->adapter_type != MFI_SERIES) {
    	megasas_reset_reply_desc(instance);
    	if (megasas_ioc_init_fusion(instance)) {
    		megasas_free_cmds(instance);
@@ -6684,7 +6694,7 @@ skip_firing_dcmds:
    }
-	if (instance->ctrl_context) {
+	if (instance->adapter_type != MFI_SERIES) {
    	megasas_release_fusion(instance);
    		pd_seq_map_sz = sizeof(struct MR_PD_CFG_SEQ_NUM_SYNC) +
    			(sizeof(struct MR_PD_CFG_SEQ) *

    

2025

2024

2023

2022

2021

2020

2019

2018

2017

[PATCH 4.14 27/54] scsi: megaraid_sas: replace instance->ctrl_context checks with instance->adapter_type