Skip to content

scsi: leapioraid: fix hiding ugood disk problem #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Avenger-285714 merged 3 commits into from
Dec 27, 2024
Merged

scsi: leapioraid: fix hiding ugood disk problem #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c91a704
scsi: leapioraid: supports LEAPIO RAID controller
Dec 12, 2024
ac27957
Merge branch 'deepin-community:linux-6.6.y' into linux-6.6.y
leap-io Dec 27, 2024
931dac0
scsi: leapioraid: fix hiding ugood disk problem
Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion drivers/scsi/leapioraid/leapioraid_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
#include <linux/poll.h>
#include <linux/io.h>
#include <linux/uaccess.h>
#include "leapioraid_func.h"

#ifdef __KERNEL__
#include <linux/miscdevice.h>
Expand Down
15 changes: 8 additions & 7 deletions drivers/scsi/leapioraid/leapioraid_func.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4746,14 +4746,11 @@ leapioraid_base_send_ioc_init(struct LEAPIORAID_ADAPTER *ioc)
current_time = ktime_get_real();
mpi_request.TimeStamp = cpu_to_le64(ktime_to_ms(current_time));
if (ioc->logging_level & LEAPIORAID_DEBUG_INIT) {
__le32 *mfp;
int i;

mfp = (__le32 *) &mpi_request;
pr_info("%s \toffset:data\n", ioc->name);
for (i = 0; i < sizeof(struct LeapioraidIOCInitReq_t) / 4; i++)
pr_info("%s \t[0x%02x]:%08x\n",
ioc->name, i * 4, le32_to_cpu(mfp[i]));
leapioraid_debug_dump_mf(&mpi_request,
sizeof(struct LeapioraidIOCInitReq_t) / 4);

}
r = leapioraid_base_handshake_req_reply_wait(ioc,
sizeof
Expand Down Expand Up @@ -7022,7 +7019,11 @@ leapioraid_config_get_volume_handle(struct LEAPIORAID_ADAPTER *ioc,
r = -1;
ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &
LEAPIORAID_IOCSTATUS_MASK;
if (ioc_status != LEAPIORAID_IOCSTATUS_SUCCESS)
if (ioc_status == LEAPIORAID_IOCSTATUS_CONFIG_INVALID_PAGE) {
*volume_handle = 0;
r = 0;
goto out;
} else if (ioc_status != LEAPIORAID_IOCSTATUS_SUCCESS)
goto out;
for (i = 0; i < config_page->NumElements; i++) {
element_type =
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/leapioraid/leapioraid_func.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
#define LEAPIORAID_KDUMP_SCSI_IO_DEPTH (64)
#define LEAPIORAID_RAID_MAX_SECTORS (128)

#define LEAPIORAID_NAME_LENGTH (32)
#define LEAPIORAID_NAME_LENGTH (48)
#define LEAPIORAID_DRIVER_NAME_LENGTH (24)
#define LEAPIORAID_STRING_LENGTH (64)

Expand Down
Loading