From owner-cvs-src-old@FreeBSD.ORG Thu May 5 03:42:17 2011 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90E8A10657E5 for ; Thu, 5 May 2011 03:42:17 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DD648FC0C for ; Thu, 5 May 2011 03:42:17 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p453gHqF094744 for ; Thu, 5 May 2011 03:42:17 GMT (envelope-from adrian@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p453gHRQ094743 for cvs-src-old@freebsd.org; Thu, 5 May 2011 03:42:17 GMT (envelope-from adrian@repoman.freebsd.org) Message-Id: <201105050342.p453gHRQ094743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to adrian@repoman.freebsd.org using -f From: Adrian Chadd Date: Thu, 5 May 2011 03:42:04 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/dev/ath/ath_hal/ar5416 ar5416reg.h X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2011 03:42:17 -0000 adrian 2011-05-05 03:42:04 UTC FreeBSD src repository Modified files: sys/dev/ath/ath_hal/ar5416 ar5416reg.h Log: SVN rev 221480 on 2011-05-05 03:42:04Z by adrian Fix up the chipset checks for the AR5416 and later silicon. The checks should function as follows: * AR_SREV_ : check macVersion matches that version id * AR_SREV__ : check macVersion and macRevision match the version / revision respectively * AR_SREV___OR_LATER: check that + if the chip silicon version == macVersion, enforce revision >= macRevision + if the chip silicon version > macVersion, allow it. For example, AR_SREV_MERLIN() only matches AR9280 (any revision), AR_SREV_MERLIN_10() would only match AR9280 version 1.0, but AR_SREV_MERLIN_20_OR_LATER() matches AR9280 version >= 2.0 _AND_ any subsequent MAC (So AR9285, AR9287, etc.) The specific fixes which may impact users: * if there is Merlin hardware > revision 2.0, it'll now be correctly matched by AR_SREV_MERLIN_20_OR_LATER() - the older code simply would match on either Merlin 2.0 or a subsequent MAC (AR9285, AR9287, etc.) * Kite version 1.1/1.2 should now correctly match. As these macros are used in the AR9285 reset/attach path, and it's assumed that the hardware is kite anyway, the behaviour shouldn't change. It'll only change if these macros are used in other codepaths shared with older silicon. Obtained from: Linux ath9k, Atheros Revision Changes Path 1.18 +37 -10 src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h