mbox series

[v2,0/4] hisi_sas: Misc patches and cleanups

Message ID 20250331123349.99591-1-liyihang9@huawei.com
Headers show
Series hisi_sas: Misc patches and cleanups | expand

Message

Yihang Li March 31, 2025, 12:33 p.m. UTC 
This series contains some minor bugfix and general tidying:
- Ignore the soft reset result by calling I_T_nexus after the SATA disk
  is soft reset
- General minor tidying

Thanks!

Changes since v1:
- Remove patch 1 and come up with a better solution to fix the issue:
  https://lore.kernel.org/linux-block/eef1e927-c9b2-c61d-7f48-92e65d8b0418@huawei.com/
  maybe in libsas or libata.

Yihang Li (4):
  scsi: hisi_sas: Use macro instead of magic number
  scsi: hisi_sas: Code style cleanup
  scsi: hisi_sas: Call I_T_nexus after soft reset for SATA disk
  scsi: hisi_sas: Wait until eh is recovered

 drivers/scsi/hisi_sas/hisi_sas.h       |  50 +++--
 drivers/scsi/hisi_sas/hisi_sas_main.c  |  81 ++++----
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c |   2 +-
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c |   6 +-
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 253 +++++++++++++++----------
 5 files changed, 229 insertions(+), 163 deletions(-)

Comments

Martin K. Petersen April 12, 2025, 12:45 a.m. UTC | #1 
Hi Yihang!

> This series contains some minor bugfix and general tidying:
> - Ignore the soft reset result by calling I_T_nexus after the SATA disk
>   is soft reset
> - General minor tidying

v3_hw won't compile after applying this series:

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_show_row_64_v3_hw’:
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3718:27: error: ‘TWO_PARA_PER_LINE’ undeclared (first use in this function)
 3718 |                 if (!(i % TWO_PARA_PER_LINE))
      |                           ^~~~~~~~~~~~~~~~~
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3718:27: note: each undeclared identifier is reported only once for each function it appears in
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_show_row_32_v3_hw’:
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3734:27: error: ‘FOUR_PARA_PER_LINE’ undeclared (first use in this function)
 3734 |                 if (!(i % FOUR_PARA_PER_LINE))
      |                           ^~~~~~~~~~~~~~~~~~
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_create_files_v3_hw’:
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3896:19: error: ‘NAME_BUF_SIZE’ undeclared (first use in this function); did you mean ‘PROT_BUF_SIZE’?
 3896 |         char name[NAME_BUF_SIZE];
      |                   ^~~~~~~~~~~~~
      |                   PROT_BUF_SIZE
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3896:14: error: unused variable ‘name’ [-Werror=unused-variable]
 3896 |         char name[NAME_BUF_SIZE];
      |              ^~~~
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_trigger_dump_v3_hw_write’:
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3974:18: error: ‘DUMP_BUF_SIZE’ undeclared (first use in this function); did you mean ‘DUMMY_BUF_SIZE’?
 3974 |         char buf[DUMP_BUF_SIZE];
      |                  ^~~~~~~~~~~~~
      |                  DUMMY_BUF_SIZE
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3974:14: error: unused variable ‘buf’ [-Werror=unused-variable]
 3974 |         char buf[DUMP_BUF_SIZE];
      |              ^~~
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_bist_linkrate_v3_hw_write’:
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4040:19: error: ‘BIST_BUF_SIZE’ undeclared (first use in this function); did you mean ‘PROT_BUF_SIZE’?
 4040 |         char kbuf[BIST_BUF_SIZE] = {}, *pkbuf;
      |                   ^~~~~~~~~~~~~
      |                   PROT_BUF_SIZE
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4040:14: error: unused variable ‘kbuf’ [-Werror=unused-variable]
 4040 |         char kbuf[BIST_BUF_SIZE] = {}, *pkbuf;
      |              ^~~~
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_bist_code_mode_v3_hw_write’:
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4115:19: error: ‘BIST_BUF_SIZE’ undeclared (first use in this function); did you mean ‘PROT_BUF_SIZE’?
 4115 |         char kbuf[BIST_BUF_SIZE] = {}, *pkbuf;
      |                   ^~~~~~~~~~~~~
      |                   PROT_BUF_SIZE
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4115:14: error: unused variable ‘kbuf’ [-Werror=unused-variable]
 4115 |         char kbuf[BIST_BUF_SIZE] = {}, *pkbuf;
      |              ^~~~
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_bist_mode_v3_hw_write’:
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4247:19: error: ‘BIST_BUF_SIZE’ undeclared (first use in this function); did you mean ‘PROT_BUF_SIZE’?
 4247 |         char kbuf[BIST_BUF_SIZE] = {}, *pkbuf;
      |                   ^~~~~~~~~~~~~
      |                   PROT_BUF_SIZE
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4247:14: error: unused variable ‘kbuf’ [-Werror=unused-variable]
 4247 |         char kbuf[BIST_BUF_SIZE] = {}, *pkbuf;
      |              ^~~~
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_phy_down_cnt_init_v3_hw’:
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4794:19: error: ‘NAME_BUF_SIZE’ undeclared (first use in this function); did you mean ‘PROT_BUF_SIZE’?
 4794 |         char name[NAME_BUF_SIZE];
      |                   ^~~~~~~~~~~~~
      |                   PROT_BUF_SIZE
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4794:14: error: unused variable ‘name’ [-Werror=unused-variable]
 4794 |         char name[NAME_BUF_SIZE];
      |              ^~~~
