Commit 2111ba87 authored by Lee Jones's avatar Lee Jones Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: Move a little data from the stack onto the heap 

Fixes the following W=1 kernel build warning(s):

 drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function ‘_scsih_scan_for_devices_after_reset’:
 drivers/scsi/mpt3sas/mpt3sas_scsih.c:10473:1: warning: the frame size of 1064 bytes is larger than 1024 bytes [-Wframe-larger-than=]

Link: https://lore.kernel.org/r/20210303144631.3175331-31-lee.jones@linaro.org


Cc: Sathya Prakash <sathya.prakash@broadcom.com>
Cc: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
Cc: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: MPT-FusionLinux.pdl@avagotech.com
Cc: MPT-FusionLinux.pdl@broadcom.com
Cc: linux-scsi@vger.kernel.org
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e015e0de

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+26 −12
Original line number Diff line number Diff line
@@ -10219,8 +10219,8 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc) 
	Mpi2ExpanderPage0_t expander_pg0;

	Mpi2SasDevicePage0_t sas_device_pg0;

	Mpi26PCIeDevicePage0_t pcie_device_pg0;

	Mpi2RaidVolPage1_t volume_pg1;

	Mpi2RaidVolPage0_t volume_pg0;

	Mpi2RaidVolPage1_t *volume_pg1;

	Mpi2RaidVolPage0_t *volume_pg0;

	Mpi2RaidPhysDiskPage0_t pd_pg0;

	Mpi2EventIrConfigElement_t element;

	Mpi2ConfigReply_t mpi_reply;
@@ -10235,6 +10235,16 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc) 
	u8 retry_count;

	unsigned long flags;



	volume_pg0 = kzalloc(sizeof(*volume_pg0), GFP_KERNEL);

	if (!volume_pg0)

		return;



	volume_pg1 = kzalloc(sizeof(*volume_pg1), GFP_KERNEL);

	if (!volume_pg1) {

		kfree(volume_pg0);

		return;

	}



	ioc_info(ioc, "scan devices: start\n");



	_scsih_sas_host_refresh(ioc);
@@ -10344,7 +10354,7 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc) 
	/* volumes */

	handle = 0xFFFF;

	while (!(mpt3sas_config_get_raid_volume_pg1(ioc, &mpi_reply,

	    &volume_pg1, MPI2_RAID_VOLUME_PGAD_FORM_GET_NEXT_HANDLE, handle))) {

	    volume_pg1, MPI2_RAID_VOLUME_PGAD_FORM_GET_NEXT_HANDLE, handle))) {

		ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &

		    MPI2_IOCSTATUS_MASK;

		if (ioc_status != MPI2_IOCSTATUS_SUCCESS) {
@@ -10352,15 +10362,15 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc) 
				 ioc_status, le32_to_cpu(mpi_reply.IOCLogInfo));

			break;

		}

		handle = le16_to_cpu(volume_pg1.DevHandle);

		handle = le16_to_cpu(volume_pg1->DevHandle);

		spin_lock_irqsave(&ioc->raid_device_lock, flags);

		raid_device = _scsih_raid_device_find_by_wwid(ioc,

		    le64_to_cpu(volume_pg1.WWID));

		    le64_to_cpu(volume_pg1->WWID));

		spin_unlock_irqrestore(&ioc->raid_device_lock, flags);

		if (raid_device)

			continue;

		if (mpt3sas_config_get_raid_volume_pg0(ioc, &mpi_reply,

		    &volume_pg0, MPI2_RAID_VOLUME_PGAD_FORM_HANDLE, handle,

		    volume_pg0, MPI2_RAID_VOLUME_PGAD_FORM_HANDLE, handle,

		     sizeof(Mpi2RaidVolPage0_t)))

			continue;

		ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &
@@ -10370,17 +10380,17 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc) 
				 ioc_status, le32_to_cpu(mpi_reply.IOCLogInfo));

			break;

		}

		if (volume_pg0.VolumeState == MPI2_RAID_VOL_STATE_OPTIMAL ||

		    volume_pg0.VolumeState == MPI2_RAID_VOL_STATE_ONLINE ||

		    volume_pg0.VolumeState == MPI2_RAID_VOL_STATE_DEGRADED) {

		if (volume_pg0->VolumeState == MPI2_RAID_VOL_STATE_OPTIMAL ||

		    volume_pg0->VolumeState == MPI2_RAID_VOL_STATE_ONLINE ||

		    volume_pg0->VolumeState == MPI2_RAID_VOL_STATE_DEGRADED) {

			memset(&element, 0, sizeof(Mpi2EventIrConfigElement_t));

			element.ReasonCode = MPI2_EVENT_IR_CHANGE_RC_ADDED;

			element.VolDevHandle = volume_pg1.DevHandle;

			element.VolDevHandle = volume_pg1->DevHandle;

			ioc_info(ioc, "\tBEFORE adding volume: handle (0x%04x)\n",

				 volume_pg1.DevHandle);

				 volume_pg1->DevHandle);

			_scsih_sas_volume_add(ioc, &element);

			ioc_info(ioc, "\tAFTER adding volume: handle (0x%04x)\n",

				 volume_pg1.DevHandle);

				 volume_pg1->DevHandle);

		}

	}
@@ -10468,6 +10478,10 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc) 
		ioc_info(ioc, "\tAFTER adding pcie end device: handle (0x%04x), wwid(0x%016llx)\n",

			 handle, (u64)le64_to_cpu(pcie_device_pg0.WWID));

	}



	kfree(volume_pg0);

	kfree(volume_pg1);



	ioc_info(ioc, "\tpcie devices: pcie end devices complete\n");

	ioc_info(ioc, "scan devices: complete\n");

}