From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0A0DC432BE for ; Fri, 27 Aug 2021 12:11:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9CBE160E93 for ; Fri, 27 Aug 2021 12:11:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9CBE160E93 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2wdDYdODK2m+bf56EsLFD/kOjQ1rNlQssrpUNFCJ7co=; b=t68NcWe31vBLzm 9/Aka+xkuHx1uy5HVHq5Hw0w6UbyBHoh6S57+LlahwiLg0fHX2+yvy/eaqklUPQSsPAFPXmiiOQ6R C3cZ3OS4pypzs0j/g+Ujpn+q6kFaHg8LbaU7KXpI1N7yOw/yKrYWOni1fUvyouhWVH22Q+oNQV4II nxtMDm4J4qn73rBkYBrTg3Kvj3M98yWQN62IumsTgMJUE3F/lAdQaz/8pOAjaY1TM9g8D9osWQ9Bt I3HNsR5Cj1a3MmsQnjumNwdGOF75Hka+WeRi7C4S60MQmrWcbgfStPi0cH5ud7tzTPsDEEWtlmtOd iq12+o00ri7VrWG5kG1w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mJahA-00COad-Sn; Fri, 27 Aug 2021 12:10:52 +0000 Received: from smtp-out1.suse.de ([195.135.220.28]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mJafv-00COI0-IF for linux-nvme@lists.infradead.org; Fri, 27 Aug 2021 12:09:43 +0000 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 7E252223CA; Fri, 27 Aug 2021 12:09:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1630066173; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GKiMiB+uedWZeccfphkNViNPXb+r6xQVS8MLz+Dn8e8=; b=KHR55PfRFzybT8pNJhxI1OuTaSvmMfp9UQdBFpTKeXLtl273VaJZrBYqG7krRIV45xTuor tFPKw0qe5Y/eOeLJN24FAqDvL1RLJRSgSnXxSIoLU+BB4D/uTGpvVTYcC0h87UovG7PBgj /LPp468EeTGuSGvUmpq2CijZbDM7wjk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1630066173; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GKiMiB+uedWZeccfphkNViNPXb+r6xQVS8MLz+Dn8e8=; b=QpBWPcktYKmzIfGdo79ru1RJryD5SrNaYbvD3BN89PVf2Odsqg2jA3Aoce9or+aOX71OJs kGEQxQyR26zX05BA== Received: from adalid.arch.suse.de (adalid.arch.suse.de [10.161.8.13]) by relay2.suse.de (Postfix) with ESMTP id 51C92A3BAA; Fri, 27 Aug 2021 12:09:32 +0000 (UTC) Received: by adalid.arch.suse.de (Postfix, from userid 16045) id 7864D518DB44; Fri, 27 Aug 2021 14:09:32 +0200 (CEST) From: Hannes Reinecke To: Christoph Hellwig Cc: Sagi Grimberg , Keith Busch , linux-nvme@lists.infradead.org, Hannes Reinecke Subject: [PATCH 2/6] nvme: add CNTRLTYPE definitions for 'identify controller' Date: Fri, 27 Aug 2021 14:09:22 +0200 Message-Id: <20210827120926.104398-3-hare@suse.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210827120926.104398-1-hare@suse.de> References: <20210827120926.104398-1-hare@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210827_050935_986827_1336C69E X-CRM114-Status: GOOD ( 11.20 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Update the 'identify controller' structure to define the missing CNTRLTYPE field. Signed-off-by: Hannes Reinecke --- 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; -- 2.29.2 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme