From nobody Tue Jul 19 09:57:50 2022 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 4LnDly5sprz4WvTC; Tue, 19 Jul 2022 09:57:50 +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 4LnDly5CPLz45dL; Tue, 19 Jul 2022 09:57:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658224670; 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=eqyO/KXW3/0LGGsyTk6HaqHMjXZQCvLTrwHQ/TQi0Lw=; b=SFka/qA1uiRB6omj2t4WadUg6JbEshWfycEy5OhNOgGvN/JBs+py/sBRxw+oEKxg9XR7oC UX69s5VDIWJACu8+SEkACXaUBfKZfjGuFxLsVTWRcQgTnOr8P2WDsw77ufCZeBYFKfcBsc jfmR0BuewAUBY2snA6BPewh0yYEwrngFN0cl1TWHCPN/lu8hJW79Dn6i0eXiHeEQfSi19C 1ERq6sto77eLGgevItqa2ltBzUWDlRgunVogqoea60WdTDsP0+X7oUXF3R+9tNLc/wftZY oq/40KwTc5ySQEjk4cjZBBFkVhqfOQCJkRCSAjhy9WKlxzMnIpDlavhnQOOIiQ== 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 4LnDly3mY9zFNY; Tue, 19 Jul 2022 09:57:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26J9vovh012994; Tue, 19 Jul 2022 09:57:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26J9voAO012993; Tue, 19 Jul 2022 09:57:50 GMT (envelope-from git) Date: Tue, 19 Jul 2022 09:57:50 GMT Message-Id: <202207190957.26J9voAO012993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Kornel=20Dul=C4=99ba?= Subject: git: 0627a69cd8ed - stable/13 - e6000sw: Fix direct register write logic 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kd X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0627a69cd8edd010eb3eed655df1698e0ff00d51 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658224670; 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=eqyO/KXW3/0LGGsyTk6HaqHMjXZQCvLTrwHQ/TQi0Lw=; b=ySvZrQB7Z5HFIKDMmxNHHMc42YhHg4TySZuAo/FGVNEWHtXQCk23Nz28Tx/LugcLBSFDw1 BlbT6TpT44UYSjvxzAbCpubU0tU3ZpEyRrcgVXGX+Ga+j4HwqUHYtlsxeZjW+yU4e3GmHf ec91D0iebwkrILmFlajmZMyCN+LUqafhVqG/rhM9R3bEYa2mDZRI4vD76c8gsxSl48N345 fIvrX8uU9wecGQYFbuWeiKkH3H6c55RSE6Q9PI7O3j8RsPKzxvFhTd4Ws/XwQK2k0Mf05g +7iOVTo9t0IE6qF7/SXW0KuLUhvfqmkpg4Xg6OzPBePr3o1ZZxHTX5DlA2z9cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658224670; a=rsa-sha256; cv=none; b=Qn9qT8sgNQPVRKCsv4/yLsbcC/ecfbddG6wYW6TZPz9q5R1eMSZhUS2wjrD/XeC/mm72Zb rd0fa/j5ks8bdHRA2/eTuiiQBjEpzpxrLxUhJ02SymEc5uvhfpFwyGK6mcWatcc26NryZ6 MZwyYLLjgCmT5hCCknEC1IhA1HFKtKGzVuckHs/TM6DlpFBuhJmoX6B85EZ8ujYdJWGtHE cXjefG1PBvJDokS2r/Ytfw7mLv6Y06bjRCDzhRYPioJiSMRY02UOjrppELd/Lsk0jxjHKs 0k/GXurgLuxpdYMm1hAFHMu/cbtTZn2Yl8V/T1ePVUdgvX7aj2yw3oCTiiw4Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kd: URL: https://cgit.FreeBSD.org/src/commit/?id=0627a69cd8edd010eb3eed655df1698e0ff00d51 commit 0627a69cd8edd010eb3eed655df1698e0ff00d51 Author: Kornel Dulęba AuthorDate: 2022-07-04 06:53:41 +0000 Commit: Kornel Dulęba CommitDate: 2022-07-19 09:36:55 +0000 e6000sw: Fix direct register write logic When accessing a register directly from etherswitchcfg one must specify a register group(e.g. registers of portN) and the register offset within the group. The latter is passed as the 5 least significant bits. Extract the former by dividing the register address by 32, not by 5. Approved by: mw(mentor) Obtained from: Semihalf Sponsored by: Stormshield MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D35672 (cherry picked from commit 66548259075788d2084e9da1c5df7b88f44c4b4d) --- sys/dev/etherswitch/e6000sw/e6000sw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c b/sys/dev/etherswitch/e6000sw/e6000sw.c index 4803e200e8fb..81abcdf5d03c 100644 --- a/sys/dev/etherswitch/e6000sw/e6000sw.c +++ b/sys/dev/etherswitch/e6000sw/e6000sw.c @@ -1031,7 +1031,7 @@ e6000sw_writereg_wrapper(device_t dev, int addr_reg, int val) device_printf(dev, "Wrong register address.\n"); return (EINVAL); } - e6000sw_writereg(device_get_softc(dev), addr_reg / 5, + e6000sw_writereg(device_get_softc(dev), addr_reg / 32, addr_reg % 32, val); return (0);