From 57fecb7bb0f51f52b23727811f4d2a0612435911 Mon Sep 17 00:00:00 2001 From: StanleyYP Wang Date: Thu, 7 Jul 2022 11:09:59 +0800 Subject: [PATCH 1123/1131] mt76: mt7915: implement bin file mode Signed-off-by: StanleyYP Wang Signed-off-by: Shayne Chen --- eeprom.c | 20 ++++++++++++++++++++ mt76.h | 3 +++ mt7915/eeprom.c | 36 +++++++++++++++++++++++++++++++++--- mt7915/eeprom.h | 7 +++++++ mt7915/mt7915.h | 9 ++++++--- mt7915/mtk_debugfs.c | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 110 insertions(+), 6 deletions(-) diff --git a/eeprom.c b/eeprom.c index cb6ff17..05b6dfa 100644 --- a/eeprom.c +++ b/eeprom.c @@ -104,6 +104,26 @@ out_put_node: } EXPORT_SYMBOL_GPL(mt76_get_of_eeprom); +bool mt76_check_bin_file_mode(struct mt76_dev *dev) +{ + struct device_node *np = dev->dev->of_node; + const char *bin_file_name = NULL; + + if (!np) + return false; + + of_property_read_string(np, "bin_file_name", &bin_file_name); + + dev->bin_file_name = bin_file_name; + if (dev->bin_file_name) + dev_info(dev->dev, "Using bin file %s\n", dev->bin_file_name); + + of_node_put(np); + + return dev->bin_file_name ? true : false; +} +EXPORT_SYMBOL_GPL(mt76_check_bin_file_mode); + void mt76_eeprom_override(struct mt76_phy *phy) { diff --git a/mt76.h b/mt76.h index c6aefbf..9b6e806 100644 --- a/mt76.h +++ b/mt76.h @@ -894,9 +894,11 @@ struct mt76_dev { struct mt76_sdio sdio; }; + /* for mtk internal */ struct mt76_connac2_patch_hdr *patch_hdr; struct mt76_connac2_fw_trailer *wm_hdr; struct mt76_connac2_fw_trailer *wa_hdr; + const char *bin_file_name; }; struct mt76_power_limits { @@ -1033,6 +1035,7 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str, int mt76_eeprom_init(struct mt76_dev *dev, int len); void mt76_eeprom_override(struct mt76_phy *phy); int mt76_get_of_eeprom(struct mt76_dev *dev, void *data, int offset, int len); +bool mt76_check_bin_file_mode(struct mt76_dev *dev); struct mt76_queue * mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc, diff --git a/mt7915/eeprom.c b/mt7915/eeprom.c index 55ba90a..54803e8 100644 --- a/mt7915/eeprom.c +++ b/mt7915/eeprom.c @@ -45,8 +45,11 @@ static int mt7915_check_eeprom(struct mt7915_dev *dev) } } -static char *mt7915_eeprom_name(struct mt7915_dev *dev) +const char *mt7915_eeprom_name(struct mt7915_dev *dev) { + if (dev->bin_file_mode) + return dev->mt76.bin_file_name; + switch (mt76_chip(&dev->mt76)) { case 0x7915: return dev->dbdc_support ? @@ -84,7 +87,10 @@ mt7915_eeprom_load_default(struct mt7915_dev *dev) return ret; if (!fw || !fw->data) { - dev_err(dev->mt76.dev, "Invalid default bin\n"); + if (dev->bin_file_mode) + dev_err(dev->mt76.dev, "Invalid bin (bin file mode)\n"); + else + dev_err(dev->mt76.dev, "Invalid default bin\n"); ret = -EINVAL; goto out; } @@ -109,6 +115,7 @@ static int mt7915_eeprom_load(struct mt7915_dev *dev) if (ret) { dev->flash_mode = true; + dev->eeprom_mode = FLASH_MODE; } else { u8 free_block_num; u32 block_num, i; @@ -129,6 +136,8 @@ static int mt7915_eeprom_load(struct mt7915_dev *dev) if (ret < 0) return ret; } + + dev->eeprom_mode = EFUSE_MODE; } return mt7915_check_eeprom(dev); @@ -234,12 +243,33 @@ int mt7915_eeprom_init(struct mt7915_dev *dev) { int ret; - ret = mt7915_eeprom_load(dev); + dev->bin_file_mode = mt76_check_bin_file_mode(&dev->mt76); + if (dev->bin_file_mode) { + dev->mt76.eeprom.size = mt7915_eeprom_size(dev); + dev->mt76.eeprom.data = devm_kzalloc(dev->mt76.dev, dev->mt76.eeprom.size, + GFP_KERNEL); + if (!dev->mt76.eeprom.data) + return -ENOMEM; + ret = mt7915_eeprom_load_default(dev); + if (ret) + return ret; + + ret = mt7915_check_eeprom(dev); + if (ret) + return ret; + dev->eeprom_mode = BIN_FILE_MODE; + } else { + ret = mt7915_eeprom_load(dev); + } + if (ret < 0) { if (ret != -EINVAL) return ret; dev_warn(dev->mt76.dev, "eeprom load fail, use default bin\n"); + dev->bin_file_mode = false; + dev->eeprom_mode = DEFAULT_BIN_MODE; + ret = mt7915_eeprom_load_default(dev); if (ret) return ret; diff --git a/mt7915/eeprom.h b/mt7915/eeprom.h index fdae347..9056d78 100644 --- a/mt7915/eeprom.h +++ b/mt7915/eeprom.h @@ -108,6 +108,13 @@ enum mt7915_sku_rate_group { MAX_SKU_RATE_GROUP_NUM, }; +enum mt7915_eeprom_mode { + DEFAULT_BIN_MODE, + EFUSE_MODE, + FLASH_MODE, + BIN_FILE_MODE, +}; + static inline int mt7915_get_channel_group_5g(int channel, bool is_7976) { diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h index 4c370bb..e5cfc77 100644 --- a/mt7915/mt7915.h +++ b/mt7915/mt7915.h @@ -42,9 +42,9 @@ #define MT7986_ROM_PATCH "mediatek/mt7986_rom_patch.bin" #define MT7986_ROM_PATCH_MT7975 "mediatek/mt7986_rom_patch_mt7975.bin" -#define MT7915_EEPROM_DEFAULT "mediatek/mt7915_eeprom.bin" -#define MT7915_EEPROM_DEFAULT_DBDC "mediatek/mt7915_eeprom_dbdc.bin" -#define MT7916_EEPROM_DEFAULT "mediatek/mt7916_eeprom.bin" +#define MT7915_EEPROM_DEFAULT "mediatek/mt7915_eeprom.bin" +#define MT7915_EEPROM_DEFAULT_DBDC "mediatek/mt7915_eeprom_dbdc.bin" +#define MT7916_EEPROM_DEFAULT "mediatek/mt7916_eeprom.bin" #define MT7986_EEPROM_MT7975_DEFAULT "mediatek/mt7986_eeprom_mt7975.bin" #define MT7986_EEPROM_MT7975_DUAL_DEFAULT "mediatek/mt7986_eeprom_mt7975_dual.bin" #define MT7986_EEPROM_MT7976_DEFAULT "mediatek/mt7986_eeprom_mt7976.bin" @@ -400,6 +400,8 @@ struct mt7915_dev { bool dbdc_support; bool flash_mode; + bool bin_file_mode; + u8 eeprom_mode; bool muru_debug; bool ibf; @@ -774,6 +776,7 @@ void mt7915_dump_tmac_info(u8 *tmac_info); int mt7915_mcu_set_txpower_level(struct mt7915_phy *phy, u8 drop_level); void mt7915_packet_log_to_host(struct mt7915_dev *dev, const void *data, int len, int type, int des_len); int mt7915_mcu_set_amsdu_algo(struct mt7915_dev *dev, u16 wcid, u8 enable); +const char *mt7915_eeprom_name(struct mt7915_dev *dev); #define PKT_BIN_DEBUG_MAGIC 0xc8763123 enum { diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c index a2ceb6f..7567666 100644 --- a/mt7915/mtk_debugfs.c +++ b/mt7915/mtk_debugfs.c @@ -3,6 +3,7 @@ #include "mt7915_debug.h" #include "mac.h" #include "mcu.h" +#include "eeprom.h" #ifdef MTK_DEBUG #define LWTBL_IDX2BASE_ID GENMASK(14, 8) @@ -2924,6 +2925,44 @@ mt7915_wa_debug(void *data, u64 val) DEFINE_DEBUGFS_ATTRIBUTE(fops_wa_debug, NULL, mt7915_wa_debug, "0x%llx\n"); +static int mt7915_show_eeprom_mode(struct seq_file *s, void *data) +{ + struct mt7915_dev *dev = dev_get_drvdata(s->private); + struct mt76_dev *mdev = &dev->mt76; +#ifdef CONFIG_NL80211_TESTMODE + const char *mtd_name = mdev->test_mtd.name; + u32 mtd_offset = mdev->test_mtd.offset; +#else + const char *mtd_name = NULL; + u32 mtd_offset; +#endif + + seq_printf(s, "Current eeprom mode:\n"); + + switch (dev->eeprom_mode) { + case DEFAULT_BIN_MODE: + seq_printf(s, " default bin mode\n filename = %s\n", mt7915_eeprom_name(dev)); + break; + case EFUSE_MODE: + seq_printf(s, " efuse mode\n"); + break; + case FLASH_MODE: + if (mtd_name) + seq_printf(s, " flash mode\n mtd name = %s\n flash offset = 0x%x\n", + mtd_name, mtd_offset); + else + seq_printf(s, " flash mode\n"); + break; + case BIN_FILE_MODE: + seq_printf(s, " bin file mode\n filename = %s\n", mt7915_eeprom_name(dev)); + break; + default: + break; + } + + return 0; +} + int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir) { struct mt7915_dev *dev = phy->dev; @@ -3009,6 +3048,8 @@ int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir) debugfs_create_devm_seqfile(dev->mt76.dev, "fw_version", dir, mt7915_dump_version); + debugfs_create_devm_seqfile(dev->mt76.dev, "eeprom_mode", dir, + mt7915_show_eeprom_mode); return 0; } #endif -- 2.36.1