From: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
To: manoj@linux.vnet.ibm.com,
Tyrel Datwyler <tyreld@linux.vnet.ibm.com>,
JBottomley@odin.com
Cc: martin.petersen@oracle.com, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org, hare@suse.de,
brking@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com,
linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH 2/6] ibmvscsi: Add and use enums for valid CRQ header values
Date: Thu, 4 Feb 2016 13:25:21 -0800 [thread overview]
Message-ID: <56B3C1C1.3080804@linux.vnet.ibm.com> (raw)
In-Reply-To: <56B3ACC9.60009@linux.vnet.ibm.com>
On 02/04/2016 11:55 AM, Manoj Kumar wrote:
> On 2/3/2016 5:28 PM, Tyrel Datwyler wrote:
>> The PAPR defines four valid header values for the first byte of a
>> CRQ message. Namely, an unused/empty message (0x00), a valid
>> command/response entry (0x80), a valid initialization entry (0xC0),
>> and a transport event (0xFF). Define these values as enums and use
>> them in the code in place of their magic number equivalents.
>>
>> Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
>> ---
>> drivers/scsi/ibmvscsi/ibmvscsi.c | 14 +++++++-------
>> drivers/scsi/ibmvscsi/viosrp.h | 7 +++++++
>> 2 files changed, 14 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
>> index adfef9d..176260d 100644
>> --- a/drivers/scsi/ibmvscsi/ibmvscsi.c
>> +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
>> @@ -182,7 +182,7 @@ static struct viosrp_crq *crq_queue_next_crq(struct crq_queue *queue)
>>
>> spin_lock_irqsave(&queue->lock, flags);
>> crq = &queue->msgs[queue->cur];
>> - if (crq->valid & 0x80) {
>> + if (crq->valid & VIOSRP_CRQ_VALID) {
>
> After the switch to enums, bitwise operators are a bit misleading.
> Especially in this case since multiple values would satisfy this
> condition: VIOSRP_CRQ_VALID, VIOSRP_CRQ_INIT and
> VIOSRP_CRQ_TRANSPORT.
Yeah, I can see how that is confusing. Since, all three possible valid
crq message types have the first bit set I think this was originally a
cute hack to grab anything that was likely valid. Then in
ibmvscsi_handle_crq() we explicitly match the full header value in a
switch statement logging anything that turned out actually invalid.
>
> If 'valid' will only have one of these four enums defined, would
> this be better written as:
>
> if (crq->valid != VIOSRP_CRQ_FREE)
This definitely would make the logic easier to read and follow. Also,
this would make sure any crq with an invalid header that doesn't have
its first bit set will also be logged by the ibmvscsi_handle_crq()
switch statement default block and not silently ignored.
-Tyrel
>
>> if (++queue->cur == queue->size)
>> queue->cur = 0;
>>
>> @@ -231,7 +231,7 @@ static void ibmvscsi_task(void *data)
>> /* Pull all the valid messages off the CRQ */
>> while ((crq = crq_queue_next_crq(&hostdata->queue)) != NULL) {
>> ibmvscsi_handle_crq(crq, hostdata);
>> - crq->valid = 0x00;
>> + crq->valid = VIOSRP_CRQ_FREE;
>> }
>>
>> vio_enable_interrupts(vdev);
>> @@ -239,7 +239,7 @@ static void ibmvscsi_task(void *data)
>> if (crq != NULL) {
>> vio_disable_interrupts(vdev);
>> ibmvscsi_handle_crq(crq, hostdata);
>> - crq->valid = 0x00;
>> + crq->valid = VIOSRP_CRQ_FREE;
>> } else {
>> done = 1;
>> }
>> @@ -474,7 +474,7 @@ static int initialize_event_pool(struct event_pool *pool,
>> struct srp_event_struct *evt = &pool->events[i];
>> memset(&evt->crq, 0x00, sizeof(evt->crq));
>> atomic_set(&evt->free, 1);
>> - evt->crq.valid = 0x80;
>> + evt->crq.valid = VIOSRP_CRQ_VALID;
>> evt->crq.IU_length = cpu_to_be16(sizeof(*evt->xfer_iu));
>> evt->crq.IU_data_ptr = cpu_to_be64(pool->iu_token +
>> sizeof(*evt->xfer_iu) * i);
>> @@ -1767,7 +1767,7 @@ static void ibmvscsi_handle_crq(struct viosrp_crq *crq,
>> struct srp_event_struct *evt_struct =
>> (__force struct srp_event_struct *)crq->IU_data_ptr;
>> switch (crq->valid) {
>> - case 0xC0: /* initialization */
>> + case VIOSRP_CRQ_INIT: /* initialization */
>> switch (crq->format) {
>> case 0x01: /* Initialization message */
>> dev_info(hostdata->dev, "partner initialized\n");
>> @@ -1791,7 +1791,7 @@ static void ibmvscsi_handle_crq(struct viosrp_crq *crq,
>> dev_err(hostdata->dev, "unknown crq message type: %d\n", crq->format);
>> }
>> return;
>> - case 0xFF: /* Hypervisor telling us the connection is closed */
>> + case VIOSRP_CRQ_TRANSPORT: /* Hypervisor telling us the connection is closed */
>> scsi_block_requests(hostdata->host);
>> atomic_set(&hostdata->request_limit, 0);
>> if (crq->format == 0x06) {
>> @@ -1807,7 +1807,7 @@ static void ibmvscsi_handle_crq(struct viosrp_crq *crq,
>> ibmvscsi_reset_host(hostdata);
>> }
>> return;
>> - case 0x80: /* real payload */
>> + case VIOSRP_CRQ_VALID: /* real payload */
>> break;
>> default:
>> dev_err(hostdata->dev, "got an invalid message type 0x%02x\n",
>> diff --git a/drivers/scsi/ibmvscsi/viosrp.h b/drivers/scsi/ibmvscsi/viosrp.h
>> index d1044e9..17f2de0 100644
>> --- a/drivers/scsi/ibmvscsi/viosrp.h
>> +++ b/drivers/scsi/ibmvscsi/viosrp.h
>> @@ -51,6 +51,13 @@ union srp_iu {
>> u8 reserved[SRP_MAX_IU_LEN];
>> };
>>
>> +enum viosrp_crq_headers {
>> + VIOSRP_CRQ_FREE = 0x00,
>> + VIOSRP_CRQ_VALID = 0x80,
>> + VIOSRP_CRQ_INIT = 0xC0,
>> + VIOSRP_CRQ_TRANSPORT = 0xFF
>> +};
>> +
>> enum viosrp_crq_formats {
>> VIOSRP_SRP_FORMAT = 0x01,
>> VIOSRP_MAD_FORMAT = 0x02,
>>
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
>
next prev parent reply other threads:[~2016-02-04 21:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-03 23:28 [PATCH 0/6] ibmvscsi: code cleanup Tyrel Datwyler
2016-02-03 23:28 ` [PATCH 1/6] ibmvscsi: Correct values for several viosrp_crq_format enums Tyrel Datwyler
2016-02-04 8:38 ` Johannes Thumshirn
2016-02-03 23:28 ` [PATCH 2/6] ibmvscsi: Add and use enums for valid CRQ header values Tyrel Datwyler
2016-02-04 8:39 ` Johannes Thumshirn
2016-02-04 19:55 ` Manoj Kumar
2016-02-04 21:25 ` Tyrel Datwyler [this message]
2016-02-09 17:41 ` Manoj Kumar
2016-02-09 18:27 ` Tyrel Datwyler
2016-02-03 23:28 ` [PATCH 3/6] ibmvscsi: Replace magic values in set_adpater_info() with defines Tyrel Datwyler
2016-02-04 8:44 ` Johannes Thumshirn
2016-02-03 23:28 ` [PATCH 4/6] ibmvscsi: Use of_root to access OF device tree root node Tyrel Datwyler
2016-02-04 8:45 ` Johannes Thumshirn
2016-02-03 23:28 ` [PATCH 5/6] ibmvscsi: Remove unsupported host config MAD and sysfs interface Tyrel Datwyler
2016-02-04 8:03 ` Johannes Thumshirn
2016-02-04 17:48 ` Tyrel Datwyler
2016-02-05 8:34 ` Johannes Thumshirn
2016-02-03 23:28 ` [PATCH 6/6] ibmvscsi: Add endian conversions to sysfs attribute show functions Tyrel Datwyler
2016-02-04 8:45 ` Johannes Thumshirn
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=56B3C1C1.3080804@linux.vnet.ibm.com \
--to=tyreld@linux.vnet.ibm.com \
--cc=JBottomley@odin.com \
--cc=brking@linux.vnet.ibm.com \
--cc=hare@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 read-only IMAP folder(s) and NNTP newsgroup(s).