cc1: all warnings being treated as errors

Please fix, thanks!
Yihang Li April 14, 2025, 1:10 a.m. UTC | #2 
I will check and fix, thanks for reminder.

Thanks,
Yihang

On 2025/4/12 8:45, Martin K. Petersen wrote:
> 
> Hi Yihang!
> 
>> This series contains some minor bugfix and general tidying:
>> - Ignore the soft reset result by calling I_T_nexus after the SATA disk
>>   is soft reset
>> - General minor tidying
> 
> v3_hw won't compile after applying this series:
> 
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_show_row_64_v3_hw’:
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3718:27: error: ‘TWO_PARA_PER_LINE’ undeclared (first use in this function)
>  3718 |                 if (!(i % TWO_PARA_PER_LINE))
>       |                           ^~~~~~~~~~~~~~~~~
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3718:27: note: each undeclared identifier is reported only once for each function it appears in
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_show_row_32_v3_hw’:
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3734:27: error: ‘FOUR_PARA_PER_LINE’ undeclared (first use in this function)
>  3734 |                 if (!(i % FOUR_PARA_PER_LINE))
>       |                           ^~~~~~~~~~~~~~~~~~
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_create_files_v3_hw’:
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3896:19: error: ‘NAME_BUF_SIZE’ undeclared (first use in this function); did you mean ‘PROT_BUF_SIZE’?
>  3896 |         char name[NAME_BUF_SIZE];
>       |                   ^~~~~~~~~~~~~
>       |                   PROT_BUF_SIZE
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3896:14: error: unused variable ‘name’ [-Werror=unused-variable]
>  3896 |         char name[NAME_BUF_SIZE];
>       |              ^~~~
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_trigger_dump_v3_hw_write’:
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3974:18: error: ‘DUMP_BUF_SIZE’ undeclared (first use in this function); did you mean ‘DUMMY_BUF_SIZE’?
>  3974 |         char buf[DUMP_BUF_SIZE];
>       |                  ^~~~~~~~~~~~~
>       |                  DUMMY_BUF_SIZE
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:3974:14: error: unused variable ‘buf’ [-Werror=unused-variable]
>  3974 |         char buf[DUMP_BUF_SIZE];
>       |              ^~~
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_bist_linkrate_v3_hw_write’:
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4040:19: error: ‘BIST_BUF_SIZE’ undeclared (first use in this function); did you mean ‘PROT_BUF_SIZE’?
>  4040 |         char kbuf[BIST_BUF_SIZE] = {}, *pkbuf;
>       |                   ^~~~~~~~~~~~~
>       |                   PROT_BUF_SIZE
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4040:14: error: unused variable ‘kbuf’ [-Werror=unused-variable]
>  4040 |         char kbuf[BIST_BUF_SIZE] = {}, *pkbuf;
>       |              ^~~~
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_bist_code_mode_v3_hw_write’:
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4115:19: error: ‘BIST_BUF_SIZE’ undeclared (first use in this function); did you mean ‘PROT_BUF_SIZE’?
>  4115 |         char kbuf[BIST_BUF_SIZE] = {}, *pkbuf;
>       |                   ^~~~~~~~~~~~~
>       |                   PROT_BUF_SIZE
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4115:14: error: unused variable ‘kbuf’ [-Werror=unused-variable]
>  4115 |         char kbuf[BIST_BUF_SIZE] = {}, *pkbuf;
>       |              ^~~~
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_bist_mode_v3_hw_write’:
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4247:19: error: ‘BIST_BUF_SIZE’ undeclared (first use in this function); did you mean ‘PROT_BUF_SIZE’?
>  4247 |         char kbuf[BIST_BUF_SIZE] = {}, *pkbuf;
>       |                   ^~~~~~~~~~~~~
>       |                   PROT_BUF_SIZE
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4247:14: error: unused variable ‘kbuf’ [-Werror=unused-variable]
>  4247 |         char kbuf[BIST_BUF_SIZE] = {}, *pkbuf;
>       |              ^~~~
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c: In function ‘debugfs_phy_down_cnt_init_v3_hw’:
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4794:19: error: ‘NAME_BUF_SIZE’ undeclared (first use in this function); did you mean ‘PROT_BUF_SIZE’?
>  4794 |         char name[NAME_BUF_SIZE];
>       |                   ^~~~~~~~~~~~~
>       |                   PROT_BUF_SIZE
> drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:4794:14: error: unused variable ‘name’ [-Werror=unused-variable]
>  4794 |         char name[NAME_BUF_SIZE];
>       |              ^~~~
> cc1: all warnings being treated as errors
> 
> Please fix, thanks!
>