From nobody Tue Apr 02 09:53:55 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 4V839v5M5mz5G9hg; Tue, 2 Apr 2024 09:53:55 +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 4V839v4sMqz4bsC; Tue, 2 Apr 2024 09:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712051635; 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=VheO/VpcUe6z6l0e4/3tPkX6FCVZJkW41rxI9Rpy+Rg=; b=ASkxQW2O8XFhzoUa9d0KqR9ipbDCa+2JEeqgYTmHHM4Si2SU2nlz7ZS4qXP+Zh9GmBarQH H1Uq530jEACCYLZVNz0+ImKa2EPBMdSr0D1Cof/xexAba2djYg2ddIvkBdoDvd6iKU4TKM Xa5CDQJ8+JDprjmjqATZ+I6qu/P+VQDTE45eqH2KSWFryJwOOlUizZFmZ0TjCon1ZF/j3w MKundY2FCiDcVXM4LFCJ4yGvisGUeQISGHgkWzMssvTJ4mMiyRc6JJGznGppifBDa1FDVR cqezOuZvKlGAS0WRCiR/A8pMl8z4f+NO/kaMsUclSyMekrpjR+nGa4KS6NafQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712051635; a=rsa-sha256; cv=none; b=S6o6SAeHRdwM32Dez4a6HFhGTRG6qvgpA/yF/u1lC1uZsPYltvaUz/pJ7pkxaJuui4f5At LAQs087k/aFFMBgfOm8oa8lui8sli+AUoUWplI3ufVVi+Pb8PPf5sh1AGEqna6Ih8Gibux 9I/ndk/uWdbDTzPjtY1I5jJOOotYy4LIQ9gESGyPXNeRWm0gvGpjQg3ZZr2Tc5Urpz+UZi 7aCsNxdx3R/uct8P0lxvG6DBgfvv5KxZXb+RCf/jdF0bh6t2LTpPJpRmn9WbgKdRzHtTeA o17hy9abt+nwGFggYtEh880KLZ10w8zjfdFmJfhSKq0+RZwXf+MTQrZqSiL6fA== 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=1712051635; 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=VheO/VpcUe6z6l0e4/3tPkX6FCVZJkW41rxI9Rpy+Rg=; b=TiAB328w+jDmWxvpQdg9x3xuqa0425ncLols2LIcmsY5moSsBMfOjYO0Y/D8z54Z3XfLqM wgUuwbQbyktezxtsIlZ4Fsc+8yYdRIPKuecfjXx6J54dkmzHKa8tqW9+FSXN8hifE9hmrP E7ZMP2ctIcg1JEYe2fxFeVSEGDcXp3U9QOT2lfRJJ/WMKumgq/8O6I2a3V/yyl1u/OuPXq msmVJYFnoH5bBxzUCDj8AOE9EGC7lWWZeE3jTqoJgtuHGnUEmaVREOWXSZyByhgIi+tYAf Kknfa6Yq5ftSfPIL0geLMAAw4RXfoYc94a4FVUQMd6bMuLxy7DBeg+YgiQMCeQ== 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 4V839v4TQSzlQ5; Tue, 2 Apr 2024 09:53:55 +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 4329rtKc015551; Tue, 2 Apr 2024 09:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4329rtAh015548; Tue, 2 Apr 2024 09:53:55 GMT (envelope-from git) Date: Tue, 2 Apr 2024 09:53:55 GMT Message-Id: <202404020953.4329rtAh015548@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: 465e5f1b8b80 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 465e5f1b8b80bac313e83b4e62d7c532ffb320d6 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=465e5f1b8b80bac313e83b4e62d7c532ffb320d6 commit 465e5f1b8b80bac313e83b4e62d7c532ffb320d6 Author: Bjoern A. Zeeb AuthorDate: 2024-03-12 21:22:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-01 23:52:40 +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 Differential Revision: https://reviews.freebsd.org/D44328 (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); }