From patchwork Fri Mar 2 15:21:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Javier_Gonz=C3=A1lez?= X-Patchwork-Id: 10254953 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 E67AE6037F for ; Fri, 2 Mar 2018 15:22:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D55D7289F6 for ; Fri, 2 Mar 2018 15:22:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1EDA289F4; Fri, 2 Mar 2018 15:22:35 +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 0552C289FF for ; Fri, 2 Mar 2018 15:22:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1427188AbeCBPWH (ORCPT ); Fri, 2 Mar 2018 10:22:07 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:55800 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1425112AbeCBPWA (ORCPT ); Fri, 2 Mar 2018 10:22:00 -0500 Received: by mail-wm0-f67.google.com with SMTP id q83so3829197wme.5 for ; Fri, 02 Mar 2018 07:21:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javigon-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mCpW7x+vYpq4chqbQdRWtoFxDS2jAD1CyD7c88OWPVA=; b=GEe5muyBgmxuCUe4dB97fBAuh9B/8NxqZw6TkJoPobdrKSzz5JyYJEFfjPCuGrxLkT wRerXIxvWBXHMHNRJPacGqB0T6byG6KbLm3zzj+Mm1CFm/z7nyS+FWmzql6m3bUbSIrg ny5DpCAMTemRtaB7lCK7lq33inpCERmNti0ly8NKc1j8QQyZ3nQerB9cl+Fe/ZfwjEBV eL4/4nfV98obqZst/JCOR8cHO5yo/2W9IbcebkUMK5cMcdjEGqSHUQE1ONkkf0VjCjho zMU/fxOuI6fhasNN5Ivz/T3e9lAZBz9bi9ce3qbSQWzQVWSOSL96sZms+J2TuiDxnjxs seZQ== 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=mCpW7x+vYpq4chqbQdRWtoFxDS2jAD1CyD7c88OWPVA=; b=tUauKKwG3cykECMz6WU+MxbxKLWZgOgbj3v1A/Kxdyp1DOZnaaKFDjZfHopd6i9QJ/ CKLxBT44YJbvUzrP8FRSIGyhx23scgm279b1Uyv+W4iTRzWKmKQbzZifrjCUbBNo/ubF ZTKjkfi0f1BOY96H0nZwQcat3QoJm7oFA6ZjHVQ8sMSOaPKUIBVRDqha5r7KdwCKLXXr qMHg1BxZwjNnPy2bzvwSZKrP8rwkDOGLs4kBAAwKrx52YhyxhqC/+quJ1BFOq5AyEfik 8xryxa+q7SNqSlEXgittmJ9bfKwvf+Wdl91X4ebTWv/hfDXbn6Fkrre3qNwajayrhN/D s/Vw== X-Gm-Message-State: APf1xPCGWoVlDVVA0sTDHTYNsCdPeI8sKnhqDctS3v0Rtrfzf8C2YWGw aeHTGzsfHmkzj9+QlNMhl5H9pw== X-Google-Smtp-Source: AG47ELvdNT/yILcK5ZVQKvMiGUajjQX/r+9k5tW1P3bSresRrfVd1stQbSSuBMFN3X6emASPRfyMbQ== X-Received: by 10.80.215.9 with SMTP id t9mr7747751edi.85.1520004118715; Fri, 02 Mar 2018 07:21:58 -0800 (PST) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id o93sm5545893edb.18.2018.03.02.07.21.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Mar 2018 07:21:58 -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, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= Subject: [PATCH 04/12] lightnvm: complete geo structure with maxoc* Date: Fri, 2 Mar 2018 16:21:12 +0100 Message-Id: <1520004080-27760-5-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520004080-27760-1-git-send-email-javier@cnexlabs.com> References: <1520004080-27760-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 Complete the generic geometry structure with the maxoc and maxocpu felds, present in the 2.0 spec. Also, expose them through sysfs. Signed-off-by: Javier González --- drivers/nvme/host/lightnvm.c | 17 +++++++++++++++++ include/linux/lightnvm.h | 2 ++ 2 files changed, 19 insertions(+) diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index f7f7769e7588..41b38ebdb1f3 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -323,6 +323,13 @@ static int nvme_nvm_setup_12(struct nvme_nvm_id12 *id, geo->ws_opt = sec_per_pg; geo->mw_cunits = geo->ws_opt << 3; /* default to MLC safe values */ + /* Do not impose values for maximum number of open blocks as it is + * unspecified in 1.2. Users of 1.2 must be aware of this and eventually + * specify these values through a quirk if restrictions apply. + */ + geo->maxoc = geo->all_luns * geo->nr_chks; + geo->maxocpu = geo->nr_chks; + geo->mccap = le32_to_cpu(src->mccap); geo->trdt = le32_to_cpu(src->trdt); @@ -409,6 +416,8 @@ static int nvme_nvm_setup_20(struct nvme_nvm_id20 *id, geo->ws_min = le32_to_cpu(id->ws_min); geo->ws_opt = le32_to_cpu(id->ws_opt); geo->mw_cunits = le32_to_cpu(id->mw_cunits); + geo->maxoc = le32_to_cpu(id->maxoc); + geo->maxocpu = le32_to_cpu(id->maxocpu); geo->trdt = le32_to_cpu(id->trdt); geo->trdm = le32_to_cpu(id->trdm); @@ -1050,6 +1059,10 @@ static ssize_t nvm_dev_attr_show_20(struct device *dev, return scnprintf(page, PAGE_SIZE, "%u\n", geo->ws_min); } else if (strcmp(attr->name, "ws_opt") == 0) { return scnprintf(page, PAGE_SIZE, "%u\n", geo->ws_opt); + } else if (strcmp(attr->name, "maxoc") == 0) { + return scnprintf(page, PAGE_SIZE, "%u\n", geo->maxoc); + } else if (strcmp(attr->name, "maxocpu") == 0) { + return scnprintf(page, PAGE_SIZE, "%u\n", geo->maxocpu); } else if (strcmp(attr->name, "mw_cunits") == 0) { return scnprintf(page, PAGE_SIZE, "%u\n", geo->mw_cunits); } else if (strcmp(attr->name, "write_typ") == 0) { @@ -1147,6 +1160,8 @@ static NVM_DEV_ATTR_20_RO(chunks); static NVM_DEV_ATTR_20_RO(clba); static NVM_DEV_ATTR_20_RO(ws_min); static NVM_DEV_ATTR_20_RO(ws_opt); +static NVM_DEV_ATTR_20_RO(maxoc); +static NVM_DEV_ATTR_20_RO(maxocpu); static NVM_DEV_ATTR_20_RO(mw_cunits); static NVM_DEV_ATTR_20_RO(write_typ); static NVM_DEV_ATTR_20_RO(write_max); @@ -1163,6 +1178,8 @@ static struct attribute *nvm_dev_attrs_20[] = { &dev_attr_clba.attr, &dev_attr_ws_min.attr, &dev_attr_ws_opt.attr, + &dev_attr_maxoc.attr, + &dev_attr_maxocpu.attr, &dev_attr_mw_cunits.attr, &dev_attr_read_typ.attr, diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index a073c0c76260..870959a58fef 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -296,6 +296,8 @@ struct nvm_geo { u32 ws_min; /* minimum write size */ u32 ws_opt; /* optimal write size */ u32 mw_cunits; /* distance required for successful read */ + u32 maxoc; /* maximum open chunks */ + u32 maxocpu; /* maximum open chunks per parallel unit */ /* device capabilities */ u32 mccap;