From 465569abadf808e3a083f3b93ded5103b5bcfab2 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 30 Oct 2017 11:51:50 -0500 Subject: [PATCH] Linux v4.14-rc7 --- ...ng-rtl8822be-fix-wrong-dma-unmap-len.patch | 46 +++++++++++++++++++ baseconfig/CONFIG_R8822BE | 2 +- gitrev | 2 +- kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- kernel-i686-PAE.config | 2 +- kernel-i686-PAEdebug.config | 2 +- kernel-i686-debug.config | 2 +- kernel-i686.config | 2 +- kernel-ppc64-debug.config | 2 +- kernel-ppc64.config | 2 +- kernel-ppc64le-debug.config | 2 +- kernel-ppc64le.config | 2 +- kernel-s390x-debug.config | 2 +- kernel-s390x.config | 2 +- kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- kernel.spec | 9 +++- sources | 3 +- 23 files changed, 74 insertions(+), 24 deletions(-) create mode 100644 0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch diff --git a/0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch b/0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch new file mode 100644 index 000000000..540b925eb --- /dev/null +++ b/0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch @@ -0,0 +1,46 @@ +From 37af97ef14c201b1db8dd341aabd262da23e48aa Mon Sep 17 00:00:00 2001 +From: Fedora Kernel Team +Date: Mon, 30 Oct 2017 11:38:27 -0500 +Subject: [PATCH] [PATCH] staging: rtl8822be: fix wrong dma unmap len + +Patch fixes splat: + +r8822be 0000:04:00.0: DMA-API: device driver frees DMA memory with different size +[device address=0x0000000078477000] [map size=4096 bytes] [unmap size=424 bytes] + +Call Trace: + debug_dma_unmap_page+0xa5/0xb0 + ? unmap_single+0x2f/0x40 + _rtl8822be_send_bcn_or_cmd_packet+0x2c5/0x300 [r8822be] + ? _rtl8822be_send_bcn_or_cmd_packet+0x2c5/0x300 [r8822be] + rtl8822b_halmac_cb_write_data_rsvd_page+0x51/0xc0 [r8822be] + _halmac_write_data_rsvd_page+0x22/0x30 [r8822be] + halmac_download_rsvd_page_88xx+0xee/0x1f0 [r8822be] + halmac_dlfw_to_mem_88xx+0x80/0x120 [r8822be] + halmac_download_firmware_88xx.part.47+0x477/0x600 [r8822be] + halmac_download_firmware_88xx+0x32/0x40 [r8822be] + rtl_halmac_dlfw+0x70/0x120 [r8822be] + rtl_halmac_init_hal+0x5f/0x1b0 [r8822be] + rtl8822be_hw_init+0x8a2/0x1040 [r8822be] + +Signed-off-by: Stanislaw Gruszka +--- + drivers/staging/rtlwifi/rtl8822be/fw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/staging/rtlwifi/rtl8822be/fw.c b/drivers/staging/rtlwifi/rtl8822be/fw.c +index 8e24da1..a2cc548 100644 +--- a/drivers/staging/rtlwifi/rtl8822be/fw.c ++++ b/drivers/staging/rtlwifi/rtl8822be/fw.c +@@ -419,7 +419,7 @@ static bool _rtl8822be_send_bcn_or_cmd_packet(struct ieee80211_hw *hw, + dma_addr = rtlpriv->cfg->ops->get_desc( + hw, (u8 *)pbd_desc, true, HW_DESC_TXBUFF_ADDR); + +- pci_unmap_single(rtlpci->pdev, dma_addr, skb->len, ++ pci_unmap_single(rtlpci->pdev, dma_addr, pskb->len, + PCI_DMA_TODEVICE); + kfree_skb(pskb); + +-- +2.13.6 + diff --git a/baseconfig/CONFIG_R8822BE b/baseconfig/CONFIG_R8822BE index 8f375f0d2..2f7c08787 100644 --- a/baseconfig/CONFIG_R8822BE +++ b/baseconfig/CONFIG_R8822BE @@ -1 +1 @@ -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m diff --git a/gitrev b/gitrev index 0398105b5..800cfe931 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -15f859ae5c43c7f0a064ed92d33f7a5bc5de6de0 +0b07194bb55ed836c2cc7c22e866b87a14681984 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 0a06ce464..a92c6a9e8 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4279,7 +4279,7 @@ CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index f5124a607..0d223ce97 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4257,7 +4257,7 @@ CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 7303ae431..427d22340 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4595,7 +4595,7 @@ CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index f929ab7e1..146f5acf4 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4319,7 +4319,7 @@ CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index d4cedf056..4416f1616 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4297,7 +4297,7 @@ CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index aac5ec7d5..0603a0142 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4573,7 +4573,7 @@ CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 6710ac7cd..c0d237f43 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -4069,7 +4069,7 @@ CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 972c156fa..4fdebfb9c 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -4090,7 +4090,7 @@ CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index feba8af30..b36877807 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -4090,7 +4090,7 @@ CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-i686.config b/kernel-i686.config index 4b11316d2..dcfa25f71 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -4069,7 +4069,7 @@ CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index f9e551df9..1c4cbb306 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -3902,7 +3902,7 @@ CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 119fbb80e..5ad56bb3f 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -3879,7 +3879,7 @@ CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 2d669bce2..38c4c750e 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3841,7 +3841,7 @@ CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index beb2209fd..8d278242d 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3818,7 +3818,7 @@ CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 52dedb01c..d672f1f1a 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3736,7 +3736,7 @@ CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-s390x.config b/kernel-s390x.config index eff8ee098..e76dd83ed 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3713,7 +3713,7 @@ CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 189c658b6..408542ba2 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -4131,7 +4131,7 @@ CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 89ef72d3a..70eef4e26 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -4110,7 +4110,7 @@ CONFIG_R8169=m CONFIG_R8188EU=m CONFIG_R8712U=m CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) -# CONFIG_R8822BE is not set +CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_AZTECH=m CONFIG_RADIO_CADET=m diff --git a/kernel.spec b/kernel.spec index 19eab26d8..2e2520301 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 6 +%global rcrev 7 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -661,6 +661,8 @@ Patch621: drm-i915-Boost-GPU-clocks-if-we-miss-the-pageflip-s-vblank.patch # rhbz 1497861, submitted upstream, Cc: Stable Patch622: 0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch +Patch623: 0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch + # END OF PATCH DEFINITIONS %endif @@ -2215,6 +2217,9 @@ fi # # %changelog +* Mon Oct 30 2017 Justin M. Forbes - 4.14.0-0.rc7.git0.1 +- Linux v4.14-rc7 + * Mon Oct 30 2017 Justin M. Forbes - Disable debugging options. diff --git a/sources b/sources index 33e7bef54..cb836c93d 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03 -SHA512 (patch-4.14-rc6.xz) = f10d13b0bd4f5e3bf295d4ef779cf358011e05c124b06277fef8afcf1a591b147f62717f0128866412fdd7ddddd660c0ae4b82b02b95702f10aabf50292c0ae7 -SHA512 (patch-4.14-rc6-git4.xz) = 353f5962e91fd364154540598fecd355080bf44d91cdde5fb9e0d18c073bcf291510e7a7d3fe9f53542cac23ee528e1608557e3fde34880dfd857f90da9f4cfc +SHA512 (patch-4.14-rc7.xz) = 5b078e3c3342f814dc250ac93272262b161b6ec763f76e78314ecff34e047c3db3f10a4764c3d9a15d62938fcdc18a5da76d18caa66ae5c38ae262363f7b73da