svn commit: r223466 - in head/sys/dev/ath/ath_hal: . ar5210 ar5211
ar5212 ar5312 ar5416 ar9001 ar9002
Adrian Chadd
adrian at FreeBSD.org
Thu Jun 23 06:55:29 UTC 2011
Author: adrian
Date: Thu Jun 23 06:55:29 2011
New Revision: 223466
URL: http://svn.freebsd.org/changeset/base/223466
Log:
Re-introduce a global ath_hal_debug again for now, whilst I figure out what
to do about the few cases where the HAL state isn't available (regdomain)
or isn't yet setup (probe/attach.)
The global ath_hal_debug now affects all instances of the HAL.
This also restores the ability for probe/attach debugging to work; as
the sysctl tree may not be attached at that point. Users can just set
the global "hw.ath.hal.debug" to a suitable value to enable probe/attach
related debugging.
Modified:
head/sys/dev/ath/ath_hal/ah_internal.h
head/sys/dev/ath/ath_hal/ah_regdomain.c
head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
head/sys/dev/ath/ath_hal/ar5212/ar5112.c
head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
head/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c
head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
head/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
head/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
Modified: head/sys/dev/ath/ath_hal/ah_internal.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_internal.h Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ah_internal.h Thu Jun 23 06:55:29 2011 (r223466)
@@ -498,10 +498,29 @@ extern void ath_hal_free(void *);
/* common debugging interfaces */
#ifdef AH_DEBUG
#include "ah_debug.h"
+extern int ath_hal_debug; /* Global debug flags */
+
+/*
+ * This is used for global debugging, when ahp doesn't yet have the
+ * related debugging state. For example, during probe/attach.
+ */
+#define HALDEBUG_G(_ah, __m, ...) \
+ do { \
+ if ((__m) == HAL_DEBUG_UNMASKABLE || \
+ ath_hal_debug & (__m)) { \
+ DO_HALDEBUG((_ah), (__m), __VA_ARGS__); \
+ } \
+ } while (0);
+
+/*
+ * This is used for local debugging, when ahp isn't NULL and
+ * thus may have debug flags set.
+ */
#define HALDEBUG(_ah, __m, ...) \
do { \
if ((__m) == HAL_DEBUG_UNMASKABLE || \
- ((_ah != AH_NULL) && (((struct ath_hal*)_ah)->ah_config.ah_debug & (__m)))) { \
+ ath_hal_debug & (__m) || \
+ (_ah)->ah_config.ah_debug & (__m)) { \
DO_HALDEBUG((_ah), (__m), __VA_ARGS__); \
} \
} while(0);
Modified: head/sys/dev/ath/ath_hal/ah_regdomain.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_regdomain.c Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ah_regdomain.c Thu Jun 23 06:55:29 2011 (r223466)
@@ -167,7 +167,7 @@ isEepromValid(struct ath_hal *ah)
if (regDomainPairs[i].regDmnEnum == rd)
return AH_TRUE;
}
- HALDEBUG(ah, HAL_DEBUG_REGDOMAIN,
+ HALDEBUG_G(ah, HAL_DEBUG_REGDOMAIN,
"%s: invalid regulatory domain/country code 0x%x\n", __func__, rd);
return AH_FALSE;
}
@@ -609,7 +609,7 @@ ath_hal_mapgsm(int sku, int freq)
return 1544 + freq;
if (sku == SKU_SR9)
return 3344 - freq;
- HALDEBUG(AH_NULL, HAL_DEBUG_ANY,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY,
"%s: cannot map freq %u unknown gsm sku %u\n",
__func__, freq, sku);
return freq;
Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c Thu Jun 23 06:55:29 2011 (r223466)
@@ -181,14 +181,14 @@ ar5210Attach(uint16_t devid, HAL_SOFTC s
HAL_STATUS ecode;
int i;
- HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ATTACH,
"%s: devid 0x%x sc %p st %p sh %p\n", __func__, devid,
sc, (void*) st, (void*) sh);
/* NB: memory is returned zero'd */
ahp = ath_hal_malloc(sizeof (struct ath_hal_5210));
if (ahp == AH_NULL) {
- HALDEBUG(AH_NULL, HAL_DEBUG_ANY,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY,
"%s: no memory for state block\n", __func__);
ecode = HAL_ENOMEM;
goto bad;
Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c Thu Jun 23 06:55:29 2011 (r223466)
@@ -200,13 +200,13 @@ ar5211Attach(uint16_t devid, HAL_SOFTC s
uint16_t eeval;
HAL_STATUS ecode;
- HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
__func__, sc, (void*) st, (void*) sh);
/* NB: memory is returned zero'd */
ahp = ath_hal_malloc(sizeof (struct ath_hal_5211));
if (ahp == AH_NULL) {
- HALDEBUG(AH_NULL, HAL_DEBUG_ANY,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY,
"%s: cannot allocate memory for state block\n", __func__);
ecode = HAL_ENOMEM;
goto bad;
Modified: head/sys/dev/ath/ath_hal/ar5212/ar5112.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5212/ar5112.c Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5112.c Thu Jun 23 06:55:29 2011 (r223466)
@@ -611,7 +611,7 @@ getFullPwrTable(uint16_t numPcdacs, uint
uint16_t idxR = 1;
if (numPcdacs < 2) {
- HALDEBUG(AH_NULL, HAL_DEBUG_ANY,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY,
"%s: at least 2 pcdac values needed [%d]\n",
__func__, numPcdacs);
return AH_FALSE;
Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Thu Jun 23 06:55:29 2011 (r223466)
@@ -317,13 +317,13 @@ ar5212Attach(uint16_t devid, HAL_SOFTC s
uint16_t eeval;
HAL_STATUS ecode;
- HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
__func__, sc, (void*) st, (void*) sh);
/* NB: memory is returned zero'd */
ahp = ath_hal_malloc(sizeof (struct ath_hal_5212));
if (ahp == AH_NULL) {
- HALDEBUG(AH_NULL, HAL_DEBUG_ANY,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY,
"%s: cannot allocate memory for state block\n", __func__);
*status = HAL_ENOMEM;
return AH_NULL;
Modified: head/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c Thu Jun 23 06:55:29 2011 (r223466)
@@ -71,13 +71,13 @@ ar5312Attach(uint16_t devid, HAL_SOFTC s
uint16_t eeval;
HAL_STATUS ecode;
- HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
__func__, sc, st, (void*) sh);
/* NB: memory is returned zero'd */
ahp = ath_hal_malloc(sizeof (struct ath_hal_5212));
if (ahp == AH_NULL) {
- HALDEBUG(AH_NULL, HAL_DEBUG_ANY,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY,
"%s: cannot allocate memory for state block\n", __func__);
*status = HAL_ENOMEM;
return AH_NULL;
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Thu Jun 23 06:55:29 2011 (r223466)
@@ -241,7 +241,7 @@ ar5416Attach(uint16_t devid, HAL_SOFTC s
HAL_STATUS ecode;
HAL_BOOL rfStatus;
- HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
__func__, sc, (void*) st, (void*) sh);
/* NB: memory is returned zero'd */
@@ -250,7 +250,7 @@ ar5416Attach(uint16_t devid, HAL_SOFTC s
sizeof(ar5416Addac)
);
if (ahp5416 == AH_NULL) {
- HALDEBUG(AH_NULL, HAL_DEBUG_ANY,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY,
"%s: cannot allocate memory for state block\n", __func__);
*status = HAL_ENOMEM;
return AH_NULL;
Modified: head/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c Thu Jun 23 06:55:29 2011 (r223466)
@@ -78,13 +78,13 @@ ar9130Attach(uint16_t devid, HAL_SOFTC s
HAL_STATUS ecode;
HAL_BOOL rfStatus;
- HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
__func__, sc, (void*) st, (void*) sh);
/* NB: memory is returned zero'd */
ahp5416 = ath_hal_malloc(sizeof (struct ath_hal_5416));
if (ahp5416 == AH_NULL) {
- HALDEBUG(AH_NULL, HAL_DEBUG_ANY,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY,
"%s: cannot allocate memory for state block\n", __func__);
*status = HAL_ENOMEM;
return AH_NULL;
Modified: head/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c Thu Jun 23 06:55:29 2011 (r223466)
@@ -101,13 +101,13 @@ ar9160Attach(uint16_t devid, HAL_SOFTC s
HAL_STATUS ecode;
HAL_BOOL rfStatus;
- HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
__func__, sc, (void*) st, (void*) sh);
/* NB: memory is returned zero'd */
ahp5416 = ath_hal_malloc(sizeof (struct ath_hal_5416));
if (ahp5416 == AH_NULL) {
- HALDEBUG(AH_NULL, HAL_DEBUG_ANY,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY,
"%s: cannot allocate memory for state block\n", __func__);
*status = HAL_ENOMEM;
return AH_NULL;
Modified: head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c Thu Jun 23 06:55:29 2011 (r223466)
@@ -120,13 +120,13 @@ ar9280Attach(uint16_t devid, HAL_SOFTC s
int8_t pwr_table_offset;
uint8_t pwr;
- HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
__func__, sc, (void*) st, (void*) sh);
/* NB: memory is returned zero'd */
ahp9280 = ath_hal_malloc(sizeof (struct ath_hal_9280));
if (ahp9280 == AH_NULL) {
- HALDEBUG(AH_NULL, HAL_DEBUG_ANY,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY,
"%s: cannot allocate memory for state block\n", __func__);
*status = HAL_ENOMEM;
return AH_NULL;
Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c Thu Jun 23 06:55:29 2011 (r223466)
@@ -118,13 +118,13 @@ ar9285Attach(uint16_t devid, HAL_SOFTC s
HAL_STATUS ecode;
HAL_BOOL rfStatus;
- HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
__func__, sc, (void*) st, (void*) sh);
/* NB: memory is returned zero'd */
ahp9285 = ath_hal_malloc(sizeof (struct ath_hal_9285));
if (ahp9285 == AH_NULL) {
- HALDEBUG(AH_NULL, HAL_DEBUG_ANY,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY,
"%s: cannot allocate memory for state block\n", __func__);
*status = HAL_ENOMEM;
return AH_NULL;
Modified: head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c Thu Jun 23 06:53:13 2011 (r223465)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c Thu Jun 23 06:55:29 2011 (r223466)
@@ -119,13 +119,13 @@ ar9287Attach(uint16_t devid, HAL_SOFTC s
HAL_BOOL rfStatus;
int8_t pwr_table_offset;
- HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n",
__func__, sc, (void*) st, (void*) sh);
/* NB: memory is returned zero'd */
ahp9287 = ath_hal_malloc(sizeof (struct ath_hal_9287));
if (ahp9287 == AH_NULL) {
- HALDEBUG(AH_NULL, HAL_DEBUG_ANY,
+ HALDEBUG_G(AH_NULL, HAL_DEBUG_ANY,
"%s: cannot allocate memory for state block\n", __func__);
*status = HAL_ENOMEM;
return AH_NULL;
More information about the svn-src-all
mailing list