* [PATCH 1/5] scsi: megaraid_sas: correct the parameter of scsi_device_lookup
2022-09-14 8:47 [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup Guixin Liu
@ 2022-09-14 8:47 ` Guixin Liu
2022-09-28 10:50 ` Sumit Saxena
2022-09-14 8:48 ` [PATCH 2/5] scsi: megaraid_sas: correct an error message Guixin Liu
` (5 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Guixin Liu @ 2022-09-14 8:47 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi
When a delete event is received, find the scsi_device and remove it,
the scsi_device_lookup`s parameter id should be "ld_target_id %
MEGASAS_MAX_DEV_PER_CHANNEL".
Fixes: ae6874ba4b43 ("scsi: megaraid_sas: Early detection of VD deletion through RaidMap update")
Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
---
drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 7f8632c..44d5e93 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -8922,7 +8922,7 @@ void megasas_add_remove_devices(struct megasas_instance *instance,
sdev1 = scsi_device_lookup(instance->host,
MEGASAS_MAX_PD_CHANNELS +
(ld_target_id / MEGASAS_MAX_DEV_PER_CHANNEL),
- (ld_target_id - MEGASAS_MAX_DEV_PER_CHANNEL),
+ (ld_target_id % MEGASAS_MAX_DEV_PER_CHANNEL),
0);
dev_info(&instance->pdev->dev, "Debug_lgx: ld_target_id:%u, sdev1:%p.\n",
ld_target_id, sdev1);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 1/5] scsi: megaraid_sas: correct the parameter of scsi_device_lookup
2022-09-14 8:47 ` [PATCH 1/5] scsi: megaraid_sas: correct the parameter of scsi_device_lookup Guixin Liu
@ 2022-09-28 10:50 ` Sumit Saxena
0 siblings, 0 replies; 14+ messages in thread
From: Sumit Saxena @ 2022-09-28 10:50 UTC (permalink / raw)
To: Guixin Liu
Cc: kashyap.desai, shivasharan.srikanteshwara, jejb, martin.petersen,
megaraidlinux.pdl, linux-scsi
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
On Wed, Sep 14, 2022 at 2:18 PM Guixin Liu <kanie@linux.alibaba.com> wrote:
>
> When a delete event is received, find the scsi_device and remove it,
> the scsi_device_lookup`s parameter id should be "ld_target_id %
> MEGASAS_MAX_DEV_PER_CHANNEL".
>
> Fixes: ae6874ba4b43 ("scsi: megaraid_sas: Early detection of VD deletion through RaidMap update")
> Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
Looks good to me.
Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/5] scsi: megaraid_sas: correct an error message
2022-09-14 8:47 [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup Guixin Liu
2022-09-14 8:47 ` [PATCH 1/5] scsi: megaraid_sas: correct the parameter of scsi_device_lookup Guixin Liu
@ 2022-09-14 8:48 ` Guixin Liu
2022-09-28 10:52 ` Sumit Saxena
2022-09-14 8:48 ` [PATCH 3/5] scsi: megaraid_sas: simplify the megasas_update_device_list Guixin Liu
` (4 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Guixin Liu @ 2022-09-14 8:48 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi
Correct the error message when alloc init request fail.
Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
---
drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 44d5e93..4973c9c 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -7224,7 +7224,7 @@ int megasas_alloc_ctrl_dma_buffers(struct megasas_instance *instance)
if (!fusion->ioc_init_request) {
dev_err(&pdev->dev,
- "Failed to allocate PD list buffer\n");
+ "Failed to allocate ioc init request\n");
return -ENOMEM;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 2/5] scsi: megaraid_sas: correct an error message
2022-09-14 8:48 ` [PATCH 2/5] scsi: megaraid_sas: correct an error message Guixin Liu
@ 2022-09-28 10:52 ` Sumit Saxena
0 siblings, 0 replies; 14+ messages in thread
From: Sumit Saxena @ 2022-09-28 10:52 UTC (permalink / raw)
To: Guixin Liu
Cc: kashyap.desai, shivasharan.srikanteshwara, jejb, martin.petersen,
megaraidlinux.pdl, linux-scsi
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
On Wed, Sep 14, 2022 at 2:18 PM Guixin Liu <kanie@linux.alibaba.com> wrote:
>
> Correct the error message when alloc init request fail.
>
> Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/5] scsi: megaraid_sas: simplify the megasas_update_device_list
2022-09-14 8:47 [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup Guixin Liu
2022-09-14 8:47 ` [PATCH 1/5] scsi: megaraid_sas: correct the parameter of scsi_device_lookup Guixin Liu
2022-09-14 8:48 ` [PATCH 2/5] scsi: megaraid_sas: correct an error message Guixin Liu
@ 2022-09-14 8:48 ` Guixin Liu
2022-09-28 11:04 ` Sumit Saxena
2022-09-14 8:48 ` [PATCH 4/5] scsi: megaraid_sas: remove unnecessary memset Guixin Liu
` (3 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Guixin Liu @ 2022-09-14 8:48 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi
Remove unnecessary dcmd_ret check and go to statements.
Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
---
drivers/scsi/megaraid/megaraid_sas_base.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 4973c9c..1ac33b1 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -8766,33 +8766,26 @@ static inline void megasas_remove_scsi_device(struct scsi_device *sdev)
int megasas_update_device_list(struct megasas_instance *instance,
int event_type)
{
- int dcmd_ret = DCMD_SUCCESS;
+ int dcmd_ret;
if (instance->enable_fw_dev_list) {
- dcmd_ret = megasas_host_device_list_query(instance, false);
- if (dcmd_ret != DCMD_SUCCESS)
- goto out;
+ return megasas_host_device_list_query(instance, false);
} else {
if (event_type & SCAN_PD_CHANNEL) {
dcmd_ret = megasas_get_pd_list(instance);
-
if (dcmd_ret != DCMD_SUCCESS)
- goto out;
+ return dcmd_ret;
}
if (event_type & SCAN_VD_CHANNEL) {
if (!instance->requestorId ||
megasas_get_ld_vf_affiliation(instance, 0)) {
- dcmd_ret = megasas_ld_list_query(instance,
+ return megasas_ld_list_query(instance,
MR_LD_QUERY_TYPE_EXPOSED_TO_HOST);
- if (dcmd_ret != DCMD_SUCCESS)
- goto out;
}
}
}
-
-out:
- return dcmd_ret;
+ return DCMD_SUCCESS;
}
/**
--
1.8.3.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 3/5] scsi: megaraid_sas: simplify the megasas_update_device_list
2022-09-14 8:48 ` [PATCH 3/5] scsi: megaraid_sas: simplify the megasas_update_device_list Guixin Liu
@ 2022-09-28 11:04 ` Sumit Saxena
0 siblings, 0 replies; 14+ messages in thread
From: Sumit Saxena @ 2022-09-28 11:04 UTC (permalink / raw)
To: Guixin Liu
Cc: kashyap.desai, shivasharan.srikanteshwara, jejb, martin.petersen,
megaraidlinux.pdl, linux-scsi
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
On Wed, Sep 14, 2022 at 2:18 PM Guixin Liu <kanie@linux.alibaba.com> wrote:
>
> Remove unnecessary dcmd_ret check and go to statements.
>
> Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 4/5] scsi: megaraid_sas: remove unnecessary memset
2022-09-14 8:47 [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup Guixin Liu
` (2 preceding siblings ...)
2022-09-14 8:48 ` [PATCH 3/5] scsi: megaraid_sas: simplify the megasas_update_device_list Guixin Liu
@ 2022-09-14 8:48 ` Guixin Liu
2022-09-28 11:17 ` Sumit Saxena
2022-09-14 8:48 ` [PATCH 5/5] scsi: megaraid_sas: move megasas_dbg_lvl init to megasas_init Guixin Liu
` (2 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Guixin Liu @ 2022-09-14 8:48 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi
Remove memset pd_list and ld_ids in megasas_get_device_list,
because they will be memset in megasas_host_device_list_query
or megasas_get_pd_list and megasas_ld_list_query.
Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
---
drivers/scsi/megaraid/megaraid_sas_base.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 1ac33b1..b5503f9 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -5878,10 +5878,6 @@ static void megasas_setup_reply_map(struct megasas_instance *instance)
static
int megasas_get_device_list(struct megasas_instance *instance)
{
- memset(instance->pd_list, 0,
- (MEGASAS_MAX_PD * sizeof(struct megasas_pd_list)));
- memset(instance->ld_ids, 0xff, MEGASAS_MAX_LD_IDS);
-
if (instance->enable_fw_dev_list) {
if (megasas_host_device_list_query(instance, true))
return FAILED;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 4/5] scsi: megaraid_sas: remove unnecessary memset
2022-09-14 8:48 ` [PATCH 4/5] scsi: megaraid_sas: remove unnecessary memset Guixin Liu
@ 2022-09-28 11:17 ` Sumit Saxena
0 siblings, 0 replies; 14+ messages in thread
From: Sumit Saxena @ 2022-09-28 11:17 UTC (permalink / raw)
To: Guixin Liu
Cc: kashyap.desai, shivasharan.srikanteshwara, jejb, martin.petersen,
megaraidlinux.pdl, linux-scsi
[-- Attachment #1: Type: text/plain, Size: 364 bytes --]
On Wed, Sep 14, 2022 at 2:18 PM Guixin Liu <kanie@linux.alibaba.com> wrote:
>
> Remove memset pd_list and ld_ids in megasas_get_device_list,
> because they will be memset in megasas_host_device_list_query
> or megasas_get_pd_list and megasas_ld_list_query.
>
> Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 5/5] scsi: megaraid_sas: move megasas_dbg_lvl init to megasas_init
2022-09-14 8:47 [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup Guixin Liu
` (3 preceding siblings ...)
2022-09-14 8:48 ` [PATCH 4/5] scsi: megaraid_sas: remove unnecessary memset Guixin Liu
@ 2022-09-14 8:48 ` Guixin Liu
2022-09-28 11:19 ` Sumit Saxena
2022-09-19 2:35 ` [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup Guixin Liu
2022-10-01 9:22 ` Martin K. Petersen
6 siblings, 1 reply; 14+ messages in thread
From: Guixin Liu @ 2022-09-14 8:48 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi
The megasas_dbg_lvl is a driver level parameter, dont init in
probe path, otherwise we can not see any debug print when bind
a device to megaraid driver.
Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
---
drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index b5503f9..66f84b5 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -7439,7 +7439,6 @@ static inline void megasas_init_ctrl_params(struct megasas_instance *instance)
(instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0071SKINNY))
instance->flag_ieee = 1;
- megasas_dbg_lvl = 0;
instance->flag = 0;
instance->unload = 1;
instance->last_time = 0;
@@ -9011,6 +9010,7 @@ static int __init megasas_init(void)
*/
pr_info("megasas: %s\n", MEGASAS_VERSION);
+ megasas_dbg_lvl = 0;
support_poll_for_event = 2;
support_device_change = 1;
support_nvme_encapsulation = true;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 5/5] scsi: megaraid_sas: move megasas_dbg_lvl init to megasas_init
2022-09-14 8:48 ` [PATCH 5/5] scsi: megaraid_sas: move megasas_dbg_lvl init to megasas_init Guixin Liu
@ 2022-09-28 11:19 ` Sumit Saxena
0 siblings, 0 replies; 14+ messages in thread
From: Sumit Saxena @ 2022-09-28 11:19 UTC (permalink / raw)
To: Guixin Liu
Cc: kashyap.desai, shivasharan.srikanteshwara, jejb, martin.petersen,
megaraidlinux.pdl, linux-scsi
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
On Wed, Sep 14, 2022 at 2:18 PM Guixin Liu <kanie@linux.alibaba.com> wrote:
>
> The megasas_dbg_lvl is a driver level parameter, dont init in
> probe path, otherwise we can not see any debug print when bind
> a device to megaraid driver.
>
> Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup
2022-09-14 8:47 [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup Guixin Liu
` (4 preceding siblings ...)
2022-09-14 8:48 ` [PATCH 5/5] scsi: megaraid_sas: move megasas_dbg_lvl init to megasas_init Guixin Liu
@ 2022-09-19 2:35 ` Guixin Liu
2022-09-22 8:49 ` Guixin Liu
2022-10-01 9:22 ` Martin K. Petersen
6 siblings, 1 reply; 14+ messages in thread
From: Guixin Liu @ 2022-09-19 2:35 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi
Hi，
Gentle ping.
Best regards,
Guixin Liu
在 2022/9/14 16:47, Guixin Liu 写道:
> *** BLURB HERE ***
>
> Hi guys,
>
> This series has bug fix and a few simple cleanups,
> please review.
>
> Guixin Liu (5):
> scsi: megaraid_sas: correct the parameter of scsi_device_lookup
> scsi: megaraid_sas: correct an error message
> scsi: megaraid_sas: simplify the megasas_update_device_list
> scsi: megaraid_sas: remove unnecessary memset
> scsi: megaraid_sas: move megasas_dbg_lvl init to megasas_init
>
> drivers/scsi/megaraid/megaraid_sas_base.c | 27 ++++++++-------------------
> 1 file changed, 8 insertions(+), 19 deletions(-)
>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup
2022-09-19 2:35 ` [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup Guixin Liu
@ 2022-09-22 8:49 ` Guixin Liu
0 siblings, 0 replies; 14+ messages in thread
From: Guixin Liu @ 2022-09-22 8:49 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi
Hi,
Gentle ping...
I think both "scsi: megaraid_sas: correct the parameter of
scsi_device_lookup" and
"scsi: megaraid_sas: move megasas_dbg_lvl init to megasas_init " are
importent issue.
Best regards,
Guixin Liu
在 2022/9/19 10:35, Guixin Liu 写道:
> Hi，
>
> Gentle ping.
>
> Best regards,
>
> Guixin Liu
>
> 在 2022/9/14 16:47, Guixin Liu 写道:
>> *** BLURB HERE ***
>>
>> Hi guys,
>>
>> This series has bug fix and a few simple cleanups,
>> please review.
>>
>> Guixin Liu (5):
>> scsi: megaraid_sas: correct the parameter of scsi_device_lookup
>> scsi: megaraid_sas: correct an error message
>> scsi: megaraid_sas: simplify the megasas_update_device_list
>> scsi: megaraid_sas: remove unnecessary memset
>> scsi: megaraid_sas: move megasas_dbg_lvl init to megasas_init
>>
>> drivers/scsi/megaraid/megaraid_sas_base.c | 27
>> ++++++++-------------------
>> 1 file changed, 8 insertions(+), 19 deletions(-)
>>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup
2022-09-14 8:47 [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup Guixin Liu
` (5 preceding siblings ...)
2022-09-19 2:35 ` [PATCH 0/5] scsi: megaraid_sas: some bug fixes and cod cleanup Guixin Liu
@ 2022-10-01 9:22 ` Martin K. Petersen
6 siblings, 0 replies; 14+ messages in thread
From: Martin K. Petersen @ 2022-10-01 9:22 UTC (permalink / raw)
To: Guixin Liu
Cc: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen, megaraidlinux.pdl, linux-scsi
Guixin,
> Guixin Liu (5):
> scsi: megaraid_sas: correct the parameter of scsi_device_lookup
> scsi: megaraid_sas: correct an error message
> scsi: megaraid_sas: simplify the megasas_update_device_list
> scsi: megaraid_sas: remove unnecessary memset
> scsi: megaraid_sas: move megasas_dbg_lvl init to megasas_init
Applied to 6.1/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 14+ messages in thread