From nobody Mon Apr 01 23:47:28 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 4V7nk91jpGz5FRSH; Mon, 1 Apr 2024 23:47:29 +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 4V7nk85tSqz4QCf; Mon, 1 Apr 2024 23:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015248; 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=ODACNkdORah275F8Pl9m8KIKT5WcX29f5kE9A3ZGPYM=; b=x2xnQuCrbgog29Qb9XM+S/wciFgxt2dNRr0heDKzpPGMOOC358oilWsLEXA02MFSQHP1tF bNCpWd6IjBXCFzN9BmZHiD4oZrr8eGtYJ2Z6wSSs6CMd3WxCZq280SurRQpscSKF9Dy8Gm m/iaYTOXnWUrr9TEpQiGYD9Qh/ww07uI4MHHZsRP8sHhOG2+FyCsZVbx6ff4AE8CW3O46s 6ZeKeYo+BVavVDQh57NEwm2bGgy1Rif+YI/CcPZgWPzyCVILVj/u2c7zjwuMUDpzLOZ/ez 9dPmwk727ohqqypg6kWAn/PwyH/R2o/cX+24/dMpIqukiwsdAg2cZrC/IwnOcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015248; a=rsa-sha256; cv=none; b=BZACSUnSCL4CZ/5iZHLy0gmoDqfXOCuf1mT6ZFjSvP1RFwMtf8HUMiMLUgnTIl2KDxebhG DdxVnLYlHtWkmWpArg9r18tPmo0TitJKW8JivNZErDuQs1r5hhYOBD+VqiR3GN9l44XPuc 6DqBq/b1+NE7/Y/nZEHRTJef2jf5VnxZkRKu7cW22UOSrQbEGpwhIvrBTNN17huDo6QeCT GPneMHpYSXNQzTM3moSvRDNEZKBzEwZFMSqvd5IZ0dRSXrCDUv2XiqrfJ4TqXMWy7CrG5h w0S0fRosgS7PmUiuYnrvLQCug5HnNg5LRPJWjnZ+FTARCmCLjviikh9Zu5iWRg== 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=1712015248; 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=ODACNkdORah275F8Pl9m8KIKT5WcX29f5kE9A3ZGPYM=; b=VALqJ7XJzRXwZ515ab78unWHAJrBcp7tihDAuVpqrcTNHGNrgtVVa9XL8OmawIzOISkbXy ZqjWvBQPHSExzIynFOoOgQ2WDIkeXBjQI8Ipf9/43H9exoTRPGp/nBeWLuJTa30ZiMrOTc R5zc8xCEnG6Z1m8nB7VEdlc3AMdWplII1f91xis1nksGXMXXXGpAspXvy5zUHpLUFBatOk P+CwjqLlld6t1w9NzvFk6WhTW91w6uIatwal5ToTQ9r4yKDdh0EYw7VvRq4N58OTov2SFD uJqO+uzmQJK8NxRuZXRKAudCDqFfUgC/BD6bUhRS2P3MbC/5CxfRx98NHxm+FQ== 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 4V7nk85VbmzR5J; Mon, 1 Apr 2024 23:47:28 +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 431NlSFv083948; Mon, 1 Apr 2024 23:47:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431NlS2g083945; Mon, 1 Apr 2024 23:47:28 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:47:28 GMT Message-Id: <202404012347.431NlS2g083945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 21b6420f67cf - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 21b6420f67cff32e69452a7e3822af37659eb4b8 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=21b6420f67cff32e69452a7e3822af37659eb4b8 commit 21b6420f67cff32e69452a7e3822af37659eb4b8 Author: Bjoern A. Zeeb AuthorDate: 2024-03-12 21:22:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-01 23:46:10 +0000 ath_hal/ar9300: allow JUPITER cards to read eeprom 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 (cherry picked from commit f254aad33dfb5ce18b6b97b7d036b420310e9ed5) --- 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); }