Yufen Yu (2): Revert "scsi: megaraid_sas: Replace undefined MFI_BIG_ENDIAN macro with __BIG_ENDIAN_BITFIELD macro" Revert "scsi: megaraid_sas: Set no_write_same only for Virtual Disk"
drivers/scsi/megaraid/megaraid_sas.h | 4 ++-- drivers/scsi/megaraid/megaraid_sas_base.c | 5 +---- drivers/scsi/megaraid/megaraid_sas_fusion.h | 21 +++++---------------- 3 files changed, 8 insertions(+), 22 deletions(-)
This reverts commit b9d5e3e7f370a817c742fb089ac1a86dfe8947dc.
After commit a7faf81d7858 ("scsi: megaraid_sas: Set no_write_same only for Virtual Disk"), write_same is support default for some devices. But we found write zero IO is very slow. So, revert it.
Signed-off-by: Yufen Yu yuyufen@huawei.com --- drivers/scsi/megaraid/megaraid_sas.h | 4 ++-- drivers/scsi/megaraid/megaraid_sas_fusion.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h index 5e4137f10e0e..37d7dc362b78 100644 --- a/drivers/scsi/megaraid/megaraid_sas.h +++ b/drivers/scsi/megaraid/megaraid_sas.h @@ -511,7 +511,7 @@ union MR_PROGRESS { */ struct MR_PD_PROGRESS { struct { -#ifndef __BIG_ENDIAN_BITFIELD +#ifndef MFI_BIG_ENDIAN u32 rbld:1; u32 patrol:1; u32 clear:1; @@ -537,7 +537,7 @@ struct MR_PD_PROGRESS { };
struct { -#ifndef __BIG_ENDIAN_BITFIELD +#ifndef MFI_BIG_ENDIAN u32 rbld:1; u32 patrol:1; u32 clear:1; diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.h b/drivers/scsi/megaraid/megaraid_sas_fusion.h index 30de4b01f703..d57ecc7f88d8 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.h +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.h @@ -774,7 +774,7 @@ struct MR_SPAN_BLOCK_INFO { struct MR_CPU_AFFINITY_MASK { union { struct { -#ifndef __BIG_ENDIAN_BITFIELD +#ifndef MFI_BIG_ENDIAN u8 hw_path:1; u8 cpu0:1; u8 cpu1:1; @@ -866,7 +866,7 @@ struct MR_LD_RAID { __le16 seqNum;
struct { -#ifndef __BIG_ENDIAN_BITFIELD +#ifndef MFI_BIG_ENDIAN u32 ldSyncRequired:1; u32 regTypeReqOnReadIsValid:1; u32 isEPD:1; @@ -889,7 +889,7 @@ struct { /* 0x30 - 0x33, Logical block size for the LD */ u32 logical_block_length; struct { -#ifndef __BIG_ENDIAN_BITFIELD +#ifndef MFI_BIG_ENDIAN /* 0x34, P_I_EXPONENT from READ CAPACITY 16 */ u32 ld_pi_exp:4; /* 0x34, LOGICAL BLOCKS PER PHYSICAL
This reverts commit a7faf81d7858b504279713d6cb98053f0ff00082.
Signed-off-by: Yufen Yu yuyufen@huawei.com --- drivers/scsi/megaraid/megaraid_sas_base.c | 5 +---- drivers/scsi/megaraid/megaraid_sas_fusion.h | 17 +++-------------- 2 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index cc45cdac1384..05927bcd306e 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -1892,10 +1892,6 @@ void megasas_set_dynamic_target_properties(struct scsi_device *sdev,
mr_device_priv_data->is_tm_capable = raid->capability.tmCapable; - - if (!raid->flags.isEPD) - sdev->no_write_same = 1; - } else if (instance->use_seqnum_jbod_fp) { pd_index = (sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL) + sdev->id; @@ -3429,6 +3425,7 @@ static struct scsi_host_template megasas_template = { .bios_param = megasas_bios_param, .change_queue_depth = scsi_change_queue_depth, .max_segment_size = 0xffffffff, + .no_write_same = 1, };
/** diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.h b/drivers/scsi/megaraid/megaraid_sas_fusion.h index d57ecc7f88d8..dd2e37e40d6b 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.h +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.h @@ -865,20 +865,9 @@ struct MR_LD_RAID { u8 regTypeReqOnRead; __le16 seqNum;
-struct { -#ifndef MFI_BIG_ENDIAN - u32 ldSyncRequired:1; - u32 regTypeReqOnReadIsValid:1; - u32 isEPD:1; - u32 enableSLDOnAllRWIOs:1; - u32 reserved:28; -#else - u32 reserved:28; - u32 enableSLDOnAllRWIOs:1; - u32 isEPD:1; - u32 regTypeReqOnReadIsValid:1; - u32 ldSyncRequired:1; -#endif + struct { + u32 ldSyncRequired:1; + u32 reserved:31; } flags;
u8 LUN[8]; /* 0x24 8 byte LUN field used for SCSI IO's */
在 2021/3/20 18:36, Yufen Yu 写道:
Yufen Yu (2): Revert "scsi: megaraid_sas: Replace undefined MFI_BIG_ENDIAN macro with __BIG_ENDIAN_BITFIELD macro" Revert "scsi: megaraid_sas: Set no_write_same only for Virtual Disk"
drivers/scsi/megaraid/megaraid_sas.h | 4 ++-- drivers/scsi/megaraid/megaraid_sas_base.c | 5 +---- drivers/scsi/megaraid/megaraid_sas_fusion.h | 21 +++++---------------- 3 files changed, 8 insertions(+), 22 deletions(-)
Reviewed-by: Jason Yan yanaijie@huawei.com
-
Jason Yan -
Yufen Yu