From nobody Fri Jan 19 16:53:29 2024 X-Original-To: dev-commits-src-branches@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 4TGm0B1dJXz56tZv; Fri, 19 Jan 2024 16:53:30 +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 4TGm0970Vdz4BNh; Fri, 19 Jan 2024 16:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705683210; 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=o9bOOiXsnWvZyOWm/w5CgmORR84l/obUr7k+igHPBa0=; b=WKwbJ7ckZ8EXmsClMc2aEFo3N5REPLjdj7rp3/N7jeLPXHF1/zGrS3ptSoYLfJwJ9LBhEV 3PjTOqMT+hqogkE6t0iywRvKb1a8R5XZIdhnrCw5dI2fpd++D0Tt5P/e2x2m00OdLhEFJo tWuWozAFPKL/eznXDbWOV5V+bjbnh0T27DO6/Nw6HmyGNGYIybvQF3krl52AtQsVQPIlGP UxTlHf8TVKrUvHf1P0fk9wGATXuRMQtMrK+asJ2fu+Mhgq+fiE3ChqNXc7U/9V8JtZYad9 rjk2yKjg/+o33VPhA5vPsXerZeP9qjQNyqto9SodBCScb6WnHyK68k0H3MDt5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705683210; 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=o9bOOiXsnWvZyOWm/w5CgmORR84l/obUr7k+igHPBa0=; b=SAaN4ucqQyDvkRT+8Bg+CHkZtneXHQKHZ2cm0C+d7XIhEH+RkqwN+kxOJR5uS5nKYtrVMi /ptSXBjHbMkhOyFOfedajtAg3EeZHgf7jdNEppQ8koR1mTv3CFmy/o2bUPGfLDMJayFg+8 00+pkLCm9/a1ytBdBO4O06BatVc2mld3fo7yo+6bnWnLt3aJlzHRQNwpCf0ri+r8BxJTVf pe3tFwIxTpjwJPCOOxg22s+a/7NslA7oo+Ge1qFmb0RjePUqGSZSdO5EemCEuLQZixWDGL u9NFUwX9IB6QFHAqjqb4Bn0F1o/R5Xq2WntRX3KwFKmS87q2B9HuhxxOjBnfhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705683210; a=rsa-sha256; cv=none; b=WBpwlrs1WaGRBHQfo8Wxn/FaXBy6MrZqtDmnw8sHmonVbnjQbc0HKxbhEA9x8eRxQ9A6t/ LrGcs0Yu7K2Es9j8PDZE4XGlP6ZtuSsU7ehmS/5VDt2eiA8POi7eQJLwGyE82oT+ZnBgjZ J6ZrM4Hhuv+8IJ1w4uugkzl9AT86SR8CHJgt/MgoPTla5uih+c1REuzo+dsu0YfZsQ5RH1 8UqhyXjKWWmMgjpsm6XanORMAR5br3hSxCpzE4wtpz8PBxwDw2b3p5obRF85Z+fNUekMGS 84A48AhDaKHs7hnm9Aao8hqDsMCXvED8HThEq02mx2uFfze4y9YDou4aIlLAcw== 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 4TGm0965yvz105L; Fri, 19 Jan 2024 16:53:29 +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 40JGrThc059942; Fri, 19 Jan 2024 16:53:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40JGrT3T059939; Fri, 19 Jan 2024 16:53:29 GMT (envelope-from git) Date: Fri, 19 Jan 2024 16:53:29 GMT Message-Id: <202401191653.40JGrT3T059939@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: f0275240dc3d - stable/13 - isp(4): Fix reading NVRAM contents for 28xx based devices List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f0275240dc3dea56c498a8e41e56c00761d3a597 Auto-Submitted: auto-generated The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f0275240dc3dea56c498a8e41e56c00761d3a597 commit f0275240dc3dea56c498a8e41e56c00761d3a597 Author: Joerg Pulz AuthorDate: 2023-07-07 21:43:34 +0000 Commit: Alexander Motin CommitDate: 2024-01-19 16:51:45 +0000 isp(4): Fix reading NVRAM contents for 28xx based devices Use correct NVRAM address for ISP28xx based HBAs to read NVRAM contents. WWPN/WWNN and framesize are correctly read from NVRAM now. PR: 271062 Reviewed by: imp, mav Sponsored by: Technical University of Munich Pull Request: https://github.com/freebsd/freebsd-src/pull/726 (cherry picked from commit f76f7fefa1bb5dc2ec0c9e44740faac0b46dac25) --- sys/dev/isp/isp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index 6940397d10b4..eddf175e669b 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -4379,7 +4379,9 @@ isp_rd_2400_nvram(ispsoftc_t *isp, uint32_t addr, uint32_t *rp) uint32_t base = 0x7ffe0000; uint32_t tmp = 0; - if (IS_26XX(isp)) { + if (IS_28XX(isp)) { + base = 0x7fad0000; /* 0x7f7d0000 + 0x300000 */ + } else if (IS_26XX(isp)) { base = 0x7fe7c000; /* XXX: Observation, may be wrong. */ } else if (IS_25XX(isp)) { base = 0x7ff00000 | 0x48000;