From patchwork Mon Jan 12 12:14:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 427707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 07ED414017C; Mon, 12 Jan 2015 23:14:05 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1YAdsg-0006sQ-PQ; Mon, 12 Jan 2015 12:14:02 +0000 Received: from mail-wi0-f178.google.com ([209.85.212.178]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1YAdsU-0006mj-ER for kernel-team@lists.ubuntu.com; Mon, 12 Jan 2015 12:13:50 +0000 Received: by mail-wi0-f178.google.com with SMTP id em10so14063650wid.5 for ; Mon, 12 Jan 2015 04:13:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4WHN4GR//tRGRZMDl0DOXIw7PMjJlZVHvYFYzKcZwGA=; b=UTVBt35JDS0JOyhjO7qPG/bz7BzW4imrrDWb2rdtxdCcDnlUrmmFlOkEcR7CSlzjLC cPnJqcCbbv8lhzMq7s20coFpHdpRRhH6jglkpESt3px+AUTQ2rp+L0m19lkLUfG9B6RO j6BP+JOxYmsMStUPpu4jOsZ+RGINkx2eGTeU9Lv9plu796/rogKOe+IYr790xG1UrwGT SrtX02nqfhu0BZeFClhe5d1exf/gZeRSu2oZne9CaF/40ya8JkakGWmTewDr+jyzCZP1 6sWk1uvI341m1BZhT27Dh2C0jPh/rHZ8KHWJBL9AvAxd/jNII208wBlKNXAXHW5k/XCJ NI3Q== X-Gm-Message-State: ALoCoQkDkd6h4WYxAuTxaCqTz58hHLZ3PFyl9KzPmGqMaRV2NgXiphrbPKjRoTmwk8tznyEZEJbC X-Received: by 10.194.77.73 with SMTP id q9mr5158556wjw.24.1421064830312; Mon, 12 Jan 2015 04:13:50 -0800 (PST) Received: from localhost ([2001:470:6973:2:d81f:9933:bb4f:7ebe]) by mx.google.com with ESMTPSA id je12sm9964933wic.22.2015.01.12.04.13.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jan 2015 04:13:49 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [utopic 2/2] UBUNTU: SAUCE: storvsc: force SPC-3 compliance on win8 and win8 r2 hosts Date: Mon, 12 Jan 2015 12:14:27 +0000 Message-Id: <1421064867-9241-4-git-send-email-apw@canonical.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1421064867-9241-1-git-send-email-apw@canonical.com> References: <1421064867-9241-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: "K. Y. Srinivasan" On win8 and win8 r2 hosts force SPC-3 compliance for MSFT virtual disks. Ubuntu has been carrying a similar patch outside the tree for a while now. Starting with win10, the host will support SPC-3 compliance. Based on all the testing that has been done on win8 and win8 r2 hosts, we are comfortable claiming SPC-3 compliance on these hosts as well. This will enable TRIM support on these hosts. Suggested by: James Bottomley Signed-off-by: K. Y. Srinivasan Reviewed-by: Long Li Signed-off-by: Christoph Hellwig [pending for v3.20 in the scsi-drivers tree] BugLink: http://bugs.launchpad.net/bugs/1406867 Signed-off-by: Andy Whitcroft --- drivers/scsi/storvsc_drv.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index a11e5e9..1e1256c 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -1459,6 +1459,19 @@ static int storvsc_device_configure(struct scsi_device *sdevice) */ sdevice->sdev_bflags |= msft_blist_flags; + /* + * If the host is WIN8 or WIN8 R2, claim conformance to SPC-3 + * if the device is a MSFT virtual device. + */ + if (!strncmp(sdevice->vendor, "Msft", 4)) { + switch (vmbus_proto_version) { + case VERSION_WIN8: + case VERSION_WIN8_1: + sdevice->scsi_level = SCSI_SPC_3; + break; + } + } + return 0; }