developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 1 | From f7cb9b3ad2c0207db231a16d04beea22be1ef798 Mon Sep 17 00:00:00 2001 |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 2 | From: StanleyYP Wang <StanleyYP.Wang@mediatek.com> |
| 3 | Date: Thu, 7 Jul 2022 11:09:59 +0800 |
developer | b403ad0 | 2022-11-08 10:16:29 +0800 | [diff] [blame] | 4 | Subject: [PATCH 1121/1128] mt76: mt7915: implement bin file mode |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 5 | |
| 6 | Change-Id: I2a726341541a11cbecdb210b33a8e79aefbd6cf3 |
| 7 | Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com> |
| 8 | --- |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 9 | eeprom.c | 18 +++++++++++++++ |
| 10 | mt76.h | 1 + |
| 11 | mt7915/eeprom.c | 52 ++++++++++++++++++++------------------------ |
| 12 | mt7915/eeprom.h | 44 +++++++++++++++++++++++++++++++++++++ |
| 13 | mt7915/mt7915.h | 17 ++++++++++++--- |
| 14 | mt7915/mtk_debugfs.c | 36 ++++++++++++++++++++++++++++++ |
| 15 | 6 files changed, 136 insertions(+), 32 deletions(-) |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 16 | |
| 17 | diff --git a/eeprom.c b/eeprom.c |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 18 | index e083964..5b9faf7 100644 |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 19 | --- a/eeprom.c |
| 20 | +++ b/eeprom.c |
developer | 28b11e2 | 2022-09-05 19:09:45 +0800 | [diff] [blame] | 21 | @@ -104,6 +104,24 @@ out_put_node: |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 22 | } |
| 23 | EXPORT_SYMBOL_GPL(mt76_get_of_eeprom); |
| 24 | |
| 25 | +bool mt76_check_bin_file_mode(struct mt76_dev *dev) |
| 26 | +{ |
| 27 | + struct device_node *np = dev->dev->of_node; |
| 28 | + const __be32 *bin_file_mode; |
| 29 | + bool ret = false; |
| 30 | + |
| 31 | + if (!np) |
| 32 | + return false; |
| 33 | + |
| 34 | + bin_file_mode = of_get_property(np, "bin_file_mode", NULL); |
| 35 | + if (bin_file_mode && be32_to_cpu(*bin_file_mode)) |
| 36 | + ret = true; |
| 37 | + |
| 38 | + of_node_put(np); |
| 39 | + return ret; |
| 40 | +} |
| 41 | +EXPORT_SYMBOL_GPL(mt76_check_bin_file_mode); |
| 42 | + |
| 43 | void |
| 44 | mt76_eeprom_override(struct mt76_phy *phy) |
| 45 | { |
| 46 | diff --git a/mt76.h b/mt76.h |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 47 | index 0a9552b..e29f490 100644 |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 48 | --- a/mt76.h |
| 49 | +++ b/mt76.h |
developer | 047bc18 | 2022-11-16 12:20:48 +0800 | [diff] [blame] | 50 | @@ -1010,6 +1010,7 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str, |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 51 | int mt76_eeprom_init(struct mt76_dev *dev, int len); |
| 52 | void mt76_eeprom_override(struct mt76_phy *phy); |
| 53 | int mt76_get_of_eeprom(struct mt76_dev *dev, void *data, int offset, int len); |
| 54 | +bool mt76_check_bin_file_mode(struct mt76_dev *dev); |
| 55 | |
| 56 | struct mt76_queue * |
| 57 | mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc, |
| 58 | diff --git a/mt7915/eeprom.c b/mt7915/eeprom.c |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 59 | index 0f5862e..4d2d9ca 100644 |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 60 | --- a/mt7915/eeprom.c |
| 61 | +++ b/mt7915/eeprom.c |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 62 | @@ -42,33 +42,6 @@ static int mt7915_check_eeprom(struct mt7915_dev *dev) |
| 63 | } |
| 64 | } |
| 65 | |
| 66 | -static char *mt7915_eeprom_name(struct mt7915_dev *dev) |
| 67 | -{ |
| 68 | - switch (mt76_chip(&dev->mt76)) { |
| 69 | - case 0x7915: |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 70 | - return dev->dbdc_support ? |
| 71 | - MT7915_EEPROM_DEFAULT_DBDC : MT7915_EEPROM_DEFAULT; |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 72 | - case 0x7986: |
| 73 | - switch (mt7915_check_adie(dev, true)) { |
| 74 | - case MT7976_ONE_ADIE_DBDC: |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 75 | - return MT7986_EEPROM_MT7976_DEFAULT_DBDC; |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 76 | - case MT7975_ONE_ADIE: |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 77 | - return MT7986_EEPROM_MT7975_DEFAULT; |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 78 | - case MT7976_ONE_ADIE: |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 79 | - return MT7986_EEPROM_MT7976_DEFAULT; |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 80 | - case MT7975_DUAL_ADIE: |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 81 | - return MT7986_EEPROM_MT7975_DUAL_DEFAULT; |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 82 | - case MT7976_DUAL_ADIE: |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 83 | - return MT7986_EEPROM_MT7976_DUAL_DEFAULT; |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 84 | - default: |
| 85 | - break; |
| 86 | - } |
| 87 | - return NULL; |
| 88 | - default: |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 89 | - return MT7916_EEPROM_DEFAULT; |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 90 | - } |
| 91 | -} |
| 92 | - |
| 93 | static int |
| 94 | mt7915_eeprom_load_default(struct mt7915_dev *dev) |
| 95 | { |
| 96 | @@ -81,7 +54,10 @@ mt7915_eeprom_load_default(struct mt7915_dev *dev) |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 97 | return ret; |
| 98 | |
| 99 | if (!fw || !fw->data) { |
| 100 | - dev_err(dev->mt76.dev, "Invalid default bin\n"); |
| 101 | + if (dev->bin_file_mode) |
| 102 | + dev_err(dev->mt76.dev, "Invalid bin (bin file mode)\n"); |
| 103 | + else |
| 104 | + dev_err(dev->mt76.dev, "Invalid default bin\n"); |
| 105 | ret = -EINVAL; |
| 106 | goto out; |
| 107 | } |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 108 | @@ -106,6 +82,7 @@ static int mt7915_eeprom_load(struct mt7915_dev *dev) |
| 109 | |
| 110 | if (ret) { |
| 111 | dev->flash_mode = true; |
| 112 | + dev->eeprom_mode = FLASH_MODE; |
| 113 | } else { |
| 114 | u8 free_block_num; |
| 115 | u32 block_num, i; |
| 116 | @@ -121,6 +98,7 @@ static int mt7915_eeprom_load(struct mt7915_dev *dev) |
| 117 | for (i = 0; i < block_num; i++) |
| 118 | mt7915_mcu_get_eeprom(dev, |
| 119 | i * MT7915_EEPROM_BLOCK_SIZE); |
| 120 | + dev->eeprom_mode = EFUSE_MODE; |
| 121 | } |
| 122 | |
| 123 | return mt7915_check_eeprom(dev); |
| 124 | @@ -224,12 +202,28 @@ int mt7915_eeprom_init(struct mt7915_dev *dev) |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 125 | { |
| 126 | int ret; |
| 127 | |
| 128 | - ret = mt7915_eeprom_load(dev); |
| 129 | + dev->bin_file_mode = mt76_check_bin_file_mode(&dev->mt76); |
| 130 | + |
| 131 | + if (dev->bin_file_mode) { |
| 132 | + dev->mt76.eeprom.size = mt7915_eeprom_size(dev); |
| 133 | + dev->mt76.eeprom.data = devm_kzalloc(dev->mt76.dev, dev->mt76.eeprom.size, |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 134 | + GFP_KERNEL); |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 135 | + if (!dev->mt76.eeprom.data) |
| 136 | + return -ENOMEM; |
| 137 | + ret = mt7915_eeprom_load_default(dev); |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 138 | + dev->eeprom_mode = BIN_FILE_MODE; |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 139 | + } else { |
| 140 | + ret = mt7915_eeprom_load(dev); |
| 141 | + } |
| 142 | + |
| 143 | if (ret < 0) { |
| 144 | if (ret != -EINVAL) |
| 145 | return ret; |
| 146 | |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 147 | dev_warn(dev->mt76.dev, "eeprom load fail, use default bin\n"); |
| 148 | + dev->bin_file_mode = false; |
| 149 | + dev->eeprom_mode = DEFAULT_BIN_MODE; |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 150 | + |
| 151 | ret = mt7915_eeprom_load_default(dev); |
| 152 | if (ret) |
| 153 | return ret; |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 154 | diff --git a/mt7915/eeprom.h b/mt7915/eeprom.h |
| 155 | index fdae347..f228926 100644 |
| 156 | --- a/mt7915/eeprom.h |
| 157 | +++ b/mt7915/eeprom.h |
| 158 | @@ -108,6 +108,13 @@ enum mt7915_sku_rate_group { |
| 159 | MAX_SKU_RATE_GROUP_NUM, |
| 160 | }; |
| 161 | |
| 162 | +enum mt7915_eeprom_mode { |
| 163 | + DEFAULT_BIN_MODE, |
| 164 | + EFUSE_MODE, |
| 165 | + FLASH_MODE, |
| 166 | + BIN_FILE_MODE, |
| 167 | +}; |
| 168 | + |
| 169 | static inline int |
| 170 | mt7915_get_channel_group_5g(int channel, bool is_7976) |
| 171 | { |
| 172 | @@ -184,6 +191,43 @@ mt7915_get_cal_group_size(struct mt7915_dev *dev) |
| 173 | } |
| 174 | } |
| 175 | |
| 176 | +static inline char *mt7915_eeprom_name(struct mt7915_dev *dev) |
| 177 | +{ |
| 178 | + switch (mt76_chip(&dev->mt76)) { |
| 179 | + case 0x7915: |
| 180 | + if (dev->bin_file_mode) |
| 181 | + return dev->dbdc_support ? |
| 182 | + MT7915_BIN_FILE_DBDC : MT7915_BIN_FILE; |
| 183 | + else |
| 184 | + return dev->dbdc_support ? |
| 185 | + MT7915_EEPROM_DEFAULT_DBDC : MT7915_EEPROM_DEFAULT; |
| 186 | + case 0x7986: |
| 187 | + switch (mt7915_check_adie(dev, true)) { |
| 188 | + case MT7976_ONE_ADIE_DBDC: |
| 189 | + return dev->bin_file_mode ? |
| 190 | + MT7986_BIN_FILE_MT7976_DBDC : MT7986_EEPROM_MT7976_DEFAULT_DBDC; |
| 191 | + case MT7975_ONE_ADIE: |
| 192 | + return dev->bin_file_mode ? |
| 193 | + MT7986_BIN_FILE_MT7975 : MT7986_EEPROM_MT7975_DEFAULT; |
| 194 | + case MT7976_ONE_ADIE: |
| 195 | + return dev->bin_file_mode ? |
| 196 | + MT7986_BIN_FILE_MT7976 : MT7986_EEPROM_MT7976_DEFAULT; |
| 197 | + case MT7975_DUAL_ADIE: |
| 198 | + return dev->bin_file_mode ? |
| 199 | + MT7986_BIN_FILE_MT7975_DUAL : MT7986_EEPROM_MT7975_DUAL_DEFAULT; |
| 200 | + case MT7976_DUAL_ADIE: |
| 201 | + return dev->bin_file_mode ? |
| 202 | + MT7986_BIN_FILE_MT7976_DUAL : MT7986_EEPROM_MT7976_DUAL_DEFAULT; |
| 203 | + default: |
| 204 | + break; |
| 205 | + } |
| 206 | + return NULL; |
| 207 | + default: |
| 208 | + return dev->bin_file_mode ? |
| 209 | + MT7916_BIN_FILE : MT7916_EEPROM_DEFAULT; |
| 210 | + } |
| 211 | +} |
| 212 | + |
| 213 | extern const u8 mt7915_sku_group_len[MAX_SKU_RATE_GROUP_NUM]; |
| 214 | |
| 215 | #endif |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 216 | diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 217 | index 1cfa6f0..9b72f41 100644 |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 218 | --- a/mt7915/mt7915.h |
| 219 | +++ b/mt7915/mt7915.h |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 220 | @@ -42,15 +42,24 @@ |
| 221 | #define MT7986_ROM_PATCH "mediatek/mt7986_rom_patch.bin" |
| 222 | #define MT7986_ROM_PATCH_MT7975 "mediatek/mt7986_rom_patch_mt7975.bin" |
| 223 | |
| 224 | -#define MT7915_EEPROM_DEFAULT "mediatek/mt7915_eeprom.bin" |
| 225 | -#define MT7915_EEPROM_DEFAULT_DBDC "mediatek/mt7915_eeprom_dbdc.bin" |
| 226 | -#define MT7916_EEPROM_DEFAULT "mediatek/mt7916_eeprom.bin" |
| 227 | +#define MT7915_EEPROM_DEFAULT "mediatek/mt7915_eeprom.bin" |
| 228 | +#define MT7915_EEPROM_DEFAULT_DBDC "mediatek/mt7915_eeprom_dbdc.bin" |
| 229 | +#define MT7916_EEPROM_DEFAULT "mediatek/mt7916_eeprom.bin" |
| 230 | #define MT7986_EEPROM_MT7975_DEFAULT "mediatek/mt7986_eeprom_mt7975.bin" |
| 231 | #define MT7986_EEPROM_MT7975_DUAL_DEFAULT "mediatek/mt7986_eeprom_mt7975_dual.bin" |
| 232 | #define MT7986_EEPROM_MT7976_DEFAULT "mediatek/mt7986_eeprom_mt7976.bin" |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 233 | #define MT7986_EEPROM_MT7976_DEFAULT_DBDC "mediatek/mt7986_eeprom_mt7976_dbdc.bin" |
| 234 | #define MT7986_EEPROM_MT7976_DUAL_DEFAULT "mediatek/mt7986_eeprom_mt7976_dual.bin" |
| 235 | |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 236 | +#define MT7915_BIN_FILE "mediatek/mt7915_binfile.bin" |
| 237 | +#define MT7915_BIN_FILE_DBDC "mediatek/mt7915_binfile_dbdc.bin" |
| 238 | +#define MT7916_BIN_FILE "mediatek/mt7916_binfile.bin" |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 239 | +#define MT7986_BIN_FILE_MT7975 "mediatek/mt7986_binfile_mt7975.bin" |
| 240 | +#define MT7986_BIN_FILE_MT7975_DUAL "mediatek/mt7986_binfile_mt7975_dual.bin" |
| 241 | +#define MT7986_BIN_FILE_MT7976 "mediatek/mt7986_binfile_mt7976.bin" |
| 242 | +#define MT7986_BIN_FILE_MT7976_DBDC "mediatek/mt7986_binfile_mt7976_dbdc.bin" |
| 243 | +#define MT7986_BIN_FILE_MT7976_DUAL "mediatek/mt7986_binfile_mt7976_dual.bin" |
| 244 | + |
| 245 | #define MT7915_EEPROM_SIZE 3584 |
| 246 | #define MT7916_EEPROM_SIZE 4096 |
| 247 | |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 248 | @@ -395,6 +404,8 @@ struct mt7915_dev { |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 249 | |
| 250 | bool dbdc_support; |
| 251 | bool flash_mode; |
| 252 | + bool bin_file_mode; |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 253 | + u8 eeprom_mode; |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 254 | bool muru_debug; |
| 255 | bool ibf; |
| 256 | |
developer | 55a79b5 | 2022-11-18 16:01:14 +0800 | [diff] [blame^] | 257 | diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c |
| 258 | index 9de5b0f..36cb6f0 100644 |
| 259 | --- a/mt7915/mtk_debugfs.c |
| 260 | +++ b/mt7915/mtk_debugfs.c |
| 261 | @@ -3,6 +3,7 @@ |
| 262 | #include "mt7915_debug.h" |
| 263 | #include "mac.h" |
| 264 | #include "mcu.h" |
| 265 | +#include "eeprom.h" |
| 266 | |
| 267 | #ifdef MTK_DEBUG |
| 268 | #define LWTBL_IDX2BASE_ID GENMASK(14, 8) |
| 269 | @@ -2893,6 +2894,39 @@ mt7915_wa_debug(void *data, u64 val) |
| 270 | DEFINE_DEBUGFS_ATTRIBUTE(fops_wa_debug, NULL, mt7915_wa_debug, |
| 271 | "0x%llx\n"); |
| 272 | |
| 273 | +static int mt7915_show_eeprom_mode(struct seq_file *s, void *data) |
| 274 | +{ |
| 275 | + struct mt7915_dev *dev = dev_get_drvdata(s->private); |
| 276 | + struct mt76_dev *mdev = &dev->mt76; |
| 277 | + char *mtd_name = mdev->test_mtd.name; |
| 278 | + u32 mtd_offset = mdev->test_mtd.offset; |
| 279 | + |
| 280 | + seq_printf(s, "Current eeprom mode:\n"); |
| 281 | + |
| 282 | + switch (dev->eeprom_mode) { |
| 283 | + case DEFAULT_BIN_MODE: |
| 284 | + seq_printf(s, " default bin mode\n filename = %s\n", mt7915_eeprom_name(dev)); |
| 285 | + break; |
| 286 | + case EFUSE_MODE: |
| 287 | + seq_printf(s, " efuse mode\n"); |
| 288 | + break; |
| 289 | + case FLASH_MODE: |
| 290 | + if (mtd_name) |
| 291 | + seq_printf(s, " flash mode\n mtd name = %s\n flash offset = 0x%x\n", |
| 292 | + mtd_name, mtd_offset); |
| 293 | + else |
| 294 | + seq_printf(s, " flash mode\n"); |
| 295 | + break; |
| 296 | + case BIN_FILE_MODE: |
| 297 | + seq_printf(s, " bin file mode\n filename = %s\n", mt7915_eeprom_name(dev)); |
| 298 | + break; |
| 299 | + default: |
| 300 | + break; |
| 301 | + } |
| 302 | + |
| 303 | + return 0; |
| 304 | +} |
| 305 | + |
| 306 | int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir) |
| 307 | { |
| 308 | struct mt7915_dev *dev = phy->dev; |
| 309 | @@ -2973,6 +3007,8 @@ int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir) |
| 310 | debugfs_create_devm_seqfile(dev->mt76.dev, "fw_version", dir, |
| 311 | mt7915_dump_version); |
| 312 | |
| 313 | + debugfs_create_devm_seqfile(dev->mt76.dev, "eeprom_mode", dir, |
| 314 | + mt7915_show_eeprom_mode); |
| 315 | return 0; |
| 316 | } |
| 317 | #endif |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 318 | -- |
developer | b403ad0 | 2022-11-08 10:16:29 +0800 | [diff] [blame] | 319 | 2.18.0 |
developer | 072c561 | 2022-07-15 18:30:03 +0800 | [diff] [blame] | 320 | |