From patchwork Wed Aug 23 17:58:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9918125 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 7AF4A603FA for ; Wed, 23 Aug 2017 17:58:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E390289BA for ; Wed, 23 Aug 2017 17:58:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63547289EE; Wed, 23 Aug 2017 17:58:30 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 1CA25289BA for ; Wed, 23 Aug 2017 17:58:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932419AbdHWR63 (ORCPT ); Wed, 23 Aug 2017 13:58:29 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:55727 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932411AbdHWR63 (ORCPT ); Wed, 23 Aug 2017 13:58:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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=H8lIsBptQAItTxeRqzLlZ4IM0Sklkx5iSU/PUaN5fzQ=; b=QZizpK/OCyn4K3gQHEPbuU3Pr xRhrT72FJ7zVW6n8FD022SJOY/qIf5TzBPw9ljXB3GowhLCyGMZRXgH0Gm5GYd7jlzck4Al65CrmK hVj0JmNdRsSovyjpQj+O4T0x01gLCmrpSdZHBK6dFEeyeth04np09CqjXskc3s1qRXWHR70hNFVmQ TMIyfQqBTyZ/6kNaGqEfq7fjj/1QpeVjofqvkpCxEm6Ix0TWEmKqneGtKM/54uXhoA4boTJm3hQqL BPGY2uDibgKpYJ9a4JbVMMfFp9bWRwleFTQgoUdQuxuGa5Hp/WocQ4yldQXdV+KtDvbshC/KrWYpN IWBU/SMIA==; Received: from clnet-p099-196.ikbnet.co.at ([83.175.99.196] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dkZv5-0000oO-Fg; Wed, 23 Aug 2017 17:58:23 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Keith Busch , Sagi Grimberg , linux-nvme@lists.infradead.org, linux-block@vger.kernel.org Subject: [PATCH 02/10] nvme: allow calling nvme_change_ctrl_state from irq context Date: Wed, 23 Aug 2017 19:58:07 +0200 Message-Id: <20170823175815.3646-3-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170823175815.3646-1-hch@lst.de> References: <20170823175815.3646-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html 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: Christoph Hellwig Reviewed-by: Sagi Grimberg Reviewed-by: Keith Busch --- drivers/nvme/host/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index b8ecd155be19..f91c649c9ca5 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -176,9 +176,10 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, enum nvme_ctrl_state new_state) { enum nvme_ctrl_state old_state; + unsigned long flags; bool changed = false; - spin_lock_irq(&ctrl->lock); + spin_lock_irqsave(&ctrl->lock, flags); old_state = ctrl->state; switch (new_state) { @@ -239,7 +240,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, if (changed) ctrl->state = new_state; - spin_unlock_irq(&ctrl->lock); + spin_unlock_irqrestore(&ctrl->lock, flags); return changed; }