From nobody Fri Jul 7 21:47:54 2023 X-Original-To: dev-commits-src-main@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 4QyRpM4NfYz4m8XK; Fri, 7 Jul 2023 21:47:55 +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 4QyRpM19NSz4NC3; Fri, 7 Jul 2023 21:47:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688766475; 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=nocKlERDJgouxSJJq6/4QWXtmv/3m/NzcACGMPabaxw=; b=psOpn4iYWAalHtyMlCm9OxTTPlJj+IFCBOE/MaeZQMvQmx/haePt0Yr2MNTBbqskMDVZ4O q+rxA1y25dpEjkgjy7Jpo/1Tzk1GKlj7ZeC3PVajJWJwqSD84MdTvGOxnMOTW21ozfGrQS j8gWPlL1J2xT718otZwYtYdZLd0DeMVC431ldTnXFxW7m96a2LNULMpdvVKVECHxaVkX/1 P9ZolyFPOjE7MFMN8U2x3VGjtWCMVhB2gGJDIcrzgPJDw4htcRODagL7EzkfBELbWdfWF6 aNmNyUx3hNRFDXaw62LjC/q+E2Pm2facuB8QINXdBi7+V4I4nkiRSfy+UTqo8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688766475; 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=nocKlERDJgouxSJJq6/4QWXtmv/3m/NzcACGMPabaxw=; b=bL62mihRCJIp7mgvV5Mrc/huvuolPyY6Q+IiR7gdu/S9QCphYldt/nz1/bE4DjaCS/8s9U SqSgpM5QIiVZqWEHrAfbVxzbp0u2zYglW+W7OlnPda1ROkH3uzevlPwf32WHekmmUn4MZw nVGadBD83VWAtFe3fkjuUAjP0LznMRZXnnRmAyZhJEx/+Oxcc7Lr9owryrowzlMWiegWt/ qi55miu55Q9V3Har3DRSM7h3mxxoXsTlIZ/WAMtdsgoV0dYMk2JZogW9DYCIF8oJ1u0bcX ODKNhfYDrvKbE8ohgbq3OIKVkJqTN3RN4HQST0oWUQGGw/seGVd/xckbqhWoPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688766475; a=rsa-sha256; cv=none; b=n736e1+f94I0ZkhnwWk0qZ7MhjXT6Mf2F9nMq8MlrpMQrAXQFPFzsn05YdPthO9XuyAZF6 X89h6U095OASSdjrYlF8M97yRfV3fDA5JwerykjTrRuuu4du7y2nsJyNIAVCHD+47mwWPP PFgK9S+dnjMJ+HrEGTdqzvxGX3rsfNvkYi+MrItIq6qBFb4Z6K6LSea6GW8YFzqGiZpcOj wNL8BQjHaSDGbf3BS95X+cBanLCXQ4FsLmiRXR987sV79j3rxXsMCQsDP+oChZHHwQKJl3 xlrhYsX1pLuN3MXSWFjV0J5QO8hnqqF/UZ83EpaCsCpra4ykNaAFsFuC98CFmQ== 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 4QyRpM06sXztsP; Fri, 7 Jul 2023 21:47:55 +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 367Llsjk094569; Fri, 7 Jul 2023 21:47:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367LlskM094568; Fri, 7 Jul 2023 21:47:54 GMT (envelope-from git) Date: Fri, 7 Jul 2023 21:47:54 GMT Message-Id: <202307072147.367LlskM094568@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: f76f7fefa1bb - main - isp(4): Fix reading NVRAM contents for 28xx based devices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f76f7fefa1bb5dc2ec0c9e44740faac0b46dac25 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f76f7fefa1bb5dc2ec0c9e44740faac0b46dac25 commit f76f7fefa1bb5dc2ec0c9e44740faac0b46dac25 Author: Joerg Pulz AuthorDate: 2023-07-07 21:43:34 +0000 Commit: Warner Losh CommitDate: 2023-07-07 21:45:30 +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 --- 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 17163c3c4cbd..46bb40c0fe07 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -4380,7 +4380,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;