From nobody Mon Jul 4 14:25:13 2022 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 A5087830315; Mon, 4 Jul 2022 14:25:14 +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 4Lc7PQ1fRmz3MDp; Mon, 4 Jul 2022 14:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656944714; 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=BubWtM6V5b24aLWrhYUYKcqN+3P6P2/Qga9wYJpWLVo=; b=nzIx78BWllvEXse0duSfYh/afNMDu0gzWDonxV6+pLce3r7+K0tAL2BrIrnX77Vky1Jche l1+gzrXqDVFKmSpfbGmvB1RxGnL8p66GCjBMmRavjzXnzJmwvWZul0TQ+5YBUP2UtykKU1 y8pd6wKte1zA30yzP76KXF+QBFxFoF485YQDm0xT4Uq0HI/LEWOzVLsaH/N0WUjcQdY2fU ks9wI6aJTgspi8HA5F4aGHKS7nvLbOEzxZEvN3npwAAH7SrNbyEfTy9v5Fz2OARF3n3mHO JOz/8aNQ/mRHzsBoQlzHK08ohFMUfWHGJNUI58DflSxPFDjV/KAYMUiIqhwQRw== 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 1357412E8D; Mon, 4 Jul 2022 14:25:14 +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 264EPDEf064139; Mon, 4 Jul 2022 14:25:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264EPDIF064138; Mon, 4 Jul 2022 14:25:13 GMT (envelope-from git) Date: Mon, 4 Jul 2022 14:25:13 GMT Message-Id: <202207041425.264EPDIF064138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Kornel=20Dul=C4=99ba?= Subject: git: 665482590757 - main - e6000sw: Fix direct register write logic 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: kd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66548259075788d2084e9da1c5df7b88f44c4b4d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656944714; 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=BubWtM6V5b24aLWrhYUYKcqN+3P6P2/Qga9wYJpWLVo=; b=wHvvldcIXJlTtfqnTRXkurqnPyMZgqs2BGAAzeK6xJJ5aqMWX6gtF6ky19wHzFwERVtYxi bo6tGkOShwuNmSwVYElQNQUhOrlVJ6jG/6cKC7gudhmsdNZvRV+SrAqSp7HIbHSEXFSsX5 Ox7U1TSi6DRq6SgOU9WU9tKAow9uLW23YG69MyarNLopmOn+zvM5RcyCJbM69lleXxeX/0 yP8ivUuua9BhY1teP2xRbsIR8B6dXOcvb5yJHLBKi0r/HAtEIr8vJv/lYvoYN3wYr8f+4T bX1LZEpwF6AUbC8Z+xp4W9w4SxFfpLxMCIcOmcP4AVlw/ntTEpM+QWU2Pb66fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656944714; a=rsa-sha256; cv=none; b=GY9S9o1ZWp8HeJja7z55b7v0VQ+SGv84ivcT1nr07Fg6SvA+3dRVstw+hUEKPIxelXKNbl 16+3BFGgLyhUmdjUzV+KXaAI53ndSIrzxUKQAXZuz1diNsUh/N0AY+zXflLR1xDAhoeqSn wGZc5yWDf4oY24RPtQaC0gEISzKB4oudUWppnriZhXuN+FRI3VXK3QWXjvSyD6bX9YHn6O uj2hvCh3zePiNO0Ii9zOtgn5pFHVJeVkNYaNYPPiCStgj6yySrMGScEKZCW+12QdugIZ4l HQEmeYKnJXPEaZmKLs2HZUiDa0uZ8dpsRcz3SxKzic+FonAX9U/K2adFNN+pkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kd: URL: https://cgit.FreeBSD.org/src/commit/?id=66548259075788d2084e9da1c5df7b88f44c4b4d commit 66548259075788d2084e9da1c5df7b88f44c4b4d Author: Kornel Dulęba AuthorDate: 2022-07-04 06:53:41 +0000 Commit: Kornel Dulęba CommitDate: 2022-07-04 14:22:22 +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 --- 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 3c0ede5cddcd..7374fe2d74e5 100644 --- a/sys/dev/etherswitch/e6000sw/e6000sw.c +++ b/sys/dev/etherswitch/e6000sw/e6000sw.c @@ -1061,7 +1061,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);