diff --git a/config/kernel/linux-sunxi-current.config b/config/kernel/linux-sunxi-current.config index 89ae2b786b..06df14e7da 100644 --- a/config/kernel/linux-sunxi-current.config +++ b/config/kernel/linux-sunxi-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.15.73 Kernel Configuration +# Linux/arm 5.15.75 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -8017,6 +8017,8 @@ CONFIG_SYMBOLIC_ERRNAME=y CONFIG_DEBUG_BUGVERBOSE=y # end of printk and dmesg options +CONFIG_AS_HAS_NON_CONST_LEB128=y + # # Compile-time checks and compiler options # diff --git a/config/kernel/linux-sunxi-edge.config b/config/kernel/linux-sunxi-edge.config index 9d26b4d097..d5dae0f4aa 100644 --- a/config/kernel/linux-sunxi-edge.config +++ b/config/kernel/linux-sunxi-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.0.3 Kernel Configuration +# Linux/arm 6.0.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -2813,6 +2813,7 @@ CONFIG_WLAN_VENDOR_TI=y # CONFIG_WL18XX is not set # CONFIG_WLCORE is not set CONFIG_RTL8723DU=m +CONFIG_RTL8822CS=m CONFIG_RTL8822BU=m CONFIG_RTL8821CU=m CONFIG_88XXAU=m diff --git a/config/kernel/linux-sunxi64-current.config b/config/kernel/linux-sunxi64-current.config index 5630764a12..752c7cf862 100644 --- a/config/kernel/linux-sunxi64-current.config +++ b/config/kernel/linux-sunxi64-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.65 Kernel Configuration +# Linux/arm64 5.15.75 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -349,11 +349,13 @@ CONFIG_ARM64_ERRATUM_1165522=y CONFIG_ARM64_ERRATUM_1319367=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_1286807=y CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_ERRATUM_1508412=y CONFIG_ARM64_ERRATUM_2441009=y +CONFIG_ARM64_ERRATUM_2457168=y # CONFIG_CAVIUM_ERRATUM_22375 is not set CONFIG_CAVIUM_ERRATUM_23144=y # CONFIG_CAVIUM_ERRATUM_23154 is not set @@ -7914,6 +7916,8 @@ CONFIG_SYMBOLIC_ERRNAME=y CONFIG_DEBUG_BUGVERBOSE=y # end of printk and dmesg options +CONFIG_AS_HAS_NON_CONST_LEB128=y + # # Compile-time checks and compiler options # diff --git a/config/kernel/linux-sunxi64-edge.config b/config/kernel/linux-sunxi64-edge.config index df554a36af..48ee4365b4 100644 --- a/config/kernel/linux-sunxi64-edge.config +++ b/config/kernel/linux-sunxi64-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.0.3 Kernel Configuration +# Linux/arm64 6.0.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -2824,6 +2824,7 @@ CONFIG_WFX=m # CONFIG_WLAN_VENDOR_ST is not set # CONFIG_WLAN_VENDOR_TI is not set CONFIG_RTL8723DU=m +CONFIG_RTL8822CS=m # CONFIG_RTL8822BU is not set CONFIG_RTL8821CU=m CONFIG_88XXAU=m diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 7425323ce1..9fd54b17bb 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -18,12 +18,12 @@ case $BRANCH in current) KERNEL_VERSION_LEVEL="5.15" - KERNELSWITCHOBJ="tag=v5.15.74" + KERNELSWITCHOBJ="tag=v5.15.75" ;; edge) KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-6.0} - KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v6.0.3'} + KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v6.0.5'} ;; esac diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index d578624202..4e02e84ab2 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -18,11 +18,11 @@ case $BRANCH in ;; current) KERNEL_VERSION_LEVEL="5.15" - KERNELSWITCHOBJ="tag=v5.15.74" + KERNELSWITCHOBJ="tag=v5.15.75" ;; edge) KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-6.0} - KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v6.0.3'} + KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v6.0.5'} ;; esac diff --git a/patch/kernel/archive/rockchip64-5.15/general-add-dwc3-xhci-usb-trb-quirk.patch b/patch/kernel/archive/rockchip64-5.15/general-add-dwc3-xhci-usb-trb-quirk.patch index 3cca7e731c..c37dfad0d5 100644 --- a/patch/kernel/archive/rockchip64-5.15/general-add-dwc3-xhci-usb-trb-quirk.patch +++ b/patch/kernel/archive/rockchip64-5.15/general-add-dwc3-xhci-usb-trb-quirk.patch @@ -1,38 +1,38 @@ diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c -index 841daec70..48825b870 100644 +index a2f3e56ab..ad1945a7d 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c -@@ -1340,6 +1340,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1398,6 +1398,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) "snps,dis-del-phy-power-chg-quirk"); dwc->dis_tx_ipgap_linecheck_quirk = device_property_read_bool(dev, "snps,dis-tx-ipgap-linecheck-quirk"); + dwc->xhci_trb_ent_quirk = device_property_read_bool(dev, + "snps,xhci-trb-ent-quirk"); + dwc->resume_hs_terminations = device_property_read_bool(dev, + "snps,resume-hs-terminations"); dwc->parkmode_disable_ss_quirk = device_property_read_bool(dev, - "snps,parkmode-disable-ss-quirk"); - diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h -index 1b241f937..e1ded14fd 100644 +index e82e4cbe4..a130e264e 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h -@@ -1049,6 +1049,9 @@ struct dwc3_scratchpad_array { +@@ -1073,6 +1073,9 @@ struct dwc3_scratchpad_array { * change quirk. * @dis_tx_ipgap_linecheck_quirk: set if we disable u2mac linestate * check during HS transmit. + * @xhci_trb_ent_quirk: set if need to enable the Evaluate Next TRB(ENT) -+ flag in the TRB data structure to force xHC to -+ pre-fetch the next TRB of a TD. ++ * flag in the TRB data structure to force xHC to ++ * pre-fetch the next TRB of a TD. + * @resume-hs-terminations: Set if we enable quirk for fixing improper crc + * generation after resume from suspend. * @parkmode_disable_ss_quirk: set if we need to disable all SuperSpeed - * instances in park mode. - * @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk -@@ -1245,6 +1248,7 @@ struct dwc3 { +@@ -1287,6 +1290,7 @@ struct dwc3 { unsigned dis_u2_freeclk_exists_quirk:1; unsigned dis_del_phy_power_chg_quirk:1; unsigned dis_tx_ipgap_linecheck_quirk:1; + unsigned xhci_trb_ent_quirk:1; + unsigned resume_hs_terminations:1; unsigned parkmode_disable_ss_quirk:1; - unsigned tx_de_emphasis_quirk:1; diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index e19517658..19d48703d 100644 --- a/drivers/usb/dwc3/host.c diff --git a/patch/kernel/archive/rockchip64-5.15/general-emmc-hs400es-init-tweak.patch b/patch/kernel/archive/rockchip64-5.15/general-emmc-hs400es-init-tweak.patch deleted file mode 100644 index 03144ffc31..0000000000 --- a/patch/kernel/archive/rockchip64-5.15/general-emmc-hs400es-init-tweak.patch +++ /dev/null @@ -1,22 +0,0 @@ -This patch is required to boot some Rock Pi 4 and NanoPC T4 units -with kernel 5.3+ and is on par with how it is done in Rockchip's BSP. - -diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c -index de8fbc396..95858e554 100644 ---- a/drivers/mmc/core/mmc.c -+++ b/drivers/mmc/core/mmc.c -@@ -1371,12 +1371,12 @@ static int mmc_select_hs400es(struct mmc_card *card) - } - - mmc_set_timing(host, MMC_TIMING_MMC_HS); -+ mmc_set_clock(host, card->ext_csd.hs_max_dtr); -+ - err = mmc_switch_status(card, true); - if (err) - goto out_err; - -- mmc_set_clock(host, card->ext_csd.hs_max_dtr); -- - /* Switch card to DDR with strobe bit */ - val = EXT_CSD_DDR_BUS_WIDTH_8 | EXT_CSD_BUS_WIDTH_STROBE; - err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,