From: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
To: james.bottomley@hansenpartnership.com
Cc: martin.petersen@oracle.com, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
nfont@linux.vnet.ibm.com, brking@linux.vnet.ibm.com,
jthumshirn@suse.de, manoj@linux.vnet.ibm.com,
Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Subject: [PATCH v2 3/7] ibmvscsi: Replace magic values in set_adpater_info() with defines
Date: Wed, 10 Feb 2016 19:32:24 -0600 [thread overview]
Message-ID: <1455154348-3226-4-git-send-email-tyreld@linux.vnet.ibm.com> (raw)
In-Reply-To: <1455154348-3226-1-git-send-email-tyreld@linux.vnet.ibm.com>
Add defines for mad version and mad os_type, and replace the magic
numbers in set_adapter_info() accordingly.
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
---
drivers/scsi/ibmvscsi/ibmvscsi.c | 8 ++++----
drivers/scsi/ibmvscsi/viosrp.h | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index c888ea1..4b09a9b 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -283,8 +283,8 @@ static void set_adapter_info(struct ibmvscsi_host_data *hostdata)
hostdata->madapter_info.partition_number =
cpu_to_be32(partition_number);
- hostdata->madapter_info.mad_version = cpu_to_be32(1);
- hostdata->madapter_info.os_type = cpu_to_be32(2);
+ hostdata->madapter_info.mad_version = cpu_to_be32(SRP_MAD_VERSION_1);
+ hostdata->madapter_info.os_type = cpu_to_be32(SRP_MAD_OS_LINUX);
}
/**
@@ -1398,7 +1398,7 @@ static void adapter_info_rsp(struct srp_event_struct *evt_struct)
hostdata->host->max_sectors =
be32_to_cpu(hostdata->madapter_info.port_max_txu[0]) >> 9;
- if (be32_to_cpu(hostdata->madapter_info.os_type) == 3 &&
+ if (be32_to_cpu(hostdata->madapter_info.os_type) == SRP_MAD_OS_AIX &&
strcmp(hostdata->madapter_info.srp_version, "1.6a") <= 0) {
dev_err(hostdata->dev, "host (Ver. %s) doesn't support large transfers\n",
hostdata->madapter_info.srp_version);
@@ -1407,7 +1407,7 @@ static void adapter_info_rsp(struct srp_event_struct *evt_struct)
hostdata->host->sg_tablesize = MAX_INDIRECT_BUFS;
}
- if (be32_to_cpu(hostdata->madapter_info.os_type) == 3) {
+ if (be32_to_cpu(hostdata->madapter_info.os_type) == SRP_MAD_OS_AIX) {
enable_fast_fail(hostdata);
return;
}
diff --git a/drivers/scsi/ibmvscsi/viosrp.h b/drivers/scsi/ibmvscsi/viosrp.h
index 3d20851..d0f689b 100644
--- a/drivers/scsi/ibmvscsi/viosrp.h
+++ b/drivers/scsi/ibmvscsi/viosrp.h
@@ -221,7 +221,10 @@ struct mad_adapter_info_data {
char srp_version[8];
char partition_name[96];
__be32 partition_number;
+#define SRP_MAD_VERSION_1 1
__be32 mad_version;
+#define SRP_MAD_OS_LINUX 2
+#define SRP_MAD_OS_AIX 3
__be32 os_type;
__be32 port_max_txu[8]; /* per-port maximum transfer */
};
--
2.5.0
next prev parent reply other threads:[~2016-02-11 1:32 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-11 1:32 [PATCH v2 0/7] ibmvscsi code cleanup Tyrel Datwyler
2016-02-11 1:32 ` [PATCH v2 1/7] ibmvscsi: Correct values for several viosrp_crq_format enums Tyrel Datwyler
2016-02-12 14:29 ` Manoj Kumar
2016-02-11 1:32 ` [PATCH v2 2/7] ibmvscsi: Add and use enums for valid CRQ header values Tyrel Datwyler
2016-02-11 8:51 ` Johannes Thumshirn
2016-02-12 14:23 ` Manoj Kumar
2016-02-11 1:32 ` Tyrel Datwyler [this message]
2016-02-12 16:43 ` [PATCH v2 3/7] ibmvscsi: Replace magic values in set_adpater_info() with defines James Bottomley
2016-02-12 16:51 ` Tyrel Datwyler
2016-02-12 16:53 ` James Bottomley
2016-02-12 16:57 ` Martin K. Petersen
2016-02-17 3:03 ` Martin K. Petersen
2016-02-17 8:05 ` Johannes Thumshirn
2016-02-12 22:06 ` Manoj Kumar
2016-02-11 1:32 ` [PATCH v2 4/7] ibmvscsi: Use of_root to access OF device tree root node Tyrel Datwyler
2016-02-11 1:32 ` [PATCH v2 5/7] ibmvscsi: Remove unsupported host config MAD Tyrel Datwyler
2016-02-11 8:53 ` Johannes Thumshirn
2016-02-11 1:32 ` [PATCH v2 6/7] ibmvscsi: Add endian conversions to sysfs attribute show functions Tyrel Datwyler
2016-02-11 1:32 ` [PATCH v2 7/7] ibmvscsi: use H_CLOSED instead of magic number Tyrel Datwyler
2016-02-11 8:54 ` Johannes Thumshirn
2016-02-12 16:55 ` [PATCH v2 0/7] ibmvscsi code cleanup Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455154348-3226-4-git-send-email-tyreld@linux.vnet.ibm.com \
--to=tyreld@linux.vnet.ibm.com \
--cc=brking@linux.vnet.ibm.com \
--cc=james.bottomley@hansenpartnership.com \
--cc=jthumshirn@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=manoj@linux.vnet.ibm.com \
--cc=martin.petersen@oracle.com \
--cc=nfont@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).