From nobody Tue Jul 16 20:37:33 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 4WNrV55ZGsz5QCLd; Tue, 16 Jul 2024 20:37:33 +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 4WNrV553Ywz4DyV; Tue, 16 Jul 2024 20:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721162253; 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=bDY7Ij/z0T3jSwwOXCR9phr1JO2S6so0WNWRSF98tX8=; b=pfSNaniUzvuOAILSdwF7KjC36Jb4Z6K8KVmFI87m6XgocTXfonRnaGEFAYM5KKcrAFjDph ioxHSMpxL9UMp3FckWgKH18t8x6fsqIyCMbI9Ey9MVlDknc4Lhxw78kaUa0Oy/jTl0K8NG zIEXC3Iku2XHMuRyKNObrqQpZq3iJNPkScHzulWb0IKStNNC7qqKjzWTL7JNdm+PRNT+U6 AZr2QZxNVyUBlFGE7hgCkMWjcRfq5JH+wkmygNBVorNYO5OD+ryA4L+AkH8xI+7/Dp/kWs lNo0N1bsI375WBvMRULEGuLeM22xlZbCbFk3QvEdjsXR0pEUWwlil9+zvjYONw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721162253; a=rsa-sha256; cv=none; b=S9BY9xz4SJ67X3ZjkaOi72qoMSS4F8XqOXTaoDPJ+OFdedTgUxOOSxPtg2tAUnmFTeg29Q d5+d7KbN13ZbENxh4LCJKjRsZWqbrMFs1is8KbVaBqfASUOFCxT46slgWMAUPYNocIp7ws 99lm06HlT/565ywU8WZbMRZClsqZwXNMiXdiukcRF7OAmqlzRtCUeHX/tddE6B16l48RnW lIudRU/aPBxxKzYl2WgnV0YumTnqVGs/uOFIAIL/ONEKUPYpS0NSVCeBy8QRlVrg4PA5b6 I9QXrUdSn3Zhhc9L9Zb755AIjHAmtfkJiTr+ECajqC0d4qexemhRwkf6Fg+DvQ== 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=1721162253; 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=bDY7Ij/z0T3jSwwOXCR9phr1JO2S6so0WNWRSF98tX8=; b=FAn2SMqwyarTp0kaXDir0rxGkzcX6NhvbKe20IyQ2cCRnS/+TYqVI5pbuA4kSZktT1bYx4 q/6SEsv9Hxfsocp+1DOMnI9lBP/9CNErr787wwnlFjKYRzEhJWlRAyCrq69M10bpuL0K2b r94Mp7Psy3ksABBpxka8Ej6/EFHcEzgonkhcmr6nrqBR4crXR04z0oFvoXst9yXUDdptwI 1Uguo3vNZlQadE4C9s551B1672j+f9wNWYXYPXKfmSIxvUoBv9b584lTIDdAyqqlCNbRIv 5/oBZLzN/cg0hVW01Czm/zuDKCuOInoIS0zdX921HoQJ53CNNUhIZTuCe+mLyg== 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 4WNrV54fjmzqpq; Tue, 16 Jul 2024 20:37:33 +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 46GKbXJD017787; Tue, 16 Jul 2024 20:37:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46GKbXHk017784; Tue, 16 Jul 2024 20:37:33 GMT (envelope-from git) Date: Tue, 16 Jul 2024 20:37:33 GMT Message-Id: <202407162037.46GKbXHk017784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Kenneth D. Merry" Subject: git: 4c94657e168d - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4c94657e168de3f45a423d65289b349fa7d69206 Auto-Submitted: auto-generated The branch stable/13 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=4c94657e168de3f45a423d65289b349fa7d69206 commit 4c94657e168de3f45a423d65289b349fa7d69206 Author: Kenneth D. Merry AuthorDate: 2024-06-21 19:30:59 +0000 Commit: Kenneth D. Merry CommitDate: 2024-07-16 20:08:52 +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: (cherry picked from commit 137b004e2b7ab504abf98c4aad9d52607df47b9a) --- 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 ad6dbd1e6f76..7246ea8031ac 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.