Skip to content

Commit 949189a

Browse files
Merge patch series "megaraid_sas: Driver version update to 07.727.03.00-rc1"
Chandrakanth patil <[email protected]> says: This set of patches includes critical fixes, and updates to the maintainer list. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
2 parents bd7f0ef + be6f218 commit 949189a

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13534,6 +13534,7 @@ MEGARAID SCSI/SAS DRIVERS
1353413534
M: Kashyap Desai <[email protected]>
1353513535
M: Sumit Saxena <[email protected]>
1353613536
M: Shivasharan S <[email protected]>
13537+
M: Chandrakanth patil <[email protected]>
1353713538
1353813539
1353913540
S: Maintained

drivers/scsi/megaraid/megaraid_sas.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
/*
2424
* MegaRAID SAS Driver meta data
2525
*/
26-
#define MEGASAS_VERSION "07.725.01.00-rc1"
27-
#define MEGASAS_RELDATE "Mar 2, 2023"
26+
#define MEGASAS_VERSION "07.727.03.00-rc1"
27+
#define MEGASAS_RELDATE "Oct 03, 2023"
2828

2929
#define MEGASAS_MSIX_NAME_LEN 32
3030

drivers/scsi/megaraid/megaraid_sas_base.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,13 +263,13 @@ u32 megasas_readl(struct megasas_instance *instance,
263263
* Fusion registers could intermittently return all zeroes.
264264
* This behavior is transient in nature and subsequent reads will
265265
* return valid value. As a workaround in driver, retry readl for
266-
* upto three times until a non-zero value is read.
266+
* up to thirty times until a non-zero value is read.
267267
*/
268268
if (instance->adapter_type == AERO_SERIES) {
269269
do {
270270
ret_val = readl(addr);
271271
i++;
272-
} while (ret_val == 0 && i < 3);
272+
} while (ret_val == 0 && i < 30);
273273
return ret_val;
274274
} else {
275275
return readl(addr);

drivers/scsi/megaraid/megaraid_sas_fusion.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4268,6 +4268,9 @@ megasas_wait_for_outstanding_fusion(struct megasas_instance *instance,
42684268
}
42694269

42704270
out:
4271+
if (!retval && reason == SCSIIO_TIMEOUT_OCR)
4272+
dev_info(&instance->pdev->dev, "IO is completed, no OCR is required\n");
4273+
42714274
return retval;
42724275
}
42734276

0 commit comments

Comments
 (0)