From nobody Mon Jun 24 20:49:46 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 4W7KpM0rhcz5PdcW; Mon, 24 Jun 2024 20:49:47 +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 4W7KpL5lrMz43fk; Mon, 24 Jun 2024 20:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719262186; 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=bTwcNVCPoy4Tc1BryogoxUVg2evk2qLgltOiAgnvPHI=; b=GlaL5BASjlT+xKOVeqygZ3EbLN2QSdd/wc8n90By74p2ki37//d/GgoTIQyDx0Qj5qpfJ2 0chjByMm0SrUizfuFocDGGd5O7a0XPHNV6aQ0xRK0D+9kvMITjmJ2/8rcOiKbhbPylzTuK gG/0009MzA66Hvw++aPzkvrRxv7q7w5x6mpCkwI2tUlmOcLnmfCdc8S14aDTqSK4Sdr0Uk C20xmvAOskRJEmkT8Ty8MjhsjmRuOB64l0uBbRDCJ/wNklNhrWQYoSJsq3g98e2rPcaZKb xUzXBTI+q2V3+itVC3O6yHmSZBefhTiOL3jwv3scKFqV/lyiDJjNejcX9c10yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719262186; a=rsa-sha256; cv=none; b=JIY4HmFtBfO2AnHkhL0BCDWqxuLy3OR2f+EU4rwjhTtK4ZfLCwnzpoO0DvWUD8lsuR6qPy NuzDRrZZ6GZTC34XljO5eTv8L15clG9m72mnzY5+FnsjBlRzP9IjuPA+PyjZ1gsuzM0FWc mLznPoqpKM/rzf295YMvaffuaGNvEVp8lBeFCurZ9GKHgGZ6nKjU67X5qYlxqCWmtYteUF rvqzduslU2OFjxToql/fvsBixTgHcEyUBndvU1IIxKCrD7btRA4+ViFumYjUI5jfDgxOCa oQzWbTl1eiLSB7lbJr0zJNIEaK7+SeUox+PVcByP/toOVj6lPiSqmJXqESDimQ== 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=1719262186; 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=bTwcNVCPoy4Tc1BryogoxUVg2evk2qLgltOiAgnvPHI=; b=C5U2km1TWNyH8gGGF2MBP9YxOrdBhuY6FRB7d2GdhCDUut6l1FlQiFvtDOTy4GTTHvcY/w ulUhJmUvvBTV8vR1wQ/neUdoWrdbBYpMZupLnlpxJd713mRFWnz9RUrDIrfCbrfDPaZs6z kv20MIBd8KMAxFOzGtGcmzxGcLhANrmd0MaF/EgiTNbrxJXqoLWlpd2RjUUtWlqoTIjDA9 60SpcHNiFydJxEU42lZ5FtyeiKG7FDi6KVmf6zE6QO8Fg7hzE1RnbqYZxOmh+qoU2ENAnl ftBKMY5cRnLko+PKguNZqYFO1440c/Ui/mw+QIXoUv5m4NP0LWGXX6g0uW7CCA== 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 4W7KpL5JgpzYhX; Mon, 24 Jun 2024 20:49:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45OKnkQf001391; Mon, 24 Jun 2024 20:49:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45OKnkMn001388; Mon, 24 Jun 2024 20:49:46 GMT (envelope-from git) Date: Mon, 24 Jun 2024 20:49:46 GMT Message-Id: <202406242049.45OKnkMn001388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Kenneth D. Merry" Subject: git: 137b004e2b7a - main - Fix the isp(4) driver with 9.x firmware. 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: ken X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 137b004e2b7ab504abf98c4aad9d52607df47b9a Auto-Submitted: auto-generated The branch main has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=137b004e2b7ab504abf98c4aad9d52607df47b9a commit 137b004e2b7ab504abf98c4aad9d52607df47b9a Author: Kenneth D. Merry AuthorDate: 2024-06-21 19:30:59 +0000 Commit: Kenneth D. Merry CommitDate: 2024-06-24 20:47:55 +0000 Fix the isp(4) driver with 9.x firmware. The isp(4) driver (and ispfw(4) firmware) previously only included firmware for Qlogic controllers up to 8Gb. It recently gained firmware for the 27XX and 28XX series controllers along with improved firmware loading capabilities. The 9.x firmware available for the 27XX and 28XX controllers in ispfw(4) adds login state for NVMe devices in the top nibble of the login state in the port database (isp_pdb_24xx_t in ispmbox.h). This breaks the check at the end of isp_getpdb() to make sure the device is in the right login state. As a result, it breaks device discovery for many (perhaps all?) FC devices. In my testing with IBM LTO-6 drives attached to a quad port 16Gb Qlogic 2714, they don't show up when they are directly connected (and in loop mode) or connected via a switch (and in fabric mode). So, mask off the top bits of of the login state before checking it. This shouldn't break anything, because all of the existing login states defined in ispmbox.h are in the low nibble. sys/dev/isp/ispmbox.h: Add a FCP login state mask define, and a NVMe login state shift. sys/dev/isp/isp.c: In isp_getpdb(), make sure we're only looking at the FCP login state bits when we try to determine whether a device is in the right login state. MFC after: 1 week Sponsored by: Spectra Logic Reviewed by: mav Differential Revision: --- sys/dev/isp/isp.c | 10 +++++++++- sys/dev/isp/ispmbox.h | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index b53171add5f5..2ed56c5e40bb 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -1539,7 +1539,15 @@ isp_getpdb(ispsoftc_t *isp, int chan, uint16_t id, isp_pdb_t *pdb) chan, id, pdb->portid, un.bill.pdb_flags, un.bill.pdb_curstate, un.bill.pdb_laststate); - if (un.bill.pdb_curstate < PDB2400_STATE_PLOGI_DONE || un.bill.pdb_curstate > PDB2400_STATE_LOGGED_IN) { + /* + * XXX KDM this is broken for NVMe. Need to determine whether this + * is an NVMe target, and if so, check the NVMe status bits. We are + * probably missing more bits for proper NVMe support, though. + */ + if (((un.bill.pdb_curstate & PDB2400_STATE_FCP_MASK) < + PDB2400_STATE_PLOGI_DONE) + || ((un.bill.pdb_curstate & PDB2400_STATE_FCP_MASK) > + PDB2400_STATE_LOGGED_IN)) { mbs.param[0] = MBOX_NOT_LOGGED_IN; return (mbs.param[0]); } diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h index c6ac9d9ce971..978ed4dc1638 100644 --- a/sys/dev/isp/ispmbox.h +++ b/sys/dev/isp/ispmbox.h @@ -890,6 +890,10 @@ typedef struct { #define PDB2400_CLASS2 0x0010 #define PDB2400_ADDR_VALID 0x0002 +/* + * For NVMe, the state is the high nibble. For FCP, the state is the low + * nibble. This appears to have changed with the 9.x firmware. + */ #define PDB2400_STATE_PLOGI_PEND 0x03 #define PDB2400_STATE_PLOGI_DONE 0x04 #define PDB2400_STATE_PRLI_PEND 0x05 @@ -897,6 +901,8 @@ typedef struct { #define PDB2400_STATE_PORT_UNAVAIL 0x07 #define PDB2400_STATE_PRLO_PEND 0x09 #define PDB2400_STATE_LOGO_PEND 0x0B +#define PDB2400_STATE_FCP_MASK 0x0f +#define PDB2400_STATE_NVME_SHIFT 4 /* * Common elements from the above two structures that are actually useful to us.