From nobody Mon Aug 26 18:03:14 2024 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 4Wsz771rq4z5TLZ8; Mon, 26 Aug 2024 18:03:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wsz7709y4z44cR; Mon, 26 Aug 2024 18:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724695395; 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=JbXUaGW4UgbN92vgWHVNS9rMUqNzCXdRJLZVTmlTLx4=; b=iLRhkpATrosQA0zewduQB/3iHrhgOJjmE8ceFhaHVTcX9Y6Eoy9Hrs/vISgUNgqARI9NO4 Yk+otb2J44UzTa9WtAy+HkSbMZ8aZG6W2Sc/pjlPqpRwl9Jtc/S8y1vhcMXY/Okcn+RNNA 1fvNaF/xhhhZmJROV7sZX6YpNWUdPzZYMRfKaVWFePHllI+UPkTO4og2iEEYWkiZFroWUM 286eDvjT6BXrd4FKGRm0op40/cIQTESywcYlk1dkCniCAaOMFgiUJwRwfnKCHOla9P7eIQ RVZzalWuce/9korBz7/tNIwIC/v6rgNLA8SwaUgXDeBI821Hf3FCqMXDdGmHMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724695395; a=rsa-sha256; cv=none; b=s0ZrLRnHWGzF8tHkqQEkW4HfWz066Adny2jZzrcbf964qandN9WtUAC8C2aHtJAWMd/zrm R8QoO46PKo2NOyNaIIkCxGvv5e7NHfUP/v8xjZM4YVx9yuiRd2HSYYHQUcpW+Jrd7882e9 o567KjBTZmNium0x9i+8GN5KOWfLZPq7QPr37rtXwCVPICed27n8/V8qxPlbp0PetFgFjx l5THhChxucGIDh8/dWXHS4xZw46vod1Zjjux2wxlac2+GgW+lOW/aB4KriLETmk3dxa3nX cTLgWcD8WMstEzYEkqGyAFa4LImnR+X/G7FetgLDx0u6Vk6uL65/t6F1Tm8GXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724695395; 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=JbXUaGW4UgbN92vgWHVNS9rMUqNzCXdRJLZVTmlTLx4=; b=fyWk4eUzIuIQYtcAwph2sVW6Br/xZnCchVyvUn5Wt2/OO5AUXKgGWoxSDNGr7ge3//CZ0O +XzuTmrNmY/kjJMLkW7SPDlDbmwa4XQp7PjFOckDDWT83V0VrWl49GZhuFgInlPPnYEUGn UvgwoecbrC0viGYJ4n3VXfpXq9FprQa7BbWQgii/lsf0BOA3s7Ynlc04XQga9TNsKoDIVf /K/hMnmc2Q7GbocX0w2uZl34HW+Ix/Zkzr+HmtdvGRc4Qi/thP7Zc+TMvDBpzCxCweHpa+ SpBn3cfwvdfF/myLg4/T3Op1nffsWzHdby91QI6xLHLZ6mtIF3/fFA6ScB635w== 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 4Wsz766pGszHKK; Mon, 26 Aug 2024 18:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47QI3ExR042505; Mon, 26 Aug 2024 18:03:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47QI3EVj042502; Mon, 26 Aug 2024 18:03:14 GMT (envelope-from git) Date: Mon, 26 Aug 2024 18:03:14 GMT Message-Id: <202408261803.47QI3EVj042502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4846d72432a8 - stable/14 - camdd: Use the NVMEV macro instead of expanded versions 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4846d72432a89614d7ceb3522cf7b5ac0185c775 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4846d72432a89614d7ceb3522cf7b5ac0185c775 commit 4846d72432a89614d7ceb3522cf7b5ac0185c775 Author: John Baldwin AuthorDate: 2024-01-29 18:50:41 +0000 Commit: John Baldwin CommitDate: 2024-08-26 17:26:24 +0000 camdd: Use the NVMEV macro instead of expanded versions Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43599 (cherry picked from commit c9d9315b74017b0637bcbcc2e7a5c01d7bc58bf1) --- usr.sbin/camdd/camdd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c index 4f15aa8eedcf..1f067113c562 100644 --- a/usr.sbin/camdd/camdd.c +++ b/usr.sbin/camdd/camdd.c @@ -1430,9 +1430,8 @@ camdd_probe_pass_nvme(struct cam_device *cam_dev, union ccb *ccb, *maxsector = nsdata.nsze; /* The LBA Data Size (LBADS) is reported as a power of 2 */ - format = nsdata.flbas & NVME_NS_DATA_FLBAS_FORMAT_MASK; - lbads = (nsdata.lbaf[format] >> NVME_NS_DATA_LBAF_LBADS_SHIFT) & - NVME_NS_DATA_LBAF_LBADS_MASK; + format = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsdata.flbas); + lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsdata.lbaf[format]); *block_len = 1 << lbads; retval = 0;