From 3157385e22778a4063ce334fb07b8cb543a09740 Mon Sep 17 00:00:00 2001 From: Lorenzo Bianconi Date: Tue, 30 Apr 2019 17:17:23 +0200 Subject: [PATCH] mt76: mt7603: dynamically alloc mcu req in mt7603_mcu_set_eeprom Do not allocate mcu requests on the stack in mt7603_mcu_set_eeprom in order to avoid the following warning: Warning: the frame size of 1032 bytes is larger than 1024 bytes Signed-off-by: Lorenzo Bianconi Signed-off-by: Felix Fietkau --- mt7603/mcu.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/mt7603/mcu.c b/mt7603/mcu.c index 766d9686..6357b565 100644 --- a/mt7603/mcu.c +++ b/mt7603/mcu.c @@ -354,24 +354,34 @@ int mt7603_mcu_set_eeprom(struct mt7603_dev *dev) u8 buffer_mode; u8 len; u8 pad[2]; - struct req_data data[255]; - } req = { + } req_hdr = { .buffer_mode = 1, .len = ARRAY_SIZE(req_fields) - 1, }; - u8 *eep = (u8 *)dev->mt76.eeprom.data; - int i; + const int size = 0xff * sizeof(struct req_data); + u8 *req, *eep = (u8 *)dev->mt76.eeprom.data; + int i, ret, len = sizeof(req_hdr) + size; + struct req_data *data; - BUILD_BUG_ON(ARRAY_SIZE(req_fields) > ARRAY_SIZE(req.data)); + BUILD_BUG_ON(ARRAY_SIZE(req_fields) * sizeof(*data) > size); + req = kmalloc(len, GFP_KERNEL); + if (!req) + return -ENOMEM; + + memcpy(req, &req_hdr, sizeof(req_hdr)); + data = (struct req_data *)(req + sizeof(req_hdr)); + memset(data, 0, size); for (i = 0; i < ARRAY_SIZE(req_fields); i++) { - req.data[i].addr = cpu_to_le16(req_fields[i]); - req.data[i].val = eep[req_fields[i]]; - req.data[i].pad = 0; + data[i].addr = cpu_to_le16(req_fields[i]); + data[i].val = eep[req_fields[i]]; } - return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_EFUSE_BUFFER_MODE, - &req, sizeof(req), true); + ret = __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_EFUSE_BUFFER_MODE, + req, len, true); + kfree(req); + + return ret; } static int mt7603_mcu_set_tx_power(struct mt7603_dev *dev)