From patchwork Wed Feb 28 15:49:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 10248165 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E14B260211 for ; Wed, 28 Feb 2018 15:50:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFFF528D75 for ; Wed, 28 Feb 2018 15:50:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE05928D9C; Wed, 28 Feb 2018 15:50:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CF4328D75 for ; Wed, 28 Feb 2018 15:50:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933379AbeB1Pt6 (ORCPT ); Wed, 28 Feb 2018 10:49:58 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:38594 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752885AbeB1Ptw (ORCPT ); Wed, 28 Feb 2018 10:49:52 -0500 Received: by mail-wm0-f65.google.com with SMTP id z9so5923406wmb.3 for ; Wed, 28 Feb 2018 07:49:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pt/2h4sismy+ISAM1cty+lqWnEF5uY6BKaeG/peDARs=; b=vvob3zi12ivO+J45rTy1s/TPkqFlhE51BN4kfyfXSY5Ju4B3pLXMvJkwDNEtc3QCfX I7R5+Xv1vKEU0TGiI2WvziEeh5DzciUDk+ZjG9Tjb/6JH3hNk4lso5V+cz19eLk2xgGh N5+eduUm3moImQv8kz6GDoG7EivF2uCaBtcyXiQeAkyJB4HXvaKn5K6/DXpzyQcM++HM R2sGD4TGvKWrO4UTOyJa6pqUYGSoDrc6u1aPQd2jAbgFS0nswipIuE5D8W8qVUMITiXR ZfHwB4irSkiZcFQR/mPwNwUl2Qd0a4fWDFuVxRm3ptMCgKvuUb4Z2t3fmyftQpH1SOmP LNFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pt/2h4sismy+ISAM1cty+lqWnEF5uY6BKaeG/peDARs=; b=mtFUM2ZCW9+iLoP4VKVa4mR1ENtZl/884Be8LmPFTO0EXOMGkVFYqOUweT1pvVG5IQ 5Xoi9HAqE/rVMhi7wF1kO2Lb0GSsn14GRqVjXKk3fD41YO4tChNlDT/nbqnSCD+tGbep +ChddchyAp7Dmj5Wr1U9U8wP7tRUtD6UWKP8pAJ2jOCccLM+qglv3jpFXtipNOq0YDaw JfoXlZG/SdWKOHgXYZDvDoU4sv3u2KaqUQ5TxV6rHZ5emAaTnUCqBOiSrQIxIVtsgRjH 1rtEQc5UYAk7/W3dluceBThFMPgDu18vArGsXapisf4nuDXCgbqE7Sz3qSmTRdX8Bo7l ceYw== X-Gm-Message-State: APf1xPBLASN9WzbomO3AGJI8SVGjrkOIpPr/RBlZ9rW248Uj7vBJVXuP j/334rPBhZBdvI3lAI3dDyjTQA== X-Google-Smtp-Source: AG47ELtfYIZtWol3Sgf9Hb1iPglOQLVa1ocuwk5KHm+F0gbNqnPef+gYdv0OfqU8TnfWk8AJmN44jQ== X-Received: by 10.80.144.119 with SMTP id z52mr21645edz.128.1519832991413; Wed, 28 Feb 2018 07:49:51 -0800 (PST) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id n2sm1953056edb.62.2018.02.28.07.49.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Feb 2018 07:49:50 -0800 (PST) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= Subject: [PATCH 04/15] lightnvm: add shorten OCSSD version in geo Date: Wed, 28 Feb 2018 16:49:24 +0100 Message-Id: <1519832975-25432-5-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519832975-25432-1-git-send-email-javier@cnexlabs.com> References: <1519832975-25432-1-git-send-email-javier@cnexlabs.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Create a shorten version to use in the generic geometry. Signed-off-by: Javier González --- drivers/nvme/host/lightnvm.c | 6 ++++++ include/linux/lightnvm.h | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index a600e70b6e6b..85f336a79cda 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -299,6 +299,9 @@ static int nvme_nvm_setup_12(struct nvme_nvm_id12 *id, geo->major_ver_id = id->ver_id; geo->minor_ver_id = 2; + /* Set compacted version for upper layers */ + geo->version = NVM_OCSSD_SPEC_12; + geo->nr_chnls = src->num_ch; geo->nr_luns = src->num_lun; geo->all_luns = geo->nr_chnls * geo->nr_luns; @@ -385,6 +388,9 @@ static int nvme_nvm_setup_20(struct nvme_nvm_id20 *id, geo->major_ver_id = id->mjr; geo->minor_ver_id = id->mnr; + /* Set compacted version for upper layers */ + geo->version = NVM_OCSSD_SPEC_20; + if (!(geo->major_ver_id == 2 && geo->minor_ver_id == 0)) { pr_err("nvm: OCSSD version not supported (v%d.%d)\n", geo->major_ver_id, geo->minor_ver_id); diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index 4b2ecbf45fd9..b8bc158a2472 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -23,6 +23,11 @@ enum { #define NVM_LUN_BITS (8) #define NVM_CH_BITS (7) +enum { + NVM_OCSSD_SPEC_12 = 12, + NVM_OCSSD_SPEC_20 = 20, +}; + struct ppa_addr { /* Generic structure for all addresses */ union { @@ -266,6 +271,9 @@ struct nvm_geo { u8 major_ver_id; u8 minor_ver_id; + /* kernel short version */ + u8 version; + /* instance specific geometry */ int nr_chnls; int nr_luns; /* per channel */