From patchwork Sun Jun 18 15:22:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagi Grimberg X-Patchwork-Id: 9794905 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 E43D9601C8 for ; Sun, 18 Jun 2017 15:22:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D71E6283AF for ; Sun, 18 Jun 2017 15:22:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CBC47283C0; Sun, 18 Jun 2017 15:22:49 +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=-5.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, URIBL_BLACK 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 7FA16283AF for ; Sun, 18 Jun 2017 15:22:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753281AbdFRPWt (ORCPT ); Sun, 18 Jun 2017 11:22:49 -0400 Received: from merlin.infradead.org ([205.233.59.134]:52276 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753255AbdFRPWs (ORCPT ); Sun, 18 Jun 2017 11:22:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZO3ZtQPK3mIEvKMhk6ZmEhgKs06wBCDMT3TlfOBkp6A=; b=2GIKY9WP4rvb9iccwA0AwTxjs 8m34c8F8XFwqMDR8qGzuK8TkKTxZW1AfXWCwmrwuN1FXr8+PqhYfXCncGdU1RbvxmlaZ/4YV9+zOb yBn4UA1GUal1IoCLP9A4nTG7OOGqcltqIUrB2cd8XryxBW6hlr2SaR7ab/WFSVjc5JLhiZ6KO28ge Pfj/LZeHFReyeIscUX5D4GcBoTHnrAu8SFUxhXjVLVYINIsqQzPSKm7hT0Ykn/3H3Fj3DZ7TgR1DD pYIGjJQn9qZVO/qeNszwGfbI7orVSU8XfJm1yOnBWnV8MuOTw/qNJUfsxbnCO9k/lgKwseXQZYnbW TyZI6qOvQ==; Received: from bzq-82-81-101-184.red.bezeqint.net ([82.81.101.184] helo=bombadil.infradead.org) by merlin.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dMc2I-0006WN-OO; Sun, 18 Jun 2017 15:22:47 +0000 From: Sagi Grimberg To: linux-nvme@lists.infradead.org Cc: Christoph Hellwig , Keith Busch , linux-block@vger.kernel.org Subject: [PATCH rfc 29/30] nvme: add sed-opal ctrl manipulation in admin configuration Date: Sun, 18 Jun 2017 18:22:03 +0300 Message-Id: <1497799324-19598-30-git-send-email-sagi@grimberg.me> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497799324-19598-1-git-send-email-sagi@grimberg.me> References: <1497799324-19598-1-git-send-email-sagi@grimberg.me> 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 Signed-off-by: Sagi Grimberg --- drivers/nvme/host/core.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 476c49c0601f..f4800b8e47a0 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2493,6 +2493,7 @@ static void nvme_free_ctrl(struct kref *kref) put_device(ctrl->device); nvme_release_instance(ctrl); ida_destroy(&ctrl->ns_ida); + free_opal_dev(ctrl->opal_dev); ctrl->ops->free_ctrl(ctrl); } @@ -2814,6 +2815,7 @@ EXPORT_SYMBOL_GPL(nvme_destroy_admin_queue); int nvme_configure_admin_queue(struct nvme_ctrl *ctrl, bool new) { + bool was_suspend = !!(ctrl->ctrl_config & NVME_CC_SHN_NORMAL); int error; error = ctrl->ops->alloc_hw_queue(ctrl, 0, NVME_AQ_DEPTH); @@ -2868,6 +2870,16 @@ int nvme_configure_admin_queue(struct nvme_ctrl *ctrl, bool new) if (error) goto out_cleanup_connect_queue; + if (ctrl->oacs & NVME_CTRL_OACS_SEC_SUPP) { + if (!ctrl->opal_dev) + ctrl->opal_dev = init_opal_dev(ctrl, &nvme_sec_submit); + else if (was_suspend) + opal_unlock_from_suspend(ctrl->opal_dev); + } else { + free_opal_dev(ctrl->opal_dev); + ctrl->opal_dev = NULL; + } + nvme_start_keep_alive(ctrl); return 0;