Page MenuHomeFreeBSD
Files F102010585

D41355.diff
No OneTemporary
Actions

D41355.diff
View Options

diff --git a/share/man/man4/ath_hal.4 b/share/man/man4/ath_hal.4
--- a/share/man/man4/ath_hal.4
+++ b/share/man/man4/ath_hal.4
@@ -28,7 +28,7 @@
.\"
.\" $FreeBSD$
.\"/
-.Dd January 25, 2019
+.Dd August 7, 2023
.Dt ATH_HAL 4
.Os
.Sh NAME
@@ -50,7 +50,6 @@
.\".Cd "device ath_ar5312"
.\".Cd "device ath_rf2136"
.\".Cd "device ath_rf2137"
-.Cd "device ath_ar9130"
.Cd "device ath_ar9160"
.Cd "device ath_ar9280"
.Cd "device ath_ar9285"
@@ -59,7 +58,7 @@
.Sh DESCRIPTION
The hal provides hardware support for wireless network adapters based on
the Atheros AR5210, AR5211, AR5212, AR5213, AR2413, AR2417, AR2425,
-AR5413, AR5416, AR5418, AR5424, AR9130, AR9160, AR9220, AR9280, AR9285,
+AR5413, AR5416, AR5418, AR5424, AR9160, AR9220, AR9280, AR9285,
AR9287, AR9380, AR9390, AR9580, AR9590, AR9562 and QCA9565
chips (and companion RF/baseband parts).
This code is part of the
diff --git a/sys/conf/files b/sys/conf/files
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1132,16 +1132,6 @@
optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
ath_ar9287 \
compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
-# ar9130 (depends upon ar5416) - also requires AH_SUPPORT_AR9130
-#
-# Since this is an embedded MAC SoC, there's no need to compile it into the
-# default HAL.
-dev/ath/ath_hal/ar9001/ar9130_attach.c optional ath_ar9130 \
- compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
-dev/ath/ath_hal/ar9001/ar9130_phy.c optional ath_ar9130 \
- compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
-dev/ath/ath_hal/ar9001/ar9130_eeprom.c optional ath_ar9130 \
- compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
# ar9160 (depends on ar5416)
dev/ath/ath_hal/ar9001/ar9160_attach.c optional ath_hal | ath_ar9160 \
compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
diff --git a/sys/conf/options b/sys/conf/options
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -820,17 +820,6 @@
ATH_DEBUG_ALQ opt_ath.h
ATH_KTR_INTR_DEBUG opt_ath.h
-# options for the Atheros hal
-# XXX For now, this breaks non-AR9130 chipsets, so only use it
-# XXX when actually targeting AR9130.
-AH_SUPPORT_AR9130 opt_ah.h
-
-# This is required for AR933x SoC support
-AH_SUPPORT_AR9330 opt_ah.h
-AH_SUPPORT_AR9340 opt_ah.h
-AH_SUPPORT_QCA9530 opt_ah.h
-AH_SUPPORT_QCA9550 opt_ah.h
-
AH_DEBUG opt_ah.h
AH_ASSERT opt_ah.h
AH_DEBUG_ALQ opt_ah.h
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h
@@ -51,19 +51,6 @@
#define AH_SUPPORT_POSEIDON 1
#define AH_SUPPORT_AR9300 1
-/* These are the embedded boards */
-#ifdef AH_SUPPORT_AR9330
-#define AH_SUPPORT_HORNET 1
-#endif /* AH_SUPPORT_AR9330 */
-#ifdef AH_SUPPORT_AR9340
-#define AH_SUPPORT_WASP 1
-#endif /* AH_SUPPORT_AR9340 */
-#ifdef AH_SUPPORT_QCA9550
-#define AH_SUPPORT_SCORPION 1
-#endif /* AH_SUPPORT_QCA9550 */
-#ifdef AH_SUPPORT_QCA9530
-#define AH_SUPPORT_HONEYBEE 1
-#endif /* AH_SUPPORT_QCA9530 */
#define FIX_NOISE_FLOOR 1
/* XXX this needs to be removed! No atomics in the HAL! */
diff --git a/sys/dev/ath/ah_osdep_ar5416.c b/sys/dev/ath/ah_osdep_ar5416.c
--- a/sys/dev/ath/ah_osdep_ar5416.c
+++ b/sys/dev/ath/ah_osdep_ar5416.c
@@ -41,7 +41,6 @@
#include <dev/ath/ath_hal/ah_internal.h>
extern struct ath_hal_chip AR5416_chip;
-extern struct ath_hal_chip AR9130_chip;
extern struct ath_hal_chip AR9160_chip;
extern struct ath_hal_chip AR9280_chip;
extern struct ath_hal_chip AR9285_chip;
@@ -60,7 +59,6 @@
switch (type) {
case MOD_LOAD:
ath_hal_add_chip(&AR5416_chip);
- ath_hal_add_chip(&AR9130_chip);
ath_hal_add_chip(&AR9160_chip);
ath_hal_add_chip(&AR9280_chip);
ath_hal_add_chip(&AR9285_chip);
@@ -74,7 +72,6 @@
case MOD_UNLOAD:
ath_hal_remove_chip(&AR5416_chip);
- ath_hal_remove_chip(&AR9130_chip);
ath_hal_remove_chip(&AR9160_chip);
ath_hal_remove_chip(&AR9280_chip);
ath_hal_remove_chip(&AR9285_chip);
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130.ini b/sys/dev/ath/ath_hal/ar9001/ar9130.ini
deleted file mode 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130.ini
+++ /dev/null
@@ -1,669 +0,0 @@
-/*
- * Copyright (c) 2010 Atheros Communications Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
- */
-
-static const uint32_t ar5416Modes_9100[][6] = {
- { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
- { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
- { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
- { 0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008 },
- { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 },
- { 0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf },
- { 0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810 },
- { 0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a },
- { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
- { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
- { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
- { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
- { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
- { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
- { 0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0 },
- { 0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
- { 0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
- { 0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
- { 0x00009850, 0x6c48b4e2, 0x6d48b4e2, 0x6d48b0e2, 0x6c48b0e2, 0x6c48b0e2 },
- { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e },
- { 0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e },
- { 0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18 },
- { 0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
- { 0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0 },
- { 0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 },
- { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0 },
- { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016 },
- { 0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d },
- { 0x00009940, 0x00750604, 0x00754604, 0xfff81204, 0xfff81204, 0xfff81204 },
- { 0x00009944, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020 },
- { 0x00009954, 0x5f3ca3de, 0x5f3ca3de, 0xe250a51e, 0xe250a51e, 0xe250a51e },
- { 0x00009958, 0x2108ecff, 0x2108ecff, 0x3388ffff, 0x3388ffff, 0x3388ffff },
- { 0x00009960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0 },
- { 0x0000a960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0 },
- { 0x0000b960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0 },
- { 0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, 0x00001120 },
- { 0x0000c9bc, 0x001a0600, 0x001a0600, 0x001a1000, 0x001a0c00, 0x001a0c00 },
- { 0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be },
- { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
- { 0x000099c8, 0x6af65329, 0x6af65329, 0x6af65329, 0x6af65329, 0x6af65329 },
- { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
- { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
- { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
- { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
- { 0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880 },
- { 0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788 },
- { 0x0000a20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
- { 0x0000b20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
- { 0x0000c20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
- { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
- { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
- { 0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa },
- { 0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000 },
- { 0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402 },
- { 0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06 },
- { 0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b },
- { 0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b },
- { 0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a },
- { 0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf },
- { 0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f },
- { 0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f },
- { 0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f },
- { 0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000 },
- { 0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
- { 0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
- { 0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-};
-
-static const uint32_t ar5416Common_9100[][2] = {
- /* Addr allmodes */
- { 0x0000000c, 0x00000000 },
- { 0x00000030, 0x00020015 },
- { 0x00000034, 0x00000005 },
- { 0x00000040, 0x00000000 },
- { 0x00000044, 0x00000008 },
- { 0x00000048, 0x00000008 },
- { 0x0000004c, 0x00000010 },
- { 0x00000050, 0x00000000 },
- { 0x00000054, 0x0000001f },
- { 0x00000800, 0x00000000 },
- { 0x00000804, 0x00000000 },
- { 0x00000808, 0x00000000 },
- { 0x0000080c, 0x00000000 },
- { 0x00000810, 0x00000000 },
- { 0x00000814, 0x00000000 },
- { 0x00000818, 0x00000000 },
- { 0x0000081c, 0x00000000 },
- { 0x00000820, 0x00000000 },
- { 0x00000824, 0x00000000 },
- { 0x00001040, 0x002ffc0f },
- { 0x00001044, 0x002ffc0f },
- { 0x00001048, 0x002ffc0f },
- { 0x0000104c, 0x002ffc0f },
- { 0x00001050, 0x002ffc0f },
- { 0x00001054, 0x002ffc0f },
- { 0x00001058, 0x002ffc0f },
- { 0x0000105c, 0x002ffc0f },
- { 0x00001060, 0x002ffc0f },
- { 0x00001064, 0x002ffc0f },
- { 0x00001230, 0x00000000 },
- { 0x00001270, 0x00000000 },
- { 0x00001038, 0x00000000 },
- { 0x00001078, 0x00000000 },
- { 0x000010b8, 0x00000000 },
- { 0x000010f8, 0x00000000 },
- { 0x00001138, 0x00000000 },
- { 0x00001178, 0x00000000 },
- { 0x000011b8, 0x00000000 },
- { 0x000011f8, 0x00000000 },
- { 0x00001238, 0x00000000 },
- { 0x00001278, 0x00000000 },
- { 0x000012b8, 0x00000000 },
- { 0x000012f8, 0x00000000 },
- { 0x00001338, 0x00000000 },
- { 0x00001378, 0x00000000 },
- { 0x000013b8, 0x00000000 },
- { 0x000013f8, 0x00000000 },
- { 0x00001438, 0x00000000 },
- { 0x00001478, 0x00000000 },
- { 0x000014b8, 0x00000000 },
- { 0x000014f8, 0x00000000 },
- { 0x00001538, 0x00000000 },
- { 0x00001578, 0x00000000 },
- { 0x000015b8, 0x00000000 },
- { 0x000015f8, 0x00000000 },
- { 0x00001638, 0x00000000 },
- { 0x00001678, 0x00000000 },
- { 0x000016b8, 0x00000000 },
- { 0x000016f8, 0x00000000 },
- { 0x00001738, 0x00000000 },
- { 0x00001778, 0x00000000 },
- { 0x000017b8, 0x00000000 },
- { 0x000017f8, 0x00000000 },
- { 0x0000103c, 0x00000000 },
- { 0x0000107c, 0x00000000 },
- { 0x000010bc, 0x00000000 },
- { 0x000010fc, 0x00000000 },
- { 0x0000113c, 0x00000000 },
- { 0x0000117c, 0x00000000 },
- { 0x000011bc, 0x00000000 },
- { 0x000011fc, 0x00000000 },
- { 0x0000123c, 0x00000000 },
- { 0x0000127c, 0x00000000 },
- { 0x000012bc, 0x00000000 },
- { 0x000012fc, 0x00000000 },
- { 0x0000133c, 0x00000000 },
- { 0x0000137c, 0x00000000 },
- { 0x000013bc, 0x00000000 },
- { 0x000013fc, 0x00000000 },
- { 0x0000143c, 0x00000000 },
- { 0x0000147c, 0x00000000 },
- { 0x00020010, 0x00000003 },
- { 0x00020038, 0x000004c2 },
- { 0x00008004, 0x00000000 },
- { 0x00008008, 0x00000000 },
- { 0x0000800c, 0x00000000 },
- { 0x00008018, 0x00000700 },
- { 0x00008020, 0x00000000 },
- { 0x00008038, 0x00000000 },
- { 0x0000803c, 0x00000000 },
- { 0x00008048, 0x40000000 },
- { 0x00008054, 0x00004000 },
- { 0x00008058, 0x00000000 },
- { 0x0000805c, 0x000fc78f },
- { 0x00008060, 0x0000000f },
- { 0x00008064, 0x00000000 },
- { 0x000080c0, 0x2a82301a },
- { 0x000080c4, 0x05dc01e0 },
- { 0x000080c8, 0x1f402710 },
- { 0x000080cc, 0x01f40000 },
- { 0x000080d0, 0x00001e00 },
- { 0x000080d4, 0x00000000 },
- { 0x000080d8, 0x00400000 },
- { 0x000080e0, 0xffffffff },
- { 0x000080e4, 0x0000ffff },
- { 0x000080e8, 0x003f3f3f },
- { 0x000080ec, 0x00000000 },
- { 0x000080f0, 0x00000000 },
- { 0x000080f4, 0x00000000 },
- { 0x000080f8, 0x00000000 },
- { 0x000080fc, 0x00020000 },
- { 0x00008100, 0x00020000 },
- { 0x00008104, 0x00000001 },
- { 0x00008108, 0x00000052 },
- { 0x0000810c, 0x00000000 },
- { 0x00008110, 0x00000168 },
- { 0x00008118, 0x000100aa },
- { 0x0000811c, 0x00003210 },
- { 0x00008120, 0x08f04800 },
- { 0x00008124, 0x00000000 },
- { 0x00008128, 0x00000000 },
- { 0x0000812c, 0x00000000 },
- { 0x00008130, 0x00000000 },
- { 0x00008134, 0x00000000 },
- { 0x00008138, 0x00000000 },
- { 0x0000813c, 0x00000000 },
- { 0x00008144, 0x00000000 },
- { 0x00008168, 0x00000000 },
- { 0x0000816c, 0x00000000 },
- { 0x00008170, 0x32143320 },
- { 0x00008174, 0xfaa4fa50 },
- { 0x00008178, 0x00000100 },
- { 0x0000817c, 0x00000000 },
- { 0x000081c4, 0x00000000 },
- { 0x000081d0, 0x00003210 },
- { 0x000081ec, 0x00000000 },
- { 0x000081f0, 0x00000000 },
- { 0x000081f4, 0x00000000 },
- { 0x000081f8, 0x00000000 },
- { 0x000081fc, 0x00000000 },
- { 0x00008200, 0x00000000 },
- { 0x00008204, 0x00000000 },
- { 0x00008208, 0x00000000 },
- { 0x0000820c, 0x00000000 },
- { 0x00008210, 0x00000000 },
- { 0x00008214, 0x00000000 },
- { 0x00008218, 0x00000000 },
- { 0x0000821c, 0x00000000 },
- { 0x00008220, 0x00000000 },
- { 0x00008224, 0x00000000 },
- { 0x00008228, 0x00000000 },
- { 0x0000822c, 0x00000000 },
- { 0x00008230, 0x00000000 },
- { 0x00008234, 0x00000000 },
- { 0x00008238, 0x00000000 },
- { 0x0000823c, 0x00000000 },
- { 0x00008240, 0x00100000 },
- { 0x00008244, 0x0010f400 },
- { 0x00008248, 0x00000100 },
- { 0x0000824c, 0x0001e800 },
- { 0x00008250, 0x00000000 },
- { 0x00008254, 0x00000000 },
- { 0x00008258, 0x00000000 },
- { 0x0000825c, 0x400000ff },
- { 0x00008260, 0x00080922 },
- { 0x00008270, 0x00000000 },
- { 0x00008274, 0x40000000 },
- { 0x00008278, 0x003e4180 },
- { 0x0000827c, 0x00000000 },
- { 0x00008284, 0x0000002c },
- { 0x00008288, 0x0000002c },
- { 0x0000828c, 0x00000000 },
- { 0x00008294, 0x00000000 },
- { 0x00008298, 0x00000000 },
- { 0x00008300, 0x00000000 },
- { 0x00008304, 0x00000000 },
- { 0x00008308, 0x00000000 },
- { 0x0000830c, 0x00000000 },
- { 0x00008310, 0x00000000 },
- { 0x00008314, 0x00000000 },
- { 0x00008318, 0x00000000 },
- { 0x00008328, 0x00000000 },
- { 0x0000832c, 0x00000007 },
- { 0x00008330, 0x00000302 },
- { 0x00008334, 0x00000e00 },
- { 0x00008338, 0x00000000 },
- { 0x0000833c, 0x00000000 },
- { 0x00008340, 0x000107ff },
- { 0x00009808, 0x00000000 },
- { 0x0000980c, 0xad848e19 },
- { 0x00009810, 0x7d14e000 },
- { 0x00009814, 0x9c0a9f6b },
- { 0x0000981c, 0x00000000 },
- { 0x0000982c, 0x0000a000 },
- { 0x00009830, 0x00000000 },
- { 0x0000983c, 0x00200400 },
- { 0x00009840, 0x206a01ae },
- { 0x0000984c, 0x1284233c },
- { 0x00009854, 0x00000859 },
- { 0x00009900, 0x00000000 },
- { 0x00009904, 0x00000000 },
- { 0x00009908, 0x00000000 },
- { 0x0000990c, 0x00000000 },
- { 0x0000991c, 0x10000fff },
- { 0x00009920, 0x05100000 },
- { 0x0000a920, 0x05100000 },
- { 0x0000b920, 0x05100000 },
- { 0x00009928, 0x00000001 },
- { 0x0000992c, 0x00000004 },
- { 0x00009934, 0x1e1f2022 },
- { 0x00009938, 0x0a0b0c0d },
- { 0x0000993c, 0x00000000 },
- { 0x00009948, 0x9280b212 },
- { 0x0000994c, 0x00020028 },
- { 0x0000c95c, 0x004b6a8e },
- { 0x0000c968, 0x000003ce },
- { 0x00009970, 0x190fb515 },
- { 0x00009974, 0x00000000 },
- { 0x00009978, 0x00000001 },
- { 0x0000997c, 0x00000000 },
- { 0x00009980, 0x00000000 },
- { 0x00009984, 0x00000000 },
- { 0x00009988, 0x00000000 },
- { 0x0000998c, 0x00000000 },
- { 0x00009990, 0x00000000 },
- { 0x00009994, 0x00000000 },
- { 0x00009998, 0x00000000 },
- { 0x0000999c, 0x00000000 },
- { 0x000099a0, 0x00000000 },
- { 0x000099a4, 0x00000001 },
- { 0x000099a8, 0x201fff00 },
- { 0x000099ac, 0x006f0000 },
- { 0x000099b0, 0x03051000 },
- { 0x000099dc, 0x00000000 },
- { 0x000099e0, 0x00000200 },
- { 0x000099e4, 0xaaaaaaaa },
- { 0x000099e8, 0x3c466478 },
- { 0x000099ec, 0x0cc80caa },
- { 0x000099fc, 0x00001042 },
- { 0x00009b00, 0x00000000 },
- { 0x00009b04, 0x00000001 },
- { 0x00009b08, 0x00000002 },
- { 0x00009b0c, 0x00000003 },
- { 0x00009b10, 0x00000004 },
- { 0x00009b14, 0x00000005 },
- { 0x00009b18, 0x00000008 },
- { 0x00009b1c, 0x00000009 },
- { 0x00009b20, 0x0000000a },
- { 0x00009b24, 0x0000000b },
- { 0x00009b28, 0x0000000c },
- { 0x00009b2c, 0x0000000d },
- { 0x00009b30, 0x00000010 },
- { 0x00009b34, 0x00000011 },
- { 0x00009b38, 0x00000012 },
- { 0x00009b3c, 0x00000013 },
- { 0x00009b40, 0x00000014 },
- { 0x00009b44, 0x00000015 },
- { 0x00009b48, 0x00000018 },
- { 0x00009b4c, 0x00000019 },
- { 0x00009b50, 0x0000001a },
- { 0x00009b54, 0x0000001b },
- { 0x00009b58, 0x0000001c },
- { 0x00009b5c, 0x0000001d },
- { 0x00009b60, 0x00000020 },
- { 0x00009b64, 0x00000021 },
- { 0x00009b68, 0x00000022 },
- { 0x00009b6c, 0x00000023 },
- { 0x00009b70, 0x00000024 },
- { 0x00009b74, 0x00000025 },
- { 0x00009b78, 0x00000028 },
- { 0x00009b7c, 0x00000029 },
- { 0x00009b80, 0x0000002a },
- { 0x00009b84, 0x0000002b },
- { 0x00009b88, 0x0000002c },
- { 0x00009b8c, 0x0000002d },
- { 0x00009b90, 0x00000030 },
- { 0x00009b94, 0x00000031 },
- { 0x00009b98, 0x00000032 },
- { 0x00009b9c, 0x00000033 },
- { 0x00009ba0, 0x00000034 },
- { 0x00009ba4, 0x00000035 },
- { 0x00009ba8, 0x00000035 },
- { 0x00009bac, 0x00000035 },
- { 0x00009bb0, 0x00000035 },
- { 0x00009bb4, 0x00000035 },
- { 0x00009bb8, 0x00000035 },
- { 0x00009bbc, 0x00000035 },
- { 0x00009bc0, 0x00000035 },
- { 0x00009bc4, 0x00000035 },
- { 0x00009bc8, 0x00000035 },
- { 0x00009bcc, 0x00000035 },
- { 0x00009bd0, 0x00000035 },
- { 0x00009bd4, 0x00000035 },
- { 0x00009bd8, 0x00000035 },
- { 0x00009bdc, 0x00000035 },
- { 0x00009be0, 0x00000035 },
- { 0x00009be4, 0x00000035 },
- { 0x00009be8, 0x00000035 },
- { 0x00009bec, 0x00000035 },
- { 0x00009bf0, 0x00000035 },
- { 0x00009bf4, 0x00000035 },
- { 0x00009bf8, 0x00000010 },
- { 0x00009bfc, 0x0000001a },
- { 0x0000a210, 0x40806333 },
- { 0x0000a214, 0x00106c10 },
- { 0x0000a218, 0x009c4060 },
- { 0x0000a220, 0x018830c6 },
- { 0x0000a224, 0x00000400 },
- { 0x0000a228, 0x001a0bb5 },
- { 0x0000a22c, 0x00000000 },
- { 0x0000a234, 0x20202020 },
- { 0x0000a238, 0x20202020 },
- { 0x0000a23c, 0x13c889af },
- { 0x0000a240, 0x38490a20 },
- { 0x0000a244, 0x00007bb6 },
- { 0x0000a248, 0x0fff3ffc },
- { 0x0000a24c, 0x00000001 },
- { 0x0000a250, 0x0000e000 },
- { 0x0000a254, 0x00000000 },
- { 0x0000a258, 0x0cc75380 },
- { 0x0000a25c, 0x0f0f0f01 },
- { 0x0000a260, 0xdfa91f01 },
- { 0x0000a268, 0x00000001 },
- { 0x0000a26c, 0x0ebae9c6 },
- { 0x0000b26c, 0x0ebae9c6 },
- { 0x0000c26c, 0x0ebae9c6 },
- { 0x0000d270, 0x00820820 },
- { 0x0000a278, 0x1ce739ce },
- { 0x0000a27c, 0x050701ce },
- { 0x0000a338, 0x00000000 },
- { 0x0000a33c, 0x00000000 },
- { 0x0000a340, 0x00000000 },
- { 0x0000a344, 0x00000000 },
- { 0x0000a348, 0x3fffffff },
- { 0x0000a34c, 0x3fffffff },
- { 0x0000a350, 0x3fffffff },
- { 0x0000a354, 0x0003ffff },
- { 0x0000a358, 0x79a8aa33 },
- { 0x0000d35c, 0x07ffffef },
- { 0x0000d360, 0x0fffffe7 },
- { 0x0000d364, 0x17ffffe5 },
- { 0x0000d368, 0x1fffffe4 },
- { 0x0000d36c, 0x37ffffe3 },
- { 0x0000d370, 0x3fffffe3 },
- { 0x0000d374, 0x57ffffe3 },
- { 0x0000d378, 0x5fffffe2 },
- { 0x0000d37c, 0x7fffffe2 },
- { 0x0000d380, 0x7f3c7bba },
- { 0x0000d384, 0xf3307ff0 },
- { 0x0000a388, 0x0c000000 },
- { 0x0000a38c, 0x20202020 },
- { 0x0000a390, 0x20202020 },
- { 0x0000a394, 0x1ce739ce },
- { 0x0000a398, 0x000001ce },
- { 0x0000a39c, 0x00000001 },
- { 0x0000a3a0, 0x00000000 },
- { 0x0000a3a4, 0x00000000 },
- { 0x0000a3a8, 0x00000000 },
- { 0x0000a3ac, 0x00000000 },
- { 0x0000a3b0, 0x00000000 },
- { 0x0000a3b4, 0x00000000 },
- { 0x0000a3b8, 0x00000000 },
- { 0x0000a3bc, 0x00000000 },
- { 0x0000a3c0, 0x00000000 },
- { 0x0000a3c4, 0x00000000 },
- { 0x0000a3c8, 0x00000246 },
- { 0x0000a3cc, 0x20202020 },
- { 0x0000a3d0, 0x20202020 },
- { 0x0000a3d4, 0x20202020 },
- { 0x0000a3dc, 0x1ce739ce },
- { 0x0000a3e0, 0x000001ce },
-};
-
-static const uint32_t ar5416Bank0_9100[][2] = {
- /* Addr allmodes */
- { 0x000098b0, 0x1e5795e5 },
- { 0x000098e0, 0x02008020 },
-};
-
-static const uint32_t ar5416BB_RfGain_9100[][3] = {
- /* Addr 5G_HT20 5G_HT40 */
- { 0x00009a00, 0x00000000, 0x00000000 },
- { 0x00009a04, 0x00000040, 0x00000040 },
- { 0x00009a08, 0x00000080, 0x00000080 },
- { 0x00009a0c, 0x000001a1, 0x00000141 },
- { 0x00009a10, 0x000001e1, 0x00000181 },
- { 0x00009a14, 0x00000021, 0x000001c1 },
- { 0x00009a18, 0x00000061, 0x00000001 },
- { 0x00009a1c, 0x00000168, 0x00000041 },
- { 0x00009a20, 0x000001a8, 0x000001a8 },
- { 0x00009a24, 0x000001e8, 0x000001e8 },
- { 0x00009a28, 0x00000028, 0x00000028 },
- { 0x00009a2c, 0x00000068, 0x00000068 },
- { 0x00009a30, 0x00000189, 0x000000a8 },
- { 0x00009a34, 0x000001c9, 0x00000169 },
- { 0x00009a38, 0x00000009, 0x000001a9 },
- { 0x00009a3c, 0x00000049, 0x000001e9 },
- { 0x00009a40, 0x00000089, 0x00000029 },
- { 0x00009a44, 0x00000170, 0x00000069 },
- { 0x00009a48, 0x000001b0, 0x00000190 },
- { 0x00009a4c, 0x000001f0, 0x000001d0 },
- { 0x00009a50, 0x00000030, 0x00000010 },
- { 0x00009a54, 0x00000070, 0x00000050 },
- { 0x00009a58, 0x00000191, 0x00000090 },
- { 0x00009a5c, 0x000001d1, 0x00000151 },
- { 0x00009a60, 0x00000011, 0x00000191 },
- { 0x00009a64, 0x00000051, 0x000001d1 },
- { 0x00009a68, 0x00000091, 0x00000011 },
- { 0x00009a6c, 0x000001b8, 0x00000051 },
- { 0x00009a70, 0x000001f8, 0x00000198 },
- { 0x00009a74, 0x00000038, 0x000001d8 },
- { 0x00009a78, 0x00000078, 0x00000018 },
- { 0x00009a7c, 0x00000199, 0x00000058 },
- { 0x00009a80, 0x000001d9, 0x00000098 },
- { 0x00009a84, 0x00000019, 0x00000159 },
- { 0x00009a88, 0x00000059, 0x00000199 },
- { 0x00009a8c, 0x00000099, 0x000001d9 },
- { 0x00009a90, 0x000000d9, 0x00000019 },
- { 0x00009a94, 0x000000f9, 0x00000059 },
- { 0x00009a98, 0x000000f9, 0x00000099 },
- { 0x00009a9c, 0x000000f9, 0x000000d9 },
- { 0x00009aa0, 0x000000f9, 0x000000f9 },
- { 0x00009aa4, 0x000000f9, 0x000000f9 },
- { 0x00009aa8, 0x000000f9, 0x000000f9 },
- { 0x00009aac, 0x000000f9, 0x000000f9 },
- { 0x00009ab0, 0x000000f9, 0x000000f9 },
- { 0x00009ab4, 0x000000f9, 0x000000f9 },
- { 0x00009ab8, 0x000000f9, 0x000000f9 },
- { 0x00009abc, 0x000000f9, 0x000000f9 },
- { 0x00009ac0, 0x000000f9, 0x000000f9 },
- { 0x00009ac4, 0x000000f9, 0x000000f9 },
- { 0x00009ac8, 0x000000f9, 0x000000f9 },
- { 0x00009acc, 0x000000f9, 0x000000f9 },
- { 0x00009ad0, 0x000000f9, 0x000000f9 },
- { 0x00009ad4, 0x000000f9, 0x000000f9 },
- { 0x00009ad8, 0x000000f9, 0x000000f9 },
- { 0x00009adc, 0x000000f9, 0x000000f9 },
- { 0x00009ae0, 0x000000f9, 0x000000f9 },
- { 0x00009ae4, 0x000000f9, 0x000000f9 },
- { 0x00009ae8, 0x000000f9, 0x000000f9 },
- { 0x00009aec, 0x000000f9, 0x000000f9 },
- { 0x00009af0, 0x000000f9, 0x000000f9 },
- { 0x00009af4, 0x000000f9, 0x000000f9 },
- { 0x00009af8, 0x000000f9, 0x000000f9 },
- { 0x00009afc, 0x000000f9, 0x000000f9 },
-};
-
-static const uint32_t ar5416Bank1_9100[][2] = {
- /* Addr allmodes */
- { 0x000098b0, 0x02108421 },
- { 0x000098ec, 0x00000008 },
-};
-
-static const uint32_t ar5416Bank2_9100[][2] = {
- /* Addr allmodes */
- { 0x000098b0, 0x0e73ff17 },
- { 0x000098e0, 0x00000420 },
-};
-
-static const uint32_t ar5416Bank3_9100[][3] = {
- /* Addr 5G_HT20 5G_HT40 */
- { 0x000098f0, 0x01400018, 0x01c00018 },
-};
-
-static const uint32_t ar5416Bank6_9100[][3] = {
- /* Addr 5G_HT20 5G_HT40 */
- { 0x0000989c, 0x00000000, 0x00000000 },
- { 0x0000989c, 0x00000000, 0x00000000 },
- { 0x0000989c, 0x00000000, 0x00000000 },
- { 0x0000989c, 0x00e00000, 0x00e00000 },
- { 0x0000989c, 0x005e0000, 0x005e0000 },
- { 0x0000989c, 0x00120000, 0x00120000 },
- { 0x0000989c, 0x00620000, 0x00620000 },
- { 0x0000989c, 0x00020000, 0x00020000 },
- { 0x0000989c, 0x00ff0000, 0x00ff0000 },
- { 0x0000989c, 0x00ff0000, 0x00ff0000 },
- { 0x0000989c, 0x00ff0000, 0x00ff0000 },
- { 0x0000989c, 0x00ff0000, 0x00ff0000 },
- { 0x0000989c, 0x005f0000, 0x005f0000 },
- { 0x0000989c, 0x00870000, 0x00870000 },
- { 0x0000989c, 0x00f90000, 0x00f90000 },
- { 0x0000989c, 0x007b0000, 0x007b0000 },
- { 0x0000989c, 0x00ff0000, 0x00ff0000 },
- { 0x0000989c, 0x00f50000, 0x00f50000 },
- { 0x0000989c, 0x00dc0000, 0x00dc0000 },
- { 0x0000989c, 0x00110000, 0x00110000 },
- { 0x0000989c, 0x006100a8, 0x006100a8 },
- { 0x0000989c, 0x004210a2, 0x004210a2 },
- { 0x0000989c, 0x0014000f, 0x0014000f },
- { 0x0000989c, 0x00c40002, 0x00c40002 },
- { 0x0000989c, 0x003000f2, 0x003000f2 },
- { 0x0000989c, 0x00440016, 0x00440016 },
- { 0x0000989c, 0x00410040, 0x00410040 },
- { 0x0000989c, 0x000180d6, 0x000180d6 },
- { 0x0000989c, 0x0000c0aa, 0x0000c0aa },
- { 0x0000989c, 0x000000b1, 0x000000b1 },
- { 0x0000989c, 0x00002000, 0x00002000 },
- { 0x0000989c, 0x000000d4, 0x000000d4 },
- { 0x000098d0, 0x0000000f, 0x0010000f },
-};
-
-static const uint32_t ar5416Bank6TPC_9100[][3] = {
- /* Addr 5G_HT20 5G_HT40 */
- { 0x0000989c, 0x00000000, 0x00000000 },
- { 0x0000989c, 0x00000000, 0x00000000 },
- { 0x0000989c, 0x00000000, 0x00000000 },
- { 0x0000989c, 0x00e00000, 0x00e00000 },
- { 0x0000989c, 0x005e0000, 0x005e0000 },
- { 0x0000989c, 0x00120000, 0x00120000 },
- { 0x0000989c, 0x00620000, 0x00620000 },
- { 0x0000989c, 0x00020000, 0x00020000 },
- { 0x0000989c, 0x00ff0000, 0x00ff0000 },
- { 0x0000989c, 0x00ff0000, 0x00ff0000 },
- { 0x0000989c, 0x00ff0000, 0x00ff0000 },
- { 0x0000989c, 0x40ff0000, 0x40ff0000 },
- { 0x0000989c, 0x005f0000, 0x005f0000 },
- { 0x0000989c, 0x00870000, 0x00870000 },
- { 0x0000989c, 0x00f90000, 0x00f90000 },
- { 0x0000989c, 0x007b0000, 0x007b0000 },
- { 0x0000989c, 0x00ff0000, 0x00ff0000 },
- { 0x0000989c, 0x00f50000, 0x00f50000 },
- { 0x0000989c, 0x00dc0000, 0x00dc0000 },
- { 0x0000989c, 0x00110000, 0x00110000 },
- { 0x0000989c, 0x006100a8, 0x006100a8 },
- { 0x0000989c, 0x00423022, 0x00423022 },
- { 0x0000989c, 0x2014008f, 0x2014008f },
- { 0x0000989c, 0x00c40002, 0x00c40002 },
- { 0x0000989c, 0x003000f2, 0x003000f2 },
- { 0x0000989c, 0x00440016, 0x00440016 },
- { 0x0000989c, 0x00410040, 0x00410040 },
- { 0x0000989c, 0x0001805e, 0x0001805e },
- { 0x0000989c, 0x0000c0ab, 0x0000c0ab },
- { 0x0000989c, 0x000000e1, 0x000000e1 },
- { 0x0000989c, 0x00007080, 0x00007080 },
- { 0x0000989c, 0x000000d4, 0x000000d4 },
- { 0x000098d0, 0x0000000f, 0x0010000f },
-};
-
-static const uint32_t ar5416Bank7_9100[][2] = {
- /* Addr allmodes */
- { 0x0000989c, 0x00000500 },
- { 0x0000989c, 0x00000800 },
- { 0x000098cc, 0x0000000e },
-};
-
-static const uint32_t ar5416Addac_9100[][2] = {
- /* Addr allmodes */
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000010 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x000000c0 },
- { 0x0000989c, 0x00000015 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x0000989c, 0x00000000 },
- { 0x000098cc, 0x00000000 },
-};
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c b/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
deleted file mode 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*-
- * SPDX-License-Identifier: ISC
- *
- * Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd
- * Copyright (c) 2008 Sam Leffler, Errno Consulting
- * Copyright (c) 2008 Atheros Communications, Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
- */
-#include "opt_ah.h"
-
-#include "ah.h"
-#include "ah_internal.h"
-#include "ah_devid.h"
-
-#include "ar5416/ar5416.h"
-#include "ar5416/ar5416reg.h"
-#include "ar5416/ar5416phy.h"
-
-#include "ar9001/ar9130reg.h"
-#include "ar9001/ar9130_phy.h"
-#include "ar9001/ar9130_eeprom.h"
-
-#include "ar9001/ar9130.ini"
-
-static const HAL_PERCAL_DATA ar9130_iq_cal = { /* multi sample */
- .calName = "IQ", .calType = IQ_MISMATCH_CAL,
- .calNumSamples = MAX_CAL_SAMPLES,
- .calCountMax = PER_MIN_LOG_COUNT,
- .calCollect = ar5416IQCalCollect,
- .calPostProc = ar5416IQCalibration
-};
-static const HAL_PERCAL_DATA ar9130_adc_gain_cal = { /* multi sample */
- .calName = "ADC Gain", .calType = ADC_GAIN_CAL,
- .calNumSamples = MAX_CAL_SAMPLES,
- .calCountMax = PER_MIN_LOG_COUNT,
- .calCollect = ar5416AdcGainCalCollect,
- .calPostProc = ar5416AdcGainCalibration
-};
-static const HAL_PERCAL_DATA ar9130_adc_dc_cal = { /* multi sample */
- .calName = "ADC DC", .calType = ADC_DC_CAL,
- .calNumSamples = MAX_CAL_SAMPLES,
- .calCountMax = PER_MIN_LOG_COUNT,
- .calCollect = ar5416AdcDcCalCollect,
- .calPostProc = ar5416AdcDcCalibration
-};
-static const HAL_PERCAL_DATA ar9130_adc_init_dc_cal = {
- .calName = "ADC Init DC", .calType = ADC_DC_INIT_CAL,
- .calNumSamples = MIN_CAL_SAMPLES,
- .calCountMax = INIT_LOG_COUNT,
- .calCollect = ar5416AdcDcCalCollect,
- .calPostProc = ar5416AdcDcCalibration
-};
-
-static HAL_BOOL ar9130FillCapabilityInfo(struct ath_hal *ah);
-
-/*
- * Attach for an AR9130 part.
- */
-static struct ath_hal *
-ar9130Attach(uint16_t devid, HAL_SOFTC sc,
- HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata,
- HAL_OPS_CONFIG *ah_config,
- HAL_STATUS *status)
-{
- struct ath_hal_5416 *ahp5416;
- struct ath_hal_5212 *ahp;
- struct ath_hal *ah;
- uint32_t val;
- HAL_STATUS ecode;
- HAL_BOOL rfStatus;
-
- HALDEBUG(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,
- "%s: cannot allocate memory for state block\n", __func__);
- *status = HAL_ENOMEM;
- return AH_NULL;
- }
- ar5416InitState(ahp5416, devid, sc, st, sh, status);
- ahp = &ahp5416->ah_5212;
- ah = &ahp->ah_priv.h;
-
- /* XXX override with 9100 specific state */
- AH5416(ah)->ah_initPLL = ar9130InitPLL;
- /* XXX should force chainmasks to 0x7, as per ath9k calibration bugs */
-
- /* override 5416 methods for our needs */
-
- AH5416(ah)->ah_cal.iqCalData.calData = &ar9130_iq_cal;
- AH5416(ah)->ah_cal.adcGainCalData.calData = &ar9130_adc_gain_cal;
- AH5416(ah)->ah_cal.adcDcCalData.calData = &ar9130_adc_dc_cal;
- AH5416(ah)->ah_cal.adcDcCalInitData.calData = &ar9130_adc_init_dc_cal;
- AH5416(ah)->ah_cal.suppCals = ADC_GAIN_CAL | ADC_DC_CAL | IQ_MISMATCH_CAL;
-
- /*
- * This was hard-set because the initial ath9k port of this
- * code kept their runtime conditional register #defines.
- * AR_SREV and the RTC registers have shifted for Howl;
- * they detected this and changed the values at runtime.
- * The current port doesn't yet do this; it may do at a
- * later stage, so this is set early so any routines which
- * manipulate the registers have ah_macVersion set to base
- * the above decision upon.
- */
- AH_PRIVATE((ah))->ah_macVersion = AR_XSREV_VERSION_HOWL;
-
- /*
- * Use the "local" EEPROM data given to us by the higher layers.
- * This is a private copy out of system flash.
- * By this stage the SoC SPI flash may have disabled the memory-
- * mapping and rely purely on port-based SPI IO.
- */
- AH_PRIVATE((ah))->ah_eepromRead = ath_hal_EepromDataRead;
- AH_PRIVATE((ah))->ah_eepromWrite = NULL;
- ah->ah_eepromdata = eepromdata;
-
- if (!ar5416SetResetReg(ah, HAL_RESET_POWER_ON)) {
- /* reset chip */
- HALDEBUG(ah, HAL_DEBUG_ANY, "%s: couldn't reset chip\n",
- __func__);
- ecode = HAL_EIO;
- goto bad;
- }
-
- if (!ar5416SetPowerMode(ah, HAL_PM_AWAKE, AH_TRUE)) {
- HALDEBUG(ah, HAL_DEBUG_ANY, "%s: couldn't wakeup chip\n",
- __func__);
- ecode = HAL_EIO;
- goto bad;
- }
- /* Read Revisions from Chips before taking out of reset */
- val = OS_REG_READ(ah, AR_SREV_CHIP_HOWL) & AR_SREV_CHIP_HOWL_ID;
-
- /* XXX are these values even valid for the mac/radio revision? -adrian */
- HALDEBUG(ah, HAL_DEBUG_ATTACH,
- "%s: ID 0x%x VERSION 0x%x TYPE 0x%x REVISION 0x%x\n",
- __func__, MS(val, AR_XSREV_ID), MS(val, AR_XSREV_VERSION),
- MS(val, AR_XSREV_TYPE), MS(val, AR_XSREV_REVISION));
- AH_PRIVATE(ah)->ah_macRev = MS(val, AR_XSREV_REVISION);
- AH_PRIVATE(ah)->ah_ispcie = 0;
-
- /* setup common ini data; rf backends handle remainder */
- HAL_INI_INIT(&ahp->ah_ini_modes, ar5416Modes_9100, 6);
- HAL_INI_INIT(&ahp->ah_ini_common, ar5416Common_9100, 2);
-
- HAL_INI_INIT(&AH5416(ah)->ah_ini_bb_rfgain, ar5416BB_RfGain_9100, 3);
- HAL_INI_INIT(&AH5416(ah)->ah_ini_bank0, ar5416Bank0_9100, 2);
- HAL_INI_INIT(&AH5416(ah)->ah_ini_bank1, ar5416Bank1_9100, 2);
- HAL_INI_INIT(&AH5416(ah)->ah_ini_bank2, ar5416Bank2_9100, 2);
- HAL_INI_INIT(&AH5416(ah)->ah_ini_bank3, ar5416Bank3_9100, 3);
- HAL_INI_INIT(&AH5416(ah)->ah_ini_bank6, ar5416Bank6TPC_9100, 3);
- HAL_INI_INIT(&AH5416(ah)->ah_ini_bank7, ar5416Bank7_9100, 2);
- HAL_INI_INIT(&AH5416(ah)->ah_ini_addac, ar5416Addac_9100, 2);
-
- ecode = ath_hal_v14EepromAttach(ah);
- if (ecode != HAL_OK)
- goto bad;
-
- if (!ar5416ChipReset(ah, AH_NULL, HAL_RESET_NORMAL)) { /* reset chip */
- HALDEBUG(ah, HAL_DEBUG_ANY, "%s: chip reset failed\n", __func__);
- ecode = HAL_EIO;
- goto bad;
- }
-
- AH_PRIVATE(ah)->ah_phyRev = OS_REG_READ(ah, AR_PHY_CHIP_ID);
-
- if (!ar5212ChipTest(ah)) {
- HALDEBUG(ah, HAL_DEBUG_ANY, "%s: hardware self-test failed\n",
- __func__);
- ecode = HAL_ESELFTEST;
- goto bad;
- }
-
- /*
- * Set correct Baseband to analog shift
- * setting to access analog chips.
- */
- OS_REG_WRITE(ah, AR_PHY(0), 0x00000007);
-
- /* Read Radio Chip Rev Extract */
- AH_PRIVATE(ah)->ah_analog5GhzRev = ar5416GetRadioRev(ah);
- switch (AH_PRIVATE(ah)->ah_analog5GhzRev & AR_RADIO_SREV_MAJOR) {
- case AR_RAD2133_SREV_MAJOR: /* Sowl: 2G/3x3 */
- case AR_RAD5133_SREV_MAJOR: /* Sowl: 2+5G/3x3 */
- break;
- default:
- if (AH_PRIVATE(ah)->ah_analog5GhzRev == 0) {
- AH_PRIVATE(ah)->ah_analog5GhzRev =
- AR_RAD5133_SREV_MAJOR;
- break;
- }
-#ifdef AH_DEBUG
- HALDEBUG(ah, HAL_DEBUG_ANY,
- "%s: 5G Radio Chip Rev 0x%02X is not supported by "
- "this driver\n", __func__,
- AH_PRIVATE(ah)->ah_analog5GhzRev);
- ecode = HAL_ENOTSUPP;
- goto bad;
-#endif
- }
- rfStatus = ar2133RfAttach(ah, &ecode);
- if (!rfStatus) {
- HALDEBUG(ah, HAL_DEBUG_ANY, "%s: RF setup failed, status %u\n",
- __func__, ecode);
- goto bad;
- }
-
- /*
- * Got everything we need now to setup the capabilities.
- */
- if (!ar9130FillCapabilityInfo(ah)) {
- ecode = HAL_EEREAD;
- goto bad;
- }
-
- ecode = ath_hal_eepromGet(ah, AR_EEP_MACADDR, ahp->ah_macaddr);
- if (ecode != HAL_OK) {
- HALDEBUG(ah, HAL_DEBUG_ANY,
- "%s: error getting mac address from EEPROM\n", __func__);
- goto bad;
- }
- /* XXX How about the serial number ? */
- /* Read Reg Domain */
- AH_PRIVATE(ah)->ah_currentRD =
- ath_hal_eepromGet(ah, AR_EEP_REGDMN_0, AH_NULL);
- AH_PRIVATE(ah)->ah_currentRDext =
- ath_hal_eepromGet(ah, AR_EEP_REGDMN_1, AH_NULL);
-
- /*
- * ah_miscMode is populated by ar5416FillCapabilityInfo()
- * starting from griffin. Set here to make sure that
- * AR_MISC_MODE_MIC_NEW_LOC_ENABLE is set before a GTK is
- * placed into hardware.
- */
- if (ahp->ah_miscMode != 0)
- OS_REG_WRITE(ah, AR_MISC_MODE, ahp->ah_miscMode);
-
- /* XXX no ANI for AR9130 */
- AH5416(ah)->nf_2g.max = AR_PHY_CCA_MAX_GOOD_VAL_5416_2GHZ;
- AH5416(ah)->nf_2g.min = AR_PHY_CCA_MIN_GOOD_VAL_5416_2GHZ;
- AH5416(ah)->nf_2g.nominal = AR_PHY_CCA_NOM_VAL_5416_2GHZ;
- AH5416(ah)->nf_5g.max = AR_PHY_CCA_MAX_GOOD_VAL_5416_5GHZ;
- AH5416(ah)->nf_5g.min = AR_PHY_CCA_MIN_GOOD_VAL_5416_5GHZ;
- AH5416(ah)->nf_5g.nominal = AR_PHY_CCA_NOM_VAL_5416_5GHZ;
-
- ar5416InitNfHistBuff(AH5416(ah)->ah_cal.nfCalHist);
-
- HALDEBUG(ah, HAL_DEBUG_ATTACH, "%s: return\n", __func__);
-
- return ah;
-bad:
- if (ahp)
- ar5416Detach((struct ath_hal *) ahp);
- if (status)
- *status = ecode;
- return AH_NULL;
-}
-
-/*
- * Fill all software cached or static hardware state information.
- * Return failure if capabilities are to come from EEPROM and
- * cannot be read.
- */
-static HAL_BOOL
-ar9130FillCapabilityInfo(struct ath_hal *ah)
-{
- HAL_CAPABILITIES *pCap = &AH_PRIVATE(ah)->ah_caps;
-
- HALDEBUG(ah, HAL_DEBUG_ATTACH, "%s: begin\n", __func__);
- if (!ar5416FillCapabilityInfo(ah))
- return AH_FALSE;
- HALDEBUG(ah, HAL_DEBUG_ATTACH, "%s: fill'ed; now setting\n", __func__);
- pCap->halCSTSupport = AH_TRUE;
- pCap->halRifsRxSupport = AH_TRUE;
- pCap->halRifsTxSupport = AH_TRUE;
- pCap->halRtsAggrLimit = 64*1024; /* 802.11n max */
- pCap->halExtChanDfsSupport = AH_TRUE;
- pCap->halUseCombinedRadarRssi = AH_TRUE;
- pCap->halAutoSleepSupport = AH_FALSE; /* XXX? */
- /*
- * MBSSID aggregation is broken in Howl v1.1, v1.2, v1.3
- * and works fine in v1.4.
- * XXX todo, enable it for v1.4.
- */
- pCap->halMbssidAggrSupport = AH_FALSE;
- pCap->hal4AddrAggrSupport = AH_TRUE;
- /* BB Read WAR */
- pCap->halHasBBReadWar = AH_TRUE;
-
- /*
- * Implement the PLL/config changes needed for half/quarter
- * rates before re-enabling them here.
- */
- pCap->halChanHalfRate = AH_FALSE;
- pCap->halChanQuarterRate = AH_FALSE;
-
- return AH_TRUE;
-}
-
-static const char*
-ar9130Probe(uint16_t vendorid, uint16_t devid)
-{
- if (vendorid == ATHEROS_VENDOR_ID && devid == AR5416_AR9130_DEVID)
- return "Atheros 9130";
- return AH_NULL;
-}
-AH_CHIP(AR9130, ar9130Probe, ar9130Attach);
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.h b/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.h
deleted file mode 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*-
- * SPDX-License-Identifier: ISC
- *
- * Copyright (c) 2010 Adrian Chadd, Xenion Pty Ltd
- * Copyright (c) 2010 Atheros Communications, Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
- */
-#ifndef __AR9130_EEPROM_H__
-#define __AR9130_EEPROM_H__
-
-#endif
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.c b/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.c
deleted file mode 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*-
- * SPDX-License-Identifier: ISC
- *
- * Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd
- * Copyright (c) 2010 Atheros Communications, Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
- */
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_phy.h b/sys/dev/ath/ath_hal/ar9001/ar9130_phy.h
deleted file mode 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130_phy.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * SPDX-License-Identifier: ISC
- *
- * Copyright (c) 2010 Adrian Chadd, Xenion Pty Ltd
- * Copyright (c) 2008 Sam Leffler, Errno Consulting
- * Copyright (c) 2008 Atheros Communications, Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
- */
-#ifndef __AR9130_PHY_H__
-#define __AR9130_PHY_H__
-
-extern void ar9130InitPLL(struct ath_hal *ah, const struct ieee80211_channel *chan);
-
-#endif
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_phy.c b/sys/dev/ath/ath_hal/ar9001/ar9130_phy.c
deleted file mode 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130_phy.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * SPDX-License-Identifier: ISC
- *
- * Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd
- * Copyright (c) 2010 Atheros Communications, Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
- */
-#include "opt_ah.h"
-
-#include "ah.h"
-#include "ah_internal.h"
-#include "ah_devid.h"
-
-#include "ar5416/ar5416.h"
-#include "ar5416/ar5416reg.h"
-#include "ar5416/ar5416phy.h"
-#include "ar9001/ar9130_phy.h"
-
-void
-ar9130InitPLL(struct ath_hal *ah, const struct ieee80211_channel *chan)
-{
-
- uint32_t pll;
-
- /*
- * XXX TODO: support half/quarter rates
- */
- if (chan && IEEE80211_IS_CHAN_5GHZ(chan))
- pll = 0x1450;
- else
- pll = 0x1458;
-
- OS_REG_WRITE(ah, AR_RTC_PLL_CONTROL, pll);
- OS_DELAY(RTC_PLL_SETTLE_DELAY);
- OS_REG_WRITE(ah, AR_RTC_SLEEP_CLK, AR_RTC_SLEEP_DERIVED_CLK);
-}
diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130reg.h b/sys/dev/ath/ath_hal/ar9001/ar9130reg.h
deleted file mode 100644
--- a/sys/dev/ath/ath_hal/ar9001/ar9130reg.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * SPDX-License-Identifier: ISC
- *
- * Copyright (c) 2010 Adrian Chadd, Xenion Pty Ltd
- * Copyright (c) 2008 Sam Leffler, Errno Consulting
- * Copyright (c) 2008 Atheros Communications, Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD$
- */
-#ifndef __AR9130REG_H__
-#define __AR9130REG_H__
-
-/* AR9130 shifts these registers */
-#define AR_SREV_CHIP_HOWL 0x0600
-#define AR_SREV_CHIP_HOWL_ID 0x00000FFF
-
-#endif /* __AR9130REG_H__ */
diff --git a/sys/modules/ath_hal_ar5416/Makefile b/sys/modules/ath_hal_ar5416/Makefile
--- a/sys/modules/ath_hal_ar5416/Makefile
+++ b/sys/modules/ath_hal_ar5416/Makefile
@@ -61,15 +61,6 @@
.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar9001
SRCS+= ar9160_attach.c
-# + AR9130 - (Sowl) - Embedded (AR913x SoC)
-#
-# This requires AH_SUPPORT_AR9130 in order to function as some
-# register values have shifted for this chipset. Definig this however
-# (currently) breaks non-AR9130 chipsets - since this is an embedded
-# chipset and no other radios are glued to it, this shouldn't pose a
-# problem.
-SRCS+= ar9130_attach.c ar9130_eeprom.c ar9130_phy.c
-
# AR9002 series chips
# + AR9220/AR9280 - Merlin
.PATH: ${SRCTOP}/sys/dev/ath/ath_hal/ar9002

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 7, 12:37 PM (22 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14512420
Default Alt Text
D41355.diff (48 KB)

Event Timeline