From nobody Tue Aug 08 08:06:41 2023 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 4RKm421G84z4TsZZ; Tue, 8 Aug 2023 08:06:42 +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 4RKm420GFdz4J8B; Tue, 8 Aug 2023 08:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691482002; 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=pkbXIYrgrxz51kzJviERiiYE98uRUQ9zP185DLQG9hY=; b=Lk93S5v4gsAUFQVjUjV1KMGf3S/mfYMSS1QmLMQ2/zJ/bJsNK5S+L8tMH1SEdkHQC2IepR BhIeyX8RfEldnC71fJBEaZE9vJ8aPucoRW/6pk9ud6VZDahyINauYLU9yEUcP1/G0ykcYF jwmUt/CWj/XX6zovQtk6oGNkd1vjj0GB8qh7WTKE/Ju61pCwGZaASvxCxBbMhTGMULZIve ChzK+KQdElpwKHCBZjSKDHtoPRNWHFWTZuIPrT+muuK2MAyMJnJ2koyavMkihWtA5MUpck tGVOemZheXBVymuNPv3M7lcOY0KkYRO8v9woT1VgXsFtkj+lV8ua8bmQqr43tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691482002; 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=pkbXIYrgrxz51kzJviERiiYE98uRUQ9zP185DLQG9hY=; b=uKJeYduxo7w+3ktb+9SRlu2Gcn9NJt789xcNOQJMr2iiMkqxtZrbd09CsCT9iBfYqGLZlv nYZgGApu7oZx1MfEZ9xR78hpJM7JDLjuIejlfmx5/MCy5BPuMUw9mmW9J8b1TCTjzjA//Q m2V+gUlH4qyL9BpKmFWw4y4FG4RIlyGHSy2leU8Ck9uq1LZCwP4Ri3XZwg9DjY2vv7xX1c 8up/dXLGDJb6bUfpqBDyBRzRS98HRsw/If9i2KkHOtfPTbiQSFQPNezQXSq36BTm68YnKW 0nmZzR0poEhvtdsuXDi30nYIO/kqa4LstVj4NuNhGr917AeNIsebbsMTSz2zsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691482002; a=rsa-sha256; cv=none; b=R+/7bOxjBUJO7PGg527zLte4wCqC7ELENr1EYHAq7Nz7cyMHsr2VpvSZxkgUiZS87/cH9v cakyZxA7b4PK/k/sUxBBZj2w+C7LFx3rhqDWU4yaDYe1767pO8RM1epN7ym5BGhZeSRLw9 +oLm6X315UgvP5iaaeu0U+jwcCdMhcaZmXwlJt8frJQBGrKkJl/ImgNA6zTj5a0iL6VArd D9oLEZ6Aqrk10DF1xqD73Bs8nKXb8ZbigaOhHh26FDBp1KrQnxjxwDElCHC25JG96n+qBF O3hzV3GE1MrlBsVDqkXeU1UpF5dfeUsmEN4cMOrCXiwsMVrMEtQDunl7AAmyug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RKm416KF5zBNn; Tue, 8 Aug 2023 08:06:41 +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 37886fRa092162; Tue, 8 Aug 2023 08:06:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37886fdo092161; Tue, 8 Aug 2023 08:06:41 GMT (envelope-from git) Date: Tue, 8 Aug 2023 08:06:41 GMT Message-Id: <202308080806.37886fdo092161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Zhilin Subject: git: e0bc8f8da2b3 - main - etherswitch/arswitch: correct version detection 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: mizhka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0bc8f8da2b3f40b74925a28c2c7f4236bd94c3f Auto-Submitted: auto-generated The branch main has been updated by mizhka: URL: https://cgit.FreeBSD.org/src/commit/?id=e0bc8f8da2b3f40b74925a28c2c7f4236bd94c3f commit e0bc8f8da2b3f40b74925a28c2c7f4236bd94c3f Author: Michael Zhilin AuthorDate: 2023-08-08 08:02:09 +0000 Commit: Michael Zhilin CommitDate: 2023-08-08 08:02:09 +0000 etherswitch/arswitch: correct version detection During porting of etherswitch to NetBSD mistypo was discovered in Atheros switch version detection. Reported by: Hiroki Mori yamori813@yahoo.co.jp MFC after: 1 week --- sys/dev/etherswitch/arswitch/arswitch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c index f22b8da55288..6a95c7a8ad80 100644 --- a/sys/dev/etherswitch/arswitch/arswitch.c +++ b/sys/dev/etherswitch/arswitch/arswitch.c @@ -126,7 +126,7 @@ arswitch_probe(device_t dev) /* AR8xxx probe */ id = arswitch_readreg(dev, AR8X16_REG_MASK_CTRL); sc->chip_rev = (id & AR8X16_MASK_CTRL_REV_MASK); - sc->chip_ver = (id & AR8X16_MASK_CTRL_VER_MASK) > AR8X16_MASK_CTRL_VER_SHIFT; + sc->chip_ver = (id & AR8X16_MASK_CTRL_VER_MASK) >> AR8X16_MASK_CTRL_VER_SHIFT; switch (id & (AR8X16_MASK_CTRL_VER_MASK | AR8X16_MASK_CTRL_REV_MASK)) { case 0x0101: chipname = "AR8216";