From e517c437cb8042252190de5bad08728a3b0524e6 Mon Sep 17 00:00:00 2001 From: Junghoon Kim Date: Mon, 20 Jan 2020 15:28:38 +0900 Subject: [PATCH 01/16] ARM64: tizen_bcmrpi3_defconfig: Disable RAID6_PQ_BENCHMARK Skip the algorithm benchmarking process of RAID6 for the fast kernel startup. The option is not crucial for the rpi boards. Change-Id: I9c959bcf2bbb178e72bc4315a0734d8059ebd46b Signed-off-by: Junghoon Kim --- arch/arm64/configs/tizen_bcmrpi3_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/tizen_bcmrpi3_defconfig b/arch/arm64/configs/tizen_bcmrpi3_defconfig index 848bb71..d55590e 100644 --- a/arch/arm64/configs/tizen_bcmrpi3_defconfig +++ b/arch/arm64/configs/tizen_bcmrpi3_defconfig @@ -419,6 +419,7 @@ CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_LZO=y +# CONFIG_RAID6_PQ_BENCHMARK is not set CONFIG_CRC_ITU_T=y CONFIG_PRINTK_TIME=y CONFIG_BOOT_PRINTK_DELAY=y -- 2.7.4 From 235c3fbb167a6cb7fea9c2f67e5d63f4bdd87bbb Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Mon, 16 Mar 2020 19:06:53 +0900 Subject: [PATCH 02/16] ARM: dts: bcm2710-rpi-3: Change build macro for optee Now, Tizen does not support optee by default. Change build macro for optee related nodes in default case. Change-Id: Ib925414ba6fd96099ca984cc8b665263812b9538 Ref: https://bugs.tizen.org/browse/TRE-2318 Signed-off-by: Seung-Woo Kim --- arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 2 +- arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 2 +- arch/arm/boot/dts/bcm2710.dtsi | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts index 9482f54..9811f72 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -1,6 +1,6 @@ /dts-v1/; -#ifdef RPI364 +#ifdef RPI364_OPTEE /memreserve/ 0x08000000 0x02000000; #endif diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts index 10a2a49..3621562 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -1,6 +1,6 @@ /dts-v1/; -#ifdef RPI364 +#ifdef RPI364_OPTEE /memreserve/ 0x08000000 0x02000000; #endif diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi index 59d66fa..e8454ed 100644 --- a/arch/arm/boot/dts/bcm2710.dtsi +++ b/arch/arm/boot/dts/bcm2710.dtsi @@ -27,7 +27,7 @@ <&cpu3>, "clock-frequency:0"; }; -#ifdef RPI364 +#ifdef RPI364_OPTEE firmware { optee { compatible = "linaro,optee-tz"; @@ -42,6 +42,7 @@ #endif }; +#ifdef RPI364_OPTEE &cpu0 { enable-method = "psci"; }; @@ -57,3 +58,4 @@ &cpu3 { enable-method = "psci"; }; +#endif -- 2.7.4 From d7702b7427fcc6707fcd4dfa2ded04eaf3d3f9ee Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Mon, 16 Mar 2020 19:08:19 +0900 Subject: [PATCH 03/16] ARM64: tizen_bcmrpi3_defconfig: Disable OPTEE Now, Tizen does not support OPTEE by default. Disable OPTEE config options. Change-Id: I424d38f42ad0e3199bd84517fb477dc212785be8 Ref: https://bugs.tizen.org/browse/TRE-2318 Signed-off-by: Seung-Woo Kim --- arch/arm64/configs/tizen_bcmrpi3_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/configs/tizen_bcmrpi3_defconfig b/arch/arm64/configs/tizen_bcmrpi3_defconfig index d55590e..0f6b66d 100644 --- a/arch/arm64/configs/tizen_bcmrpi3_defconfig +++ b/arch/arm64/configs/tizen_bcmrpi3_defconfig @@ -379,7 +379,6 @@ CONFIG_PWM_BCM2835=y CONFIG_ANDROID=y CONFIG_DAX=y CONFIG_TEE=y -CONFIG_OPTEE=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y -- 2.7.4 From bfde5555874e6e548ea322451423757cf05d2052 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Mon, 16 Mar 2020 19:09:40 +0900 Subject: [PATCH 04/16] rpi3: config_64bit: boot from u-boot instead of spl Now, Tizen does not support OPTEE by default, so u-boot-spl is not required. Boot from u-boot instead of u-boot-spl. Change-Id: Iadaee5290ede214b4f85487eea8e9151f9ea98f9 Ref: https://bugs.tizen.org/browse/TRE-2318 Signed-off-by: Seung-Woo Kim --- rpi3/boot/config_64bit.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpi3/boot/config_64bit.txt b/rpi3/boot/config_64bit.txt index 5f51835..da9a874 100644 --- a/rpi3/boot/config_64bit.txt +++ b/rpi3/boot/config_64bit.txt @@ -64,13 +64,13 @@ uart_2ndstage=1 arm_control=0x200 # for 64-bit # Kernel binary -kernel=u-boot-spl.bin +kernel=u-boot.bin # Kernel Address 0x0 -kernel_old=1 +#kernel_old=1 # Skip filling ATAGS -disable_commandline_tags=1 +#disable_commandline_tags=1 # enable JTAG flag enable_jtag_gpio=1 -- 2.7.4 From b24be89f3bf7e4721de4deef8e3c40a4e8aba03d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 11 Feb 2019 23:04:54 +0100 Subject: [PATCH 05/16] brcmfmac: support firmware reporting 160 MHz channels MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit So far 160 MHz channels were treated as 20 MHz ones which was breaking support for 40/80 MHz due to the brcmf_construct_chaninfo() logic and its assumptions. Signed-off-by: Rafał Miłecki Signed-off-by: Kalle Valo [sw0312.kim: backport mainline commit 30519cbe339a to show more 5G channels properly] Signed-off-by: Seung-Woo Kim Change-Id: I62ca12dfd97d0cd3233840d5b569e768dc4a1672 --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 82ec8f9..1dd7a1f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -6002,7 +6002,9 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg, /* assuming the chanspecs order is HT20, * HT40 upper, HT40 lower, and VHT80. */ - if (ch.bw == BRCMU_CHAN_BW_80) { + if (ch.bw == BRCMU_CHAN_BW_160) + channel->flags &= ~IEEE80211_CHAN_NO_160MHZ; + else if (ch.bw == BRCMU_CHAN_BW_80) { channel->flags &= ~IEEE80211_CHAN_NO_80MHZ; } else if (ch.bw == BRCMU_CHAN_BW_40) { brcmf_update_bw40_channel_flag(channel, &ch); -- 2.7.4 From e181eaf6143665695731c1697a5c7e699f4bcbf0 Mon Sep 17 00:00:00 2001 From: Ravi Bangoria Date: Tue, 11 Jun 2019 08:31:09 +0530 Subject: [PATCH 06/16] perf version: Fix segfault due to missing OPT_END() 'perf version' on powerpc segfaults when used with non-supported option: # perf version -a Segmentation fault (core dumped) Fix this. Signed-off-by: Ravi Bangoria Reviewed-by: Kamalesh Babulal Tested-by: Mamatha Inamdar Cc: Jiri Olsa Cc: Kamalesh Babulal Link: http://lkml.kernel.org/r/20190611030109.20228-1-ravi.bangoria@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo [sw0312.kim: cherry-pick mainline commit 916c31fff946 to fix possible seg.fault in Tizen armv7l] Signed-off-by: Seung-Woo Kim Change-Id: If19720350e2992d1f5e58711f1f708a4d4ec5683 --- tools/perf/builtin-version.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/builtin-version.c b/tools/perf/builtin-version.c index 50df168..b02c961 100644 --- a/tools/perf/builtin-version.c +++ b/tools/perf/builtin-version.c @@ -19,6 +19,7 @@ static struct version version; static struct option version_options[] = { OPT_BOOLEAN(0, "build-options", &version.build_options, "display the build options"), + OPT_END(), }; static const char * const version_usage[] = { -- 2.7.4 From a0611c26e7dfedeb087e7407377d093809ab5963 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Fri, 17 Apr 2020 12:26:21 +0900 Subject: [PATCH 07/16] packaging: Add build perf with unwind call-graph support To support perf unwind call-graph, add BuildRequires for unwind, dw, elfutils and other related devel packages. Also add definition to remove not necessary perl dependency Change-Id: I8e94ec4642026841255bbec08ae3dea2a8f5b531 Signed-off-by: Seung-Woo Kim --- packaging/linux-rpi3.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packaging/linux-rpi3.spec b/packaging/linux-rpi3.spec index a103e18..7658e30 100644 --- a/packaging/linux-rpi3.spec +++ b/packaging/linux-rpi3.spec @@ -31,6 +31,12 @@ BuildRequires: u-boot-tools >= 2016.03 BuildRequires: bison BuildRequires: flex BuildRequires: libopenssl1.1-devel +BuildRequires: libunwind-devel +BuildRequires: libdw-devel +BuildRequires: libelf-devel +BuildRequires: elfutils +BuildRequires: xz-devel +BuildRequires: binutils-devel %description The Linux Kernel, the operating system core itself @@ -96,8 +102,8 @@ make dtbs %{?_smp_mflags} make modules %{?_smp_mflags} # 1-5. Build perf -make -s -C tools/lib/traceevent %{?_smp_mflags} -make -s -C tools/perf EXTRA_CFLAGS="-fPIE -rdynamic" %{?_smp_mflags} +make -s -C tools/lib/traceevent %{?_smp_mflags} NO_LIBPERL=1 +make -s -C tools/perf EXTRA_CFLAGS="-fPIE -rdynamic" %{?_smp_mflags} NO_LIBPERL=1 %install QA_SKIP_BUILD_ROOT="DO_NOT_WANT"; export QA_SKIP_BUILD_ROOT @@ -131,9 +137,10 @@ install -m 644 rpi3/boot/fixup*.dat %{buildroot}/boot/ # 2-5. Install perf install -d %{buildroot}/usr -make -s -C tools/perf EXTRA_CFLAGS="-fPIE -rdynamic" DESTDIR=%{buildroot}/usr install +make -s -C tools/perf EXTRA_CFLAGS="-fPIE -rdynamic" DESTDIR=%{buildroot}/usr install NO_LIBPERL=1 rm -rf %{buildroot}/usr/etc rm -rf %{buildroot}/usr/lib/debug +rm -rf %{buildroot}/usr/lib/perf rm -rf %{buildroot}/usr/share # 3-1. remove unnecessary files to prepare for devel package -- 2.7.4 From 63e7ba798e69bc981633d70fb0d545426397f991 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Mon, 22 Jun 2020 16:13:46 +0900 Subject: [PATCH 08/16] ARM64: configs: tizen_bcmrpi3: change BLK_DEV_RAM_SIZE to 32MB Change BLK_DEV_RAM_SIZE from 12MB to 32MB. And also change BLK_DEV_RAM_COUNT from 16 to 2. It doesn't need to keep /dev/ram0-16. Change-Id: I598dba4abc102a7ba51f5419ad6871875b73165c Signed-off-by: Jaehoon Chung --- arch/arm64/configs/tizen_bcmrpi3_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/tizen_bcmrpi3_defconfig b/arch/arm64/configs/tizen_bcmrpi3_defconfig index 0f6b66d..71cf7b9 100644 --- a/arch/arm64/configs/tizen_bcmrpi3_defconfig +++ b/arch/arm64/configs/tizen_bcmrpi3_defconfig @@ -208,7 +208,8 @@ CONFIG_OF_CONFIGFS=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=y CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=12288 +CONFIG_BLK_DEV_RAM_COUNT=2 +CONFIG_BLK_DEV_RAM_SIZE=32768 CONFIG_TIZEN_INFORM_REBOOT=y CONFIG_TIZEN_INFORM_PATH="/mnt/inform/reboot-param.bin" CONFIG_SCSI=y -- 2.7.4 From 717dd483d95d5722936953819b3a7c493d71a3d3 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Mon, 22 Jun 2020 16:14:37 +0900 Subject: [PATCH 09/16] ARM: configs: tizen_bcm2709: change BLK_DEV_RAM_SIZE to 32MB Change BLK_DEV_RAM_SIZE from 12MB to 32MB. And also change BLK_DEV_RAM_COUNT from 16 to 2. It doesn't need to keep /dev/ram0-16. Change-Id: If6acb3813061827a260e5b6414a34e06cfc0965b Signed-off-by: Jaehoon Chung --- arch/arm/configs/tizen_bcm2709_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/tizen_bcm2709_defconfig b/arch/arm/configs/tizen_bcm2709_defconfig index c01dc9d..1502d5c 100644 --- a/arch/arm/configs/tizen_bcm2709_defconfig +++ b/arch/arm/configs/tizen_bcm2709_defconfig @@ -210,7 +210,8 @@ CONFIG_OF_CONFIGFS=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=y CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=12288 +CONFIG_BLK_DEV_RAM_COUNT=2 +CONFIG_BLK_DEV_RAM_SIZE=32768 CONFIG_TIZEN_INFORM_REBOOT=y CONFIG_TIZEN_INFORM_PATH="/mnt/inform/reboot-param.bin" CONFIG_SCSI=y -- 2.7.4 From f32f814b41b21ab7b898341d76ec380c31c90b42 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Thu, 25 Jun 2020 16:01:33 +0900 Subject: [PATCH 10/16] ARM64: configs: tizen_bcmrpi3: revert BLK_DEV_RAM_COUNT to 16 Revert BLK_DEV_RAM_COUNT to 16 - default value. Becaues there is timing issue about booting fail, use default value. Change-Id: I1bec8f42fc719522510971ad5ec25512e57ee8aa Signed-off-by: Jaehoon Chung --- arch/arm64/configs/tizen_bcmrpi3_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/configs/tizen_bcmrpi3_defconfig b/arch/arm64/configs/tizen_bcmrpi3_defconfig index 71cf7b9..80184b02 100644 --- a/arch/arm64/configs/tizen_bcmrpi3_defconfig +++ b/arch/arm64/configs/tizen_bcmrpi3_defconfig @@ -208,7 +208,6 @@ CONFIG_OF_CONFIGFS=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=y CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=2 CONFIG_BLK_DEV_RAM_SIZE=32768 CONFIG_TIZEN_INFORM_REBOOT=y CONFIG_TIZEN_INFORM_PATH="/mnt/inform/reboot-param.bin" -- 2.7.4 From da05dbc8b4ed0ef16937e99a7856f50abac1bd6b Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Thu, 25 Jun 2020 16:02:27 +0900 Subject: [PATCH 11/16] ARM: configs: tizen_bcm2709: revert BLK_DEV_RAM_COUNT to 16 Revert BLK_DEV_RAM_COUNT to 16 - default value. Becaues there is timing issue about booting fail, use default value. Change-Id: Ida3985e9a48863abbc2bd14476edb146c3f5744f Signed-off-by: Jaehoon Chung --- arch/arm/configs/tizen_bcm2709_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/tizen_bcm2709_defconfig b/arch/arm/configs/tizen_bcm2709_defconfig index 1502d5c..d3635f7 100644 --- a/arch/arm/configs/tizen_bcm2709_defconfig +++ b/arch/arm/configs/tizen_bcm2709_defconfig @@ -210,7 +210,6 @@ CONFIG_OF_CONFIGFS=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=y CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=2 CONFIG_BLK_DEV_RAM_SIZE=32768 CONFIG_TIZEN_INFORM_REBOOT=y CONFIG_TIZEN_INFORM_PATH="/mnt/inform/reboot-param.bin" -- 2.7.4 From c43a8ea27ff16c6db7bc46bebaaeb0d29eaf91b9 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Fri, 17 Jul 2020 14:02:44 +0900 Subject: [PATCH 12/16] ARM: configs: tizen_bcm2709_defconfig: Enable FUSE_FS Tizen requires CONFIG_FUSE_FS for user space filesystem. Enable the option. Change-Id: Icf66feb085fee5ab30e3b680d1914a51f276d9bd Signed-off-by: Seung-Woo Kim --- arch/arm/configs/tizen_bcm2709_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/tizen_bcm2709_defconfig b/arch/arm/configs/tizen_bcm2709_defconfig index d3635f7..6e6b78f 100644 --- a/arch/arm/configs/tizen_bcm2709_defconfig +++ b/arch/arm/configs/tizen_bcm2709_defconfig @@ -418,6 +418,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_F2FS_FS=y CONFIG_FANOTIFY=y CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=y CONFIG_FSCACHE=y CONFIG_FSCACHE_STATS=y CONFIG_FSCACHE_HISTOGRAM=y -- 2.7.4 From 0e55e59ae473a19ab160c838505c83d9b023e7e7 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Fri, 17 Jul 2020 14:03:38 +0900 Subject: [PATCH 13/16] ARM64: configs: tizen_bcmrpi3_defconfig: Enable FUSE_FS Tizen requires CONFIG_FUSE_FS for user space filesystem. Enable the option. Change-Id: Ia4eefdcd95b5be4944a9717e69a4ce2deb31a081 Signed-off-by: Seung-Woo Kim --- arch/arm64/configs/tizen_bcmrpi3_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/tizen_bcmrpi3_defconfig b/arch/arm64/configs/tizen_bcmrpi3_defconfig index 80184b02..837b97f 100644 --- a/arch/arm64/configs/tizen_bcmrpi3_defconfig +++ b/arch/arm64/configs/tizen_bcmrpi3_defconfig @@ -387,6 +387,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_F2FS_FS=y CONFIG_FANOTIFY=y CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=y CONFIG_FSCACHE=y CONFIG_FSCACHE_STATS=y CONFIG_FSCACHE_HISTOGRAM=y -- 2.7.4 From 1672851ed296f7a9097dbbeabf9ddd51b648009d Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Mon, 3 Aug 2020 15:41:28 +0900 Subject: [PATCH 14/16] Revert "brcmfmac: move configuration of probe request IEs" This reverts commit bd99a3013bdc00f8fc7534c657b39616792b4467. It doesn't find any p2p-device with wpa_supplicant on Tien. - After reverted this, it's working fine. Change-Id: I1cd77e65ad17078370116473dd46adc7338d6695 Signed-off-by: Jaehoon Chung --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 ----- drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 1dd7a1f..858871c 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -1108,11 +1108,6 @@ brcmf_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) if (err) goto scan_out; - err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_PRBREQ_FLAG, - request->ie, request->ie_len); - if (err) - goto scan_out; - err = brcmf_do_escan(vif->ifp, request); if (err) goto scan_out; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c index 3e9c4f2..c856ee5 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c @@ -879,7 +879,7 @@ int brcmf_p2p_scan_prep(struct wiphy *wiphy, { struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy); struct brcmf_p2p_info *p2p = &cfg->p2p; - int err; + int err = 0; if (brcmf_p2p_scan_is_p2p_request(request)) { /* find my listen channel */ @@ -902,7 +902,9 @@ int brcmf_p2p_scan_prep(struct wiphy *wiphy, /* override .run_escan() callback. */ cfg->escan_info.run = brcmf_p2p_run_escan; } - return 0; + err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_PRBREQ_FLAG, + request->ie, request->ie_len); + return err; } -- 2.7.4 From 718567d336d0b0943385905bb12707552d8bef66 Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Fri, 7 Aug 2020 13:49:30 +0200 Subject: [PATCH 15/16] WORKAROUND: security: smack: Allow ptracing even processes in onlycap set Change-Id: I708d19703da0f1b83950454fda1362bec7369b5c Signed-off-by: Karol Lewandowski Signed-off-by: Seung-Woo Kim --- security/smack/smack_lsm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 017c47e..a4405f4 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -441,6 +441,8 @@ static int smk_ptrace_rule_check(struct task_struct *tracer, rc = 0; else if (smack_ptrace_rule == SMACK_PTRACE_DRACONIAN) rc = -EACCES; + else if (smack_ptrace_rule == SMACK_PTRACE_EXACT) + rc = capable(CAP_SYS_PTRACE) != 0 ? 0 : -EACCES; else if (smack_privileged_cred(CAP_SYS_PTRACE, tracercred)) rc = 0; else -- 2.7.4 From 92cdf08e22888de09d94367ca79e866c38f2c3ab Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Fri, 21 Aug 2020 10:10:27 +0900 Subject: [PATCH 16/16] Revert "WORKAROUND: security: smack: Allow ptracing even processes in onlycap set" This reverts commit 718567d336d0b0943385905bb12707552d8bef66. Now crash-worker has System::Privileged privilege, so not anymore ptrace related workaround is necessary. So revert the workaround. Change-Id: I42b535e4152eb742df011a5a08324764b49f989a Signed-off-by: Seung-Woo Kim --- security/smack/smack_lsm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index a4405f4..017c47e 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -441,8 +441,6 @@ static int smk_ptrace_rule_check(struct task_struct *tracer, rc = 0; else if (smack_ptrace_rule == SMACK_PTRACE_DRACONIAN) rc = -EACCES; - else if (smack_ptrace_rule == SMACK_PTRACE_EXACT) - rc = capable(CAP_SYS_PTRACE) != 0 ? 0 : -EACCES; else if (smack_privileged_cred(CAP_SYS_PTRACE, tracercred)) rc = 0; else -- 2.7.4