kernel/kernel-rt/centos/patches/0011-scsi-smartpqi-Enable-sas_address-sysfs-for-SATA-dev.patch
jma1 e7fffa117b scsi: smartpqi: Enable sas_address sys fs for SATA device type.
We met the issue DM complains that it can't find the disk specified
in the deployment config file after we updated the Linux kernel to 5.10.
The error is "failed to find disk for path /dev/disk/by-path/
pci-0000:3b:00.0-sas-0x31402ec001d92983-lun-0"

This happens because device type SATA is excluded from being
processed with the function pqi_is_device_with_sas_address.
which causes all SATA type disk drives to appear the same, having
zeroes in the lun name. /dev/disk/by-path/
pci-0000:3b:00.0-sas-0x0000000000000000-lun-0

We can add type SA_DEVICE_TYPE_SATA to class device_with_sas_address,
since it will also get the sas_address from wwid. and works
transparently with the old kernel without gaps.

Successfully installed on Wind River lab ml350_g10 which
contains a P816i-a SR Gen10 disk controller. This lab
previously exhibited the problem.

Closes-Bug: #1947313

Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
Change-Id: I4445bac52a4706b923ac16865bd24a82783512ba
2021-10-26 20:51:13 -04:00

42 lines
1.6 KiB
Diff

From 2a32d5bc7e385fbf40f22cc413354e17a24d4de9 Mon Sep 17 00:00:00 2001
From: Jiping Ma <jiping.ma2@windriver.com>
Date: Sun, 10 Oct 2021 18:56:26 -0700
Subject: [PATCH] scsi: smartpqi: Enable sas_address sysfs for SATA device
type.
We met the issue DM complains that it can't find the disk specified
in the deployment config file after we updated the Linux kernel to 5.10.
The error is "failed to find disk for path /dev/disk/by-path/
pci-0000:3b:00.0-sas-0x31402ec001d92983-lun-0"
This happens because device type SATA is excluded from being
processed with the function pqi_is_device_with_sas_address.
which causes all SATA type disk drives to appear the same, having
zeroes in the lun name. /dev/disk/by-path/
pci-0000:3b:00.0-sas-0x0000000000000000-lun-0
We can add type SA_DEVICE_TYPE_SATA to class device_with_sas_address,
since it will also get the sas_address from wwid. and works transparently
with the old kernel without gaps.
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
---
drivers/scsi/smartpqi/smartpqi_init.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index ecb2af3f43ca..df16e0a27a41 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -2101,6 +2101,7 @@ static inline void pqi_mask_device(u8 *scsi3addr)
static inline bool pqi_is_device_with_sas_address(struct pqi_scsi_dev *device)
{
switch (device->device_type) {
+ case SA_DEVICE_TYPE_SATA:
case SA_DEVICE_TYPE_SAS:
case SA_DEVICE_TYPE_EXPANDER_SMP:
case SA_DEVICE_TYPE_SES:
--
2.31.1