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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3168DC76196 for ; Sat, 1 Apr 2023 01:53:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233939AbjDABxT (ORCPT ); Fri, 31 Mar 2023 21:53:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234035AbjDABw7 (ORCPT ); Fri, 31 Mar 2023 21:52:59 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3133D4F9D; Fri, 31 Mar 2023 18:49:25 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 92992B83315; Sat, 1 Apr 2023 01:43:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5CA1EC4339B; Sat, 1 Apr 2023 01:43:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680313390; bh=zYVrXWEQFmTPkTJitl1+07F2lBqNIRNx4Xz4bW6f8MM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aIVIJNjIHpNnncHSK2GgInot15ZnI0hADrqXtqv9UIcLOpJCBnfkXs/Jkl5O4FeOF Tsz1Am6HKlKJdUj23iJVFD2Anub/a3C0iW0rooAbFqg9lHZNQXHAZJkdfYNO/ZAbG5 VMefwSBbzptnk/DYVQzCbk4W9I67Cxwim8jH5yAANgffzc2GXm4XK0F2MBudTre0v1 RuIrYQPcfYWE+cGDqSUUxnt2VEevpeTZ5plKdYrp4ilZnA8ASIsKXvXZdwMiXqeZVz GrT/MWDkklCVxP5GtS2b8SDF72g1wAEPC7ghEFAqLFMwScnWwu+qvCkN8DZWmDBIT9 G8xmGOcbH6Dzg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin George , Martin George , Christoph Hellwig , Sasha Levin , kbusch@kernel.org, axboe@fb.com, sagi@grimberg.me, linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 18/24] nvme: send Identify with CNS 06h only to I/O controllers Date: Fri, 31 Mar 2023 21:42:34 -0400 Message-Id: <20230401014242.3356780-18-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230401014242.3356780-1-sashal@kernel.org> References: <20230401014242.3356780-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin George [ Upstream commit def84ab600b71ea3fcc422a876d5d0d0daa7d4f3 ] Identify CNS 06h (I/O Command Set Specific Identify Controller data structure) is supported only on i/o controllers. But nvme_init_non_mdts_limits() currently invokes this on all controllers. Correct this by ensuring this is sent to I/O controllers only. Signed-off-by: Martin George Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index a95e48b51da66..82f3c7231a0a0 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3074,7 +3074,8 @@ static int nvme_init_non_mdts_limits(struct nvme_ctrl *ctrl) else ctrl->max_zeroes_sectors = 0; - if (nvme_ctrl_limited_cns(ctrl)) + if (ctrl->subsys->subtype != NVME_NQN_NVME || + nvme_ctrl_limited_cns(ctrl)) return 0; id = kzalloc(sizeof(*id), GFP_KERNEL); -- 2.39.2