From nobody Fri Apr 15 20:46:43 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2CC8B5D6EB2; Fri, 15 Apr 2022 20:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kg7fX0Yswz4tQ3; Fri, 15 Apr 2022 20:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650055604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZklPMltBRnqp9eZ8FPZTbfNBFCjEo/2jhD6K3nBQ3fM=; b=OBNQvht+cau7T9XmuKkh045vnD0oCNSbtvBBqIywEDJY8Mc7gMGkHvP7ZNu4dLEHP19fWz bnmycUpsn4hXEKeffSiyFsit0zr4/pJAUgZ93xa+8d7DOj3xMtyJ5VOCoEYpIIpWGpdiOo ci1TqvkUA4hyRwOCWM/FFmVBYmsboIYgPwBA7TvECBRJw7/zQBRpDD9HOGl7FPLEaVs73g oQ5MfQn5TUYQlbfYmmYUyPotQ8HcsSug6r76Xp+zUUPHDm+mD6VI7UwQFHFvs1lvnSBal0 MtcOX7xSJkBQMsw9EI1xReWWbo3HzY3S7WWKFfB6c7UZ0C4EadLhbeZpbU4WvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE5F01C252; Fri, 15 Apr 2022 20:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23FKkh6l079279; Fri, 15 Apr 2022 20:46:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23FKkhl3079278; Fri, 15 Apr 2022 20:46:43 GMT (envelope-from git) Date: Fri, 15 Apr 2022 20:46:43 GMT Message-Id: <202204152046.23FKkhl3079278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a7218e7a6b05 - main - nvme: Fix old intel alignment size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7218e7a6b05557c9ce60f8db33c06c97da72641 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650055604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZklPMltBRnqp9eZ8FPZTbfNBFCjEo/2jhD6K3nBQ3fM=; b=iLQlXuRJbnIfdJ5wzjhT23QYtwkEVKfSH+8zYpaIZI7T5nJ4SmlE6xxeXqWsmGQPPhhKS1 SG5ddWBnWfIBFZ9QDgAB65FIVN4ymIG+izb+3HPOpYcmJO3bbi51Y6tBscGE9XbhhYtC+y BS2IbB7TOk2dJYiq040PbhgJuCwJtpjEetRqIy7InSzMipTwePWE1WCBDnz3HGC/ZHB1lT YYwy2F9dq98f2x1O5kVP1Nn7Sjw1Y6a91aoaAu2PYcsLsJhB/87m6szsKkkuIoVwg9X1ho aEZkmSoMP0HD4UY15qX3lGyYPZxX4DwlN8sKkFiKnaPAbWPAfLEBpzTjn+EGbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650055604; a=rsa-sha256; cv=none; b=ZSZti3yyQx4ayeSdVWHimcpck0TOhZ7E3hstTJLPqVbvRtuWvHRk414RGw7HLf4yeGD3Rl JFKp/RdBY/3r3B7NOKrA1guf1J+O6T6ZxUDI3Eopet91+p+sK7ImQvTdFrzbkZN/XEoQQ0 r81RuQGJv6MKLZiSWtbr0DnOn44QHcRZ7HD9EqaV9u0hG8VnyW9rNiEaSBeFuUy0K4N3ch eaCXYvEAEnSDxJooE6FL0mLwzp5/C/OphJ35k6gtQS1JV3hNdM6GwfigayET/fpT6Mq6hF 27u4SU1/5Yk5uy5Mf+CS0ab/K7WSj6aBZzyP1ANakbfnkwPE9taOnE1sAOHTiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a7218e7a6b05557c9ce60f8db33c06c97da72641 commit a7218e7a6b05557c9ce60f8db33c06c97da72641 Author: Warner Losh AuthorDate: 2022-04-15 20:40:57 +0000 Commit: Warner Losh CommitDate: 2022-04-15 20:46:18 +0000 nvme: Fix old intel alignment size The intel raid stripe alignment parameter is based on CAP.MPSMIN, so use that directly now that we have it available. Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D34866 --- sys/dev/nvme/nvme_ns.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index ba6960e476f8..da700ae9f59f 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -567,14 +567,16 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, } /* - * Older Intel devices advertise in vendor specific space an alignment - * that improves performance. If present use for the stripe size. NVMe - * 1.3 standardized this as NOIOB, and newer Intel drives use that. + * Older Intel devices (like the PC35xxx and P45xx series) advertise in + * vendor specific space an alignment that improves performance. If + * present use for the stripe size. NVMe 1.3 standardized this as + * NOIOB, and newer Intel drives use that. */ if ((ctrlr->quirks & QUIRK_INTEL_ALIGNMENT) != 0) { if (ctrlr->cdata.vs[3] != 0) ns->boundary = - (1 << ctrlr->cdata.vs[3]) * ctrlr->min_page_size; + 1 << (ctrlr->cdata.vs[3] + NVME_MPS_SHIFT + + NVME_CAP_HI_MPSMIN(ctrlr->cap_hi)); else ns->boundary = 0; } else {