Commit 949189a5 authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge patch series "megaraid_sas: Driver version update to 07.727.03.00-rc1" 

Chandrakanth patil <chandrakanth.patil@broadcom.com> says:

This set of patches includes critical fixes, and updates to the
maintainer list.

Link: https://lore.kernel.org/r/20231003110021.168862-1-chandrakanth.patil@broadcom.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents bd7f0ef2 be6f2181

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -13534,6 +13534,7 @@ MEGARAID SCSI/SAS DRIVERS 
M:	Kashyap Desai <kashyap.desai@broadcom.com>

M:	Sumit Saxena <sumit.saxena@broadcom.com>

M:	Shivasharan S <shivasharan.srikanteshwara@broadcom.com>

M:	Chandrakanth patil <chandrakanth.patil@broadcom.com>

L:	megaraidlinux.pdl@broadcom.com

L:	linux-scsi@vger.kernel.org

S:	Maintained

drivers/scsi/megaraid/megaraid_sas.h

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
/*

 * MegaRAID SAS Driver meta data

 */

#define MEGASAS_VERSION				"07.725.01.00-rc1"

#define MEGASAS_RELDATE				"Mar 2, 2023"

#define MEGASAS_VERSION				"07.727.03.00-rc1"

#define MEGASAS_RELDATE				"Oct 03, 2023"



#define MEGASAS_MSIX_NAME_LEN			32

drivers/scsi/megaraid/megaraid_sas_base.c

+2 −2
Original line number Diff line number Diff line
@@ -263,13 +263,13 @@ u32 megasas_readl(struct megasas_instance *instance, 
	 * Fusion registers could intermittently return all zeroes.

	 * This behavior is transient in nature and subsequent reads will

	 * return valid value. As a workaround in driver, retry readl for

	 * upto three times until a non-zero value is read.

	 * up to thirty times until a non-zero value is read.

	 */

	if (instance->adapter_type == AERO_SERIES) {

		do {

			ret_val = readl(addr);

			i++;

		} while (ret_val == 0 && i < 3);

		} while (ret_val == 0 && i < 30);

		return ret_val;

	} else {

		return readl(addr);

drivers/scsi/megaraid/megaraid_sas_fusion.c

+3 −0
Original line number Diff line number Diff line
@@ -4268,6 +4268,9 @@ megasas_wait_for_outstanding_fusion(struct megasas_instance *instance, 
	}



out:

	if (!retval && reason == SCSIIO_TIMEOUT_OCR)

		dev_info(&instance->pdev->dev, "IO is completed, no OCR is required\n");



	return retval;

}