mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-21 15:08:15 +02:00
399d5cf532
Some of our local patches have been accepted upstream. And there are some more relevant changes (mostly for rt2800usb). Import them and rebase our remaining local patches on top. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
85 lines
3.3 KiB
Diff
85 lines
3.3 KiB
Diff
From 7272416609126e8910b7f0d0e3dba008aa87830c Mon Sep 17 00:00:00 2001
|
|
From: Arnd Bergmann <arnd@arndb.de>
|
|
Date: Tue, 14 Feb 2017 22:28:33 +0100
|
|
Subject: [PATCH 07/19] rt2500usb: don't mark register accesses as inline
|
|
|
|
When CONFIG_KASAN is set, we get a rather large stack here:
|
|
|
|
drivers/net/wireless/ralink/rt2x00/rt2500usb.c: In function 'rt2500usb_set_device_state':
|
|
drivers/net/wireless/ralink/rt2x00/rt2500usb.c:1074:1: error: the frame size of 3032 bytes is larger than 100 bytes [-Werror=frame-larger-than=]
|
|
|
|
If we don't force those functions to be inline, the compiler can figure this
|
|
out better itself and not inline the functions when doing so would be harmful,
|
|
reducing the stack size to a merge 256 bytes.
|
|
|
|
Note that there is another problem that manifests in this driver, as a result
|
|
of the typecheck() macro causing even larger stack frames.
|
|
|
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 19 +++++--------------
|
|
1 file changed, 5 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
|
|
index 62357465fe29..0d2670a56c4c 100644
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
|
|
@@ -55,7 +55,7 @@ MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
|
|
* If the csr_mutex is already held then the _lock variants must
|
|
* be used instead.
|
|
*/
|
|
-static inline void rt2500usb_register_read(struct rt2x00_dev *rt2x00dev,
|
|
+static void rt2500usb_register_read(struct rt2x00_dev *rt2x00dev,
|
|
const unsigned int offset,
|
|
u16 *value)
|
|
{
|
|
@@ -66,7 +66,7 @@ static inline void rt2500usb_register_read(struct rt2x00_dev *rt2x00dev,
|
|
*value = le16_to_cpu(reg);
|
|
}
|
|
|
|
-static inline void rt2500usb_register_read_lock(struct rt2x00_dev *rt2x00dev,
|
|
+static void rt2500usb_register_read_lock(struct rt2x00_dev *rt2x00dev,
|
|
const unsigned int offset,
|
|
u16 *value)
|
|
{
|
|
@@ -77,16 +77,7 @@ static inline void rt2500usb_register_read_lock(struct rt2x00_dev *rt2x00dev,
|
|
*value = le16_to_cpu(reg);
|
|
}
|
|
|
|
-static inline void rt2500usb_register_multiread(struct rt2x00_dev *rt2x00dev,
|
|
- const unsigned int offset,
|
|
- void *value, const u16 length)
|
|
-{
|
|
- rt2x00usb_vendor_request_buff(rt2x00dev, USB_MULTI_READ,
|
|
- USB_VENDOR_REQUEST_IN, offset,
|
|
- value, length);
|
|
-}
|
|
-
|
|
-static inline void rt2500usb_register_write(struct rt2x00_dev *rt2x00dev,
|
|
+static void rt2500usb_register_write(struct rt2x00_dev *rt2x00dev,
|
|
const unsigned int offset,
|
|
u16 value)
|
|
{
|
|
@@ -96,7 +87,7 @@ static inline void rt2500usb_register_write(struct rt2x00_dev *rt2x00dev,
|
|
®, sizeof(reg));
|
|
}
|
|
|
|
-static inline void rt2500usb_register_write_lock(struct rt2x00_dev *rt2x00dev,
|
|
+static void rt2500usb_register_write_lock(struct rt2x00_dev *rt2x00dev,
|
|
const unsigned int offset,
|
|
u16 value)
|
|
{
|
|
@@ -106,7 +97,7 @@ static inline void rt2500usb_register_write_lock(struct rt2x00_dev *rt2x00dev,
|
|
®, sizeof(reg), REGISTER_TIMEOUT);
|
|
}
|
|
|
|
-static inline void rt2500usb_register_multiwrite(struct rt2x00_dev *rt2x00dev,
|
|
+static void rt2500usb_register_multiwrite(struct rt2x00_dev *rt2x00dev,
|
|
const unsigned int offset,
|
|
void *value, const u16 length)
|
|
{
|
|
--
|
|
2.12.1
|
|
|