* [PATCH 00/10] backports: bring backports to next-20150818
@ 2015-09-14 7:48 Hauke Mehrtens
2015-09-14 7:48 ` [PATCH 01/10] header: add acpi_dev_remove_driver_gpios() Hauke Mehrtens
` (9 more replies)
0 siblings, 10 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2015-09-14 7:48 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
This makes backports compatible with next-20150818.
In addition it adds support for GCC 5.
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.71 [ OK ]
4 3.3.8 [ OK ]
5 3.4.108 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.88 [ OK ]
12 3.11.10 [ OK ]
13 3.12.47 [ OK ]
14 3.13.11 [ OK ]
15 3.14.52 [ OK ]
16 3.15.10 [ OK ]
17 3.16.7 [ OK ]
18 3.17.8 [ OK ]
19 3.18.21 [ OK ]
20 3.19.8 [ OK ]
21 4.0.9 [ OK ]
22 4.1.7 [ OK ]
23 4.2.0 [ OK ]
Hauke Mehrtens (10):
header: add acpi_dev_remove_driver_gpios()
header: add page_is_pfmemalloc()
header: remove parameter from mei_cl_register_event_cb()
header: add compiler-gcc5.h
patches: make ACPI gpio configuration depend on kernel >= 3.19
patches: add additional include to brcmfmac
dependencies: deactivate mwifiex SDIO part in kernel < 3.2
dependencies: make netup-unidvb driver depend on >= 3.4
devel: update test kernel versions
backports: refresh on next-20150818
backport/backport-include/linux/acpi.h | 6 ++
backport/backport-include/linux/compiler-gcc5.h | 73 ++++++++++++++++++++
backport/backport-include/linux/mei_cl_bus.h | 11 +++
backport/backport-include/linux/mm.h | 9 +++
dependencies | 4 ++
devel/backports-update-manager | 14 ++--
patches/backport-adjustments/crypto-ccm.patch | 4 +-
.../media/0001-dma_mmap_coherent-revert.patch | 4 +-
.../media/0002-no_dmabuf/v4l2.patch | 60 ++++++++---------
.../media/0003-devnode_param_type/rc.patch | 2 +-
.../media/0005-dma-no-sync/v4l2.patch | 14 ++--
.../include_net_cfg80211.patch | 2 +-
.../network/0005-disable-usb-net-asix.patch | 4 +-
.../net_wireless_core.patch | 6 +-
.../0013-fix-makefile-includes/brcmfmac.patch | 10 +++
.../0014-netlink_seq/net_wireless_nl80211.patch | 2 +-
.../network/0046-mmc_rescan_entered/mwifiex.patch | 12 ----
.../network/0049-no-pfmemalloc/no-pfmemalloc.cocci | 2 +-
.../network/0050-iov_iter/bluetooth.patch | 2 +-
.../network/0053-possible_net_t.patch | 2 +-
.../0053-remove_wait_on_bit_timeout/btusb.patch | 12 ++--
.../network/0062-acpi-gpio-remove/hci_bcm.patch | 78 ++++++++++++++++++++++
22 files changed, 256 insertions(+), 77 deletions(-)
create mode 100644 backport/backport-include/linux/compiler-gcc5.h
create mode 100644 backport/backport-include/linux/mei_cl_bus.h
create mode 100644 patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch
delete mode 100644 patches/collateral-evolutions/network/0046-mmc_rescan_entered/mwifiex.patch
create mode 100644 patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 01/10] header: add acpi_dev_remove_driver_gpios() 2015-09-14 7:48 [PATCH 00/10] backports: bring backports to next-20150818 Hauke Mehrtens @ 2015-09-14 7:48 ` Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 02/10] header: add page_is_pfmemalloc() Hauke Mehrtens ` (8 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Hauke Mehrtens @ 2015-09-14 7:48 UTC (permalink / raw) To: backports; +Cc: Hauke Mehrtens This adds an empty implementation of acpi_dev_remove_driver_gpios() for kernel version < 3.19, on these versions we do not support these acpi features. This is used by hci_bcm.c Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/acpi.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backport/backport-include/linux/acpi.h b/backport/backport-include/linux/acpi.h index ff55d76..395ca18 100644 --- a/backport/backport-include/linux/acpi.h +++ b/backport/backport-include/linux/acpi.h @@ -54,4 +54,10 @@ static inline struct acpi_device *_acpi_get_companion(struct device *dev) #define ACPI_COMPANION(dev) (NULL) #endif /* CONFIG_ACPI */ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) +#define acpi_dev_remove_driver_gpios LINUX_BACKPORT(acpi_dev_remove_driver_gpios) +static inline void acpi_dev_remove_driver_gpios(struct acpi_device *adev) {} +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) */ + #endif /* __BACKPORT_LINUX_ACPI_H */ -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 02/10] header: add page_is_pfmemalloc() 2015-09-14 7:48 [PATCH 00/10] backports: bring backports to next-20150818 Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 01/10] header: add acpi_dev_remove_driver_gpios() Hauke Mehrtens @ 2015-09-14 7:48 ` Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 03/10] header: remove parameter from mei_cl_register_event_cb() Hauke Mehrtens ` (7 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Hauke Mehrtens @ 2015-09-14 7:48 UTC (permalink / raw) To: backports; +Cc: Hauke Mehrtens This adds page_is_pfmemalloc() which is used by the igb driver. The direct access to page->pfmemalloc was replaced by this function call in 54d985ce23 upstream commit. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/mm.h | 9 +++++++++ .../network/0049-no-pfmemalloc/no-pfmemalloc.cocci | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/backport/backport-include/linux/mm.h b/backport/backport-include/linux/mm.h index 96be9e6..ddb8813 100644 --- a/backport/backport-include/linux/mm.h +++ b/backport/backport-include/linux/mm.h @@ -95,4 +95,13 @@ static inline unsigned long *frame_vector_pfns(struct frame_vector *vec) } #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) +#define page_is_pfmemalloc LINUX_BACKPORT(page_is_pfmemalloc) +static inline bool page_is_pfmemalloc(struct page *page) +{ + return page->pfmemalloc; +} +#endif /* < 4.2 */ + #endif /* __BACKPORT_MM_H */ diff --git a/patches/collateral-evolutions/network/0049-no-pfmemalloc/no-pfmemalloc.cocci b/patches/collateral-evolutions/network/0049-no-pfmemalloc/no-pfmemalloc.cocci index bbc1201..5c6dd24 100644 --- a/patches/collateral-evolutions/network/0049-no-pfmemalloc/no-pfmemalloc.cocci +++ b/patches/collateral-evolutions/network/0049-no-pfmemalloc/no-pfmemalloc.cocci @@ -4,6 +4,6 @@ expression E1; @@ return E1 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) - || page->pfmemalloc + || page_is_pfmemalloc(page) +#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */ ; -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 03/10] header: remove parameter from mei_cl_register_event_cb() 2015-09-14 7:48 [PATCH 00/10] backports: bring backports to next-20150818 Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 01/10] header: add acpi_dev_remove_driver_gpios() Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 02/10] header: add page_is_pfmemalloc() Hauke Mehrtens @ 2015-09-14 7:48 ` Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 04/10] header: add compiler-gcc5.h Hauke Mehrtens ` (6 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Hauke Mehrtens @ 2015-09-14 7:48 UTC (permalink / raw) To: backports; +Cc: Hauke Mehrtens mei_cl_register_event_cb() got a new parameter in bb2ef9c39d, currently it is used in the same way as before so just ignoring it should be save. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/mei_cl_bus.h | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 backport/backport-include/linux/mei_cl_bus.h diff --git a/backport/backport-include/linux/mei_cl_bus.h b/backport/backport-include/linux/mei_cl_bus.h new file mode 100644 index 0000000..d7f0dfd --- /dev/null +++ b/backport/backport-include/linux/mei_cl_bus.h @@ -0,0 +1,11 @@ +#ifndef __BACKPORT_LINUX_MEI_CL_BUS_H +#define __BACKPORT_LINUX_MEI_CL_BUS_H +#include_next <linux/mei_cl_bus.h> + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)) +#define mei_cl_register_event_cb(device, event_mask, read_cb, context) \ + mei_cl_register_event_cb(device, read_cb, context) +#endif + + +#endif /* __BACKPORT_LINUX_MEI_CL_BUS_H */ -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 04/10] header: add compiler-gcc5.h 2015-09-14 7:48 [PATCH 00/10] backports: bring backports to next-20150818 Hauke Mehrtens ` (2 preceding siblings ...) 2015-09-14 7:48 ` [PATCH 03/10] header: remove parameter from mei_cl_register_event_cb() Hauke Mehrtens @ 2015-09-14 7:48 ` Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 05/10] patches: make ACPI gpio configuration depend on kernel >= 3.19 Hauke Mehrtens ` (5 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Hauke Mehrtens @ 2015-09-14 7:48 UTC (permalink / raw) To: backports; +Cc: Hauke Mehrtens This adds support for gcc 5. In kernel version >= 3.18 this is shipped with the kernel, in kernel version >= 4.2 all the gcc version specific files are merged into one file. This patch got backported to many kernel versions, but ignore it because it is always the same file. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/backport-include/linux/compiler-gcc5.h | 73 +++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 backport/backport-include/linux/compiler-gcc5.h diff --git a/backport/backport-include/linux/compiler-gcc5.h b/backport/backport-include/linux/compiler-gcc5.h new file mode 100644 index 0000000..4e2f7c4 --- /dev/null +++ b/backport/backport-include/linux/compiler-gcc5.h @@ -0,0 +1,73 @@ +#ifndef __LINUX_COMPILER_H +#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead." +#endif + +#include <linux/version.h> + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) +#include_next <linux/compiler-gcc5.h> +#else + +#define __used __attribute__((__used__)) +#define __must_check __attribute__((warn_unused_result)) +#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) + +/* Mark functions as cold. gcc will assume any path leading to a call + to them will be unlikely. This means a lot of manual unlikely()s + are unnecessary now for any paths leading to the usual suspects + like BUG(), printk(), panic() etc. [but let's keep them for now for + older compilers] + + Early snapshots of gcc 4.3 don't support this and we can't detect this + in the preprocessor, but we can live with this because they're unreleased. + Maketime probing would be overkill here. + + gcc also has a __attribute__((__hot__)) to move hot functions into + a special section, but I don't see any sense in this right now in + the kernel context */ +#define __cold __attribute__((__cold__)) + +#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) + +#ifndef __CHECKER__ +# define __compiletime_warning(message) __attribute__((warning(message))) +# define __compiletime_error(message) __attribute__((error(message))) +#endif /* __CHECKER__ */ + +/* + * Mark a position in code as unreachable. This can be used to + * suppress control flow warnings after asm blocks that transfer + * control elsewhere. + * + * Early snapshots of gcc 4.5 don't support this and we can't detect + * this in the preprocessor, but we can live with this because they're + * unreleased. Really, we need to have autoconf for the kernel. + */ +#define unreachable() __builtin_unreachable() + +/* Mark a function definition as prohibited from being cloned. */ +#define __noclone __attribute__((__noclone__)) + +/* + * Tell the optimizer that something else uses this function or variable. + */ +#define __visible __attribute__((externally_visible)) + +/* + * GCC 'asm goto' miscompiles certain code sequences: + * + * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 + * + * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. + * Fixed in GCC 4.8.2 and later versions. + * + * (asm goto is automatically volatile - the naming reflects this.) + */ +#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) + +#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP +#define __HAVE_BUILTIN_BSWAP32__ +#define __HAVE_BUILTIN_BSWAP64__ +#define __HAVE_BUILTIN_BSWAP16__ +#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0) */ -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 05/10] patches: make ACPI gpio configuration depend on kernel >= 3.19 2015-09-14 7:48 [PATCH 00/10] backports: bring backports to next-20150818 Hauke Mehrtens ` (3 preceding siblings ...) 2015-09-14 7:48 ` [PATCH 04/10] header: add compiler-gcc5.h Hauke Mehrtens @ 2015-09-14 7:48 ` Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 06/10] patches: add additional include to brcmfmac Hauke Mehrtens ` (4 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Hauke Mehrtens @ 2015-09-14 7:48 UTC (permalink / raw) To: backports; +Cc: Hauke Mehrtens The GPIO configuration in the hci_bcm driver is now fetched from ACPI, which only works in kernel version >= 3.19. In addition it used these GPIO informations with the gpio consumer framework which was added in 3.13, deactivate these new features if the kernel does not support them. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- .../network/0062-acpi-gpio-remove/hci_bcm.patch | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch diff --git a/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch b/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch new file mode 100644 index 0000000..df1b165 --- /dev/null +++ b/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch @@ -0,0 +1,78 @@ +--- a/drivers/bluetooth/hci_bcm.c ++++ b/drivers/bluetooth/hci_bcm.c +@@ -29,7 +29,9 @@ + #include <linux/acpi.h> + #include <linux/platform_device.h> + #include <linux/clk.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) + #include <linux/gpio/consumer.h> ++#endif + #include <linux/tty.h> + + #include <net/bluetooth/bluetooth.h> +@@ -138,8 +140,10 @@ static int bcm_gpio_set_power(struct bcm + if (powered && !IS_ERR(dev->clk) && !dev->clk_enabled) + clk_enable(dev->clk); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) + gpiod_set_value(dev->shutdown, powered); + gpiod_set_value(dev->device_wakeup, powered); ++#endif + + if (!powered && !IS_ERR(dev->clk) && dev->clk_enabled) + clk_disable(dev->clk); +@@ -347,7 +351,9 @@ static int bcm_suspend(struct device *de + + /* Suspend the device */ + if (bdev->device_wakeup) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) + gpiod_set_value(bdev->device_wakeup, false); ++#endif + BT_DBG("suspend, delaying 15 ms"); + mdelay(15); + } +@@ -363,7 +369,9 @@ static int bcm_resume(struct device *dev + BT_DBG("resume (%p): is_suspended %d", bdev, bdev->is_suspended); + + if (bdev->device_wakeup) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) + gpiod_set_value(bdev->device_wakeup, true); ++#endif + BT_DBG("resume, delaying 15 ms"); + mdelay(15); + } +@@ -379,6 +387,7 @@ static int bcm_resume(struct device *dev + } + #endif + ++#if defined(CONFIG_ACPI) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) + static const struct acpi_gpio_params device_wakeup_gpios = { 0, 0, false }; + static const struct acpi_gpio_params shutdown_gpios = { 1, 0, false }; + +@@ -388,7 +397,6 @@ static const struct acpi_gpio_mapping ac + { }, + }; + +-#ifdef CONFIG_ACPI + static int bcm_resource(struct acpi_resource *ares, void *data) + { + struct bcm_device *dev = data; +@@ -527,7 +535,7 @@ static const struct hci_uart_proto bcm_p + .dequeue = bcm_dequeue, + }; + +-#ifdef CONFIG_ACPI ++#if defined(CONFIG_ACPI) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) + static const struct acpi_device_id bcm_acpi_match[] = { + { "BCM2E39", 0 }, + { "BCM2E67", 0 }, +@@ -544,7 +552,9 @@ static struct platform_driver bcm_driver + .remove = bcm_remove, + .driver = { + .name = "hci_bcm", ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) + .acpi_match_table = ACPI_PTR(bcm_acpi_match), ++#endif + .pm = &bcm_pm_ops, + }, + }; -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 06/10] patches: add additional include to brcmfmac 2015-09-14 7:48 [PATCH 00/10] backports: bring backports to next-20150818 Hauke Mehrtens ` (4 preceding siblings ...) 2015-09-14 7:48 ` [PATCH 05/10] patches: make ACPI gpio configuration depend on kernel >= 3.19 Hauke Mehrtens @ 2015-09-14 7:48 ` Hauke Mehrtens 2015-09-14 8:16 ` Arend van Spriel 2015-09-14 7:48 ` [PATCH 07/10] dependencies: deactivate mwifiex SDIO part in kernel < 3.2 Hauke Mehrtens ` (3 subsequent siblings) 9 siblings, 1 reply; 13+ messages in thread From: Hauke Mehrtens @ 2015-09-14 7:48 UTC (permalink / raw) To: backports; +Cc: Hauke Mehrtens brcmfmac uses atomic_or(), but does not include linux/atomic.h which causes problems on kernel 3.0 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- .../network/0013-fix-makefile-includes/brcmfmac.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch diff --git a/patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch b/patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch new file mode 100644 index 0000000..0e0a96c --- /dev/null +++ b/patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch @@ -0,0 +1,10 @@ +--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c ++++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c +@@ -15,6 +15,7 @@ + */ + + #include <linux/types.h> ++#include <linux/atomic.h> + #include <linux/kernel.h> + #include <linux/kthread.h> + #include <linux/printk.h> -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 06/10] patches: add additional include to brcmfmac 2015-09-14 7:48 ` [PATCH 06/10] patches: add additional include to brcmfmac Hauke Mehrtens @ 2015-09-14 8:16 ` Arend van Spriel 2015-09-14 19:35 ` Hauke Mehrtens 0 siblings, 1 reply; 13+ messages in thread From: Arend van Spriel @ 2015-09-14 8:16 UTC (permalink / raw) To: Hauke Mehrtens, backports On 09/14/2015 09:48 AM, Hauke Mehrtens wrote: > brcmfmac uses atomic_or(), but does not include linux/atomic.h which > causes problems on kernel 3.0 Hi Hauke, Will you also submit the actual patch upstream? Regards, Arend > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> > --- > .../network/0013-fix-makefile-includes/brcmfmac.patch | 10 ++++++++++ > 1 file changed, 10 insertions(+) > create mode 100644 patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch > > diff --git a/patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch b/patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch > new file mode 100644 > index 0000000..0e0a96c > --- /dev/null > +++ b/patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch > @@ -0,0 +1,10 @@ > +--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c > ++++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c > +@@ -15,6 +15,7 @@ > + */ > + > + #include <linux/types.h> > ++#include <linux/atomic.h> > + #include <linux/kernel.h> > + #include <linux/kthread.h> > + #include <linux/printk.h> > -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 06/10] patches: add additional include to brcmfmac 2015-09-14 8:16 ` Arend van Spriel @ 2015-09-14 19:35 ` Hauke Mehrtens 0 siblings, 0 replies; 13+ messages in thread From: Hauke Mehrtens @ 2015-09-14 19:35 UTC (permalink / raw) To: Arend van Spriel, backports On 09/14/2015 10:16 AM, Arend van Spriel wrote: > On 09/14/2015 09:48 AM, Hauke Mehrtens wrote: >> brcmfmac uses atomic_or(), but does not include linux/atomic.h which >> causes problems on kernel 3.0 > > Hi Hauke, > > Will you also submit the actual patch upstream? > > Regards, > Arend Yes, already planed that. Hauke -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 07/10] dependencies: deactivate mwifiex SDIO part in kernel < 3.2 2015-09-14 7:48 [PATCH 00/10] backports: bring backports to next-20150818 Hauke Mehrtens ` (5 preceding siblings ...) 2015-09-14 7:48 ` [PATCH 06/10] patches: add additional include to brcmfmac Hauke Mehrtens @ 2015-09-14 7:48 ` Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 08/10] dependencies: make netup-unidvb driver depend on >= 3.4 Hauke Mehrtens ` (2 subsequent siblings) 9 siblings, 0 replies; 13+ messages in thread From: Hauke Mehrtens @ 2015-09-14 7:48 UTC (permalink / raw) To: backports; +Cc: Hauke Mehrtens The mwifiex SDIO driver needs mmc_hw_reset() which was added in kernel 3.2. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- dependencies | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dependencies b/dependencies index e0b69bf..4f4c922 100644 --- a/dependencies +++ b/dependencies @@ -174,3 +174,6 @@ ATH_TRACEPOINTS 3.1 # to backport that only down to 3.5. For full details refer to backports # commit 8cb8816d IGB 3.5 + +# This driver needs mmc_hw_reset() which was added in kernel version 3.2 +MWIFIEX_SDIO 3.2 -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 08/10] dependencies: make netup-unidvb driver depend on >= 3.4 2015-09-14 7:48 [PATCH 00/10] backports: bring backports to next-20150818 Hauke Mehrtens ` (6 preceding siblings ...) 2015-09-14 7:48 ` [PATCH 07/10] dependencies: deactivate mwifiex SDIO part in kernel < 3.2 Hauke Mehrtens @ 2015-09-14 7:48 ` Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 09/10] devel: update test kernel versions Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 10/10] backports: refresh on next-20150818 Hauke Mehrtens 9 siblings, 0 replies; 13+ messages in thread From: Hauke Mehrtens @ 2015-09-14 7:48 UTC (permalink / raw) To: backports; +Cc: Hauke Mehrtens netup-unidvb uses spi_finalize_current_message() now which is not available on < 3.4. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- dependencies | 1 + 1 file changed, 1 insertion(+) diff --git a/dependencies b/dependencies index 4f4c922..ba78004 100644 --- a/dependencies +++ b/dependencies @@ -123,6 +123,7 @@ DVB_PT3 3.3 # missing spi_finalize_current_message() and struct spi_master.transfer_one_message USB_MSI2500 3.4 +DVB_NETUP_UNIDVB 3.4 # missing vb2_expbuf() SOC_CAMERA 3.5 -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 09/10] devel: update test kernel versions 2015-09-14 7:48 [PATCH 00/10] backports: bring backports to next-20150818 Hauke Mehrtens ` (7 preceding siblings ...) 2015-09-14 7:48 ` [PATCH 08/10] dependencies: make netup-unidvb driver depend on >= 3.4 Hauke Mehrtens @ 2015-09-14 7:48 ` Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 10/10] backports: refresh on next-20150818 Hauke Mehrtens 9 siblings, 0 replies; 13+ messages in thread From: Hauke Mehrtens @ 2015-09-14 7:48 UTC (permalink / raw) To: backports; +Cc: Hauke Mehrtens Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- devel/backports-update-manager | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/devel/backports-update-manager b/devel/backports-update-manager index 9e171ab..f7f6b81 100755 --- a/devel/backports-update-manager +++ b/devel/backports-update-manager @@ -26,7 +26,7 @@ SPACE_PER_KERNEL_DEB=13 KERNEL_URLS = [ KPATH + "v3.0.101-oneiric/linux-headers-3.0.101-0300101_3.0.101-0300101.201310220446_all.deb", KPATH + "v3.1.10-precise/linux-headers-3.1.10-030110_3.1.10-030110.201201181135_all.deb", - KPATH + "v3.2.69-precise/linux-headers-3.2.69-030269_3.2.69-030269.201505100136_all.deb", + KPATH + "v3.2.71-precise/linux-headers-3.2.71-030271_3.2.71-030271.201508141530_all.deb", KPATH + "v3.3.8-quantal/linux-headers-3.3.8-030308_3.3.8-030308.201206041356_all.deb", KPATH + "v3.4.108-quantal/linux-headers-3.4.108-0304108_3.4.108-0304108.201506191442_all.deb", KPATH + "v3.5.7.12-quantal/linux-headers-3.5.7-03050712_3.5.7-03050712.201305111435_all.deb", @@ -34,19 +34,19 @@ KERNEL_URLS = [ KPATH + "v3.7.10-raring/linux-headers-3.7.10-030710_3.7.10-030710.201302271235_all.deb", KPATH + "v3.8.13-raring/linux-headers-3.8.13-030813_3.8.13-030813.201305111843_all.deb", KPATH + "v3.9.11-saucy/linux-headers-3.9.11-030911_3.9.11-030911.201307202035_all.deb", - KPATH + "v3.10.84-saucy/linux-headers-3.10.84-031084_3.10.84-031084.201507101935_all.deb", + KPATH + "v3.10.88-saucy/linux-headers-3.10.88-031088_3.10.88-031088.201509131337_all.deb", KPATH + "v3.11.10-saucy/linux-headers-3.11.10-031110_3.11.10-031110.201311291453_all.deb", - KPATH + "v3.12.44-trusty/linux-headers-3.12.44-031244_3.12.44-031244.201506151235_all.deb", + KPATH + "v3.12.47-trusty/linux-headers-3.12.47-031247_3.12.47-031247.201508281031_all.deb", KPATH + "v3.13.11-trusty/linux-headers-3.13.11-031311_3.13.11-031311.201404222035_all.deb", - KPATH + "v3.14.48-utopic/linux-headers-3.14.48-031448_3.14.48-031448.201507101835_all.deb", + KPATH + "v3.14.52-utopic/linux-headers-3.14.52-031452_3.14.52-031452.201509131726_all.deb", KPATH + "v3.15.10-utopic/linux-headers-3.15.10-031510_3.15.10-031510.201408132333_all.deb", KPATH + "v3.16.7-utopic/linux-headers-3.16.7-031607_3.16.7-031607.201410301735_all.deb", KPATH + "v3.17.8-vivid/linux-headers-3.17.8-031708_3.17.8-031708.201501081837_all.deb", - KPATH + "v3.18.19-vivid/linux-headers-3.18.19-031819_3.18.19-031819.201507220230_all.deb", + KPATH + "v3.18.21-vivid/linux-headers-3.18.21-031821_3.18.21-031821.201509020527_all.deb", KPATH + "v3.19.8-vivid/linux-headers-3.19.8-031908_3.19.8-031908.201505110938_all.deb", KPATH + "v4.0.9-wily/linux-headers-4.0.9-040009_4.0.9-040009.201507212131_all.deb", - KPATH + "v4.1.3-unstable/linux-headers-4.1.3-040103_4.1.3-040103.201507220129_all.deb", - KPATH + "v4.2-rc3-unstable/linux-headers-4.2.0-040200rc3_4.2.0-040200rc3.201507192329_all.deb" + KPATH + "v4.1.7-unstable/linux-headers-4.1.7-040107_4.1.7-040107.201509131330_all.deb", + KPATH + "v4.2-unstable/linux-headers-4.2.0-040200_4.2.0-040200.201508301530_all.deb" ] NUM_KERNELS=len(KERNEL_URLS) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 10/10] backports: refresh on next-20150818 2015-09-14 7:48 [PATCH 00/10] backports: bring backports to next-20150818 Hauke Mehrtens ` (8 preceding siblings ...) 2015-09-14 7:48 ` [PATCH 09/10] devel: update test kernel versions Hauke Mehrtens @ 2015-09-14 7:48 ` Hauke Mehrtens 9 siblings, 0 replies; 13+ messages in thread From: Hauke Mehrtens @ 2015-09-14 7:48 UTC (permalink / raw) To: backports; +Cc: Hauke Mehrtens 1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.71 [ OK ] 4 3.3.8 [ OK ] 5 3.4.108 [ OK ] 6 3.5.7 [ OK ] 7 3.6.11 [ OK ] 8 3.7.10 [ OK ] 9 3.8.13 [ OK ] 10 3.9.11 [ OK ] 11 3.10.88 [ OK ] 12 3.11.10 [ OK ] 13 3.12.47 [ OK ] 14 3.13.11 [ OK ] 15 3.14.52 [ OK ] 16 3.15.10 [ OK ] 17 3.16.7 [ OK ] 18 3.17.8 [ OK ] 19 3.18.21 [ OK ] 20 3.19.8 [ OK ] 21 4.0.9 [ OK ] 22 4.1.7 [ OK ] 23 4.2.0 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- patches/backport-adjustments/crypto-ccm.patch | 4 +- .../media/0001-dma_mmap_coherent-revert.patch | 4 +- .../media/0002-no_dmabuf/v4l2.patch | 60 +++++++++++----------- .../media/0003-devnode_param_type/rc.patch | 2 +- .../media/0005-dma-no-sync/v4l2.patch | 14 ++--- .../include_net_cfg80211.patch | 2 +- .../network/0005-disable-usb-net-asix.patch | 4 +- .../net_wireless_core.patch | 6 +-- .../0014-netlink_seq/net_wireless_nl80211.patch | 2 +- .../network/0046-mmc_rescan_entered/mwifiex.patch | 12 ----- .../network/0050-iov_iter/bluetooth.patch | 2 +- .../network/0053-possible_net_t.patch | 2 +- .../0053-remove_wait_on_bit_timeout/btusb.patch | 12 ++--- 13 files changed, 57 insertions(+), 69 deletions(-) delete mode 100644 patches/collateral-evolutions/network/0046-mmc_rescan_entered/mwifiex.patch diff --git a/patches/backport-adjustments/crypto-ccm.patch b/patches/backport-adjustments/crypto-ccm.patch index 6a86d54..fe75000 100644 --- a/patches/backport-adjustments/crypto-ccm.patch +++ b/patches/backport-adjustments/crypto-ccm.patch @@ -46,7 +46,7 @@ struct ccm_instance_ctx { struct crypto_skcipher_spawn ctr; -@@ -901,7 +932,7 @@ static struct crypto_template crypto_rfc +@@ -897,7 +928,7 @@ static struct crypto_template crypto_rfc .module = THIS_MODULE, }; @@ -55,7 +55,7 @@ { int err; -@@ -927,18 +958,9 @@ out_undo_base: +@@ -923,18 +954,9 @@ out_undo_base: goto out; } diff --git a/patches/collateral-evolutions/media/0001-dma_mmap_coherent-revert.patch b/patches/collateral-evolutions/media/0001-dma_mmap_coherent-revert.patch index f4620c3..6ce8aa7 100644 --- a/patches/collateral-evolutions/media/0001-dma_mmap_coherent-revert.patch +++ b/patches/collateral-evolutions/media/0001-dma_mmap_coherent-revert.patch @@ -25,7 +25,7 @@ Date: Thu Jun 14 11:32:21 2012 -0300 --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c -@@ -188,6 +188,52 @@ static void *vb2_dc_alloc(void *alloc_ct +@@ -168,6 +168,52 @@ static void *vb2_dc_alloc(void *alloc_ct return buf; } @@ -78,7 +78,7 @@ Date: Thu Jun 14 11:32:21 2012 -0300 static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) { struct vb2_dc_buf *buf = buf_priv; -@@ -224,6 +270,7 @@ static int vb2_dc_mmap(void *buf_priv, s +@@ -204,6 +250,7 @@ static int vb2_dc_mmap(void *buf_priv, s return 0; } diff --git a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch index 8d606c7..89eb464 100644 --- a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch +++ b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch @@ -9,7 +9,7 @@ tristate config VIDEOBUF2_MEMOPS -@@ -90,13 +90,13 @@ config VIDEOBUF2_DMA_CONTIG +@@ -91,13 +91,13 @@ config VIDEOBUF2_DMA_CONTIG depends on HAS_DMA select VIDEOBUF2_CORE select VIDEOBUF2_MEMOPS @@ -27,7 +27,7 @@ tristate --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c -@@ -459,6 +459,7 @@ int v4l2_m2m_create_bufs(struct file *fi +@@ -466,6 +466,7 @@ int v4l2_m2m_create_bufs(struct file *fi } EXPORT_SYMBOL_GPL(v4l2_m2m_create_bufs); @@ -35,7 +35,7 @@ /** * v4l2_m2m_expbuf() - export a source or destination buffer, depending on * the type -@@ -472,6 +473,7 @@ int v4l2_m2m_expbuf(struct file *file, s +@@ -479,6 +480,7 @@ int v4l2_m2m_expbuf(struct file *file, s return vb2_expbuf(vq, eb); } EXPORT_SYMBOL_GPL(v4l2_m2m_expbuf); @@ -43,7 +43,7 @@ /** * v4l2_m2m_streamon() - turn on streaming for a video queue */ -@@ -839,6 +841,7 @@ int v4l2_m2m_ioctl_prepare_buf(struct fi +@@ -846,6 +848,7 @@ int v4l2_m2m_ioctl_prepare_buf(struct fi } EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_prepare_buf); @@ -51,7 +51,7 @@ int v4l2_m2m_ioctl_expbuf(struct file *file, void *priv, struct v4l2_exportbuffer *eb) { -@@ -847,6 +850,7 @@ int v4l2_m2m_ioctl_expbuf(struct file *f +@@ -854,6 +857,7 @@ int v4l2_m2m_ioctl_expbuf(struct file *f return v4l2_m2m_expbuf(file, fh->m2m_ctx, eb); } EXPORT_SYMBOL_GPL(v4l2_m2m_ioctl_expbuf); @@ -61,7 +61,7 @@ enum v4l2_buf_type type) --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c -@@ -253,6 +253,7 @@ static void __vb2_buf_userptr_put(struct +@@ -255,6 +255,7 @@ static void __vb2_buf_userptr_put(struct } } @@ -69,7 +69,7 @@ /** * __vb2_plane_dmabuf_put() - release memory associated with * a DMABUF shared plane -@@ -281,6 +282,7 @@ static void __vb2_buf_dmabuf_put(struct +@@ -283,6 +284,7 @@ static void __vb2_buf_dmabuf_put(struct for (plane = 0; plane < vb->num_planes; ++plane) __vb2_plane_dmabuf_put(vb, &vb->planes[plane]); } @@ -77,7 +77,7 @@ /** * __setup_lengths() - setup initial lengths for every plane in -@@ -424,8 +426,10 @@ static void __vb2_free_mem(struct vb2_qu +@@ -426,8 +428,10 @@ static void __vb2_free_mem(struct vb2_qu /* Free MMAP buffers or release USERPTR buffers */ if (q->memory == V4L2_MEMORY_MMAP) __vb2_buf_mem_free(vb); @@ -88,7 +88,7 @@ else __vb2_buf_userptr_put(vb); } -@@ -784,6 +788,7 @@ static int __verify_mmap_ops(struct vb2_ +@@ -787,6 +791,7 @@ static int __verify_mmap_ops(struct vb2_ return 0; } @@ -96,7 +96,7 @@ /** * __verify_dmabuf_ops() - verify that all memory operations required for * DMABUF queue type have been provided -@@ -797,6 +802,7 @@ static int __verify_dmabuf_ops(struct vb +@@ -800,6 +805,7 @@ static int __verify_dmabuf_ops(struct vb return 0; } @@ -104,7 +104,7 @@ /** * __verify_memory_type() - Check whether the memory type and buffer type -@@ -830,10 +836,12 @@ static int __verify_memory_type(struct v +@@ -833,10 +839,12 @@ static int __verify_memory_type(struct v return -EINVAL; } @@ -117,7 +117,7 @@ /* * Place the busy tests at the end: -EBUSY can be ignored when -@@ -1499,6 +1507,7 @@ err: +@@ -1513,6 +1521,7 @@ err: return ret; } @@ -125,7 +125,7 @@ /** * __qbuf_dmabuf() - handle qbuf of a DMABUF buffer */ -@@ -1617,6 +1626,7 @@ err: +@@ -1631,6 +1640,7 @@ err: return ret; } @@ -133,9 +133,9 @@ /** * __enqueue_in_driver() - enqueue a vb2_buffer in driver for processing -@@ -1679,9 +1689,11 @@ static int __buf_prepare(struct vb2_buff +@@ -1693,9 +1703,11 @@ static int __buf_prepare(struct vb2_buff + case V4L2_MEMORY_USERPTR: ret = __qbuf_userptr(vb, b); - up_read(¤t->mm->mmap_sem); break; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) case V4L2_MEMORY_DMABUF: @@ -145,7 +145,7 @@ default: WARN(1, "Invalid queue type\n"); ret = -EINVAL; -@@ -2072,8 +2084,10 @@ EXPORT_SYMBOL_GPL(vb2_wait_for_all_buffe +@@ -2088,8 +2100,10 @@ EXPORT_SYMBOL_GPL(vb2_wait_for_all_buffe */ static void __vb2_dqbuf(struct vb2_buffer *vb) { @@ -156,7 +156,7 @@ /* nothing to do if the buffer is already dequeued */ if (vb->state == VB2_BUF_STATE_DEQUEUED) -@@ -2081,6 +2095,7 @@ static void __vb2_dqbuf(struct vb2_buffe +@@ -2097,6 +2111,7 @@ static void __vb2_dqbuf(struct vb2_buffe vb->state = VB2_BUF_STATE_DEQUEUED; @@ -164,7 +164,7 @@ /* unmap DMABUF buffer */ if (q->memory == V4L2_MEMORY_DMABUF) for (i = 0; i < vb->num_planes; ++i) { -@@ -2089,6 +2104,7 @@ static void __vb2_dqbuf(struct vb2_buffe +@@ -2105,6 +2120,7 @@ static void __vb2_dqbuf(struct vb2_buffe call_void_memop(vb, unmap_dmabuf, vb->planes[i].mem_priv); vb->planes[i].dbuf_mapped = 0; } @@ -172,7 +172,7 @@ } static int vb2_internal_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking) -@@ -2399,6 +2415,7 @@ static int __find_plane_by_offset(struct +@@ -2418,6 +2434,7 @@ static int __find_plane_by_offset(struct return -EINVAL; } @@ -180,7 +180,7 @@ /** * vb2_expbuf() - Export a buffer as a file descriptor * @q: videobuf2 queue -@@ -2476,6 +2493,7 @@ int vb2_expbuf(struct vb2_queue *q, stru +@@ -2495,6 +2512,7 @@ int vb2_expbuf(struct vb2_queue *q, stru return 0; } EXPORT_SYMBOL_GPL(vb2_expbuf); @@ -188,7 +188,7 @@ /** * vb2_mmap() - map video buffers into application address space -@@ -3421,6 +3439,7 @@ int vb2_ioctl_streamoff(struct file *fil +@@ -3440,6 +3458,7 @@ int vb2_ioctl_streamoff(struct file *fil } EXPORT_SYMBOL_GPL(vb2_ioctl_streamoff); @@ -196,7 +196,7 @@ int vb2_ioctl_expbuf(struct file *file, void *priv, struct v4l2_exportbuffer *p) { struct video_device *vdev = video_devdata(file); -@@ -3430,6 +3449,7 @@ int vb2_ioctl_expbuf(struct file *file, +@@ -3449,6 +3468,7 @@ int vb2_ioctl_expbuf(struct file *file, return vb2_expbuf(vdev->queue, p); } EXPORT_SYMBOL_GPL(vb2_ioctl_expbuf); @@ -206,7 +206,7 @@ --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c -@@ -98,8 +98,10 @@ static void *vb2_dc_vaddr(void *buf_priv +@@ -78,8 +78,10 @@ static void *vb2_dc_vaddr(void *buf_priv { struct vb2_dc_buf *buf = buf_priv; @@ -217,7 +217,7 @@ return buf->vaddr; } -@@ -272,6 +274,7 @@ static int vb2_dc_mmap(void *buf_priv, s +@@ -252,6 +254,7 @@ static int vb2_dc_mmap(void *buf_priv, s } #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)) */ @@ -225,7 +225,7 @@ /*********************************************/ /* DMABUF ops for exporters */ /*********************************************/ -@@ -444,6 +447,7 @@ static struct sg_table *vb2_dc_get_base_ +@@ -424,6 +427,7 @@ static struct sg_table *vb2_dc_get_base_ return sgt; } @@ -235,8 +235,8 @@ { --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c -@@ -30,7 +30,9 @@ struct vb2_vmalloc_buf { - unsigned int n_pages; +@@ -28,7 +28,9 @@ struct vb2_vmalloc_buf { + unsigned long size; atomic_t refcount; struct vb2_vmarea_handler handler; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) @@ -296,7 +296,7 @@ void *(*vaddr)(void *buf_priv); void *(*cookie)(void *buf_priv); -@@ -463,7 +467,9 @@ void vb2_queue_release(struct vb2_queue +@@ -465,7 +469,9 @@ void vb2_queue_release(struct vb2_queue void vb2_queue_error(struct vb2_queue *q); int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b); @@ -306,7 +306,7 @@ int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking); int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type); -@@ -637,8 +643,10 @@ int vb2_ioctl_qbuf(struct file *file, vo +@@ -639,8 +645,10 @@ int vb2_ioctl_qbuf(struct file *file, vo int vb2_ioctl_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p); int vb2_ioctl_streamon(struct file *file, void *priv, enum v4l2_buf_type i); int vb2_ioctl_streamoff(struct file *file, void *priv, enum v4l2_buf_type i); @@ -337,7 +337,7 @@ int nonblocking) --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c -@@ -377,9 +377,11 @@ static void *vb2_dma_sg_vaddr(void *buf_ +@@ -316,9 +316,11 @@ static void *vb2_dma_sg_vaddr(void *buf_ BUG_ON(!buf); if (!buf->vaddr) { diff --git a/patches/collateral-evolutions/media/0003-devnode_param_type/rc.patch b/patches/collateral-evolutions/media/0003-devnode_param_type/rc.patch index 398a88e..2d0f58f 100644 --- a/patches/collateral-evolutions/media/0003-devnode_param_type/rc.patch +++ b/patches/collateral-evolutions/media/0003-devnode_param_type/rc.patch @@ -1,6 +1,6 @@ --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c -@@ -761,7 +761,11 @@ static void ir_close(struct input_dev *i +@@ -762,7 +762,11 @@ static void ir_close(struct input_dev *i } /* class for /sys/class/rc */ diff --git a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch index e41bbba..f2f45f3 100644 --- a/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch +++ b/patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch @@ -1,6 +1,6 @@ --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c -@@ -570,7 +570,9 @@ static void vb2_dc_put_userptr(void *buf +@@ -470,7 +470,9 @@ static void vb2_dc_put_userptr(void *buf if (sgt) { DEFINE_DMA_ATTRS(attrs); @@ -10,7 +10,7 @@ /* * No need to sync to CPU, it's already synced to the CPU * since the finish() memop will have been called before this. -@@ -635,7 +637,9 @@ static void *vb2_dc_get_userptr(void *al +@@ -534,7 +536,9 @@ static void *vb2_dc_get_userptr(void *al unsigned long dma_align = dma_get_cache_alignment(); DEFINE_DMA_ATTRS(attrs); @@ -42,17 +42,17 @@ dprintk(1, "%s: Freeing buffer of %d pages\n", __func__, buf->num_pages); dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents, -@@ -242,7 +246,9 @@ static void *vb2_dma_sg_get_userptr(void - struct sg_table *sgt; +@@ -235,7 +239,9 @@ static void *vb2_dma_sg_get_userptr(void DEFINE_DMA_ATTRS(attrs); + struct frame_vector *vec; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs); +#endif - buf = kzalloc(sizeof *buf, GFP_KERNEL); if (!buf) -@@ -350,7 +356,9 @@ static void vb2_dma_sg_put_userptr(void + return NULL; +@@ -292,7 +298,9 @@ static void vb2_dma_sg_put_userptr(void int i = buf->num_pages; DEFINE_DMA_ATTRS(attrs); diff --git a/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch b/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch index 2f681f3..edc4dc4 100644 --- a/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch +++ b/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch @@ -1,6 +1,6 @@ --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -3120,6 +3120,9 @@ struct wiphy_vendor_command { +@@ -3119,6 +3119,9 @@ struct wiphy_vendor_command { struct wiphy { /* assign these fields before you register the wiphy */ diff --git a/patches/collateral-evolutions/network/0005-disable-usb-net-asix.patch b/patches/collateral-evolutions/network/0005-disable-usb-net-asix.patch index 9d1ad08..23de21e 100644 --- a/patches/collateral-evolutions/network/0005-disable-usb-net-asix.patch +++ b/patches/collateral-evolutions/network/0005-disable-usb-net-asix.patch @@ -1,8 +1,8 @@ --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile -@@ -9,7 +9,6 @@ obj-$(CONFIG_USB_RTL8150) += rtl8150.o - obj-$(CONFIG_USB_RTL8152) += r8152.o +@@ -10,7 +10,6 @@ obj-$(CONFIG_USB_RTL8152) += r8152.o obj-$(CONFIG_USB_HSO) += hso.o + obj-$(CONFIG_USB_LAN78XX) += lan78xx.o obj-$(CONFIG_USB_NET_AX8817X) += asix.o -asix-y := asix_devices.o asix_common.o ax88172a.o obj-$(CONFIG_USB_NET_AX88179_178A) += ax88179_178a.o diff --git a/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch index b843822..733d16b 100644 --- a/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch +++ b/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch @@ -1,7 +1,7 @@ --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -420,10 +420,6 @@ use_default_name: - INIT_WORK(&rdev->sched_scan_results_wk, __cfg80211_sched_scan_results); +@@ -423,10 +423,6 @@ use_default_name: + INIT_WORK(&rdev->mlme_unreg_wk, cfg80211_mlme_unreg_wk); INIT_DELAYED_WORK(&rdev->dfs_update_channels_wk, cfg80211_dfs_channels_update_work); -#ifdef CONFIG_CFG80211_WEXT @@ -11,7 +11,7 @@ device_initialize(&rdev->wiphy.dev); rdev->wiphy.dev.class = &ieee80211_class; rdev->wiphy.dev.platform_data = rdev; -@@ -1017,6 +1013,15 @@ static int cfg80211_netdev_notifier_call +@@ -1022,6 +1018,15 @@ static int cfg80211_netdev_notifier_call } wdev->netdev = dev; #ifdef CONFIG_CFG80211_WEXT diff --git a/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch index 4d991be..88a0553 100644 --- a/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch +++ b/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -6651,7 +6651,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -6652,7 +6652,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev); diff --git a/patches/collateral-evolutions/network/0046-mmc_rescan_entered/mwifiex.patch b/patches/collateral-evolutions/network/0046-mmc_rescan_entered/mwifiex.patch deleted file mode 100644 index 9dfd418..0000000 --- a/patches/collateral-evolutions/network/0046-mmc_rescan_entered/mwifiex.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/mwifiex/sdio.c -+++ b/drivers/net/wireless/mwifiex/sdio.c -@@ -2125,7 +2125,9 @@ static void mwifiex_sdio_card_reset_work - mmc_remove_host(target); - /* 200ms delay is based on experiment with sdhci controller */ - mdelay(200); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) - target->rescan_entered = 0; /* rescan non-removable cards */ -+#endif - mmc_add_host(target); - } - diff --git a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch index c7729b9..0a60b78 100644 --- a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch +++ b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch @@ -68,7 +68,7 @@ err = l2cap_chan_send(chan, &msg, skb->len); if (err > 0) { -@@ -1053,6 +1060,9 @@ static const struct l2cap_ops bt_6lowpan +@@ -1056,6 +1063,9 @@ static const struct l2cap_ops bt_6lowpan .suspend = chan_suspend_cb, .get_sndtimeo = chan_get_sndtimeo_cb, .alloc_skb = chan_alloc_skb_cb, diff --git a/patches/collateral-evolutions/network/0053-possible_net_t.patch b/patches/collateral-evolutions/network/0053-possible_net_t.patch index 95651d8..aa470f9 100644 --- a/patches/collateral-evolutions/network/0053-possible_net_t.patch +++ b/patches/collateral-evolutions/network/0053-possible_net_t.patch @@ -2,7 +2,7 @@ diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 04e5785..a251da1 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -3243,12 +3243,12 @@ struct wiphy { +@@ -3242,12 +3242,12 @@ struct wiphy { static inline struct net *wiphy_net(struct wiphy *wiphy) { diff --git a/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch b/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch index ee19313..10b3da6 100644 --- a/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch +++ b/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -1759,8 +1759,12 @@ static void btusb_intel_bootup(struct bt +@@ -1762,8 +1762,12 @@ static void btusb_intel_bootup(struct bt return; if (test_and_clear_bit(BTUSB_BOOTING, &data->flags)) { @@ -13,7 +13,7 @@ } } -@@ -1777,8 +1781,12 @@ static void btusb_intel_secure_send_resu +@@ -1780,8 +1784,12 @@ static void btusb_intel_secure_send_resu if (test_and_clear_bit(BTUSB_DOWNLOADING, &data->flags) && test_bit(BTUSB_FIRMWARE_LOADED, &data->flags)) { @@ -26,7 +26,7 @@ } } -@@ -2133,6 +2141,7 @@ static int btusb_setup_intel_new(struct +@@ -2136,6 +2144,7 @@ static int btusb_setup_intel_new(struct * and thus just timeout if that happens and fail the setup * of this device. */ @@ -34,7 +34,7 @@ err = wait_on_bit_timeout(&data->flags, BTUSB_DOWNLOADING, TASK_INTERRUPTIBLE, msecs_to_jiffies(5000)); -@@ -2147,6 +2156,31 @@ static int btusb_setup_intel_new(struct +@@ -2150,6 +2159,31 @@ static int btusb_setup_intel_new(struct err = -ETIMEDOUT; goto done; } @@ -66,7 +66,7 @@ if (test_bit(BTUSB_FIRMWARE_FAILED, &data->flags)) { BT_ERR("%s: Firmware loading failed", hdev->name); -@@ -2186,6 +2220,7 @@ done: +@@ -2189,6 +2223,7 @@ done: */ BT_INFO("%s: Waiting for device to boot", hdev->name); @@ -74,7 +74,7 @@ err = wait_on_bit_timeout(&data->flags, BTUSB_BOOTING, TASK_INTERRUPTIBLE, msecs_to_jiffies(1000)); -@@ -2199,6 +2234,33 @@ done: +@@ -2202,6 +2237,33 @@ done: BT_ERR("%s: Device boot timeout", hdev->name); return -ETIMEDOUT; } -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in ^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2015-09-14 19:35 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-09-14 7:48 [PATCH 00/10] backports: bring backports to next-20150818 Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 01/10] header: add acpi_dev_remove_driver_gpios() Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 02/10] header: add page_is_pfmemalloc() Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 03/10] header: remove parameter from mei_cl_register_event_cb() Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 04/10] header: add compiler-gcc5.h Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 05/10] patches: make ACPI gpio configuration depend on kernel >= 3.19 Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 06/10] patches: add additional include to brcmfmac Hauke Mehrtens 2015-09-14 8:16 ` Arend van Spriel 2015-09-14 19:35 ` Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 07/10] dependencies: deactivate mwifiex SDIO part in kernel < 3.2 Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 08/10] dependencies: make netup-unidvb driver depend on >= 3.4 Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 09/10] devel: update test kernel versions Hauke Mehrtens 2015-09-14 7:48 ` [PATCH 10/10] backports: refresh on next-20150818 Hauke Mehrtens
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox