| From e6b4dcb07b02fea725d11d364fabb0f801423edd Mon Sep 17 00:00:00 2001 |
| From: Shayne Chen <shayne.chen@mediatek.com> |
| Date: Thu, 8 Dec 2022 15:54:19 +0800 |
| Subject: [PATCH 6/6] wifi: mt76: mt7915: add chip id condition in |
| mt7915_check_eeprom() |
| |
| When flash mode is enabled, and the eeprom data in the flash is not for |
| the current chipset, it'll still be checked valid, and the default |
| eeprom bin won't be loaded. |
| (e.g., mt7915 NIC inserted with mt7916 eeprom data in the flash.) |
| |
| Fix this kind of case by adding chip id into consideration in |
| mt7915_check_eeprom(). |
| |
| Reported-by: Cheng-Ji Li <cheng-ji.li@mediatek.com> |
| Signed-off-by: Shayne Chen <shayne.chen@mediatek.com> |
| --- |
| mt7915/eeprom.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/mt7915/eeprom.c b/mt7915/eeprom.c |
| index 24efa28..a796289 100644 |
| --- a/mt7915/eeprom.c |
| +++ b/mt7915/eeprom.c |
| @@ -33,11 +33,14 @@ static int mt7915_check_eeprom(struct mt7915_dev *dev) |
| u8 *eeprom = dev->mt76.eeprom.data; |
| u16 val = get_unaligned_le16(eeprom); |
| |
| +#define CHECK_EEPROM_ERR(match) (match ? 0 : -EINVAL) |
| switch (val) { |
| case 0x7915: |
| + return CHECK_EEPROM_ERR(is_mt7915(&dev->mt76)); |
| case 0x7916: |
| + return CHECK_EEPROM_ERR(is_mt7916(&dev->mt76)); |
| case 0x7986: |
| - return 0; |
| + return CHECK_EEPROM_ERR(is_mt7986(&dev->mt76)); |
| default: |
| return -EINVAL; |
| } |
| -- |
| 2.36.1 |
| |