From nobody Tue Mar 12 21:58:30 2024 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 4TvSFg1vvKz5Cc5J; Tue, 12 Mar 2024 21:58:31 +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 4TvSFg15V0z4j6w; Tue, 12 Mar 2024 21:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710280711; 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=jjo1dn33qfrjJJjM7tg7t+uAs5Pm9vayjZJ+SLqpUtU=; b=qkS0GzOU0tyXE3/kv4O8hJRSWq+3XST1ReWpywwhn2okeHbPTlu4eaGQaBUlrC5tUnyRt6 4Gbk2Ft38ARQx0vlzz6w7JG5+GDPSOCQyuAXPGFFPVPqnPSEv1r2OTHmHd2jMNHWtg5t2e sZdQ96h/wz2n84wZA/aiMe4P3sl0wEoVmHZsZ6C1lpRbwolig7JEqTyalsKEhmvsCTUyuw KKTIFDrSTyRC7IYSBQu4Wqwmx5pruYa1lQ3jBlLJEXiJxcBiLmiBKpV3qa/SwJfPJggr/g 4HQg+awfsR+GbTr0L709HwyhqXt4101inCMput1QdRuDbM8W+7jfS2P3jMfA5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710280711; a=rsa-sha256; cv=none; b=yvvo58qfOkkvgQazEERXyhvd68aTDut6b21WNPPg7pkD7xHWuQEwlvCTUP6DujFZBoea72 Wz/YPlgjnRFOwr2CeT6QsopHXPZPtXlpx1BL3Dmx4f67cc5j/6fUEhrFzZeyGKWyfwFZK+ up2kpXSAFcwYff12cdCYLdG5VRJY0UssPLXtIS5FtbAaEPgQ2ckBaz1hIEbnxYCfDQOnHv H0/xwbwlVzxky2lOdpGs8zSuGWCjh/wG4oF5W90z4Y2IJ97sFwLVlWX2892bgogKTiNTQH XSVeSO85Npv0wwi9S0O3kNjhdk0B2QjuL9/Qi6RCx/GRFiL+BSwn45eU2YKPdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710280711; 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=jjo1dn33qfrjJJjM7tg7t+uAs5Pm9vayjZJ+SLqpUtU=; b=p6KRRbmtQ2hK85uWxOrm6UnkksyfjOiiwUt1waIMmupH5Xvsa9gC6cpoN9BlBXrmXkgZ0a RLGsNLxRiL4ozzepuBqtKkT0H9E08sqHD57HC5XhTVNhlJGQhXaUESiPy1Yzr/Hbum+eGv OcBhAB/V93mwhFf7HM2ZDzcBjmH66XCn3M1DMa6zScfwuzqUef8xdlCFbnQpisgyxNb0RX ou770eQmxsF43DT1gMpvL1oREf2vyRY14RJZpHw/e2R0ZGQtcQM4D/REDfYQgIUxJED5ik +XQHYIbdtFwl2WERA8enoloRegkV4SPzG0G3yUVqHgwL0rb+ZEm+cr1qsLnXEA== 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 4TvSFg0ZSbzFxF; Tue, 12 Mar 2024 21:58:31 +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 42CLwUnd010614; Tue, 12 Mar 2024 21:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42CLwUcU010611; Tue, 12 Mar 2024 21:58:30 GMT (envelope-from git) Date: Tue, 12 Mar 2024 21:58:30 GMT Message-Id: <202403122158.42CLwUcU010611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f254aad33dfb - main - ath_hal/ar9300: allow JUPITER cards to read eeprom 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f254aad33dfb5ce18b6b97b7d036b420310e9ed5 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f254aad33dfb5ce18b6b97b7d036b420310e9ed5 commit f254aad33dfb5ce18b6b97b7d036b420310e9ed5 Author: Bjoern A. Zeeb AuthorDate: 2024-03-12 21:22:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-03-12 21:56:56 +0000 ath_hal/ar9300: allow JUPITER cards to read eeprom Summary: In ar9300_eeprom_read_word() also allow JUPITER cards read the eeprom instead of returning an error. While this will not help all the 9462, 9485, 9565 OEM cards to work, it will make debugging of the next steps a lot easier. While here fix a typo in the error message if we do not get CAL. PR: 255337 Tested by: John Nielsen (john jnielsen net) Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D44328 --- sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c index 0251222c50b4..073428c8fa71 100644 --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c @@ -225,7 +225,7 @@ ar9300_eeprom_restore_something(struct ath_hal *ah, ar9300_eeprom_t *mptr, HAL_BOOL ar9300_eeprom_read_word(struct ath_hal *ah, u_int off, u_int16_t *data) { - if (AR_SREV_OSPREY(ah) || AR_SREV_POSEIDON(ah)) + if (AR_SREV_OSPREY(ah) || AR_SREV_POSEIDON(ah) || AR_SREV_JUPITER(ah)) { (void) OS_REG_READ(ah, AR9300_EEPROM_OFFSET + (off << AR9300_EEPROM_S)); if (!ath_hal_wait(ah, @@ -4319,7 +4319,7 @@ ar9300_eeprom_restore_internal(struct ath_hal *ah, ar9300_eeprom_t *mptr, } #endif if (nptr < 0) { - ath_hal_printf(ah, "%s[%d] No vaid CAL, calling default template\n", + ath_hal_printf(ah, "%s[%d] No valid CAL, calling default template\n", __func__, __LINE__); nptr = ar9300_eeprom_restore_something(ah, mptr, mdata_size); }