staging/pepe2k/target/linux, branch v17.01.7

kernel: Reorder kernel configuration

2019-06-20T10:53:53Z

The following command was run on the configuration: ./scripts/kconfig.pl target/linux/generic/config-4.4 > target/linux/generic/config-4.4-new Signed-off-by: Hauke Mehrtens

layerscape: Adapt patch to changes in upstream kernel

2019-06-20T10:53:53Z

In kernel v4.4.179 the structure of the scripts/mod/file2alias.c file changed, this adapts the patch to the changes done in the stable kernel. This fixes the following compile problem: HOSTCC scripts/mod/file2alias.o scripts/mod/file2alias.c:1199:17: error: expected declaration specifiers or '...' before string constant ADD_TO_DEVTABLE("fslmc", fsl_mc_device_id, do_fsl_mc_entry); ^ scripts/mod/file2alias.c:1199:26: error: unknown type name 'fsl_mc_device_id' ADD_TO_DEVTABLE("fslmc", fsl_mc_device_id, do_fsl_mc_entry); ^ scripts/mod/file2alias.c:1199:44: error: expected declaration specifiers or '...' before 'do_fsl_mc_entry' ADD_TO_DEVTABLE("fslmc", fsl_mc_device_id, do_fsl_mc_entry); ^ scripts/mod/file2alias.c:1190:12: warning: 'do_fsl_mc_entry' defined but not used [-Wunused-function] static int do_fsl_mc_entry(const char *filename, void *symval, ^ SHIPPED scripts/dtc/dtc-parser.tab.h Fixes: 6c5c3a2edccf ("kernel: Update to version 4.4.182") Signed-off-by: Hauke Mehrtens

apm821xx: Revert upstream fix which breaks compile

2019-06-20T10:53:53Z

This reverts a commit added in kernel v4.4.179 which breaks compilation on the apm821xx target. This fixes the following compile problem: drivers/crypto/amcc/crypto4xx_core.c: In function 'crypto4xx_ablkcipher_done': drivers/crypto/amcc/crypto4xx_core.c:650:21: warning: dereferencing 'void *' pointer if (pd_uinfo->sa_va->sa_command_0.bf.save_iv == SA_SAVE_IV) { ^ drivers/crypto/amcc/crypto4xx_core.c:650:21: error: request for member 'sa_command_0' in something not a structure or union drivers/crypto/amcc/crypto4xx_core.c:651:38: error: implicit declaration of function 'crypto_skcipher_reqtfm' [-Werror=implicit-function-declaration] struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req); ^ drivers/crypto/amcc/crypto4xx_core.c:651:61: error: 'req' undeclared (first use in this function) struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req); ^ drivers/crypto/amcc/crypto4xx_core.c:651:61: note: each undeclared identifier is reported only once for each function it appears in drivers/crypto/amcc/crypto4xx_core.c:653:3: error: implicit declaration of function 'crypto4xx_memcpy_from_le32' [-Werror=implicit-function-declaration] crypto4xx_memcpy_from_le32((u32 *)req->iv, ^ drivers/crypto/amcc/crypto4xx_core.c:654:19: warning: dereferencing 'void *' pointer pd_uinfo->sr_va->save_iv, ^ drivers/crypto/amcc/crypto4xx_core.c:654:19: error: request for member 'save_iv' in something not a structure or union drivers/crypto/amcc/crypto4xx_core.c:655:4: error: implicit declaration of function 'crypto_skcipher_ivsize' [-Werror=implicit-function-declaration] crypto_skcipher_ivsize(skcipher)); ^ cc1: some warnings being treated as errors Fixes: 6c5c3a2edccf ("kernel: Update to version 4.4.182") Signed-off-by: Hauke Mehrtens

brcm2708: Adapt patches to kernel update

2019-06-20T10:53:53Z

