mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
bd6dc4bffa
ath9k-htc USB-based adapterssupport 5/10MHz channel bandwidth, the same as standard ath9k ones. Move the code handling the features in debugfs to common-debug.c, and create proper registration functions to use in debug.c and htc_drv_debug.c, leaving only debugfs registration there. While at that, refresh one patch that would conflict otherwise. Tested on TP-Link Archer C7v2 (ath79) and TP-Link WN722Nv1 (AR9287) and WN822Nv2 (AR7010+AR9287). Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
93 lines
2.7 KiB
Diff
93 lines
2.7 KiB
Diff
--- a/drivers/net/wireless/ath/ath9k/debug.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/debug.c
|
|
@@ -1471,6 +1471,7 @@ int ath9k_init_debug(struct ath_hw *ah)
|
|
|
|
ath9k_cmn_debug_base_eeprom(sc->debug.debugfs_phy, sc->sc_ah);
|
|
ath9k_cmn_debug_modal_eeprom(sc->debug.debugfs_phy, sc->sc_ah);
|
|
+ ath9k_cmn_debug_eeprom(sc->debug.debugfs_phy, sc->sc_ah);
|
|
|
|
debugfs_create_u32("gpio_mask", 0600,
|
|
sc->debug.debugfs_phy, &sc->sc_ah->gpio_mask);
|
|
--- a/drivers/net/wireless/ath/ath9k/common-debug.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/common-debug.c
|
|
@@ -260,3 +260,58 @@ void ath9k_cmn_debug_phy_err(struct dent
|
|
&fops_phy_err);
|
|
}
|
|
EXPORT_SYMBOL(ath9k_cmn_debug_phy_err);
|
|
+
|
|
+static ssize_t read_file_eeprom(struct file *file, char __user *user_buf,
|
|
+ size_t count, loff_t *ppos)
|
|
+{
|
|
+ struct ath_hw *ah = file->private_data;
|
|
+ struct ath_common *common = ath9k_hw_common(ah);
|
|
+ int bytes = 0;
|
|
+ int pos = *ppos;
|
|
+ int size = 4096;
|
|
+ u16 val;
|
|
+ int i;
|
|
+
|
|
+ if (AR_SREV_9300_20_OR_LATER(ah))
|
|
+ size = 16384;
|
|
+
|
|
+ if (*ppos < 0)
|
|
+ return -EINVAL;
|
|
+
|
|
+ if (count > size - *ppos)
|
|
+ count = size - *ppos;
|
|
+
|
|
+ for (i = *ppos / 2; count > 0; count -= bytes, *ppos += bytes, i++) {
|
|
+ void *from = &val;
|
|
+
|
|
+ if (!common->bus_ops->eeprom_read(common, i, &val))
|
|
+ val = 0xffff;
|
|
+
|
|
+ if (*ppos % 2) {
|
|
+ from++;
|
|
+ bytes = 1;
|
|
+ } else if (count == 1) {
|
|
+ bytes = 1;
|
|
+ } else {
|
|
+ bytes = 2;
|
|
+ }
|
|
+ if (copy_to_user(user_buf, from, bytes))
|
|
+ return -EFAULT;
|
|
+ user_buf += bytes;
|
|
+ }
|
|
+ return *ppos - pos;
|
|
+}
|
|
+
|
|
+static const struct file_operations fops_eeprom = {
|
|
+ .read = read_file_eeprom,
|
|
+ .open = simple_open,
|
|
+ .owner = THIS_MODULE
|
|
+};
|
|
+
|
|
+void ath9k_cmn_debug_eeprom(struct dentry *debugfs_phy,
|
|
+ struct ath_hw *ah)
|
|
+{
|
|
+ debugfs_create_file("eeprom", S_IRUSR, debugfs_phy, ah,
|
|
+ &fops_eeprom);
|
|
+}
|
|
+EXPORT_SYMBOL(ath9k_cmn_debug_eeprom);
|
|
--- a/drivers/net/wireless/ath/ath9k/common-debug.h
|
|
+++ b/drivers/net/wireless/ath/ath9k/common-debug.h
|
|
@@ -69,6 +69,8 @@ void ath9k_cmn_debug_modal_eeprom(struct
|
|
struct ath_hw *ah);
|
|
void ath9k_cmn_debug_base_eeprom(struct dentry *debugfs_phy,
|
|
struct ath_hw *ah);
|
|
+void ath9k_cmn_debug_eeprom(struct dentry *debugfs_phy,
|
|
+ struct ath_hw *ah);
|
|
void ath9k_cmn_debug_stat_rx(struct ath_rx_stats *rxstats,
|
|
struct ath_rx_status *rs);
|
|
void ath9k_cmn_debug_recv(struct dentry *debugfs_phy,
|
|
--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
|
|
@@ -519,6 +519,7 @@ int ath9k_htc_init_debug(struct ath_hw *
|
|
|
|
ath9k_cmn_debug_base_eeprom(priv->debug.debugfs_phy, priv->ah);
|
|
ath9k_cmn_debug_modal_eeprom(priv->debug.debugfs_phy, priv->ah);
|
|
+ ath9k_cmn_debug_eeprom(priv->debug.debugfs_phy, priv->ah);
|
|
|
|
return 0;
|
|
}
|