From patchwork Mon Feb 26 13:17:03 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: 10242359 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 973BB602DC for ; Mon, 26 Feb 2018 13:24:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86AC32A007 for ; Mon, 26 Feb 2018 13:24:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79C962A00B; Mon, 26 Feb 2018 13:24:44 +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=unavailable 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 0146B2A007 for ; Mon, 26 Feb 2018 13:24:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753105AbeBZNXy (ORCPT ); Mon, 26 Feb 2018 08:23:54 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:37133 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753092AbeBZNRb (ORCPT ); Mon, 26 Feb 2018 08:17:31 -0500 Received: by mail-wm0-f65.google.com with SMTP id 139so4028166wmn.2 for ; Mon, 26 Feb 2018 05:17:31 -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=vvoTpyk8OtwuBfFaTrNMt4ikUZiT/Zcv8gYT/kzhAL0=; b=GqBryyFTeMlD4RcPFqa1ODFZDkVBv1isay4bdfiUO493/ZanieRAjYbL8RsGyox6Ua LxRdCnGe4sMi5nMSKDN9D6H9Gb6Jdxhqmn6by+Hr+OkWxIui+adRKhjGDOU2/brodNXX WSrgl0TYVq2J9Oknxqv8cpH8w0Jd/zrr2jgeaapikJqbBeVUT96NrAGp15Yiyc0k6Q0n ZjtfJrMrZSUvahLFlNuTTZ0sKa4V+NFWNjPeANSUYmJKf6KDet6Y98qEgCrl0RCBPl01 0fXTSsmWq32rcXOL5sA5CBY8ZVrnkCVASJU78u8Twaz63DpgLJ7lqFEn1Afzm1Vm9Ect 1Bwg== 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=vvoTpyk8OtwuBfFaTrNMt4ikUZiT/Zcv8gYT/kzhAL0=; b=Wjiu5umlnJCIzYWAhBbLqbckofY0p/myK7wvqsAMHzyxChFgwsDfbmI3DsvhGys/v6 p7+H5KEHIHoVGlF9NSGbCRhk/myvLr2uG4qHneDhvz+tbsy6b6QfIfX7KH21xSZ3vMVY GS3J27QhPNrdpik6JYRJdojtVu3UiWUiOdHQNpiTx7m2zn6B0z/vEPbkji6NfU3mi3ZX Qm58ziuqZB3U3sldLkBB4W4tIbFWBoKM3CGoMmNSgLjcKvsRVqimTmqFGF6j47wBV8e8 N2sSVzFTOMINsyGv1mXj53UMHLddT5Q3TAlZLK9szXwfrYux909S+AM6aMOE9uYiSalG X/Hg== X-Gm-Message-State: APf1xPCVvLpGXCWKdchpGWZZxuu/613eMdhqNDtFfmRlC5XvvZb1eQEA MLVya5x69gdGy4qfGOBEdJ/VCQ== X-Google-Smtp-Source: AH8x226gqFO57LWVbiUXZv7fIAhrIWotobX25sO+VISLy4dDaPe+wuQsG7Lz0n68rc8PV1UqGMNekw== X-Received: by 10.80.150.33 with SMTP id y30mr14283436eda.114.1519651050749; Mon, 26 Feb 2018 05:17:30 -0800 (PST) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id g59sm7097451ede.19.2018.02.26.05.17.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Feb 2018 05:17:30 -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/19] lightnvm: add shorten OCSSD version in geo Date: Mon, 26 Feb 2018 14:17:03 +0100 Message-Id: <1519651038-16845-5-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519651038-16845-1-git-send-email-javier@cnexlabs.com> References: <1519651038-16845-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 8befb60eeacb..a48950a37b8d 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, dev_geo->major_ver_id = id->ver_id; dev_geo->minor_ver_id = 2; + /* Set compacted version for upper layers */ + dev_geo->c.version = NVM_OCSSD_SPEC_12; + dev_geo->nr_chnls = src->num_ch; dev_geo->nr_luns = src->num_lun; dev_geo->all_luns = dev_geo->nr_chnls * dev_geo->nr_luns; @@ -385,6 +388,9 @@ static int nvme_nvm_setup_20(struct nvme_nvm_id20 *id, dev_geo->major_ver_id = id->mjr; dev_geo->minor_ver_id = id->mnr; + /* Set compacted version for upper layers */ + dev_geo->c.version = NVM_OCSSD_SPEC_20; + if (!(dev_geo->major_ver_id == 2 && dev_geo->minor_ver_id == 0)) { pr_err("nvm: OCSSD version not supported (v%d.%d)\n", dev_geo->major_ver_id, dev_geo->minor_ver_id); diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index ccaf8a30202d..57d00644a1c6 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 { @@ -262,6 +267,9 @@ enum { /* Device common geometry */ struct nvm_common_geo { + /* kernel short version */ + u8 version; + /* chunk geometry */ u32 num_chk; /* chunks per lun */ u32 clba; /* sectors per chunk */