From patchwork Tue Jun 21 21:53:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1646237 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=j4J8eGaW; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LSKz20MNNz9sGD for ; Wed, 22 Jun 2022 07:53:49 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o3lob-00007c-Kj; Tue, 21 Jun 2022 21:53:41 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1o3loZ-00007E-BV for kernel-team@lists.ubuntu.com; Tue, 21 Jun 2022 21:53:39 +0000 Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id EDFA13F194 for ; Tue, 21 Jun 2022 21:53:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655848418; bh=KHNfRcAwGN27h373HfvvlJRgJRr+T1vpdAeoLAqso0U=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=j4J8eGaWi52TvEtSeRW7ygD+kY9ldKIrxis+QsirMFsfABoB0dtHBaoz+Sr+P6DJM ZPE2b25SaSC0BmZMmEP6lo2pTa9BGxbRY/xGZDA3SjRBvelecPPIFCwMdpP2W0b79k c1IiunJ4wO4eyoIxu9o2LKDO/d0R07HxWbrKY0hLMhqAs/4mJGOM5oDWJ+SgMEbmXG qjHhuHtKhKgALeoH3w/FvYcnzmS4pVn0h9d+bihg4o8f1EXC+vOj5lf6z4xPCfX/VS JGNueZUG/x4KQhB/P8r2/Y6dSbJCgm4jpNzXZwmc+MOX4WuM+gmKnR5v8MfhdHCGe6 7keCyctKoDnEQ== Received: by mail-oi1-f199.google.com with SMTP id q126-20020aca5c84000000b0032ebb50e698so8395652oib.11 for ; Tue, 21 Jun 2022 14:53:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KHNfRcAwGN27h373HfvvlJRgJRr+T1vpdAeoLAqso0U=; b=GDM/I+yEbpVGiUbvyj+IA7hwhjX1Bm/9XEm5aJxL+/7gWKhF6KA12sqN1lEU6LGMuK ln75YtJdCm64zvMEFc3kfhPll/Pzo7cnbRp+B/W72jwgHlN3h0wZoObSm2qjGY+mlhGo YdySVsL8EvNa0iRseKlj3S+YyfbFxRFE7ZWUDmliBgye1wXVBHHWcJjjBDvqzxCkiDrf HWRfqP7056ZeOFwZc8z8j08Ufz3PHkVR8kQvc00X263i1+npVab2lsfgnaK+pASX43m0 JUc+JUlmW2XjaRzTSjwZ4oVv5nTYpO86U4fUeWuLe13+WBgzDHjlOK+MnBLMqw/YmfDR 0TGA== X-Gm-Message-State: AJIora/GhN2Dttizb42DW+SdDfg+NcpqNyPBk3MZ/Va+ykKrt8EOZoF4 QbFfHIUDTs7NmxZUZdGm/YkNS+NyXa/8qq4rMFWaLmQObK3VwpfgaYLuKt9sV++R1drXwTfrPJi HqP9rP39weeMLngBqni/NRqz9dPNriL8H8iNJPkBayQ== X-Received: by 2002:a05:6870:f2a0:b0:fe:29a0:4b48 with SMTP id u32-20020a056870f2a000b000fe29a04b48mr114215oap.183.1655848417543; Tue, 21 Jun 2022 14:53:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vboFuXYGnA/moKDJX7AewdhQKq86thjAbducq2XxvXRicm21Mi8Zt50GD8O5YXrpyAc4tr1Q== X-Received: by 2002:a05:6870:f2a0:b0:fe:29a0:4b48 with SMTP id u32-20020a056870f2a000b000fe29a04b48mr114195oap.183.1655848417073; Tue, 21 Jun 2022 14:53:37 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:1e02:1914:1444:eac5]) by smtp.gmail.com with ESMTPSA id bd31-20020a056808221f00b0032e7bd6557fsm9921769oib.50.2022.06.21.14.53.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 14:53:36 -0700 (PDT) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3] nvme: add CNTRLTYPE definitions for 'identify controller' Date: Tue, 21 Jun 2022 16:53:30 -0500 Message-Id: <20220621215332.23492-2-michael.reed@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220621215332.23492-1-michael.reed@canonical.com> References: <20220621215332.23492-1-michael.reed@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Hannes Reinecke Update the 'identify controller' structure to define the newly added CNTRLTYPE field. BugLink: https://bugs.launchpad.net/bugs/1948626 Signed-off-by: Hannes Reinecke Reviewed-by: Chaitanya Kulkarni Reviewed-by: Himanshu Madhani Signed-off-by: Christoph Hellwig (cherry picked from commit e15a8a9755659ff5972f30de4dd64867c97f242d linux-next) Signed-off-by: Michael Reed --- include/linux/nvme.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/linux/nvme.h b/include/linux/nvme.h index b7c4c4130b65..ed2428918bca 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -31,6 +31,12 @@ enum nvme_subsys_type { NVME_NQN_NVME = 2, /* NVME type target subsystem */ }; +enum nvme_ctrl_type { + NVME_CTRL_IO = 1, /* I/O controller */ + NVME_CTRL_DISC = 2, /* Discovery controller */ + NVME_CTRL_ADMIN = 3, /* Administrative controller */ +}; + /* Address Family codes for Discovery Log Page entry ADRFAM field */ enum { NVMF_ADDR_FAMILY_PCI = 0, /* PCIe */ @@ -244,7 +250,9 @@ struct nvme_id_ctrl { __le32 rtd3e; __le32 oaes; __le32 ctratt; - __u8 rsvd100[28]; + __u8 rsvd100[11]; + __u8 cntrltype; + __u8 fguid[16]; __le16 crdt1; __le16 crdt2; __le16 crdt3;