|
 |
3c6e85 |
From 75d6abe137209168d1011e00454d44f3f00b5057 Mon Sep 17 00:00:00 2001
|
|
|
3c6e85 |
From: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3c6e85 |
Date: Thu, 1 Aug 2019 15:55:39 -0400
|
|
|
3c6e85 |
Subject: [PATCH 079/124] [scsi] scsi: qla2xxx: Move
|
|
|
3c6e85 |
qla2x00_set_reserved_loop_ids() definition
|
|
|
3c6e85 |
|
|
|
3c6e85 |
Message-id: <20190801155618.12650-80-hmadhani@redhat.com>
|
|
|
3c6e85 |
Patchwork-id: 267860
|
|
|
3c6e85 |
O-Subject: [RHEL 7.8 e-stor PATCH 079/118] scsi: qla2xxx: Move qla2x00_set_reserved_loop_ids() definition
|
|
|
3c6e85 |
Bugzilla: 1729270
|
|
|
3c6e85 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
3c6e85 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
3c6e85 |
|
|
|
3c6e85 |
From: Bart Van Assche <bvanassche@acm.org>
|
|
|
3c6e85 |
|
|
|
3c6e85 |
Bugzilla 1729270
|
|
|
3c6e85 |
|
|
|
3c6e85 |
Since qla2x00_set_reserved_loop_ids() only has a single caller, move it
|
|
|
3c6e85 |
into the source file from where it is called.
|
|
|
3c6e85 |
|
|
|
3c6e85 |
Cc: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3c6e85 |
Cc: Giridhar Malavali <gmalavali@marvell.com>
|
|
|
3c6e85 |
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
|
|
|
3c6e85 |
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3c6e85 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
3c6e85 |
(cherry picked from commit 0e145a595d4113caee8c1d9d3345781567c43826)
|
|
|
3c6e85 |
Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3c6e85 |
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
|
3c6e85 |
---
|
|
|
3c6e85 |
drivers/scsi/qla2xxx/qla_inline.h | 14 --------------
|
|
|
3c6e85 |
drivers/scsi/qla2xxx/qla_os.c | 13 +++++++++++++
|
|
|
3c6e85 |
2 files changed, 13 insertions(+), 14 deletions(-)
|
|
|
3c6e85 |
|
|
|
3c6e85 |
diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
|
|
|
3c6e85 |
index f3c3ddc94eec..888f43a1afc9 100644
|
|
|
3c6e85 |
--- a/drivers/scsi/qla2xxx/qla_inline.h
|
|
|
3c6e85 |
+++ b/drivers/scsi/qla2xxx/qla_inline.h
|
|
|
3c6e85 |
@@ -90,20 +90,6 @@ host_to_adap(uint8_t *src, uint8_t *dst, uint32_t bsize)
|
|
|
3c6e85 |
*odest++ = cpu_to_le32(*isrc);
|
|
|
3c6e85 |
}
|
|
|
3c6e85 |
|
|
|
3c6e85 |
-static inline void
|
|
|
3c6e85 |
-qla2x00_set_reserved_loop_ids(struct qla_hw_data *ha)
|
|
|
3c6e85 |
-{
|
|
|
3c6e85 |
- int i;
|
|
|
3c6e85 |
-
|
|
|
3c6e85 |
- if (IS_FWI2_CAPABLE(ha))
|
|
|
3c6e85 |
- return;
|
|
|
3c6e85 |
-
|
|
|
3c6e85 |
- for (i = 0; i < SNS_FIRST_LOOP_ID; i++)
|
|
|
3c6e85 |
- set_bit(i, ha->loop_id_map);
|
|
|
3c6e85 |
- set_bit(MANAGEMENT_SERVER, ha->loop_id_map);
|
|
|
3c6e85 |
- set_bit(BROADCAST, ha->loop_id_map);
|
|
|
3c6e85 |
-}
|
|
|
3c6e85 |
-
|
|
|
3c6e85 |
static inline int
|
|
|
3c6e85 |
qla2x00_is_reserved_id(scsi_qla_host_t *vha, uint16_t loop_id)
|
|
|
3c6e85 |
{
|
|
|
3c6e85 |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
|
|
|
3c6e85 |
index 57ca13874045..d85dd97a883a 100644
|
|
|
3c6e85 |
--- a/drivers/scsi/qla2xxx/qla_os.c
|
|
|
3c6e85 |
+++ b/drivers/scsi/qla2xxx/qla_os.c
|
|
|
3c6e85 |
@@ -4110,6 +4110,19 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha, int defer)
|
|
|
3c6e85 |
}
|
|
|
3c6e85 |
}
|
|
|
3c6e85 |
|
|
|
3c6e85 |
+static void qla2x00_set_reserved_loop_ids(struct qla_hw_data *ha)
|
|
|
3c6e85 |
+{
|
|
|
3c6e85 |
+ int i;
|
|
|
3c6e85 |
+
|
|
|
3c6e85 |
+ if (IS_FWI2_CAPABLE(ha))
|
|
|
3c6e85 |
+ return;
|
|
|
3c6e85 |
+
|
|
|
3c6e85 |
+ for (i = 0; i < SNS_FIRST_LOOP_ID; i++)
|
|
|
3c6e85 |
+ set_bit(i, ha->loop_id_map);
|
|
|
3c6e85 |
+ set_bit(MANAGEMENT_SERVER, ha->loop_id_map);
|
|
|
3c6e85 |
+ set_bit(BROADCAST, ha->loop_id_map);
|
|
|
3c6e85 |
+}
|
|
|
3c6e85 |
+
|
|
|
3c6e85 |
/*
|
|
|
3c6e85 |
* qla2x00_mem_alloc
|
|
|
3c6e85 |
* Allocates adapter memory.
|
|
|
3c6e85 |
--
|
|
|
3c6e85 |
2.13.6
|
|
|
3c6e85 |
|