From patchwork Mon Nov 16 14:34:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matias_Bj=C3=B8rling?= X-Patchwork-Id: 7627981 X-Patchwork-Delegate: axboe@kernel.dk Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 543C6BF90C for ; Mon, 16 Nov 2015 14:41:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7A14720588 for ; Mon, 16 Nov 2015 14:41:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 927392057E for ; Mon, 16 Nov 2015 14:41:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751527AbbKPOkv (ORCPT ); Mon, 16 Nov 2015 09:40:51 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:34451 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752183AbbKPOhb (ORCPT ); Mon, 16 Nov 2015 09:37:31 -0500 Received: by wmvv187 with SMTP id v187so179672378wmv.1 for ; Mon, 16 Nov 2015 06:37:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bjorling.me; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=xryPROIzb8qRmw+aCdW+xPoI55TNLY8XZs+n39fKRkc=; b=M8DodefXH5n7ogmVFVD5j2+VBcug1p03/w3+/4pxGeEzc8xCoCD5r4nnBKQmjrf98Z Z4KYtDRyMzyOilkr5ahl2G4twNQF744TdgvSo0O+udhv410CiHPGwwkJW9yNAXYjd53t /x2Axeo2rktnqLbYoArAM2MMax7PFSe2qkLAs= 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:mime-version:content-type:content-transfer-encoding; bh=xryPROIzb8qRmw+aCdW+xPoI55TNLY8XZs+n39fKRkc=; b=jvRFtYiE/fiHkEVMn0lhN85S71z1iQBmQmk0qWkX1WDN+dqpP7JqOB+XCXlfPTeXx5 kznnk39gkojma8edvarhpjgjgdtxmsS9Y1Tb23wggA+fXr2HaQXwBMmCJE5R3Kg4UQze bFdhiES63hFDbOuWT1ndxnwoDCIDt6fiv6oeVYhqZkW893zwhv68ILz+oLG5TGd6dKXR XiBGDpz/EJkizKZ01q7IYuUJvV1c2kPf00fpc7IC3UUo22+x5pqAsucvuC87OpxEPpuA XWrX/24INSJexItM17OGAj98zm5FizH4aPNTe6ekCsmVzIyNDcTiBADMaciKhRETnEnk 0yug== X-Gm-Message-State: ALoCoQl16Gu2HO61i8UEELdLEow5+GzDxEX795JliZv6gKJIbmGYGRZODIYCqOkuZOy/qQc4JnOd X-Received: by 10.28.153.137 with SMTP id b131mr20547925wme.3.1447684650457; Mon, 16 Nov 2015 06:37:30 -0800 (PST) Received: from localhost.localdomain (6164198-cl69.boa.fiberby.dk. [193.106.164.198]) by smtp.gmail.com with ESMTPSA id u139sm18818127wmu.22.2015.11.16.06.37.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Nov 2015 06:37:29 -0800 (PST) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, axboe@fb.com Cc: =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 05/13] lightnvm: expose mccap in identify command Date: Mon, 16 Nov 2015 15:34:39 +0100 Message-Id: <1447684487-25539-6-git-send-email-m@bjorling.me> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447684487-25539-1-git-send-email-m@bjorling.me> References: <1447684487-25539-1-git-send-email-m@bjorling.me> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The mccap field is required for I/O command option support. It defines the following flash access modes: * SLC mode * Erase/Program Suspension * Scramble On/Off * Encryption It is slotted in between mpos and cpar, changing the offset for cpar as well. Signed-off-by: Matias Bjørling --- drivers/nvme/host/lightnvm.c | 4 +++- include/linux/lightnvm.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index 60687ed..52b311c 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -169,8 +169,9 @@ struct nvme_nvm_id_group { __le32 tbet; __le32 tbem; __le32 mpos; + __le32 mccap; __le16 cpar; - __u8 reserved[910]; + __u8 reserved[906]; } __packed; struct nvme_nvm_addr_format { @@ -265,6 +266,7 @@ static int init_grps(struct nvm_id *nvm_id, struct nvme_nvm_id *nvme_nvm_id) dst->tbet = le32_to_cpu(src->tbet); dst->tbem = le32_to_cpu(src->tbem); dst->mpos = le32_to_cpu(src->mpos); + dst->mccap = le32_to_cpu(src->mccap); dst->cpar = le16_to_cpu(src->cpar); } diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index 9b3dc1b..2572856 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -74,6 +74,7 @@ struct nvm_id_group { u32 tbet; u32 tbem; u32 mpos; + u32 mccap; u16 cpar; u8 res[913]; } __packed;