In kernel 4.4.182 get_user_pages() does not get the write and force parameter any more, but one flags parameter with WRITE and FORCE attributes. This adapts the patches to use the changed API and fixes the compile problems with the brcm2708 target. This fixes the following compile problem: drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c: In function 'dump_phys_mem': drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c:1501:3: warning: passing argument 7 of 'get_user_pages' from incompatible pointer type [-Wincompatible-pointer-types] pages, /* pages (array of page pointers) */ ^ In file included from drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c:42:0: include/linux/mm.h:1200:6: note: expected 'struct vm_area_struct **' but argument is of type 'struct page **' long get_user_pages(struct task_struct *tsk, struct mm_struct *mm, ^ drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c:1495:7: error: too many arguments to function 'get_user_pages' rc = get_user_pages(current, /* task */ ^ In file included from drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c:42:0: include/linux/mm.h:1200:6: note: declared here long get_user_pages(struct task_struct *tsk, struct mm_struct *mm, ^ scripts/Makefile.build:277: recipe for target 'drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.o' failed Fixes: 6c5c3a2edccf ("kernel: Update to version 4.4.182") Signed-off-by: Hauke Mehrtens

kernel: Add CONFIG_RTC to generic config

2019-06-20T10:53:37Z

RTC (the legacy driver) should not really be used, but seems to crop up after the kernel update. Fix this by disabling it in the generic config. Fixes the following build issue seen in arm64 or powerpc64: ARM JTAG DCC console (HVC_DCC) [N/y/?] n Virtio console (VIRTIO_CONSOLE) [N/m/y/?] n Enhanced Real Time Clock Support (legacy PC RTC driver) (RTC) [N/m/y/?] (NEW) aborted! Console input/output is redirected. Run 'make oldconfig' to update configuration. scripts/kconfig/Makefile:37: recipe for target 'silentoldconfig' failed This should fix the build on the arm64/generic and the layerscape/64b targets. Fixes: 6c5c3a2edccf ("kernel: Update to version 4.4.182") Signed-off-by: Hauke Mehrtens

kernel: Update to version 4.4.182

2019-06-18T18:45:33Z

Fixes: - CVE-2019-11479 - CVE-2019-11478 - CVE-2019-11477 - CVE-2019-11833 - CVE-2019-11091 - CVE-2018-12126 - CVE-2018-12130 - CVE-2018-12127 - CVE-2019-3882 - CVE-2019-6974 - CVE-2019-3819 - CVE-2019-7221 - CVE-2019-7222 - CVE-2019-3701 - CVE-2018-19985 - CVE-2018-1120 And probably more Signed-off-by: Hauke Mehrtens

kernel: fix refcnt leak in LED netdev trigger on interface rename

2019-03-06T05:12:39Z

Renaming a netdev-trigger-tracked interface was resulting in an unbalanced dev_hold(). Example: > iw phy phy0 interface add foo type __ap > echo netdev > trigger > echo foo > device_name > ip link set foo name bar > iw dev bar del [ 237.355366] unregister_netdevice: waiting for bar to become free. Usage count = 1 [ 247.435362] unregister_netdevice: waiting for bar to become free. Usage count = 1 [ 257.545366] unregister_netdevice: waiting for bar to become free. Usage count = 1 Above problem was caused by trigger checking a dev->name which obviously changes after renaming an interface. It meant missing all further events including the NETDEV_UNREGISTER which is required for calling dev_put(). This change fixes that by: 1) Comparing device struct *address* for notification-filtering purposes 2) Dropping unneeded NETDEV_CHANGENAME code (no behavior change) Signed-off-by: Rafał Miłecki (cherry picked from commit eea538204bb973d73d3bc3d38947d7f85214d486)

cns3xxx: use actual size reads for PCIe

2019-01-15T14:51:19Z

upstream commit 802b7c06adc7 ("ARM: cns3xxx: Convert PCI to use generic config accessors") reimplemented cns3xxx_pci_read_config() using pci_generic_config_read32(), which preserved the property of only doing 32-bit reads. It also replaced cns3xxx_pci_write_config() with pci_generic_config_write(), so it changed writes from always being 32 bits to being the actual size, which works just fine. Due to: - The documentation does not mention that only 32 bit access is allowed. - Writes are already executed using the actual size - Extensive testing shows that 8b, 16b and 32b reads work as intended It makes perfectly sense to also swap 32 bit reading in favor of actual size. Signed-off-by: Koen Vandeputte

apm821xx: switch MX60(W)'s recovery images to multi-image method

2019-01-01T17:53:06Z

In the past, the MX60(W)'s recovery images always had problems with the size restriction and never really worked without manual intervention. This patch reworks the initramfs, which allows the device to ease up on the impossible tight kernel size requirements for the initramfs image. This new initramfs can be loaded through the MX60(W) U-boot in the following way: => setenv bootargs console=ttyS0,$baudrate => tftpboot $meraki_loadaddr meraki_mx60-initramfs-kernel.bin [...] Load address: 0x800000 Loading: ################################################ [...] done [...] => bootm $fileaddr \## Booting kernel from Legacy Image at 00800000 ... ... For more information and the latest flashing guide: please visit the OpenWrt Wiki Page for the MX60(W): Signed-off-by: Chris Blake Signed-off-by: Christian Lamparter (cherry picked from commit 36c19c9f0be23ad327085aa762e95de638e19b4a)

apm821xx: MBL: load kernel/dtb from SATA 0:1 first

2018-12-27T15:40:07Z

This remedies an issue with the MBL Duo if both disks are inserted and contain OpenWrt. kernel and dtb would be loaded from SATA 1:1 while rootfs (/dev/sda2) would be mounted on SATA 0:1. Such a mix&match would obviously only work if both OpenWrt versions/ builds are identical, and especially fail after sysupgrade upgraded the system disk on SATA 0:1. The fallback to SATA 1:1 needs to be kept for MBL Single (only has SATA 1:1) and MBL Duo with one disk inserted on SATA 1:1. To speed up booting in those cases, the unneccesarily doubled "sata init" will only be called once. (In theory it could be omitted completely since the on-flash boot script already initializes SATA to load the on-disk boot script.) Tested on MBL Duo (all possible combination of disks) and MBL Single Signed-off-by: Freddy Leitner