kernel: bump 4.19 to 4.19.90

[openwrt/staging/chunkeey.git] / target / linux / brcm2708 / patches-4.19 / 950-0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch

diff --git a/target/linux/brcm2708/patches-4.19/950-0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch b/target/linux/brcm2708/patches-4.19/950-0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch
deleted file mode 100644 (file)
index aeb74b0..0000000
--- a/target/linux/brcm2708/patches-4.19/950-0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 01995961823e4185f687c02cf326d78ba1b6b7bf Mon Sep 17 00:00:00 2001
-From: James Hughes <JamesH65@users.noreply.github.com>
-Date: Tue, 13 Nov 2018 17:27:00 +0000
-Subject: [PATCH 206/806] Mailbox firmware calls now use kmalloc (#2749)
-
-A previous change moved away from variable stack
-allocation of a data buffer to a fixed maximum size.
-However, some mailbox calls use larger data buffers
-than the maximum allowed. This change moves from
-stack storage to kmalloc to ensure all sizes are
-catered for.
-
-Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
----
- drivers/firmware/raspberrypi.c | 35 +++++++++++++++++-----------------
- 1 file changed, 18 insertions(+), 17 deletions(-)
-
---- a/drivers/firmware/raspberrypi.c
-+++ b/drivers/firmware/raspberrypi.c
-@@ -15,6 +15,7 @@
- #include <linux/of_platform.h>
- #include <linux/platform_device.h>
- #include <linux/reboot.h>
-+#include <linux/slab.h>
- #include <soc/bcm2835/raspberrypi-firmware.h>
- 
- #define MBOX_MSG(chan, data28)                (((data28) & ~0xf) | ((chan) & 0xf))
-@@ -22,8 +23,6 @@
- #define MBOX_DATA28(msg)              ((msg) & ~0xf)
- #define MBOX_CHAN_PROPERTY            8
- 
--#define MAX_RPI_FW_PROP_BUF_SIZE      48
--
- static struct platform_device *rpi_hwmon;
- 
- struct rpi_firmware {
-@@ -149,28 +148,28 @@ EXPORT_SYMBOL_GPL(rpi_firmware_property_
- int rpi_firmware_property(struct rpi_firmware *fw,
-                         u32 tag, void *tag_data, size_t buf_size)
- {
--      /* Single tags are very small (generally 8 bytes), so the
--       * stack should be safe.
--       */
--      u8 data[sizeof(struct rpi_firmware_property_tag_header) +
--              MAX_RPI_FW_PROP_BUF_SIZE];
--      struct rpi_firmware_property_tag_header *header =
--              (struct rpi_firmware_property_tag_header *)data;
-       int ret;
-+      struct rpi_firmware_property_tag_header *header;
- 
--      if (WARN_ON(buf_size > sizeof(data) - sizeof(*header)))
--              return -EINVAL;
-+      /* Some mailboxes can use over 1k bytes. Rather than checking
-+       * size and using stack or kmalloc depending on requirements,
-+       * just use kmalloc. Mailboxes don't get called enough to worry
-+       * too much about the time taken in the allocation.
-+       */
-+      void *data = kmalloc(sizeof(*header) + buf_size, GFP_KERNEL);
- 
-+      if (!data)
-+              return -ENOMEM;
-+
-+      header = data;
-       header->tag = tag;
-       header->buf_size = buf_size;
-       header->req_resp_size = 0;
--      memcpy(data + sizeof(struct rpi_firmware_property_tag_header),
--             tag_data, buf_size);
-+      memcpy(data + sizeof(*header), tag_data, buf_size);
- 
--      ret = rpi_firmware_property_list(fw, &data, buf_size + sizeof(*header));
--      memcpy(tag_data,
--             data + sizeof(struct rpi_firmware_property_tag_header),
--             buf_size);
-+      ret = rpi_firmware_property_list(fw, data, buf_size + sizeof(*header));
-+
-+      memcpy(tag_data, data + sizeof(*header), buf_size);
- 
-       if ((tag == RPI_FIRMWARE_GET_THROTTLED) &&
-            memcmp(&fw->get_throttled, tag_data, sizeof(fw->get_throttled))) {
-@@ -178,6 +177,8 @@ int rpi_firmware_property(struct rpi_fir
-               sysfs_notify(&fw->cl.dev->kobj, NULL, "get_throttled");
-       }
- 
-+      kfree(data);
-+
-       return ret;
- }
- EXPORT_SYMBOL_GPL(rpi_firmware_property);