From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757302AbbE2Uut (ORCPT ); Fri, 29 May 2015 16:50:49 -0400 Received: from mail-bn1bon0134.outbound.protection.outlook.com ([157.56.111.134]:42928 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751139AbbE2Uuj convert rfc822-to-8bit (ORCPT ); Fri, 29 May 2015 16:50:39 -0400 From: Long Li To: KY Srinivasan , "gregkh@linuxfoundation.org" , "linux-kernel@vger.kernel.org" , "devel@linuxdriverproject.org" , "ohering@suse.com" , "jbottomley@parallels.com" , "hch@infradead.org" , "linux-scsi@vger.kernel.org" , "apw@canonical.com" , "vkuznets@redhat.com" , "jasowang@redhat.com" CC: Keith Mange Subject: RE: [PATCH 2/6] scsi: storvsc: Use a single value to track protocol versions Thread-Topic: [PATCH 2/6] scsi: storvsc: Use a single value to track protocol versions Thread-Index: AQHQmkLmV29awLYuI06bdOy5j41HLJ2TaTAg Date: Fri, 29 May 2015 20:34:54 +0000 Message-ID: References: <1432931336-14434-1-git-send-email-kys@microsoft.com> <1432931359-14473-1-git-send-email-kys@microsoft.com> <1432931359-14473-2-git-send-email-kys@microsoft.com> In-Reply-To: <1432931359-14473-2-git-send-email-kys@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=longli@microsoft.com; x-originating-ip: [2001:4898:80e0:ee43::2] x-microsoft-exchange-diagnostics: 1;DM2PR03MB478;3:VU3vLuM02TDFpHQntsTznATLrlq1ehM9Wbs/cbrxWnXt2w3bTDdExWl6cOleTX4WRza6dIoLd9z2ZKvcMCjGdDG0wNoQVH3zHDzUaAMpFDrjM7U71IWyw5Je5XmvQAcQeveloDdh4fv5hZwQq2nhpA==;10:y91aWQqECkI8/K2xP1gt2nEoDzNKQUzlaq106/wt3JBA8XCNBGQOnIclsmcIIi70x5pLsuecEtlJ1z1qCqa5frxI+6UOaLnfaTUw5AF/y+s=;6:l2pJOIQuK2D4vpUwGzhP37NnHojBzPnEoyveCpHsezkc7MMhbVb9j1DrWbTb95YX x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB478; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(601004)(2401001)(5005006)(520003)(3002001);SRVR:DM2PR03MB478;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB478; x-forefront-prvs: 059185FE08 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(199003)(377454003)(51704005)(189002)(13464003)(87936001)(101416001)(33656002)(92566002)(1511001)(64706001)(2201001)(5001960100002)(76576001)(107886002)(2656002)(86362001)(105586002)(99286002)(189998001)(106356001)(106116001)(77156002)(50986999)(2501003)(62966003)(74316001)(76176999)(54356999)(86612001)(19580405001)(19580395003)(2421001)(1720100001)(2900100001)(122556002)(40100003)(81156007)(4001540100001)(5001770100001)(97736004)(5001920100001)(5002640100001)(102836002)(2950100001)(46102003)(5001830100001)(77096005)(5001860100001)(68736005)(15975445007)(2561002)(921003)(3826002)(4001430100001)(1121003);DIR:OUT;SFP:1102;SCL:1;SRVR:DM2PR03MB478;H:DM2PR03MB416.namprd03.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-originalarrivaltime: 29 May 2015 20:34:54.3937 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR03MB478 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > -----Original Message----- > From: devel [mailto:driverdev-devel-bounces@linuxdriverproject.org] On > Behalf Of K. Y. Srinivasan > Sent: Friday, May 29, 2015 1:29 PM > To: gregkh@linuxfoundation.org; linux-kernel@vger.kernel.org; > devel@linuxdriverproject.org; ohering@suse.com; jbottomley@parallels.com; > hch@infradead.org; linux-scsi@vger.kernel.org; apw@canonical.com; > vkuznets@redhat.com; jasowang@redhat.com > Cc: Keith Mange > Subject: [PATCH 2/6] scsi: storvsc: Use a single value to track protocol versions > > From: keith.mange@microsoft.com > > Use a single value to track protocol versions to simplify comparisons and to be > consistent with vmbus version tracking. > Reviewed-by: Long Li > Tested-by: Alex Ng > Signed-off-by: Keith Mange > Signed-off-by: K. Y. Srinivasan > --- > drivers/scsi/storvsc_drv.c | 35 +++++++++-------------------------- > 1 files changed, 9 insertions(+), 26 deletions(-) > > diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index > 582f3b5..5f9d133 100644 > --- a/drivers/scsi/storvsc_drv.c > +++ b/drivers/scsi/storvsc_drv.c > @@ -58,12 +58,11 @@ > * Win8: 5.1 > */ > > +#define VMSTOR_PROTO_VERSION(MAJOR_, MINOR_) ((((MAJOR_) & 0xff) > << 8) | \ > + (((MINOR_) & 0xff))) > > -#define VMSTOR_WIN7_MAJOR 4 > -#define VMSTOR_WIN7_MINOR 2 > - > -#define VMSTOR_WIN8_MAJOR 5 > -#define VMSTOR_WIN8_MINOR 1 > +#define VMSTOR_PROTO_VERSION_WIN7 VMSTOR_PROTO_VERSION(4, > 2) > +#define VMSTOR_PROTO_VERSION_WIN8 VMSTOR_PROTO_VERSION(5, > 1) > > > /* Packet structure describing virtual storage requests. */ @@ -161,8 +160,7 > @@ static int sense_buffer_size; > */ > > static int vmscsi_size_delta; > -static int vmstor_current_major; > -static int vmstor_current_minor; > +static int vmstor_proto_version; > > struct vmscsi_win8_extension { > /* > @@ -481,18 +479,6 @@ done: > kfree(wrk); > } > > -/* > - * Major/minor macros. Minor version is in LSB, meaning that earlier flat > - * version numbers will be interpreted as "0.x" (i.e., 1 becomes 0.1). > - */ > - > -static inline u16 storvsc_get_version(u8 major, u8 minor) -{ > - u16 version; > - > - version = ((major << 8) | minor); > - return version; > -} > > /* > * We can get incoming messages from the host that are not in response to > @@ -930,8 +916,7 @@ static int storvsc_channel_init(struct hv_device *device) > vstor_packet->operation = > VSTOR_OPERATION_QUERY_PROTOCOL_VERSION; > vstor_packet->flags = REQUEST_COMPLETION_FLAG; > > - vstor_packet->version.major_minor = > - storvsc_get_version(vmstor_current_major, > vmstor_current_minor); > + vstor_packet->version.major_minor = vmstor_proto_version; > > /* > * The revision number is only used in Windows; set it to 0. > @@ -1562,7 +1547,7 @@ static int storvsc_queuecommand(struct Scsi_Host > *host, struct scsi_cmnd *scmnd) > u32 payload_sz; > u32 length; > > - if (vmstor_current_major <= VMSTOR_WIN8_MAJOR) { > + if (vmstor_proto_version <= VMSTOR_PROTO_VERSION_WIN8) { > /* > * On legacy hosts filter unimplemented commands. > * Future hosts are expected to correctly handle @@ -1760,16 > +1745,14 @@ static int storvsc_probe(struct hv_device *device, > if (vmbus_proto_version < VERSION_WIN8) { > sense_buffer_size = PRE_WIN8_STORVSC_SENSE_BUFFER_SIZE; > vmscsi_size_delta = sizeof(struct vmscsi_win8_extension); > - vmstor_current_major = VMSTOR_WIN7_MAJOR; > - vmstor_current_minor = VMSTOR_WIN7_MINOR; > + vmstor_proto_version = VMSTOR_PROTO_VERSION_WIN7; > max_luns_per_target = > STORVSC_IDE_MAX_LUNS_PER_TARGET; > max_targets = STORVSC_IDE_MAX_TARGETS; > max_channels = STORVSC_IDE_MAX_CHANNELS; > } else { > sense_buffer_size = > POST_WIN7_STORVSC_SENSE_BUFFER_SIZE; > vmscsi_size_delta = 0; > - vmstor_current_major = VMSTOR_WIN8_MAJOR; > - vmstor_current_minor = VMSTOR_WIN8_MINOR; > + vmstor_proto_version = VMSTOR_PROTO_VERSION_WIN8; > max_luns_per_target = STORVSC_MAX_LUNS_PER_TARGET; > max_targets = STORVSC_MAX_TARGETS; > max_channels = STORVSC_MAX_CHANNELS; > -- > 1.7.4.1 > > _______________________________________________ > devel mailing list > devel@linuxdriverproject.org > http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel