|
 |
b37f23 |
From c73c42f25ffbb9a519ea942a9a943069abf6d6be Mon Sep 17 00:00:00 2001
|
|
|
b37f23 |
From: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
|
|
|
b37f23 |
Date: Wed, 26 Oct 2016 13:34:41 +0530
|
|
|
b37f23 |
Subject: [PATCH 10/11] scsi: mpt3sas: Fix for Endianness issue.
|
|
|
b37f23 |
|
|
|
b37f23 |
Use le16_to_cpu only for accessing two byte data provided by controller.
|
|
|
b37f23 |
|
|
|
b37f23 |
Signed-off-by: Chaitra P B <chaitra.basappa@broadcom.com>
|
|
|
b37f23 |
Signed-off-by: Sathya Prakash <sathya.prakash@broadcom.com>
|
|
|
b37f23 |
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
|
|
|
b37f23 |
Reviewed-by: Hannes Reinecke <hare@suse.com>
|
|
|
b37f23 |
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
|
|
|
b37f23 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
b37f23 |
---
|
|
|
b37f23 |
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 12 +++++++-----
|
|
|
b37f23 |
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
|
b37f23 |
|
|
|
b37f23 |
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
|
|
b37f23 |
index 0dcf826..55b4472 100644
|
|
|
b37f23 |
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
|
|
b37f23 |
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
|
|
b37f23 |
@@ -5442,10 +5442,10 @@ _scsih_check_device(struct MPT3SAS_ADAPTER *ioc,
|
|
|
b37f23 |
sas_device->handle, handle);
|
|
|
b37f23 |
sas_target_priv_data->handle = handle;
|
|
|
b37f23 |
sas_device->handle = handle;
|
|
|
b37f23 |
- if (sas_device_pg0.Flags &
|
|
|
b37f23 |
+ if (le16_to_cpu(sas_device_pg0.Flags) &
|
|
|
b37f23 |
MPI2_SAS_DEVICE0_FLAGS_ENCL_LEVEL_VALID) {
|
|
|
b37f23 |
sas_device->enclosure_level =
|
|
|
b37f23 |
- le16_to_cpu(sas_device_pg0.EnclosureLevel);
|
|
|
b37f23 |
+ sas_device_pg0.EnclosureLevel;
|
|
|
b37f23 |
memcpy(&sas_device->connector_name[0],
|
|
|
b37f23 |
&sas_device_pg0.ConnectorName[0], 4);
|
|
|
b37f23 |
} else {
|
|
|
b37f23 |
@@ -5573,9 +5573,10 @@ _scsih_add_device(struct MPT3SAS_ADAPTER *ioc, u16 handle, u8 phy_num,
|
|
|
b37f23 |
sas_device->fast_path = (le16_to_cpu(sas_device_pg0.Flags) &
|
|
|
b37f23 |
MPI25_SAS_DEVICE0_FLAGS_FAST_PATH_CAPABLE) ? 1 : 0;
|
|
|
b37f23 |
|
|
|
b37f23 |
- if (sas_device_pg0.Flags & MPI2_SAS_DEVICE0_FLAGS_ENCL_LEVEL_VALID) {
|
|
|
b37f23 |
+ if (le16_to_cpu(sas_device_pg0.Flags)
|
|
|
b37f23 |
+ & MPI2_SAS_DEVICE0_FLAGS_ENCL_LEVEL_VALID) {
|
|
|
b37f23 |
sas_device->enclosure_level =
|
|
|
b37f23 |
- le16_to_cpu(sas_device_pg0.EnclosureLevel);
|
|
|
b37f23 |
+ sas_device_pg0.EnclosureLevel;
|
|
|
b37f23 |
memcpy(&sas_device->connector_name[0],
|
|
|
b37f23 |
&sas_device_pg0.ConnectorName[0], 4);
|
|
|
b37f23 |
} else {
|
|
|
b37f23 |
@@ -7115,7 +7116,7 @@ Mpi2SasDevicePage0_t *sas_device_pg0)
|
|
|
b37f23 |
if (sas_device_pg0->Flags &
|
|
|
b37f23 |
MPI2_SAS_DEVICE0_FLAGS_ENCL_LEVEL_VALID) {
|
|
|
b37f23 |
sas_device->enclosure_level =
|
|
|
b37f23 |
- le16_to_cpu(sas_device_pg0->EnclosureLevel);
|
|
|
b37f23 |
+ sas_device_pg0->EnclosureLevel;
|
|
|
b37f23 |
memcpy(&sas_device->connector_name[0],
|
|
|
b37f23 |
&sas_device_pg0->ConnectorName[0], 4);
|
|
|
b37f23 |
} else {
|
|
|
b37f23 |
@@ -7177,6 +7178,7 @@ _scsih_search_responding_sas_devices(struct MPT3SAS_ADAPTER *ioc)
|
|
|
b37f23 |
sas_device_pg0.SASAddress =
|
|
|
b37f23 |
le64_to_cpu(sas_device_pg0.SASAddress);
|
|
|
b37f23 |
sas_device_pg0.Slot = le16_to_cpu(sas_device_pg0.Slot);
|
|
|
b37f23 |
+ sas_device_pg0.Flags = le16_to_cpu(sas_device_pg0.Flags);
|
|
|
b37f23 |
_scsih_mark_responding_sas_device(ioc, &sas_device_pg0);
|
|
|
b37f23 |
}
|
|
|
b37f23 |
|
|
|
b37f23 |
--
|
|
|
b37f23 |
1.8.3.1
|
|
|
b37f23 |
|