ipq807x_v5.4/ipq50xx: When device is booting, it causes lan/wan ports bridge together

Fixes: WIFI-14849
Signed-off-by: jackcybertan <jack.tsai@cybertan.com.tw>

.github/workflows/build-dev.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ 'cig_wf189h', 'cig_wf189w', 'cig_wf672', 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap63xc-211g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap630w-211g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750e-h', 'sonicfi_rap750e-s', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_eap112', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'senao_iap4300m', 'senao_iap2300m', 'senao_jeap6500', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655', 'emplus_wap588m', 'zyxel_nwa130be', 'sercomm_ap72tip-v4' ]
+        target: [ 'cig_wf189h', 'cig_wf189w', 'cig_wf660a', 'cig_wf672', 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap63xc-211g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap630w-211g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750e-h', 'sonicfi_rap750e-s', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_eap112', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'senao_iap4300m', 'senao_iap2300m', 'senao_jeap6500', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655', 'emplus_wap588m', 'zyxel_nwa130be', 'sercomm_ap72tip-v4' ]
     steps:
     - uses: actions/checkout@v3
 

feeds/hostapd/hostapd/patches/zzzz-002-initialize-mode-for-hostapd-cli-chan-switch.patch

@@ -0,0 +1,14 @@
+--- a/hostapd/ctrl_iface.c	2025-09-24 14:15:25.135668867 +0800
++++ b/hostapd/ctrl_iface.c	2025-09-24 15:32:46.082317382 +0800
+@@ -2657,6 +2657,11 @@ static int hostapd_ctrl_iface_chan_switc
+ 		break;
+ 	}
+ 
++    /* Initialize HT/VHT/HE parameters */
++    settings.freq_params.ht_enabled = iface->conf->ieee80211n;
++    settings.freq_params.vht_enabled = iface->conf->ieee80211ac;
++    settings.freq_params.he_enabled = iface->conf->ieee80211ax;
++
+ 	if (settings.freq_params.center_freq1)
+ 		dfs_range += hostapd_is_dfs_overlap(
+ 			iface, bandwidth, settings.freq_params.center_freq1);

feeds/ipq40xx/ath10k-ct-firmware/Makefile

@@ -1,701 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ath10k-ct-firmware
-PKG_VERSION:=2020-10-07
-PKG_RELEASE:=2
-CTVER1=021
-CTVER2=021
-
-# From fw_lede.bash, or can do it manually as well.
-H988XFC=a4c3d1e2fb80f6b8b9738c7189795ab9505e6c09efc12ba5f08ee7f49e934239
-H988XFCH=93108bd0870652860cdb57749f5a12205ecb15bb1f129d916ad73b6f06406c82
-H9887FC=459692deb186a63ab8eeddb7ad5d54779266e68ca686e7c46062554db6dca12b
-H9887FCH=fd126a457d0927d0c8ea10d66ef5b67d5e1e0741f8692bb3016bb602d0af3098
-H9980FC=52300e9d128c3d506e0b133d7a7964df3115f9511f1b574ef2a0767972c063bd
-H9980FCH=9c20c3a44b701f8fef0fe02f156e382b36b717fb56c76d540f6eac2077ec189b
-H9980CH=55f27045e7cf87a6a5656a050771d6d7a6197153a0737288a702c0836d5c6572
-H9980FHQ=add509b2a15ba90869f403c2e4440dbb91bd7037188d8468249cf1263adfd44e
-H9984FC=e6354a1547a308b4b0fe4cbc29693848c234acedd9e7a483a1b4fb5f9bbf0dc0
-H9984FCH=6e19ecd0b001ffb594a8b033deb2007595b8c0402402789b7de55b208639ebec
-H9984CH=7b6fdf3d970f3eff7c34df476c934a9bebb4f289b7968067950d31b82c71bb07
-H9984FHQ=f6a5d5a3a7b2c9267dc31673a19ee3b5312a2f84f26123cb5e8c000428ed76d2
-H4019FC=cde992cb328680e81cf85e195554699bcceef065c0c696ce4ef90c3311ab11fb
-H4019FCH=818afeb1226389357dfde754d641f936fb82ebe78607f10e15efd5c952a54f48
-H4019CH=30ba10f0d82116c6617cb58c3df5cc81e5ed8f29dbc8f95c0ca9c5013ce4f702
-H4019FHQ=8e4161f7bed5bd56513ca5caab582a6eee64e9e14a69f4de67587563b7b4d735
-H9888FC=d24e66bdb2f1098a2e06ff20fe037e31937e1a483e87c68827830513b4233b5d
-H9888FCH=5891e1c184da433ecc12ca0176ca89a77f7bc2b675576698b69bc93d46b77042
-H9888CH=b94f46cdda6171e5f566b1cdd6aafd68ff1a4f7e8a27762b90eb5d4f03839d99
-H9888FHQ=3cc81f8707bf5ba63bc9ffc14578c77637cae0e15766ae146af02eefb9ab7bfd
-
-include $(INCLUDE_DIR)/package.mk
-
-ATH10K_FIRMWARE_REV:=d622d160e9f552ead68d9ae81b715422892dc2ef
-ATH10K_FIRMWARE_URL:=@GITHUB/kvalo/ath10k-firmware/$(ATH10K_FIRMWARE_REV)
-
-QCA9887_BOARD_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca9887-board.bin
-define Download/qca9887-board
-  FILE:=$(QCA9887_BOARD_FILE)
-  URL:=$(ATH10K_FIRMWARE_URL)/QCA9887/hw1.0
-  URL_FILE:=board.bin
-  HASH:=cf4df099f6ee05c181f55ce17297a1d32c61d725eb96246fd315ad5587c42426
-endef
-$(eval $(call Download,qca9887-board))
-
-QCA988X_BOARD_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca988x-board.bin
-define Download/qca988x-board
-  FILE:=$(QCA988X_BOARD_FILE)
-  URL:=$(ATH10K_FIRMWARE_URL)/QCA988X/hw2.0
-  URL_FILE:=board.bin
-  HASH:=5b5b380333c2dd3b6ce67f30e2f7008f4020bf594970d3b464fd8d4a80fcd880
-endef
-$(eval $(call Download,qca988x-board))
-
-QCA99X0_BOARD_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca99x0-board.bin
-define Download/qca99x0-board
-  FILE:=$(QCA99X0_BOARD_FILE)
-  URL:=$(ATH10K_FIRMWARE_URL)/QCA99X0/hw2.0
-  URL_FILE:=boardData_AR900B_CUS239_5G_v2_001.bin
-  HASH:=3bf7561ee373b369025dcd366d276d038a97d3397ccae41ce841d98a58b30aff
-endef
-$(eval $(call Download,qca99x0-board))
-
-QCA99X0_BOARD2_REV:=ddcec9efd245da9365c474f513a855a55f3ac7fe
-QCA99X0_BOARD2_FILE:=ath10k-firmware-$(QCA99X0_BOARD2_REV)-qca99x0-board-2.bin
-define Download/qca99x0-board2
-  FILE:=$(QCA99X0_BOARD2_FILE)
-  URL:=https://source.codeaurora.org/quic/qsdk/oss/firmware/ath10k-firmware/plain/ath10k/QCA99X0/hw2.0
-  URL_FILE:=board-2.bin?id=$(QCA99X0_BOARD2_REV)
-  HASH:=03711ac21e60ef59d3815e235eb721c0c22851b5410299411085aa6f2af45401
-endef
-$(eval $(call Download,qca99x0-board2))
-
-QCA9984_BOARD2_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca9984-board-2.bin
-define Download/qca9984-board2
-  FILE:=$(QCA9984_BOARD2_FILE)
-  URL:=$(ATH10K_FIRMWARE_URL)/QCA9984/hw1.0
-  URL_FILE:=board-2.bin
-  HASH:=0d6d46cf0467185e3959ce3cb69e2415be6e48ab8a4bee3eb400edbe48cb9c25
-endef
-$(eval $(call Download,qca9984-board2))
-
-QCA4019_BOARD2_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca4019-board-2.bin
-define Download/qca4019-board2
-  FILE:=$(QCA4019_BOARD2_FILE)
-  URL:=$(ATH10K_FIRMWARE_URL)/QCA4019/hw1.0
-  URL_FILE:=board-2.bin
-  HASH:=94b66aa4ddbed5110a96364d3c7b4ebcb320e3ac4e8697660b277e76077bc338
-endef
-$(eval $(call Download,qca4019-board2))
-
-QCA9888_BOARD2_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca9888-board-2.bin
-define Download/qca9888-board2
-  FILE:=$(QCA9888_BOARD2_FILE)
-  URL:=$(ATH10K_FIRMWARE_URL)/QCA9888/hw2.0
-  URL_FILE:=board-2.bin
-  HASH:=5b871bb567f64525ca45adb88063211de472015d09e0f9aa3fa61ab71c8fdfd3
-endef
-$(eval $(call Download,qca9888-board2))
-
-CT_FIRMWARE_FILE = $(1)-$($(1)_FIRMWARE_FILE_CT)
-CT_FIRMWARE_FILE_FULL_HTT = $(1)-$($(1)_FIRMWARE_FILE_CT_FULL_HTT)
-CT_FIRMWARE_FILE_HTT = $(1)-$($(1)_FIRMWARE_FILE_CT_HTT)
-
-define Download/ct-firmware
-  URL:=https://www.candelatech.com/downloads/$(2)
-  FILE:=$(call CT_FIRMWARE_FILE,$(1))
-  URL_FILE:=$($(1)_FIRMWARE_FILE_CT)
-endef
-
-define Download/ct-firmware-full-htt
-  URL:=https://www.candelatech.com/downloads/$(2)
-  FILE:=$(call CT_FIRMWARE_FILE_FULL_HTT,$(1))
-  URL_FILE:=$($(1)_FIRMWARE_FILE_CT_FULL_HTT)
-endef
-
-define Download/ct-firmware-htt
-  URL:=https://www.candelatech.com/downloads/$(2)
-  FILE:=$(call CT_FIRMWARE_FILE_HTT,$(1))
-  URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT)
-endef
-
-QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.$(CTVER1)
-define Download/ath10k-firmware-qca988x-ct
-  $(call Download/ct-firmware,QCA988X,)
-  HASH:=$(H988XFC)
-endef
-$(eval $(call Download,ath10k-firmware-qca988x-ct))
-
-QCA988X_FIRMWARE_FILE_CT_FULL_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.$(CTVER1)
-define Download/ath10k-firmware-qca988x-ct-full-htt
-  $(call Download/ct-firmware-full-htt,QCA988X,)
-  HASH:=$(H988XFCH)
-endef
-$(eval $(call Download,ath10k-firmware-qca988x-ct-full-htt))
-
-
-QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.$(CTVER1)
-define Download/ath10k-firmware-qca9887-ct
-  $(call Download/ct-firmware,QCA9887,ath10k-9887)
-  HASH:=$(H9887FC)
-endef
-$(eval $(call Download,ath10k-firmware-qca9887-ct))
-
-QCA9887_FIRMWARE_FILE_CT_FULL_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.$(CTVER1)
-define Download/ath10k-firmware-qca9887-ct-full-htt
-  $(call Download/ct-firmware-full-htt,QCA9887,ath10k-9887)
-  HASH:=$(H9887FCH)
-endef
-$(eval $(call Download,ath10k-firmware-qca9887-ct-full-htt))
-
-
-QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.$(CTVER2)
-define Download/ath10k-firmware-qca99x0-ct
-  $(call Download/ct-firmware,QCA99X0,ath10k-10-4b)
-  HASH:=$(H9980FC)
-endef
-$(eval $(call Download,ath10k-firmware-qca99x0-ct))
-
-QCA99X0_FIRMWARE_FILE_CT_FULL_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.$(CTVER2)
-define Download/ath10k-firmware-qca99x0-ct-full-htt
-  $(call Download/ct-firmware-full-htt,QCA99X0,ath10k-10-4b)
-  HASH:=$(H9980FCH)
-endef
-$(eval $(call Download,ath10k-firmware-qca99x0-ct-full-htt))
-
-QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-community-12.bin-lede.$(CTVER2)
-define Download/ath10k-firmware-qca99x0-ct-htt
-  $(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4b)
-  HASH:=$(H9980CH)
-endef
-$(eval $(call Download,ath10k-firmware-qca99x0-ct-htt))
-
-
-QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.$(CTVER2)
-define Download/ath10k-firmware-qca9984-ct
-  $(call Download/ct-firmware,QCA9984,ath10k-9984-10-4b)
-  HASH:=$(H9984FC)
-endef
-$(eval $(call Download,ath10k-firmware-qca9984-ct))
-
-QCA9984_FIRMWARE_FILE_CT_FULL_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.$(CTVER2)
-define Download/ath10k-firmware-qca9984-ct-full-htt
-  $(call Download/ct-firmware-full-htt,QCA9984,ath10k-9984-10-4b)
-  HASH:=$(H9984FCH)
-endef
-$(eval $(call Download,ath10k-firmware-qca9984-ct-full-htt))
-
-QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-community-12.bin-lede.$(CTVER2)
-define Download/ath10k-firmware-qca9984-ct-htt
-  $(call Download/ct-firmware-htt,QCA9984,ath10k-9984-10-4b)
-  HASH:=$(H9984CH)
-endef
-$(eval $(call Download,ath10k-firmware-qca9984-ct-htt))
-
-
-QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.$(CTVER2)
-define Download/ath10k-firmware-qca4019-ct
-  $(call Download/ct-firmware,QCA4019,ath10k-4019-10-4b)
-  HASH:=$(H4019FC)
-endef
-$(eval $(call Download,ath10k-firmware-qca4019-ct))
-
-QCA4019_FIRMWARE_FILE_CT_FULL_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.$(CTVER2)
-define Download/ath10k-firmware-qca4019-ct-full-htt
-  $(call Download/ct-firmware-full-htt,QCA4019,ath10k-4019-10-4b)
-  HASH:=$(H4019FCH)
-endef
-$(eval $(call Download,ath10k-firmware-qca4019-ct-full-htt))
-
-QCA4019_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-community-12.bin-lede.$(CTVER2)
-define Download/ath10k-firmware-qca4019-ct-htt
-  $(call Download/ct-firmware-htt,QCA4019,ath10k-4019-10-4b)
-  HASH:=$(H4019CH)
-endef
-$(eval $(call Download,ath10k-firmware-qca4019-ct-htt))
-
-
-QCA9888_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.$(CTVER2)
-define Download/ath10k-firmware-qca9888-ct
-  $(call Download/ct-firmware,QCA9888,ath10k-9888-10-4b)
-  HASH:=$(H9888FC)
-endef
-$(eval $(call Download,ath10k-firmware-qca9888-ct))
-
-QCA9888_FIRMWARE_FILE_CT_FULL_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.$(CTVER2)
-define Download/ath10k-firmware-qca9888-ct-full-htt
-  $(call Download/ct-firmware-full-htt,QCA9888,ath10k-9888-10-4b)
-  HASH:=$(H9888FCH)
-endef
-$(eval $(call Download,ath10k-firmware-qca9888-ct-full-htt))
-
-QCA9888_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-htt-mgt-community-12.bin-lede.$(CTVER2)
-define Download/ath10k-firmware-qca9888-ct-htt
-  $(call Download/ct-firmware-htt,QCA9888,ath10k-9888-10-4b)
-  HASH:=$(H9888CH)
-endef
-$(eval $(call Download,ath10k-firmware-qca9888-ct-htt))
-
-
-define Package/ath10k-ct-firmware-default
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  URL:=https://www.candelatech.com/ath10k.php
-  DEPENDS:=
-endef
-
-define Package/ath10k-firmware-qca988x-ct
-$(Package/ath10k-ct-firmware-default)
-  TITLE:=ath10k CT 10.1 firmware for QCA988x devices
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca988x
-endef
-define Package/ath10k-firmware-qca988x-ct-full-htt
-$(Package/ath10k-ct-firmware-default)
-  TITLE:=ath10k CT 10.1 full-htt-mgt fw for QCA988x
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca988x
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
-endef
-
-define Package/ath10k-firmware-qca9887-ct
-$(Package/ath10k-ct-firmware-default)
-  TITLE:=ath10k CT 10.1 firmware for QCA9887 devices
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca9887
-endef
-define Package/ath10k-firmware-qca9887-ct-full-htt
-$(Package/ath10k-ct-firmware-default)
-  TITLE:=ath10k CT 10.1 full-htt-mgt fw for QCA9887
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca9887
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
-endef
-
-define Package/ath10k-firmware-qca99x0-ct
-$(Package/ath10k-ct-firmware-default)
-  TITLE:=ath10k CT 10.4 firmware for QCA99x0 devices
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca99x0
-endef
-define Package/ath10k-firmware-qca99x0-ct-full-htt
-$(Package/ath10k-ct-firmware-default)
-  TITLE:=ath10k CT 10.4 full-htt-mgt fw for QCA99x0
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca99x0
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
-endef
-define Package/ath10k-firmware-qca99x0-ct-htt
-$(Package/ath10k-firmware-default)
-  TITLE:=ath10k CT 10.4 htt-mgt fw for QCA99x0
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca99x0
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
-endef
-
-define Package/ath10k-firmware-qca9984-ct
-$(Package/ath10k-ct-firmware-default)
-  TITLE:=ath10k CT 10.4 firmware for QCA9984 devices
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca9984
-endef
-define Package/ath10k-firmware-qca9984-ct-full-htt
-$(Package/ath10k-ct-firmware-default)
-  TITLE:=ath10k CT 10.4 full-htt-mgt fw for QCA9984
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca9984
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
-endef
-define Package/ath10k-firmware-qca9984-ct-htt
-$(Package/ath10k-firmware-default)
-  TITLE:=ath10k CT 10.4 htt-mgt fw for QCA9984
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca9984
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
-endef
-
-define Package/ath10k-firmware-qca4019-ct
-$(Package/ath10k-ct-firmware-default)
-  TITLE:=ath10k CT 10.4 firmware for QCA4018/9
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca4019
-endef
-define Package/ath10k-firmware-qca4019-ct-full-htt
-$(Package/ath10k-ct-firmware-default)
-  TITLE:=ath10k CT 10.4 full-htt-mgt for QCA4018/9
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca4019
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
-endef
-define Package/ath10k-firmware-qca4019-ct-htt
-$(Package/ath10k-firmware-default)
-  TITLE:=ath10k CT 10.4 htt-mgt for QCA4018/9
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca4019
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
-endef
-
-define Package/ath10k-firmware-qca9888-ct
-$(Package/ath10k-ct-firmware-default)
-  TITLE:=ath10k CT 10.4 fw for QCA9886/8 devices
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca9888
-endef
-define Package/ath10k-firmware-qca9888-ct-full-htt
-$(Package/ath10k-ct-firmware-default)
-  TITLE:=ath10k CT 10.4 full-htt-mgt fw for QCA9886/8
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca9888
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
-endef
-define Package/ath10k-firmware-qca9888-ct-htt
-$(Package/ath10k-firmware-default)
-  TITLE:=ath10k CT 10.4 htt-mgt fw for QCA9886/8
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  PROVIDES:=ath10k-firmware-qca9888
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
-endef
-
-
-define Package/ath10k-firmware-qca9887-ct/description
-Alternative ath10k firmware for QCA9887 from Candela Technologies.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.1.php
-This firmware conflicts with the standard 9887 firmware, so select only
-one.
-endef
-define Package/ath10k-firmware-qca9887-ct-full-htt/description
-Alternative ath10k firmware for QCA9887 from Candela Technologies.
-Uses normal HTT TX data path for management frames, which improves
-stability in busy networks and fixes .11r authentication.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.1.php
-This firmware selects and requires the ath10k-ct driver.
-endef
-
-define Package/ath10k-firmware-qca988x-ct/description
-Alternative ath10k firmware for QCA988X from Candela Technologies.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.1.php
-This firmware will NOT be used unless the standard ath10k-firmware-qca988x
-is un-selected since the driver will try to load firmware-5.bin before
-firmware-2.bin
-endef
-define Package/ath10k-firmware-qca988x-ct-full-htt/description
-Alternative ath10k firmware for QCA988X from Candela Technologies.
-Uses normal HTT TX data path for management frames, which improves
-stability in busy networks and fixes .11r authentication.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.1.php
-This firmware selects and requires the ath10k-ct driver.
-endef
-
-define Package/ath10k-firmware-qca99x0-ct/description
-Alternative ath10k firmware for QCA99x0 from Candela Technologies.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.4.php
-This firmware conflicts with the standard 99x0 firmware, so select only
-one.
-endef
-define Package/ath10k-firmware-qca99x0-ct-full-htt/description
-Alternative ath10k firmware for QCA99x0 from Candela Technologies.
-Uses normal HTT TX data path for management frames, which improves
-stability in busy networks and may be required for .11r authentication.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.4.php
-This firmware selects and requires the ath10k-ct driver.
-endef
-define Package/ath10k-firmware-qca99x0-ct-htt/description
-Alternative ath10k firmware for QCA99x0 from Candela Technologies.
-Uses normal HTT TX data path for management frames, which improves
-stability in busy networks and may be required for .11r authentication.
-This firmware lacks a lot of features that ath10k does not use, saving
-a lot of resources.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.4.php
-This firmware selects and requires the ath10k-ct driver.
-endef
-
-define Package/ath10k-firmware-qca9984-ct/description
-Alternative ath10k firmware for QCA9984 from Candela Technologies.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.4.php
-This firmware conflicts with the standard 9984 firmware, so select only
-one.
-endef
-define Package/ath10k-firmware-qca9984-ct-full-htt/description
-Alternative ath10k firmware for QCA9984 from Candela Technologies.
-Uses normal HTT TX data path for management frames, which improves
-stability in busy networks and may be required for .11r authentication.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.4.php
-This firmware selects and requires the ath10k-ct driver.
-endef
-define Package/ath10k-firmware-qca9984-ct-htt/description
-Alternative ath10k firmware for QCA9984 from Candela Technologies.
-Uses normal HTT TX data path for management frames, which improves
-stability in busy networks and may be required for .11r authentication.
-This firmware lacks a lot of features that ath10k does not use, saving
-a lot of resources.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.4.php
-This firmware selects and requires the ath10k-ct driver.
-endef
-
-define Package/ath10k-firmware-qca4019-ct/description
-Alternative ath10k firmware for IPQ4019 radio from Candela Technologies.
-Enables IBSS and other features.  Works with standard or ath10k-ct driver.
-See:  http://www.candelatech.com/ath10k-10.4.php
-endef
-define Package/ath10k-firmware-qca4019-ct-full-htt/description
-Alternative ath10k firmware for IPQ4019 radio from Candela Technologies.
-Uses normal HTT TX data path for management frames, which improves
-stability in busy networks and may be required for .11r authentication.
-Enables IBSS and other features.
-See:  http://www.candelatech.com/ath10k-10.4.php
-This firmware selects and requires the ath10k-ct driver.
-endef
-define Package/ath10k-firmware-qca4019-ct-htt/description
-Alternative ath10k firmware for IPQ4019 radio from Candela Technologies.
-Uses normal HTT TX data path for management frames, which improves
-stability in busy networks and may be required for .11r authentication.
-This firmware lacks a lot of features that ath10k does not use, saving
-a lot of resources.
-Enables IBSS and other features.
-See:  http://www.candelatech.com/ath10k-10.4.php
-This firmware selects and requires the ath10k-ct driver.
-endef
-
-define Package/ath10k-firmware-qca9888-ct/description
-Alternative ath10k firmware for QCA9886 and QCA9888 from Candela Technologies.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.4.php
-This firmware conflicts with the standard 9886 and 9888 firmware, so select only
-one.
-endef
-define Package/ath10k-firmware-qca9888-ct-full-htt/description
-Alternative ath10k firmware for QCA9886 and QCA9888 from Candela Technologies.
-Uses normal HTT TX data path for management frames, which improves
-stability in busy networks and may be required for .11r authentication.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.4.php
-This firmware selects and requires the ath10k-ct driver.
-endef
-define Package/ath10k-firmware-qca9888-ct-htt/description
-Alternative ath10k firmware for QCA9886 and QCA9888 from Candela Technologies.
-Uses normal HTT TX data path for management frames, which improves
-stability in busy networks and may be required for .11r authentication.
-This firmware lacks a lot of features that ath10k does not use, saving
-a lot of resources.
-Enables IBSS and other features.  See:
-http://www.candelatech.com/ath10k-10.4.php
-This firmware selects and requires the ath10k-ct driver.
-endef
-
-
-define Build/Compile
-
-endef
-
-
-define Package/ath10k-firmware-qca9887-ct/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9887/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA9887) \
-		$(1)/lib/firmware/ath10k/QCA9887/hw1.0/firmware-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9887_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9887/hw1.0/board.bin
-endef
-define Package/ath10k-firmware-qca9887-ct-full-htt/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9887/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE_FULL_HTT,QCA9887) \
-		$(1)/lib/firmware/ath10k/QCA9887/hw1.0/ct-firmware-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9887_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9887/hw1.0/board.bin
-endef
-
-define Package/ath10k-firmware-qca988x-ct/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA988X_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/board.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA988X) \
-		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
-endef
-define Package/ath10k-firmware-qca988x-ct-full-htt/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA988X_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/board.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE_FULL_HTT,QCA988X) \
-		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/ct-firmware-2.bin
-endef
-
-define Package/ath10k-firmware-qca99x0-ct/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA99X0) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin
-endef
-define Package/ath10k-firmware-qca99x0-ct-full-htt/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE_FULL_HTT,QCA99X0) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/ct-firmware-5.bin
-endef
-define Package/ath10k-firmware-qca99x0-ct-htt/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA99X0) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/ct-firmware-5.bin
-endef
-
-define Package/ath10k-firmware-qca9984-ct/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9984_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA9984) \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin
-endef
-define Package/ath10k-firmware-qca9984-ct-full-htt/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9984_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE_FULL_HTT,QCA9984) \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/ct-firmware-5.bin
-endef
-define Package/ath10k-firmware-qca9984-ct-htt/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9984_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA9984) \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/ct-firmware-5.bin
-endef
-
-define Package/ath10k-firmware-qca4019-ct/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA4019/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA4019_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA4019) \
-		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/firmware-5.bin
-endef
-define Package/ath10k-firmware-qca4019-ct-full-htt/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA4019/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA4019_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE_FULL_HTT,QCA4019) \
-		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/ct-firmware-5.bin
-endef
-define Package/ath10k-firmware-qca4019-ct-htt/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA4019/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA4019_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA4019) \
-		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/ct-firmware-5.bin
-endef
-
-define Package/ath10k-firmware-qca9888-ct/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9888/hw2.0
-	ln -s \
-		../../cal-pci-0000:01:00.0.bin \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9888_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA9888) \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/firmware-5.bin
-endef
-define Package/ath10k-firmware-qca9888-ct-full-htt/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9888/hw2.0
-	ln -s \
-		../../cal-pci-0000:01:00.0.bin \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9888_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE_FULL_HTT,QCA9888) \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/ct-firmware-5.bin
-endef
-define Package/ath10k-firmware-qca9888-ct-htt/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9888/hw2.0
-	ln -s \
-		../../cal-pci-0000:01:00.0.bin \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9888_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA9888) \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/ct-firmware-5.bin
-endef
-
-
-$(eval $(call BuildPackage,ath10k-firmware-qca9887-ct))
-$(eval $(call BuildPackage,ath10k-firmware-qca9887-ct-full-htt))
-$(eval $(call BuildPackage,ath10k-firmware-qca988x-ct))
-$(eval $(call BuildPackage,ath10k-firmware-qca988x-ct-full-htt))
-$(eval $(call BuildPackage,ath10k-firmware-qca99x0-ct))
-$(eval $(call BuildPackage,ath10k-firmware-qca99x0-ct-full-htt))
-$(eval $(call BuildPackage,ath10k-firmware-qca99x0-ct-htt))
-$(eval $(call BuildPackage,ath10k-firmware-qca9984-ct))
-$(eval $(call BuildPackage,ath10k-firmware-qca9984-ct-full-htt))
-$(eval $(call BuildPackage,ath10k-firmware-qca9984-ct-htt))
-$(eval $(call BuildPackage,ath10k-firmware-qca4019-ct))
-$(eval $(call BuildPackage,ath10k-firmware-qca4019-ct-full-htt))
-$(eval $(call BuildPackage,ath10k-firmware-qca4019-ct-htt))
-$(eval $(call BuildPackage,ath10k-firmware-qca9888-ct))
-$(eval $(call BuildPackage,ath10k-firmware-qca9888-ct-full-htt))
-$(eval $(call BuildPackage,ath10k-firmware-qca9888-ct-htt))

feeds/ipq40xx/ath10k-ct/Makefile

@@ -1,122 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ath10k-ct
-PKG_RELEASE=1
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=
-
-PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
-PKG_MIRROR_HASH:=37b4f00231cb0ae00f63da1c94ae53c940c76d047ce0fb081c08a35fffbfd2c0
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-05-22b
-PKG_SOURCE_VERSION:=54a9ac02f1139596ea4361ebbc3e444955d86cfd
-#PKG_MIRROR_HASH:=97cf22a4a57381c7eb7a9b8a8b1e347e9711ce51c89db971b4ab9a35af476ece
-
-# Build the 5.4 ath10k-ct driver version.  Other option is "-4.19".
-# Probably this should match as closely as
-# possible to whatever mac80211 backports version is being used.
-CT_KVER="-5.7"
-
-PKG_MAINTAINER:=Ben Greear <greearb@candelatech.com>
-PKG_BUILD_PARALLEL:=1
-PKG_EXTMOD_SUBDIRS:=ath10k$(CT_KVER)
-
-STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
-
-include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/ath10k-ct
-  SUBMENU:=Wireless Drivers
-  TITLE:=ath10k-ct driver optimized for CT ath10k firmware
-  DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT +@DRIVER_11W_SUPPORT @PCI_SUPPORT +kmod-hwmon-core
-  FILES:=\
-	$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_pci.ko \
-	$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko
-  AUTOLOAD:=$(call AutoProbe,ath10k_pci)
-  PROVIDES:=kmod-ath10k
-  VARIANT:=regular
-endef
-
-define KernelPackage/ath10k-ct/config
-
-       config ATH10K-CT_LEDS
-               bool "Enable LED support"
-               default y
-               depends on PACKAGE_kmod-ath10k-ct || PACKAGE_kmod-ath10k-ct-smallbuffers
-endef
-
-define KernelPackage/ath10k-ct-smallbuffers
-$(call KernelPackage/ath10k-ct)
-  TITLE+= (small buffers for low-RAM devices)
-  VARIANT:=smallbuffers
-endef
-
-NOSTDINC_FLAGS = \
-	-I$(PKG_BUILD_DIR) \
-	-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
-	-I$(STAGING_DIR)/usr/include/mac80211-backport \
-	-I$(STAGING_DIR)/usr/include/mac80211/uapi \
-	-I$(STAGING_DIR)/usr/include/mac80211 \
-	-include backport/autoconf.h \
-	-include backport/backport.h
-
-ifdef CONFIG_PACKAGE_MAC80211_MESH
-  NOSTDINC_FLAGS += -DCONFIG_MAC80211_MESH
-endif
-
-CT_MAKEDEFS += CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m CONFIG_ATH10K_CE=y
-
-# This AHB logic is needed for IPQ4019 radios
-CT_MAKEDEFS += CONFIG_ATH10K_AHB=m
-NOSTDINC_FLAGS += -DCONFIG_ATH10K_AHB
-
-NOSTDINC_FLAGS += -DSTANDALONE_CT
-
-ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS
-  CT_MAKEDEFS += CONFIG_ATH10K_DEBUGFS=y CONFIG_MAC80211_DEBUGFS=y
-  NOSTDINC_FLAGS += -DCONFIG_MAC80211_DEBUGFS
-  NOSTDINC_FLAGS += -DCONFIG_ATH10K_DEBUGFS
-endif
-
-ifdef CONFIG_PACKAGE_ATH_DEBUG
-  NOSTDINC_FLAGS += -DCONFIG_ATH10K_DEBUG
-endif
-
-ifdef CONFIG_PACKAGE_ATH_DFS
-  NOSTDINC_FLAGS += -DCONFIG_ATH10K_DFS_CERTIFIED
-endif
-
-ifdef CONFIG_PACKAGE_ATH_SPECTRAL
-  CT_MAKEDEFS += CONFIG_ATH10K_SPECTRAL=y
-  NOSTDINC_FLAGS += -DCONFIG_ATH10K_SPECTRAL
-endif
-
-ifeq ($(CONFIG_ATH10K-CT_LEDS),y)
-  CT_MAKEDEFS += CONFIG_ATH10K_LEDS=y
-  NOSTDINC_FLAGS += -DCONFIG_ATH10K_LEDS
-endif
-
-ifeq ($(BUILD_VARIANT),smallbuffers)
-  NOSTDINC_FLAGS += -DCONFIG_ATH10K_SMALLBUFFERS
-endif
-
-define Build/Configure
-	cp $(STAGING_DIR)/usr/include/mac80211/ath/*.h $(PKG_BUILD_DIR)
-endef
-
-ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
-  CT_MAKEDEFS += V=1
-endif
-
-define Build/Compile
-	+$(MAKE) $(CT_MAKEDEFS) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-		$(KERNEL_MAKE_FLAGS) \
-		M="$(PKG_BUILD_DIR)/ath10k$(CT_KVER)" \
-		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
-		modules
-endef
-
-$(eval $(call KernelPackage,ath10k-ct))
-$(eval $(call KernelPackage,ath10k-ct-smallbuffers))

feeds/ipq40xx/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch

@@ -1,37 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Tue, 26 Feb 2019 08:06:35 +0100
-Subject: ath10k-ct: apply mac80211 rates to ath10k-ct rate state
-
-The rates from mac80211 have to be copied to the state of ath10k-ct or
-otherwise the ath10k_check_apply_special_rates function overwrites
-them again with some default values. This breaks for example the
-mcast_rate set for a wifi-iface.
-
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-
---- a/ath10k-5.4/mac.c
-+++ b/ath10k-5.4/mac.c
-@@ -6793,6 +6793,7 @@ static void ath10k_bss_info_changed(stru
- 			   "mac vdev %d mcast_rate %x\n",
- 			   arvif->vdev_id, rate);
- 
-+		arvif->mcast_rate[band] = rate;
- 		vdev_param = ar->wmi.vdev_param->mcast_data_rate;
- 		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
- 						vdev_param, rate);
-@@ -6801,6 +6802,7 @@ static void ath10k_bss_info_changed(stru
- 				    "failed to set mcast rate on vdev %i: %d\n",
- 				    arvif->vdev_id,  ret);
- 
-+		arvif->bcast_rate[band] = rate;
- 		vdev_param = ar->wmi.vdev_param->bcast_data_rate;
- 		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
- 						vdev_param, rate);
-@@ -6827,6 +6829,7 @@ static void ath10k_bss_info_changed(stru
- 			return;
- 		}
- 
-+		arvif->mgt_rate[def.chan->band] = hw_rate_code;
- 		vdev_param = ar->wmi.vdev_param->mgmt_rate;
- 		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
- 						hw_rate_code);

feeds/ipq40xx/ath10k-ct/patches/201-ath10k-add-LED-and-GPIO-controlling-support-for-various-chipsets.patch

@@ -1,598 +0,0 @@
-From: Sebastian Gottschall <s.gottschall@newmedia-net.de>
-
-Adds LED and GPIO Control support for 988x, 9887, 9888, 99x0, 9984 based
-chipsets with on chipset connected led's using WMI Firmware API.  The LED
-device will get available named as "ath10k-phyX" at sysfs and can be controlled
-with various triggers.  adds also debugfs interface for gpio control.
-
-This patch is specific for OpenWRt base, as is use old backported package
-with old wireless source. Support for QCA9984 is removed.
-Reworked to use ath10k-ct custom source
-
-
-Signed-off-by: Sebastian Gottschall <s.gottschall@dd-wrt.com>
-Reviewed-by: Steve deRosier <derosier@cal-sierra.com>
-[kvalo: major reorg and cleanup]
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
----
-
-v13:
-
-* only compile tested!
-
-* fix all checkpatch warnings
-
-* fix commit log
-
-* sizeof(struct ath10k_gpiocontrol) -> sizeof(*gpio)
-
-* unsigned -> unsigned int
-
-* remove GPIOLIB code, that should be added in a separate patch
-
-* rename gpio.c to leds.c
-
-* add leds.h
-
-* rename some functions:
-
-  ath10k_attach_led() -> ath10k_leds_register()
-  ath10k_unregister_led() -> ath10k_leds_unregister()
-  ath10k_reset_led_pin() -> ath10k_leds_start()
-
-* call ath10k_leds_unregister() before ath10k_thermal_unregister() to preserve ordering
-
-* call ath10k_leds_start() only from ath10k_core_start() and not from mac.c
-
-* rename struct ath10k_gpiocontrol as anonymous function under struct
-  ath10k::leds, no need for memory allocation
-
-* merge ath10k_add_led() to ath10k_attach_led(), which is it's only caller
-
-* remove #if IS_ENABLED() checks from most of places, memory savings from those were not worth it
-
-* Kconfig help text improvement and move it lower in the menu, also don't enable it by default
-
-* switch to set_brightness_blocking() so that the callback can sleep,
-  then no need to use ath10k_wmi_cmd_send_nowait() and can take mutex
-  to access ar->state
-
-* don't touch ath10k_wmi_pdev_get_temperature()
-
-* as QCA6174/QCA9377 are not (yet) supported don't add the command to WMI-TLV interface
-
-* remove debugfs interface, that should be added in another patch
-
-* cleanup includes
-
- ath10k-5.4/Kconfig   |  10 +++
- ath10k-5.4/Makefile  |   1 +
- ath10k-5.4/core.c    |  22 +++++++
- ath10k-5.4/core.h    |   9 ++-
- ath10k-5.4/hw.h      |   1 +
- ath10k-5.4/leds.c    | 103 ++++++++++++++++++++++++++++++
- ath10k-5.4/leds.h    |  45 +++++++++++++
- ath10k-5.4/mac.c     |   1 +
- ath10k-5.4/wmi-ops.h |  32 ++++++++++
- ath10k-5.4/wmi-tlv.c |   2 +
- ath10k-5.4/wmi.c     |  54 ++++++++++++++++
- ath10k-5.4/wmi.h     |  35 ++++++++++
- 12 files changed, 314 insertions(+), 1 deletion(-)
- create mode 100644 ath10k-5.4/leds.c
- create mode 100644 ath10k-5.4/leds.h
-
---- a/ath10k-5.4/Kconfig
-+++ b/ath10k-5.4/Kconfig
-@@ -66,6 +66,16 @@ config ATH10K_DEBUGFS
- 
- 	  If unsure, say Y to make it easier to debug problems.
- 
-+config ATH10K_LEDS
-+	bool "Atheros ath10k LED support"
-+	depends on ATH10K
-+	select MAC80211_LEDS
-+	select LEDS_CLASS
-+	select NEW_LEDS
-+	default y
-+	---help---
-+	  This option is necessary, if you want LED support for chipset connected led pins. If unsure, say N.
-+
- config ATH10K_SPECTRAL
- 	bool "Atheros ath10k spectral scan support"
- 	depends on ATH10K_DEBUGFS
---- a/ath10k-5.4/Makefile
-+++ b/ath10k-5.4/Makefile
-@@ -19,6 +19,7 @@ ath10k_core-$(CONFIG_ATH10K_SPECTRAL) +=
- ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o
- ath10k_core-$(CONFIG_ATH10K_TRACING) += trace.o
- ath10k_core-$(CONFIG_THERMAL) += thermal.o
-+ath10k_core-$(CONFIG_ATH10K_LEDS) += leds.o
- ath10k_core-$(CONFIG_MAC80211_DEBUGFS) += debugfs_sta.o
- ath10k_core-$(CONFIG_PM) += wow.o
- ath10k_core-$(CONFIG_DEV_COREDUMP) += coredump.o
---- a/ath10k-5.4/core.c
-+++ b/ath10k-5.4/core.c
-@@ -25,6 +25,7 @@
- #include "testmode.h"
- #include "wmi-ops.h"
- #include "coredump.h"
-+#include "leds.h"
- 
- /* Disable ath10k-ct DBGLOG output by default */
- unsigned int ath10k_debug_mask = ATH10K_DBG_NO_DBGLOG;
-@@ -67,6 +68,7 @@ static const struct ath10k_hw_params ath
- 		.dev_id = QCA988X_2_0_DEVICE_ID,
- 		.bus = ATH10K_BUS_PCI,
- 		.name = "qca988x hw2.0",
-+		.led_pin = 1,
- 		.patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,
- 		.uart_pin = 7,
- 		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,
-@@ -137,6 +139,7 @@ static const struct ath10k_hw_params ath
- 		.dev_id = QCA9887_1_0_DEVICE_ID,
- 		.bus = ATH10K_BUS_PCI,
- 		.name = "qca9887 hw1.0",
-+		.led_pin = 1,
- 		.patch_load_addr = QCA9887_HW_1_0_PATCH_LOAD_ADDR,
- 		.uart_pin = 7,
- 		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,
-@@ -344,6 +347,7 @@ static const struct ath10k_hw_params ath
- 		.dev_id = QCA99X0_2_0_DEVICE_ID,
- 		.bus = ATH10K_BUS_PCI,
- 		.name = "qca99x0 hw2.0",
-+		.led_pin = 17,
- 		.patch_load_addr = QCA99X0_HW_2_0_PATCH_LOAD_ADDR,
- 		.uart_pin = 7,
- 		.otp_exe_param = 0x00000700,
-@@ -385,6 +389,7 @@ static const struct ath10k_hw_params ath
- 		.dev_id = QCA9984_1_0_DEVICE_ID,
- 		.bus = ATH10K_BUS_PCI,
- 		.name = "qca9984/qca9994 hw1.0",
-+		.led_pin = 17,
- 		.patch_load_addr = QCA9984_HW_1_0_PATCH_LOAD_ADDR,
- 		.uart_pin = 7,
- 		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
-@@ -433,6 +438,7 @@ static const struct ath10k_hw_params ath
- 		.dev_id = QCA9888_2_0_DEVICE_ID,
- 		.bus = ATH10K_BUS_PCI,
- 		.name = "qca9888 hw2.0",
-+		.led_pin = 17,
- 		.patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR,
- 		.uart_pin = 7,
- 		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
-@@ -3573,6 +3579,10 @@ int ath10k_core_start(struct ath10k *ar,
- 			ath10k_wmi_check_apply_board_power_ctl_table(ar);
- 	}
- 
-+	status = ath10k_leds_start(ar);
-+	if (status)
-+		goto err_hif_stop;
-+
- 	return 0;
- 
- err_hif_stop:
-@@ -3829,9 +3839,18 @@ static void ath10k_core_register_work(st
- 		goto err_spectral_destroy;
- 	}
- 
-+	status = ath10k_leds_register(ar);
-+	if (status) {
-+		ath10k_err(ar, "could not register leds: %d\n",
-+			   status);
-+		goto err_thermal_unregister;
-+	}
-+
- 	set_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags);
- 	return;
- 
-+err_thermal_unregister:
-+	ath10k_thermal_unregister(ar);
- err_spectral_destroy:
- 	ath10k_spectral_destroy(ar);
- err_debug_destroy:
-@@ -3891,6 +3910,8 @@ void ath10k_core_unregister(struct ath10
- 	if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags))
- 		return;
- 
-+	ath10k_leds_unregister(ar);
-+
- 	ath10k_thermal_unregister(ar);
- 	/* Stop spectral before unregistering from mac80211 to remove the
- 	 * relayfs debugfs file cleanly. Otherwise the parent debugfs tree
---- a/ath10k-5.4/core.h
-+++ b/ath10k-5.4/core.h
-@@ -14,6 +14,7 @@
- #include <linux/pci.h>
- #include <linux/uuid.h>
- #include <linux/time.h>
-+#include <linux/leds.h>
- 
- #include "htt.h"
- #include "htc.h"
-@@ -1469,6 +1470,13 @@ struct ath10k {
- 	} testmode;
- 
- 	struct {
-+		struct gpio_led wifi_led;
-+		struct led_classdev cdev;
-+		char label[48];
-+		u32 gpio_state_pin;
-+	} leds;
-+
-+	struct {
- 		/* protected by data_lock */
- 		u32 fw_crash_counter;
- 		u32 fw_warm_reset_counter;
---- a/ath10k-5.4/hw.h
-+++ b/ath10k-5.4/hw.h
-@@ -518,6 +518,7 @@ struct ath10k_hw_params {
- 	const char *name;
- 	u32 patch_load_addr;
- 	int uart_pin;
-+	int led_pin;
- 	u32 otp_exe_param;
- 
- 	/* Type of hw cycle counter wraparound logic, for more info
---- /dev/null
-+++ b/ath10k-5.4/leds.c
-@@ -0,0 +1,103 @@
-+/*
-+ * Copyright (c) 2005-2011 Atheros Communications Inc.
-+ * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
-+ * Copyright (c) 2018 Sebastian Gottschall <s.gottschall@dd-wrt.com>
-+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <linux/leds.h>
-+
-+#include "core.h"
-+#include "wmi.h"
-+#include "wmi-ops.h"
-+
-+#include "leds.h"
-+
-+static int ath10k_leds_set_brightness_blocking(struct led_classdev *led_cdev,
-+					       enum led_brightness brightness)
-+{
-+	struct ath10k *ar = container_of(led_cdev, struct ath10k,
-+					 leds.cdev);
-+	struct gpio_led *led = &ar->leds.wifi_led;
-+
-+	mutex_lock(&ar->conf_mutex);
-+
-+	if (ar->state != ATH10K_STATE_ON)
-+		goto out;
-+
-+	ar->leds.gpio_state_pin = (brightness != LED_OFF) ^ led->active_low;
-+	ath10k_wmi_gpio_output(ar, led->gpio, ar->leds.gpio_state_pin);
-+
-+out:
-+	mutex_unlock(&ar->conf_mutex);
-+
-+	return 0;
-+}
-+
-+int ath10k_leds_start(struct ath10k *ar)
-+{
-+	if (ar->hw_params.led_pin == 0)
-+		/* leds not supported */
-+		return 0;
-+
-+	/* under some circumstances, the gpio pin gets reconfigured
-+	 * to default state by the firmware, so we need to
-+	 * reconfigure it this behaviour has only ben seen on
-+	 * QCA9984 and QCA99XX devices so far
-+	 */
-+	ath10k_wmi_gpio_config(ar, ar->hw_params.led_pin, 0,
-+			       WMI_GPIO_PULL_NONE, WMI_GPIO_INTTYPE_DISABLE);
-+	ath10k_wmi_gpio_output(ar, ar->hw_params.led_pin, 1);
-+
-+	return 0;
-+}
-+
-+int ath10k_leds_register(struct ath10k *ar)
-+{
-+	int ret;
-+
-+	if (ar->hw_params.led_pin == 0)
-+		/* leds not supported */
-+		return 0;
-+
-+	snprintf(ar->leds.label, sizeof(ar->leds.label), "ath10k-%s",
-+		 wiphy_name(ar->hw->wiphy));
-+	ar->leds.wifi_led.active_low = 1;
-+	ar->leds.wifi_led.gpio = ar->hw_params.led_pin;
-+	ar->leds.wifi_led.name = ar->leds.label;
-+	ar->leds.wifi_led.default_state = LEDS_GPIO_DEFSTATE_KEEP;
-+
-+	ar->leds.cdev.name = ar->leds.label;
-+	ar->leds.cdev.brightness_set_blocking = ath10k_leds_set_brightness_blocking;
-+
-+	/* FIXME: this assignment doesn't make sense as it's NULL, remove it? */
-+	ar->leds.cdev.default_trigger = ar->leds.wifi_led.default_trigger;
-+
-+	ret = led_classdev_register(wiphy_dev(ar->hw->wiphy), &ar->leds.cdev);
-+	if (ret)
-+		return ret;
-+
-+	return 0;
-+}
-+
-+void ath10k_leds_unregister(struct ath10k *ar)
-+{
-+	if (ar->hw_params.led_pin == 0)
-+		/* leds not supported */
-+		return;
-+
-+	led_classdev_unregister(&ar->leds.cdev);
-+}
-+
---- /dev/null
-+++ b/ath10k-5.4/leds.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+#ifndef _LEDS_H_
-+#define _LEDS_H_
-+
-+#include "core.h"
-+
-+#ifdef CONFIG_ATH10K_LEDS
-+void ath10k_leds_unregister(struct ath10k *ar);
-+int ath10k_leds_start(struct ath10k *ar);
-+int ath10k_leds_register(struct ath10k *ar);
-+#else
-+static inline void ath10k_leds_unregister(struct ath10k *ar)
-+{
-+}
-+
-+static inline int ath10k_leds_start(struct ath10k *ar)
-+{
-+	return 0;
-+}
-+
-+static inline int ath10k_leds_register(struct ath10k *ar)
-+{
-+	return 0;
-+}
-+
-+#endif
-+#endif /* _LEDS_H_ */
---- a/ath10k-5.4/mac.c
-+++ b/ath10k-5.4/mac.c
-@@ -24,6 +24,7 @@
- #include "wmi-tlv.h"
- #include "wmi-ops.h"
- #include "wow.h"
-+#include "leds.h"
- 
- /*********/
- /* Rates */
---- a/ath10k-5.4/wmi-ops.h
-+++ b/ath10k-5.4/wmi-ops.h
-@@ -218,7 +218,10 @@ struct wmi_ops {
- 	struct sk_buff *(*gen_bb_timing)
- 			(struct ath10k *ar,
- 			 const struct wmi_bb_timing_cfg_arg *arg);
-+	struct sk_buff *(*gen_gpio_config)(struct ath10k *ar, u32 gpio_num,
-+					   u32 input, u32 pull_type, u32 intr_mode);
- 
-+	struct sk_buff *(*gen_gpio_output)(struct ath10k *ar, u32 gpio_num, u32 set);
- };
- 
- int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id);
-@@ -1105,6 +1108,35 @@ ath10k_wmi_force_fw_hang(struct ath10k *
- 	return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->force_fw_hang_cmdid);
- }
- 
-+static inline int ath10k_wmi_gpio_config(struct ath10k *ar, u32 gpio_num,
-+					 u32 input, u32 pull_type, u32 intr_mode)
-+{
-+	struct sk_buff *skb;
-+
-+	if (!ar->wmi.ops->gen_gpio_config)
-+		return -EOPNOTSUPP;
-+
-+	skb = ar->wmi.ops->gen_gpio_config(ar, gpio_num, input, pull_type, intr_mode);
-+	if (IS_ERR(skb))
-+		return PTR_ERR(skb);
-+
-+	return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->gpio_config_cmdid);
-+}
-+
-+static inline int ath10k_wmi_gpio_output(struct ath10k *ar, u32 gpio_num, u32 set)
-+{
-+	struct sk_buff *skb;
-+
-+	if (!ar->wmi.ops->gen_gpio_config)
-+		return -EOPNOTSUPP;
-+
-+	skb = ar->wmi.ops->gen_gpio_output(ar, gpio_num, set);
-+	if (IS_ERR(skb))
-+		return PTR_ERR(skb);
-+
-+	return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->gpio_output_cmdid);
-+}
-+
- static inline int
- ath10k_wmi_dbglog_cfg(struct ath10k *ar, u64 module_enable, u32 log_level)
- {
---- a/ath10k-5.4/wmi-tlv.c
-+++ b/ath10k-5.4/wmi-tlv.c
-@@ -4364,6 +4364,8 @@ static const struct wmi_ops wmi_tlv_ops
- 	.gen_echo = ath10k_wmi_tlv_op_gen_echo,
- 	.gen_vdev_spectral_conf = ath10k_wmi_tlv_op_gen_vdev_spectral_conf,
- 	.gen_vdev_spectral_enable = ath10k_wmi_tlv_op_gen_vdev_spectral_enable,
-+	/* .gen_gpio_config not implemented */
-+	/* .gen_gpio_output not implemented */
- };
- 
- static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = {
---- a/ath10k-5.4/wmi.c
-+++ b/ath10k-5.4/wmi.c
-@@ -8295,6 +8295,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
- 	return skb;
- }
- 
-+static struct sk_buff *ath10k_wmi_op_gen_gpio_config(struct ath10k *ar,
-+						     u32 gpio_num, u32 input,
-+						     u32 pull_type, u32 intr_mode)
-+{
-+	struct wmi_gpio_config_cmd *cmd;
-+	struct sk_buff *skb;
-+
-+	skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
-+	if (!skb)
-+		return ERR_PTR(-ENOMEM);
-+
-+	cmd = (struct wmi_gpio_config_cmd *)skb->data;
-+	cmd->pull_type = __cpu_to_le32(pull_type);
-+	cmd->gpio_num = __cpu_to_le32(gpio_num);
-+	cmd->input = __cpu_to_le32(input);
-+	cmd->intr_mode = __cpu_to_le32(intr_mode);
-+
-+	ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi gpio_config gpio_num 0x%08x input 0x%08x pull_type 0x%08x intr_mode 0x%08x\n",
-+		   gpio_num, input, pull_type, intr_mode);
-+
-+	return skb;
-+}
-+
-+static struct sk_buff *ath10k_wmi_op_gen_gpio_output(struct ath10k *ar,
-+						     u32 gpio_num, u32 set)
-+{
-+	struct wmi_gpio_output_cmd *cmd;
-+	struct sk_buff *skb;
-+
-+	skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
-+	if (!skb)
-+		return ERR_PTR(-ENOMEM);
-+
-+	cmd = (struct wmi_gpio_output_cmd *)skb->data;
-+	cmd->gpio_num = __cpu_to_le32(gpio_num);
-+	cmd->set = __cpu_to_le32(set);
-+
-+	ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi gpio_output gpio_num 0x%08x set 0x%08x\n",
-+		   gpio_num, set);
-+
-+	return skb;
-+}
-+
- static struct sk_buff *
- ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id,
- 			     enum wmi_sta_ps_mode psmode)
-@@ -10094,6 +10137,9 @@ static const struct wmi_ops wmi_ops = {
- 	.fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill,
- 	.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
- 	.gen_echo = ath10k_wmi_op_gen_echo,
-+	.gen_gpio_config = ath10k_wmi_op_gen_gpio_config,
-+	.gen_gpio_output = ath10k_wmi_op_gen_gpio_output,
-+
- 	/* .gen_bcn_tmpl not implemented */
- 	/* .gen_prb_tmpl not implemented */
- 	/* .gen_p2p_go_bcn_ie not implemented */
-@@ -10164,6 +10210,8 @@ static const struct wmi_ops wmi_10_1_ops
- 	.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
- 	.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
- 	.gen_echo = ath10k_wmi_op_gen_echo,
-+	.gen_gpio_config = ath10k_wmi_op_gen_gpio_config,
-+	.gen_gpio_output = ath10k_wmi_op_gen_gpio_output,
- 	/* .gen_bcn_tmpl not implemented */
- 	/* .gen_prb_tmpl not implemented */
- 	/* .gen_p2p_go_bcn_ie not implemented */
-@@ -10243,6 +10291,8 @@ static const struct wmi_ops wmi_10_2_ops
- 	.gen_delba_send = ath10k_wmi_op_gen_delba_send,
- 	.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
- 	.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
-+	.gen_gpio_config = ath10k_wmi_op_gen_gpio_config,
-+	.gen_gpio_output = ath10k_wmi_op_gen_gpio_output,
- 	/* .gen_pdev_enable_adaptive_cca not implemented */
- };
- 
-@@ -10314,6 +10364,8 @@ static const struct wmi_ops wmi_10_2_4_o
- 		ath10k_wmi_op_gen_pdev_enable_adaptive_cca,
- 	.get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype,
- 	.gen_bb_timing = ath10k_wmi_10_2_4_op_gen_bb_timing,
-+	.gen_gpio_config = ath10k_wmi_op_gen_gpio_config,
-+	.gen_gpio_output = ath10k_wmi_op_gen_gpio_output,
- 	/* .gen_bcn_tmpl not implemented */
- 	/* .gen_prb_tmpl not implemented */
- 	/* .gen_p2p_go_bcn_ie not implemented */
-@@ -10395,6 +10447,8 @@ static const struct wmi_ops wmi_10_4_ops
- 	.gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info,
- 	.gen_echo = ath10k_wmi_op_gen_echo,
- 	.gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config,
-+	.gen_gpio_config = ath10k_wmi_op_gen_gpio_config,
-+	.gen_gpio_output = ath10k_wmi_op_gen_gpio_output,
- };
- 
- int ath10k_wmi_attach(struct ath10k *ar)
---- a/ath10k-5.4/wmi.h
-+++ b/ath10k-5.4/wmi.h
-@@ -3110,6 +3110,41 @@ enum wmi_10_4_feature_mask {
- 
- };
- 
-+/* WMI_GPIO_CONFIG_CMDID */
-+enum {
-+	WMI_GPIO_PULL_NONE,
-+	WMI_GPIO_PULL_UP,
-+	WMI_GPIO_PULL_DOWN,
-+};
-+
-+enum {
-+	WMI_GPIO_INTTYPE_DISABLE,
-+	WMI_GPIO_INTTYPE_RISING_EDGE,
-+	WMI_GPIO_INTTYPE_FALLING_EDGE,
-+	WMI_GPIO_INTTYPE_BOTH_EDGE,
-+	WMI_GPIO_INTTYPE_LEVEL_LOW,
-+	WMI_GPIO_INTTYPE_LEVEL_HIGH
-+};
-+
-+/* WMI_GPIO_CONFIG_CMDID */
-+struct wmi_gpio_config_cmd {
-+	__le32 gpio_num;             /* GPIO number to be setup */
-+	__le32 input;                /* 0 - Output/ 1 - Input */
-+	__le32 pull_type;            /* Pull type defined above */
-+	__le32 intr_mode;            /* Interrupt mode defined above (Input) */
-+} __packed;
-+
-+/* WMI_GPIO_OUTPUT_CMDID */
-+struct wmi_gpio_output_cmd {
-+	__le32 gpio_num;    /* GPIO number to be setup */
-+	__le32 set;         /* Set the GPIO pin*/
-+} __packed;
-+
-+/* WMI_GPIO_INPUT_EVENTID */
-+struct wmi_gpio_input_event {
-+	__le32 gpio_num;    /* GPIO number which changed state */
-+} __packed;
-+
- struct wmi_ext_resource_config_10_4_cmd {
- 	/* contains enum wmi_host_platform_type */
- 	__le32 host_platform_config;

feeds/ipq40xx/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch

@@ -1,53 +0,0 @@
-From 79c9d7aabae1d1da9eea97d83b61e1517a8a2221 Mon Sep 17 00:00:00 2001
-From: Mathias Kresin <dev@kresin.me>
-Date: Fri, 22 Jun 2018 18:59:44 +0200
-Subject: [PATCH] ath10k: use tpt LED trigger by default
-
-Use the tpt LED trigger for each created phy led. Ths way LEDs attached
-to the ath10k GPIO pins are indicating the phy status and blink on
-traffic.
-
-Signed-off-by: Mathias Kresin <dev@kresin.me>
----
- ath10k-5.4/core.h | 4 ++++
- ath10k-5.4/leds.c | 4 +---
- ath10k-5.4/mac.c  | 2 +-
- 3 files changed, 6 insertions(+), 4 deletions(-)
-
---- a/ath10k-5.4/core.h
-+++ b/ath10k-5.4/core.h
-@@ -1573,6 +1573,10 @@ struct ath10k {
- 	u8 csi_data[4096];
- 	u16 csi_data_len;
- 
-+#ifdef CPTCFG_MAC80211_LEDS
-+	const char *led_default_trigger;
-+#endif
-+
- 	/* must be last */
- 	u8 drv_priv[0] __aligned(sizeof(void *));
- };
---- a/ath10k-5.4/leds.c
-+++ b/ath10k-5.4/leds.c
-@@ -81,9 +81,7 @@ int ath10k_leds_register(struct ath10k *
- 
- 	ar->leds.cdev.name = ar->leds.label;
- 	ar->leds.cdev.brightness_set_blocking = ath10k_leds_set_brightness_blocking;
--
--	/* FIXME: this assignment doesn't make sense as it's NULL, remove it? */
--	ar->leds.cdev.default_trigger = ar->leds.wifi_led.default_trigger;
-+	ar->leds.cdev.default_trigger = ar->led_default_trigger;
- 
- 	ret = led_classdev_register(wiphy_dev(ar->hw->wiphy), &ar->leds.cdev);
- 	if (ret)
---- a/ath10k-5.4/mac.c
-+++ b/ath10k-5.4/mac.c
-@@ -10367,7 +10367,7 @@ int ath10k_mac_register(struct ath10k *a
- 	ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;
- 
- #ifdef CPTCFG_MAC80211_LEDS
--	ieee80211_create_tpt_led_trigger(ar->hw,
-+	ar->led_default_trigger = ieee80211_create_tpt_led_trigger(ar->hw,
- 		IEEE80211_TPT_LEDTRIG_FL_RADIO, ath10k_tpt_blink,
- 		ARRAY_SIZE(ath10k_tpt_blink));
- #endif

feeds/ipq40xx/ath10k-ct/patches/205-ath10k-Add-NL80211_EXT_FEATURE_AQL-flag.patch

@@ -1,10 +0,0 @@
---- a/ath10k-5.4/mac.c
-+++ b/ath10k-5.4/mac.c
-@@ -10180,6 +10180,7 @@ int ath10k_mac_register(struct ath10k *a
- 	wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_VHT_IBSS);
- 	wiphy_ext_feature_set(ar->hw->wiphy,
- 			      NL80211_EXT_FEATURE_SET_SCAN_DWELL);
-+	wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_AQL);
- 
- 	if (test_bit(WMI_SERVICE_TX_DATA_ACK_RSSI, ar->wmi.svc_map) ||
- 	    test_bit(WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS, ar->wmi.svc_map))

feeds/ipq40xx/ath10k-ct/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch

@@ -1,14 +0,0 @@
---- a/ath10k-5.4/htt.h
-+++ b/ath10k-5.4/htt.h
-@@ -225,7 +225,11 @@ enum htt_rx_ring_flags {
- };
- 
- #define HTT_RX_RING_SIZE_MIN 128
-+#ifndef CONFIG_ATH10K_SMALLBUFFERS
- #define HTT_RX_RING_SIZE_MAX 2048
-+#else
-+#define HTT_RX_RING_SIZE_MAX 512
-+#endif
- #define HTT_RX_RING_SIZE HTT_RX_RING_SIZE_MAX
- #define HTT_RX_RING_FILL_LEVEL (((HTT_RX_RING_SIZE) / 2) - 1)
- #define HTT_RX_RING_FILL_LEVEL_DUAL_MAC (HTT_RX_RING_SIZE - 1)

feeds/ipq40xx/ath10k-ct/patches/960-0011-ath10k-limit-pci-buffer-size.patch

@@ -1,50 +0,0 @@
---- a/ath10k-5.4/pci.c
-+++ b/ath10k-5.4/pci.c
-@@ -131,7 +131,11 @@ static struct ce_attr host_ce_config_wla
- 		.flags = CE_ATTR_FLAGS,
- 		.src_nentries = 0,
- 		.src_sz_max = 2048,
-+#ifndef CONFIG_ATH10K_SMALLBUFFERS
- 		.dest_nentries = 512,
-+#else
-+		.dest_nentries = 128,
-+#endif
- 		.recv_cb = ath10k_pci_htt_htc_rx_cb,
- 	},
- 
-@@ -140,7 +144,11 @@ static struct ce_attr host_ce_config_wla
- 		.flags = CE_ATTR_FLAGS,
- 		.src_nentries = 0,
- 		.src_sz_max = 2048,
-+#ifndef CONFIG_ATH10K_SMALLBUFFERS
- 		.dest_nentries = 128,
-+#else
-+		.dest_nentries = 64,
-+#endif
- 		.recv_cb = ath10k_pci_htc_rx_cb,
- 	},
- 
-@@ -167,7 +175,11 @@ static struct ce_attr host_ce_config_wla
- 		.flags = CE_ATTR_FLAGS,
- 		.src_nentries = 0,
- 		.src_sz_max = 512,
-+#ifndef CONFIG_ATH10K_SMALLBUFFERS
- 		.dest_nentries = 512,
-+#else
-+		.dest_nentries = 128,
-+#endif
- 		.recv_cb = ath10k_pci_htt_rx_cb,
- 	},
- 
-@@ -192,7 +204,11 @@ static struct ce_attr host_ce_config_wla
- 		.flags = CE_ATTR_FLAGS,
- 		.src_nentries = 0,
- 		.src_sz_max = 2048,
-+#ifndef CONFIG_ATH10K_SMALLBUFFERS
- 		.dest_nentries = 128,
-+#else
-+		.dest_nentries = 96,
-+#endif
- 		.recv_cb = ath10k_pci_pktlog_rx_cb,
- 	},
- 

feeds/ipq40xx/ath10k-ct/patches/960-0012-ath10k-add_cmd_processing_time_for_scan_timeout.patch

@@ -1,22 +0,0 @@
-diff -Naur a/ath10k-5.7/mac.c b/ath10k-5.7/mac.c
---- a/ath10k-5.7/mac.c	2021-06-09 16:30:17.793556032 -0400
-+++ b/ath10k-5.7/mac.c	2021-06-09 17:38:08.587733979 -0400
-@@ -7103,13 +7103,15 @@
- 		scan_timeout = min_t(u32, arg.max_rest_time *
- 				(arg.n_channels - 1) + (req->duration +
- 				ATH10K_SCAN_CHANNEL_SWITCH_WMI_EVT_OVERHEAD) *
--				arg.n_channels, arg.max_scan_time + 200);
-+				arg.n_channels, arg.max_scan_time);
- 
- 	} else {
--		/* Add a 200ms margin to account for event/command processing */
--		scan_timeout = arg.max_scan_time + 200;
-+		scan_timeout = arg.max_scan_time;
- 	}
- 
-+	/* Add a 200ms margin to account for event/command processing */
-+	scan_timeout += 200;
-+
- 	ret = ath10k_start_scan(ar, &arg);
- 	if (ret) {
- 		ath10k_warn(ar, "failed to start hw scan: %d\n", ret);

feeds/ipq40xx/ath10k-ct/patches/970-accumulate-survey-info-data

@@ -1,11 +0,0 @@
---- a/ath10k-5.7/mac.c	2021-07-06 11:12:56.022146449 -0700
-+++ b/ath10k-5.7/mac.c	2021-07-06 19:37:52.352753693 -0700
-@@ -8286,7 +8286,7 @@
- 				  struct ieee80211_channel *channel)
- {
- 	int ret;
--	enum wmi_bss_survey_req_type type = WMI_BSS_SURVEY_REQ_TYPE_READ_CLEAR;
-+	enum wmi_bss_survey_req_type type = WMI_BSS_SURVEY_REQ_TYPE_READ;
- 
- 	lockdep_assert_held(&ar->conf_mutex);
- 

feeds/ipq40xx/ath10k-ct/patches/970-add-survey-local-bss-receive-time

@@ -1,31 +0,0 @@
---- a/ath10k-5.7/wmi.c
-+++ b/ath10k-5.7/wmi.c
-@@ -6347,16 +6347,18 @@
- 
- 	survey = &ar->survey[idx];
- 
--	survey->noise     = noise_floor;
--	survey->time      = div_u64(total, cc_freq_hz);
--	survey->time_busy = div_u64(busy, cc_freq_hz);
--	survey->time_rx   = div_u64(rx_bss, cc_freq_hz);
--	survey->time_tx   = div_u64(tx, cc_freq_hz);
--	survey->filled   |= (SURVEY_INFO_NOISE_DBM |
--			     SURVEY_INFO_TIME |
--			     SURVEY_INFO_TIME_BUSY |
--			     SURVEY_INFO_TIME_RX |
--			     SURVEY_INFO_TIME_TX);
-+	survey->noise       = noise_floor;
-+	survey->time        = div_u64(total, cc_freq_hz);
-+	survey->time_busy   = div_u64(busy, cc_freq_hz);
-+	survey->time_rx     = div_u64(rx, cc_freq_hz);
-+	survey->time_bss_rx = div_u64(rx_bss, cc_freq_hz);
-+	survey->time_tx     = div_u64(tx, cc_freq_hz);
-+	survey->filled     |= (SURVEY_INFO_NOISE_DBM |
-+			       SURVEY_INFO_TIME |
-+			       SURVEY_INFO_TIME_BUSY |
-+			       SURVEY_INFO_TIME_RX |
-+			       SURVEY_INFO_TIME_TX |
-+			       SURVEY_INFO_TIME_BSS_RX);
- exit:
- 	spin_unlock_bh(&ar->data_lock);
- 	complete(&ar->bss_survey_done);

feeds/ipq40xx/ath10k-ct/patches/999-ath10k-threading.patch

@@ -1,14 +0,0 @@
-Index: ath10k-ct-2021-05-22b-54a9ac02/ath10k-5.7/core.c
-===================================================================
---- ath10k-ct-2021-05-22b-54a9ac02.orig/ath10k-5.7/core.c
-+++ ath10k-ct-2021-05-22b-54a9ac02/ath10k-5.7/core.c
-@@ -4146,6 +4146,9 @@ struct ath10k *ath10k_core_create(size_t
- 	INIT_WORK(&ar->stop_scan_work, ath10k_wmi_stop_scan_work);
- 
- 	init_dummy_netdev(&ar->napi_dev);
-+	snprintf(ar->napi_dev.name, sizeof(ar->napi_dev.name), "%s",
-+		 wiphy_name(ar->hw->wiphy));
-+	ar->napi_dev.threaded = 1;
- 
- 	ret = ath10k_coredump_create(ar);
- 	if (ret)

feeds/ipq40xx/ath10k-firmware/Makefile

@@ -1,182 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ath10k-firmware
-PKG_SOURCE_DATE:=2019-10-03
-PKG_SOURCE_VERSION:=d622d160e9f552ead68d9ae81b715422892dc2ef
-PKG_MIRROR_HASH:=2e504e071c3f896d629c4cfffe7ff4b5f1acdb4fecd3f01e8ff8c73e87a67cc7
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/kvalo/ath10k-firmware.git
-
-PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ath10k-firmware-default
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  URL:=$(PKG_SOURCE_URL)
-  DEPENDS:=
-endef
-
-define Package/ath10k-firmware-qca9887
-$(Package/ath10k-firmware-default)
-  TITLE:=ath10k firmware for QCA9887 devices
-endef
-
-define Package/ath10k-firmware-qca9888
-$(Package/ath10k-firmware-default)
-  TITLE:=ath10k firmware for QCA9888 devices
-endef
-
-define Package/ath10k-firmware-qca988x
-$(Package/ath10k-firmware-default)
-  TITLE:=ath10k firmware for QCA988x devices
-  SECTION:=firmware
-  CATEGORY:=Firmware
-endef
-
-define Package/ath10k-firmware-qca99x0
-$(Package/ath10k-firmware-default)
-  TITLE:=ath10k firmware for QCA99x0 devices
-  SECTION:=firmware
-  CATEGORY:=Firmware
-endef
-
-define Package/ath10k-firmware-qca99x0/description
-Standard ath10k firmware for QCA99x0 from QCA
-This firmware conflicts with the CT 99x0 firmware, so select only
-one.
-endef
-
-define Package/ath10k-firmware-qca9984
-$(Package/ath10k-firmware-default)
-  TITLE:=ath10k firmware for QCA9984 devices
-  SECTION:=firmware
-  CATEGORY:=Firmware
-endef
-
-define Package/ath10k-firmware-qca4019
-$(Package/ath10k-firmware-default)
-  TITLE:=ath10k firmware for IPQ/QCA4019 devices
-  SECTION:=firmware
-  CATEGORY:=Firmware
-endef
-
-define Package/ath10k-firmware-qca6174
-$(Package/ath10k-firmware-default)
-  TITLE:=ath10k firmware for QCA6174 devices
-  SECTION:=firmware
-  CATEGORY:=Firmware
-endef
-
-QCA99X0_BOARD_REV:=ddcec9efd245da9365c474f513a855a55f3ac7fe
-QCA99X0_BOARD_FILE:=board-2.bin.$(QCA99X0_BOARD_REV)
-
-define Download/qca99x0-board
-  URL:=https://source.codeaurora.org/quic/qsdk/oss/firmware/ath10k-firmware/plain/ath10k/QCA99X0/hw2.0
-  URL_FILE:=board-2.bin?id=$(QCA99X0_BOARD_REV)
-  FILE:=$(QCA99X0_BOARD_FILE)
-  HASH:=03711ac21e60ef59d3815e235eb721c0c22851b5410299411085aa6f2af45401
-endef
-$(eval $(call Download,qca99x0-board))
-
-define Build/Compile
-
-endef
-
-define Package/ath10k-firmware-qca4019/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA4019/hw1.0
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA4019/hw1.0/board-2.bin \
-		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA4019/hw1.0/3.5.3/firmware-5.bin_10.4-3.5.3-00057 \
-		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/firmware-5.bin
-endef
-
-define Package/ath10k-firmware-qca9887/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9887/hw1.0
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA9887/hw1.0/10.2.4-1.0/firmware-5.bin_10.2.4-1.0-00047 \
-		$(1)/lib/firmware/ath10k/QCA9887/hw1.0/firmware-5.bin
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA9887/hw1.0/board.bin \
-		$(1)/lib/firmware/ath10k/QCA9887/hw1.0/board.bin
-endef
-
-define Package/ath10k-firmware-qca9888/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9888/hw2.0
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA9888/hw2.0/board-2.bin \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA9888/hw2.0/3.5.3/firmware-5.bin_10.4-3.5.3-00053 \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/firmware-5.bin
-endef
-
-define Package/ath10k-firmware-qca988x/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA988X/hw2.0/board.bin \
-		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA988X/hw2.0/10.2.4-1.0/firmware-5.bin_10.2.4-1.0-00047 \
-		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
-endef
-
-define Package/ath10k-firmware-qca6174/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA6174/hw2.1
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA6174/hw2.1/board-2.bin \
-		$(1)/lib/firmware/ath10k/QCA6174/hw2.1/
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA6174/hw2.1/firmware-5.bin_SW_RM.1.1.1-00157-QCARMSWPZ-1 \
-		$(1)/lib/firmware/ath10k/QCA6174/hw2.1/firmware-5.bin
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA6174/hw3.0
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA6174/hw3.0/board-2.bin \
-		$(1)/lib/firmware/ath10k/QCA6174/hw3.0/
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA6174/hw3.0/4.4.1.c1/firmware-6.bin_RM.4.4.1.c1-00042-QCARMSWP-1 \
-		$(1)/lib/firmware/ath10k/QCA6174/hw3.0/firmware-6.bin
-endef
-
-define Package/ath10k-firmware-qca99x0/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA99X0/hw2.0/boardData_AR900B_CUS239_5G_v2_001.bin \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA99X0/hw2.0/firmware-5.bin_10.4.1.00030-1 \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin
-endef
-
-define Package/ath10k-firmware-qca9984/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA9984/hw1.0/3.5.3/firmware-5.bin_10.4-3.5.3-00053 \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin
-endef
-
-$(eval $(call BuildPackage,ath10k-firmware-qca9887))
-#$(eval $(call BuildPackage,ath10k-firmware-qca9888))
-$(eval $(call BuildPackage,ath10k-firmware-qca988x))
-#$(eval $(call BuildPackage,ath10k-firmware-qca99x0))
-#$(eval $(call BuildPackage,ath10k-firmware-qca6174))
-#$(eval $(call BuildPackage,ath10k-firmware-qca9984))
-#$(eval $(call BuildPackage,ath10k-firmware-qca4019))

feeds/ipq40xx/batctl/Makefile

@@ -1,231 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=batctl
-PKG_VERSION:=2020.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-PKG_HASH:=d29cdb53ee68abd5027eae07d9fd645b3f154e0d577efa2666c1334bb6d60efd
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
-PKG_LICENSE:=GPL-2.0-only ISC MIT
-PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT LICENSES/deprecated/ISC
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/batctl/Default
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=https://www.open-mesh.org/
-  DEPENDS:=+libnl-tiny +libc +librt
-  PROVIDES:=batctl
-endef
-
-define Package/batctl/description
-  batctl is a more intuitive managment utility for B.A.T.M.A.N.-Advanced.
-  It is an easier method for configuring batman-adv and provides some
-  additional tools for debugging as well. This package builds
-  version $(PKG_VERSION) of the user space utility.
-endef
-
-define Package/batctl-tiny
-$(call Package/batctl/Default)
-  TITLE:=B.A.T.M.A.N. Advanced user space configuration tool (Minimal)
-  VARIANT:=tiny
-  ALTERNATIVES:=100:/usr/sbin/batctl:/usr/libexec/batctl-tiny
-endef
-
-define Package/batctl-tiny/description
-$(Package/batctl/description)
-  Only configuration relevant subcommands are enabled.
-endef
-
-define Package/batctl-default
-$(call Package/batctl/Default)
-  TITLE:=B.A.T.M.A.N. Advanced user space configuration tool (Default)
-  VARIANT:=default
-  ALTERNATIVES:=200:/usr/sbin/batctl:/usr/libexec/batctl-default
-endef
-
-define Package/batctl-default/description
-$(Package/batctl/description)
-  Standard subcommands for configuration and online debugging are enabled.
-endef
-
-define Package/batctl-full
-$(call Package/batctl/Default)
-  TITLE:=B.A.T.M.A.N. Advanced user space configuration tool (Full)
-  VARIANT:=full
-  ALTERNATIVES:=300:/usr/sbin/batctl:/usr/libexec/batctl-full
-endef
-
-define Package/batctl-full/description
-$(Package/batctl/description)
-  Subcommands for configuration, online and offline debugging are enabled.
-endef
-
-# The linker can identify unused sections of a binary when each symbol is stored
-# in a separate section. This mostly removes unused linker sections and reduces
-# the size by ~3% on mipsel.
-
-TARGET_CFLAGS  += -ffunction-sections -fdata-sections
-TARGET_LDFLAGS += -Wl,--gc-sections
-
-# Link-time optimization allows to move parts of the optimization from the single
-# source file to the global source view. This is done by emitting the GIMPLE
-# representation in each object file and analyzing it again during the link step.
-
-TARGET_CFLAGS  += -flto
-TARGET_LDFLAGS += -fuse-linker-plugin
-
-MAKE_VARS += \
-        LIBNL_NAME="libnl-tiny" \
-        LIBNL_GENL_NAME="libnl-tiny"
-
-MAKE_FLAGS += \
-        REVISION="$(PKG_VERSION)-openwrt-$(PKG_RELEASE)"
-
-config-n := \
-	aggregation \
-	ap_isolation \
-	backbonetable \
-	bisect_iv \
-	bonding \
-	bridge_loop_avoidance \
-	claimtable \
-	dat_cache \
-	distributed_arp_table \
-	elp_interval \
-	event \
-	fragmentation \
-	gateways \
-	gw_mode \
-	hop_penalty \
-	interface \
-	isolation_mark \
-	loglevel \
-	mcast_flags \
-	multicast_fanout \
-	multicast_forceflood \
-	multicast_mode \
-	nc_nodes \
-	neighbors \
-	network_coding \
-	orig_interval \
-	originators \
-	ping \
-	routing_algo \
-	statistics \
-	tcpdump \
-	throughput_override \
-	throughputmeter \
-	traceroute \
-	transglobal \
-	translate \
-	translocal \
-
-config-settings := \
-	aggregation \
-	ap_isolation \
-	bonding \
-	bridge_loop_avoidance \
-	distributed_arp_table \
-	elp_interval \
-	fragmentation \
-	gw_mode \
-	hop_penalty \
-	interface \
-	isolation_mark \
-	loglevel \
-	multicast_fanout \
-	multicast_forceflood \
-	multicast_mode \
-	network_coding \
-	orig_interval \
-	routing_algo \
-	throughput_override \
-
-config-tables := \
-	backbonetable \
-	claimtable \
-	dat_cache \
-	gateways \
-	loglevel \
-	nc_nodes \
-	neighbors \
-	originators \
-	statistics \
-	transglobal \
-	translocal \
-
-config-tools := \
-	event \
-	ping \
-	tcpdump \
-	throughputmeter \
-	traceroute \
-	translate \
-
-config-extratools := \
-	bisect_iv \
-
-ifeq ($(BUILD_VARIANT),tiny)
-
-config-y := \
-	$(config-settings) \
-
-endif
-
-ifeq ($(BUILD_VARIANT),default)
-
-config-y := \
-	$(config-settings) \
-	$(config-tables) \
-	$(config-tools) \
-
-endif
-
-ifeq ($(BUILD_VARIANT),full)
-
-config-y := \
-	$(config-settings) \
-	$(config-tables) \
-	$(config-tools) \
-	$(config-extratools) \
-
-endif
-
-define ConfigVars
-$(subst $(space),,$(foreach opt,$(config-$(1)),CONFIG_$(opt)=$(1)
-))
-endef
-
-define batctl_config
-$(call ConfigVars,n)$(call ConfigVars,y)
-endef
-$(eval $(call shexport,batctl_config))
-
-MAKE_FLAGS += $$$$$(call shvar,batctl_config)
-
-define Package/batctl-tiny/install
-	$(INSTALL_DIR) $(1)/usr/libexec
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/batctl $(1)/usr/libexec/batctl-tiny
-endef
-
-define Package/batctl-default/install
-	$(INSTALL_DIR) $(1)/usr/libexec
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/batctl $(1)/usr/libexec/batctl-default
-endef
-
-define Package/batctl-full/install
-	$(INSTALL_DIR) $(1)/usr/libexec
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/batctl $(1)/usr/libexec/batctl-full
-endef
-
-$(eval $(call BuildPackage,batctl-default))
-$(eval $(call BuildPackage,batctl-tiny))
-$(eval $(call BuildPackage,batctl-full))

feeds/ipq40xx/batman-adv/Config.in

@@ -1,110 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2007-2019  B.A.T.M.A.N. contributors:
-#
-# Marek Lindner, Simon Wunderlich
-
-#
-# B.A.T.M.A.N meshing protocol
-#
-
-config BATMAN_ADV_BATMAN_V
-	bool "B.A.T.M.A.N. V protocol"
-	depends on PACKAGE_kmod-batman-adv
-	default y
-	help
-	  This option enables the B.A.T.M.A.N. V protocol, the successor
-	  of the currently used B.A.T.M.A.N. IV protocol. The main
-	  changes include splitting of the OGM protocol into a neighbor
-	  discovery protocol (Echo Location Protocol, ELP) and a new OGM
-	  Protocol OGMv2 for flooding protocol information through the
-	  network, as well as a throughput based metric.
-	  B.A.T.M.A.N. V is currently considered experimental and not
-	  compatible to B.A.T.M.A.N. IV networks.
-
-config BATMAN_ADV_BLA
-	bool "Bridge Loop Avoidance"
-	depends on PACKAGE_kmod-batman-adv
-	select PACKAGE_kmod-lib-crc16
-	default y
-	help
-	  This option enables BLA (Bridge Loop Avoidance), a mechanism
-	  to avoid Ethernet frames looping when mesh nodes are connected
-	  to both the same LAN and the same mesh. If you will never use
-	  more than one mesh node in the same LAN, you can safely remove
-	  this feature and save some space.
-
-config BATMAN_ADV_DAT
-	bool "Distributed ARP Table"
-	depends on PACKAGE_kmod-batman-adv
-	default y
-	help
-	  This option enables DAT (Distributed ARP Table), a DHT based
-	  mechanism that increases ARP reliability on sparse wireless
-	  mesh networks. If you think that your network does not need
-	  this option you can safely remove it and save some space.
-
-config BATMAN_ADV_NC
-	bool "Network Coding"
-	depends on PACKAGE_kmod-batman-adv
-	help
-	  This option enables network coding, a mechanism that aims to
-	  increase the overall network throughput by fusing multiple
-	  packets in one transmission.
-	  Note that interfaces controlled by batman-adv must be manually
-	  configured to have promiscuous mode enabled in order to make
-	  network coding work.
-	  If you think that your network does not need this feature you
-	  can safely disable it and save some space.
-
-config BATMAN_ADV_MCAST
-	bool "Multicast optimisation"
-	depends on PACKAGE_kmod-batman-adv
-	default y
-	help
-	  This option enables the multicast optimisation which aims to
-	  reduce the air overhead while improving the reliability of
-	  multicast messages.
-
-config BATMAN_ADV_DEBUGFS
-	bool "batman-adv debugfs entries"
-	depends on PACKAGE_kmod-batman-adv
-	select KERNEL_DEBUG_FS
-	help
-	  Enable this to export routing related debug tables via debugfs.
-	  The information for each soft-interface and used hard-interface can be
-	  found under batman_adv/
-
-	  If unsure, say N.
-
-config BATMAN_ADV_DEBUG
-	bool "B.A.T.M.A.N. debugging"
-	depends on PACKAGE_kmod-batman-adv
-	help
-	  This is an option for use by developers; most people should
-	  say N here. This enables compilation of support for
-	  outputting debugging information to the debugfs log or tracing
-	  buffer. The output is controlled via the batadv netdev specific
-	  log_level setting.
-
-config BATMAN_ADV_SYSFS
-	bool "batman-adv sysfs entries"
-	depends on PACKAGE_kmod-batman-adv
-	help
-	  Say Y here if you want to enable batman-adv device configuration and
-	  status interface through sysfs attributes. It is replaced by the
-	  batadv generic netlink family but still used by various userspace
-	  tools and scripts.
-
-	  If unsure, say Y.
-
-config BATMAN_ADV_TRACING
-	bool "B.A.T.M.A.N. tracing support"
-	depends on PACKAGE_kmod-batman-adv
-	select KERNEL_FTRACE
-	select KERNEL_ENABLE_DEFAULT_TRACERS
-	help
-	  This is an option for use by developers; most people should
-	  say N here. Select this option to gather traces like the debug
-	  messages using the generic tracing infrastructure of the kernel.
-	  BATMAN_ADV_DEBUG must also be selected to get trace events for
-	  batadv_dbg.

feeds/ipq40xx/batman-adv/Makefile

@@ -1,91 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=batman-adv
-PKG_VERSION:=2020.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-PKG_HASH:=a73f5ce72c6efa9dd7bd7cc8daa667d0982e12e40811c978bb652607bb5666a3
-PKG_EXTMOD_SUBDIRS:=net/batman-adv
-
-PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
-PKG_LICENSE:=GPL-2.0-only MIT
-PKG_LICENSE_FILES:=LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT
-
-STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
-
-include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/batman-adv
-  SUBMENU:=Network Support
-  TITLE:=B.A.T.M.A.N. Adv
-  URL:=https://www.open-mesh.org/
-  DEPENDS:=+BATMAN_ADV_BLA:kmod-lib-crc16 +kmod-lib-crc32c +kmod-cfg80211 +batctl
-  FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoProbe,batman-adv)
-endef
-
-define KernelPackage/batman-adv/description
-  B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is
-  a routing protocol for multi-hop ad-hoc mesh networks. The
-  networks may be wired or wireless. See
-  https://www.open-mesh.org/ for more information and user space
-  tools. This package builds version $(PKG_VERSION) of the kernel
-  module.
-endef
-
-define KernelPackage/batman-adv/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/kmod-batman-adv/conffiles
-/etc/config/batman-adv
-endef
-
-PKG_EXTRA_KCONFIG:= \
-	CONFIG_BATMAN_ADV=m \
-	CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_BATMAN_ADV_DEBUG),y,n) \
-	CONFIG_BATMAN_ADV_DEBUGFS=$(if $(CONFIG_BATMAN_ADV_DEBUGFS),y,n) \
-	CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_BATMAN_ADV_BLA),y,n) \
-	CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_BATMAN_ADV_DAT),y,n) \
-	CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_BATMAN_ADV_MCAST),y,n) \
-	CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_BATMAN_ADV_NC),y,n) \
-	CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_BATMAN_V),y,n) \
-	CONFIG_BATMAN_ADV_SYSFS=$(if $(CONFIG_BATMAN_ADV_SYSFS),y,n) \
-	CONFIG_BATMAN_ADV_TRACING=$(if $(CONFIG_BATMAN_ADV_TRACING),y,n) \
-
-PKG_EXTRA_CFLAGS:= \
-	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
-	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
-
-NOSTDINC_FLAGS = \
-	-I$(PKG_BUILD_DIR)/net/batman-adv \
-	-I$(STAGING_DIR)/usr/include/mac80211-backport \
-	-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
-	-I$(STAGING_DIR)/usr/include/mac80211 \
-	-I$(STAGING_DIR)/usr/include/mac80211/uapi \
-	-I$(PKG_BUILD_DIR)/include/ \
-	-include backport/autoconf.h \
-	-include backport/backport.h \
-	-include $(PKG_BUILD_DIR)/compat-hacks.h \
-	-DBATADV_SOURCE_VERSION=\\\"$(PKG_VERSION)-openwrt-$(PKG_RELEASE)\\\"
-
-define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-		$(KERNEL_MAKE_FLAGS) \
-		M="$(PKG_BUILD_DIR)/net/batman-adv" \
-		$(PKG_EXTRA_KCONFIG) \
-		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \
-		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
-		modules
-endef
-
-define KernelPackage/batman-adv/install
-	$(CP) ./files/. $(1)/
-endef
-
-$(eval $(call KernelPackage,batman-adv))

feeds/ipq40xx/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif

@@ -1,97 +0,0 @@
-#!/bin/sh
-
-# This UCI-Defaults script will split the batadv proto network interfaces
-# in batadv_hardif and batadv proto. The configuration options from
-# /etc/config/batman-adv will be moved to the latter.
-
-. /lib/functions.sh
-
-proto_batadv_to_batadv_hardif() {
-    local section="$1"
-    local proto
-    local mesh
-    local routing_algo
-
-    config_get proto "${section}" proto
-    config_get mesh "${section}" mesh
-    config_get routing_algo "${section}" routing_algo
-
-    if [ -z "$mesh" -o "${proto}" != "batadv" ]; then
-        continue
-    fi
-
-    uci set network."${section}".proto="batadv_hardif"
-    uci rename network."${section}".mesh="master"
-    uci delete network."${section}".routing_algo
-
-    # create new section or adjust existing one
-    uci set network."${mesh}"=interface
-    uci set network."${mesh}".proto=batadv
-    [ -n "${routing_algo}" ]  && uci set network."${mesh}".routing_algo="${routing_algo}"
-}
-
-mv_batadv_config_section() {
-    local section="$1"
-    local aggregated_ogms
-    local ap_isolation
-    local bonding
-    local bridge_loop_avoidance
-    local distributed_arp_table
-    local fragmentation
-    local gw_bandwidth
-    local gw_mode
-    local gw_sel_class
-    local hop_penalty
-    local isolation_mark
-    local log_level
-    local multicast_mode
-    local network_coding
-    local orig_interval
-
-    config_get aggregated_ogms "${section}" aggregated_ogms
-    config_get ap_isolation "${section}" ap_isolation
-    config_get bonding "${section}" bonding
-    config_get bridge_loop_avoidance "${section}" bridge_loop_avoidance
-    config_get distributed_arp_table "${section}" distributed_arp_table
-    config_get fragmentation "${section}" fragmentation
-    config_get gw_bandwidth "${section}" gw_bandwidth
-    config_get gw_mode "${section}" gw_mode
-    config_get gw_sel_class "${section}" gw_sel_class
-    config_get hop_penalty "${section}" hop_penalty
-    config_get isolation_mark "${section}" isolation_mark
-    config_get log_level "${section}" log_level
-    config_get multicast_mode "${section}" multicast_mode
-    config_get network_coding "${section}" network_coding
-    config_get orig_interval "${section}" orig_interval
-
-    # update section in case it exists
-    [ -n "${aggregated_ogms}" ]  && uci set network."${section}".aggregated_ogms="${aggregated_ogms}"
-    [ -n "${ap_isolation}" ]  && uci set network."${section}".ap_isolation="${ap_isolation}"
-    [ -n "${bonding}" ]  && uci set network."${section}".bonding="${bonding}"
-    [ -n "${bridge_loop_avoidance}" ]  && uci set network."${section}".bridge_loop_avoidance="${bridge_loop_avoidance}"
-    [ -n "${distributed_arp_table}" ]  && uci set network."${section}".distributed_arp_table="${distributed_arp_table}"
-    [ -n "${fragmentation}" ]  && uci set network."${section}".fragmentation="${fragmentation}"
-    [ -n "${gw_bandwidth}" ]  && uci set network."${section}".gw_bandwidth="${gw_bandwidth}"
-    [ -n "${gw_mode}" ]  && uci set network."${section}".gw_mode="${gw_mode}"
-    [ -n "${gw_sel_class}" ]  && uci set network."${section}".gw_sel_class="${gw_sel_class}"
-    [ -n "${hop_penalty}" ]  && uci set network."${section}".hop_penalty="${hop_penalty}"
-    [ -n "${isolation_mark}" ]  && uci set network."${section}".isolation_mark="${isolation_mark}"
-    [ -n "${log_level}" ]  && uci set network."${section}".log_level="${log_level}"
-    [ -n "${multicast_mode}" ]  && uci set network."${section}".multicast_mode="${multicast_mode}"
-    [ -n "${network_coding}" ]  && uci set network."${section}".network_coding="${network_coding}"
-    [ -n "${orig_interval}" ]  && uci set network."${section}".orig_interval="${orig_interval}"
-}
-
-if [ -f /etc/config/batman-adv ]; then
-    config_load network
-    config_foreach proto_batadv_to_batadv_hardif 'interface'
-    uci commit network
-
-    config_load batman-adv
-    config_foreach mv_batadv_config_section 'mesh'
-    uci commit network
-
-    rm -f /etc/config/batman-adv
-fi
-
-exit 0

feeds/ipq40xx/batman-adv/files/lib/netifd/proto/batadv.sh

@@ -1,123 +0,0 @@
-#!/bin/sh
-
-[ -n "$INCLUDE_ONLY" ] || {
-	. /lib/functions.sh
-	. ../netifd-proto.sh
-	init_proto "$@"
-}
-
-proto_batadv_init_config() {
-	no_device=1
-	available=1
-
-	proto_config_add_boolean 'aggregated_ogms:bool'
-	proto_config_add_boolean 'ap_isolation:bool'
-	proto_config_add_boolean 'bonding:bool'
-	proto_config_add_boolean 'bridge_loop_avoidance:bool'
-	proto_config_add_boolean 'distributed_arp_table:bool'
-	proto_config_add_boolean 'fragmentation:bool'
-	proto_config_add_string 'gw_bandwidth'
-	proto_config_add_string 'gw_mode'
-	proto_config_add_int 'gw_sel_class'
-	proto_config_add_int 'hop_penalty'
-	proto_config_add_string 'isolation_mark'
-	proto_config_add_string 'log_level'
-	proto_config_add_int 'multicast_fanout'
-	proto_config_add_boolean 'multicast_mode:bool'
-	proto_config_add_boolean 'network_coding:bool'
-	proto_config_add_int 'orig_interval'
-	proto_config_add_string 'routing_algo'
-}
-
-proto_batadv_setup() {
-	local config="$1"
-	local iface="$config"
-
-	local aggregated_ogms
-	local ap_isolation
-	local bonding
-	local bridge_loop_avoidance
-	local distributed_arp_table
-	local fragmentation
-	local gw_bandwidth
-	local gw_mode
-	local gw_sel_class
-	local hop_penalty
-	local isolation_mark
-	local log_level
-	local multicast_fanout
-	local multicast_mode
-	local network_coding
-	local orig_interval
-	local routing_algo
-
-	json_get_vars aggregated_ogms
-	json_get_vars ap_isolation
-	json_get_vars bonding
-	json_get_vars bridge_loop_avoidance
-	json_get_vars distributed_arp_table
-	json_get_vars fragmentation
-	json_get_vars gw_bandwidth
-	json_get_vars gw_mode
-	json_get_vars gw_sel_class
-	json_get_vars hop_penalty
-	json_get_vars isolation_mark
-	json_get_vars log_level
-	json_get_vars multicast_fanout
-	json_get_vars multicast_mode
-	json_get_vars network_coding
-	json_get_vars orig_interval
-	json_get_vars routing_algo
-
-	set_default routing_algo 'BATMAN_IV'
-
-	batctl routing_algo "$routing_algo"
-	batctl meshif "$iface" interface create
-
-	[ -n "$aggregated_ogms" ] && batctl meshif "$iface" aggregation "$aggregated_ogms"
-	[ -n "$ap_isolation" ] && batctl meshif "$iface" ap_isolation "$ap_isolation"
-	[ -n "$bonding" ] && batctl meshif "$iface" bonding "$bonding"
-	[ -n "$bridge_loop_avoidance" ] &&  batctl meshif "$iface" bridge_loop_avoidance "$bridge_loop_avoidance" 2>&-
-	[ -n "$distributed_arp_table" ] && batctl meshif "$iface" distributed_arp_table "$distributed_arp_table" 2>&-
-	[ -n "$fragmentation" ] && batctl meshif "$iface" fragmentation "$fragmentation"
-
-	case "$gw_mode" in
-	server)
-		if [ -n "$gw_bandwidth" ]; then
-			batctl meshif "$iface" gw_mode "server" "$gw_bandwidth"
-		else
-			batctl meshif "$iface" gw_mode "server"
-		fi
-		;;
-	client)
-		if [ -n "$gw_sel_class" ]; then
-			batctl meshif "$iface" gw_mode "client" "$gw_sel_class"
-		else
-			batctl meshif "$iface" gw_mode "client"
-		fi
-		;;
-	*)
-		batctl meshif "$iface" gw_mode "off"
-		;;
-	esac
-
-	[ -n "$hop_penalty" ] && batctl meshif "$iface" hop_penalty "$hop_penalty"
-	[ -n "$isolation_mark" ] && batctl meshif "$iface" isolation_mark "$isolation_mark"
-	[ -n "$multicast_fanout" ] && batctl meshif "$iface" multicast_fanout "$multicast_fanout"
-	[ -n "$multicast_mode" ] && batctl meshif "$iface" multicast_mode "$multicast_mode" 2>&-
-	[ -n "$network_coding" ] && batctl meshif "$iface" network_coding "$network_coding" 2>&-
-	[ -n "$log_level" ] && batctl meshif "$iface" loglevel "$log_level" 2>&-
-	[ -n "$orig_interval" ] && batctl meshif "$iface" orig_interval "$orig_interval"
-
-	proto_init_update "$iface" 1
-	proto_send_update "$config"
-}
-
-proto_batadv_teardown() {
-	local config="$1"
-	local iface="$config"
-
-	batctl meshif "$iface" interface destroy
-}
-
-add_protocol batadv

feeds/ipq40xx/batman-adv/files/lib/netifd/proto/batadv_hardif.sh

@@ -1,49 +0,0 @@
-#!/bin/sh
-
-[ -n "$INCLUDE_ONLY" ] || {
-	. /lib/functions.sh
-	. ../netifd-proto.sh
-	init_proto "$@"
-}
-
-proto_batadv_hardif_init_config() {
-	proto_config_add_int 'elp_interval'
-	proto_config_add_string "master"
-	proto_config_add_string 'throughput_override'
-}
-
-proto_batadv_hardif_setup() {
-	local config="$1"
-	local iface="$2"
-
-	local elp_interval
-	local master
-	local throughput_override
-
-	json_get_vars elp_interval
-	json_get_vars master
-	json_get_vars throughput_override
-
-	( proto_add_host_dependency "$config" '' "$master" )
-
-	batctl meshif "$master" interface -M add "$iface"
-
-	[ -n "$elp_interval" ] && batctl hardif "$iface" elp_interval "$elp_interval"
-	[ -n "$throughput_override" ] && batctl hardif "$iface" throughput_override "$throughput_override"
-
-	proto_init_update "$iface" 1
-	proto_send_update "$config"
-}
-
-proto_batadv_hardif_teardown() {
-	local config="$1"
-	local iface="$2"
-
-	local master
-
-	json_get_vars master
-
-	batctl meshif "$master" interface -M del "$iface" || true
-}
-
-add_protocol batadv_hardif

feeds/ipq40xx/batman-adv/files/lib/netifd/proto/batadv_vlan.sh

@@ -1,25 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. ../netifd-proto.sh
-init_proto "$@"
-
-proto_batadv_vlan_init_config() {
-	proto_config_add_boolean 'ap_isolation:bool'
-}
-
-proto_batadv_vlan_setup() {
-	local config="$1"
-	local iface="$2"
-
-	# batadv_vlan options
-	local ap_isolation
-
-	json_get_vars ap_isolation
-
-	[ -n "$ap_isolation" ] && batctl vlan "$iface" ap_isolation "$ap_isolation"
-	proto_init_update "$iface" 1
-	proto_send_update "$config"
-}
-
-add_protocol batadv_vlan

feeds/ipq40xx/batman-adv/src/compat-hacks.h

@@ -1,181 +0,0 @@
-/* Please avoid adding hacks here - instead add it to mac80211/backports.git */
-
-#undef CONFIG_MODULE_STRIPPED
-
-#include <linux/version.h>	/* LINUX_VERSION_CODE */
-#include <linux/types.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
-
-#include <linux/netdevice.h>
-
-#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) ({\
-	BUILD_BUG_ON(extack != NULL); \
-	netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info); \
-})
-
-#endif /* < KERNEL_VERSION(4, 15, 0) */
-
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
-
-#ifndef sizeof_field
-#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER))
-#endif
-
-#endif /* < KERNEL_VERSION(4, 16, 0) */
-
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
-
-#include_next <linux/igmp.h>
-#include_next <net/addrconf.h>
-
-static inline int batadv_ipv6_mc_check_mld1(struct sk_buff *skb)
-{
-	return ipv6_mc_check_mld(skb, NULL);
-}
-
-static inline int batadv_ipv6_mc_check_mld2(struct sk_buff *skb,
-					    struct sk_buff **skb_trimmed)
-{
-	return ipv6_mc_check_mld(skb, skb_trimmed);
-}
-
-#define ipv6_mc_check_mld_get(_1, _2, ipv6_mc_check_mld_name, ...) ipv6_mc_check_mld_name
-#define ipv6_mc_check_mld(...) \
-	ipv6_mc_check_mld_get(__VA_ARGS__, batadv_ipv6_mc_check_mld2, batadv_ipv6_mc_check_mld1)(__VA_ARGS__)
-
-static inline int batadv_ip_mc_check_igmp1(struct sk_buff *skb)
-{
-	return ip_mc_check_igmp(skb, NULL);
-}
-
-static inline int batadv_ip_mc_check_igmp2(struct sk_buff *skb,
-					   struct sk_buff **skb_trimmed)
-{
-	return ip_mc_check_igmp(skb, skb_trimmed);
-}
-
-#define ip_mc_check_igmp_get(_1, _2, ip_mc_check_igmp_name, ...) ip_mc_check_igmp_name
-#define ip_mc_check_igmp(...) \
-	ip_mc_check_igmp_get(__VA_ARGS__, batadv_ip_mc_check_igmp2, batadv_ip_mc_check_igmp1)(__VA_ARGS__)
-
-#endif /* < KERNEL_VERSION(5, 1, 0) */
-
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
-
-#define batadv_softif_slave_add(__dev, __slave_dev, __extack) \
-	batadv_softif_slave_add(__dev, __slave_dev)
-
-#endif /* < KERNEL_VERSION(4, 15, 0) */
-
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
-
-static inline int batadv_access_ok(int type, const void __user *p,
-				   unsigned long size)
-{
-	return access_ok(type, p, size);
-}
-
-#ifdef access_ok
-#undef access_ok
-#endif
-
-#define access_ok_get(_1, _2, _3 , access_ok_name, ...) access_ok_name
-#define access_ok(...) \
-	access_ok_get(__VA_ARGS__, access_ok3, access_ok2)(__VA_ARGS__)
-
-#define access_ok2(addr, size)	batadv_access_ok(VERIFY_WRITE, (addr), (size))
-#define access_ok3(type, addr, size)	batadv_access_ok((type), (addr), (size))
-
-#endif /* < KERNEL_VERSION(5, 0, 0) */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
-
-#ifndef fallthrough
-#if __GNUC__ > 7 && !defined(__CHECKER__)
-# define fallthrough                    __attribute__((__fallthrough__))
-#else
-# define fallthrough                    do {} while (0)  /* fallthrough */
-#endif
-#endif
-
-#endif /* < KERNEL_VERSION(5, 4, 0) */
-
-/* <DECLARE_EWMA> */
-
-#include <linux/version.h>
-#include_next <linux/average.h>
-
-#include <linux/bug.h>
-
-#ifdef DECLARE_EWMA
-#undef DECLARE_EWMA
-#endif /* DECLARE_EWMA */
-
-/*
- * Exponentially weighted moving average (EWMA)
- *
- * This implements a fixed-precision EWMA algorithm, with both the
- * precision and fall-off coefficient determined at compile-time
- * and built into the generated helper funtions.
- *
- * The first argument to the macro is the name that will be used
- * for the struct and helper functions.
- *
- * The second argument, the precision, expresses how many bits are
- * used for the fractional part of the fixed-precision values.
- *
- * The third argument, the weight reciprocal, determines how the
- * new values will be weighed vs. the old state, new values will
- * get weight 1/weight_rcp and old values 1-1/weight_rcp. Note
- * that this parameter must be a power of two for efficiency.
- */
-
-#define DECLARE_EWMA(name, _precision, _weight_rcp)			\
-	struct ewma_##name {						\
-		unsigned long internal;					\
-	};								\
-	static inline void ewma_##name##_init(struct ewma_##name *e)	\
-	{								\
-		BUILD_BUG_ON(!__builtin_constant_p(_precision));	\
-		BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp));	\
-		/*							\
-		 * Even if you want to feed it just 0/1 you should have	\
-		 * some bits for the non-fractional part...		\
-		 */							\
-		BUILD_BUG_ON((_precision) > 30);			\
-		BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);		\
-		e->internal = 0;					\
-	}								\
-	static inline unsigned long					\
-	ewma_##name##_read(struct ewma_##name *e)			\
-	{								\
-		BUILD_BUG_ON(!__builtin_constant_p(_precision));	\
-		BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp));	\
-		BUILD_BUG_ON((_precision) > 30);			\
-		BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);		\
-		return e->internal >> (_precision);			\
-	}								\
-	static inline void ewma_##name##_add(struct ewma_##name *e,	\
-					     unsigned long val)		\
-	{								\
-		unsigned long internal = READ_ONCE(e->internal);	\
-		unsigned long weight_rcp = ilog2(_weight_rcp);		\
-		unsigned long precision = _precision;			\
-									\
-		BUILD_BUG_ON(!__builtin_constant_p(_precision));	\
-		BUILD_BUG_ON(!__builtin_constant_p(_weight_rcp));	\
-		BUILD_BUG_ON((_precision) > 30);			\
-		BUILD_BUG_ON_NOT_POWER_OF_2(_weight_rcp);		\
-									\
-		WRITE_ONCE(e->internal, internal ?			\
-			(((internal << weight_rcp) - internal) +	\
-				(val << precision)) >> weight_rcp :	\
-			(val << precision));				\
-	}
-
-/* </DECLARE_EWMA> */

feeds/ipq40xx/ipq-wifi/Makefile

@@ -1,151 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/version.mk
-
-PKG_NAME:=ipq-wifi
-PKG_RELEASE:=1
-PKG_FLAGS:=nonshared
-
-include $(INCLUDE_DIR)/package.mk
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Compile
-endef
-
-# Use ath10k-bdencoder from https://github.com/qca/qca-swiss-army-knife.git
-# to generate the board-* files here.
-#
-# This is intended to be used on an interim basis until device-specific
-# board data for new devices is available through the upstream compilation
-#
-# Please send a mail with your device-specific board files upstream.
-# You can find instructions and examples on the linux-wireless wiki:
-# <https://wireless.wiki.kernel.org/en/users/drivers/ath10k/boardfiles>
-
-ALLWIFIBOARDS:= \
-	8dev_habanero-dvk \
-	aruba_ap-303 \
-	avm_fritzrepeater-1200 \
-	buffalo_wtr-m2133hp \
-	cellc_rtl30vw \
-	devolo_magic-2-wifi-next \
-	dlink_dap2610 \
-	edgecore_ecw5410 \
-	edgecore_ssw2ac2600 \
-	edgecore_oap100 \
-	engenius_eap2200 \
-	engenius_emd1 \
-	engenius_emr3500 \
-	ezviz_cs-w3-wd1200g-eup \
-	glinet_gl-ap1300 \
-	glinet_gl-s1300 \
-	linksys_ea8300 \
-	linksys_mr8300-v0 \
-	luma_wrtq-329acn \
-	mikrotik_hap-ac2 \
-	mikrotik_sxtsq-5-ac \
-	mobipromo_cm520-79f \
-	nec_wg2600hp3 \
-	plasmacloud_pa1200 \
-	plasmacloud_pa2200 \
-	qxwlan_e2600ac \
-	cig_wf610d \
-	wallys_dr40x9 \
-	tp-link_ec420-g1 \
-	udaya-a5-id2 \
-	hfcl_ion4
-
-ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
-
-define Package/ipq-wifi-default
-  SUBMENU:=ath10k Board-Specific Overrides
-  SECTION:=firmware
-  CATEGORY:=Firmware
-  DEPENDS:=@(TARGET_ipq40xx||TARGET_ipq806x)
-  TITLE:=Custom Board
-endef
-
-define ipq-wifi-install-one-to
-  $(INSTALL_DIR)  $(2)/lib/firmware/ath10k/$(3)/
-  $(INSTALL_DATA) $(1) $(2)/lib/firmware/ath10k/$(3)/board-2.bin
-endef
-
-define ipq-wifi-install-one
-  $(if $(filter $(suffix $(1)),.QCA4019 .qca4019),\
-    $(call ipq-wifi-install-one-to,$(1),$(2),QCA4019/hw1.0),\
-  $(if $(filter $(suffix $(1)),.QCA9888 .qca9888),\
-    $(call ipq-wifi-install-one-to,$(1),$(2),QCA9888/hw2.0),\
-  $(if $(filter $(suffix $(1)),.QCA9984 .qca9984),\
-    $(call ipq-wifi-install-one-to,$(1),$(2),QCA9984/hw1.0),\
-    $(error Unrecognized board-file suffix '$(suffix $(1))' for '$(1)')\
-  )))
-
-endef
-# Blank line required at end of above define due to foreach context
-
-define generate-ipq-wifi-package
-  define Package/ipq-wifi-$(1)
-    $(call Package/ipq-wifi-default)
-    TITLE:=board-2.bin Overrides for $(2)
-    CONFLICTS:=$(PREV_BOARD)
-  endef
-
-  define Package/ipq-wifi-$(1)/description
-The $(2) requires board-specific, reference ("cal") data
-that is not yet present in the upstream wireless firmware distribution.
-
-This package supplies board-2.bin file(s) that, in the interim,
-overwrite those supplied by the ath10k-firmware-* packages.
-
-This is package is only necessary for the $(2).
-
-Do not install it for any other device!
-  endef
-
-  define Package/ipq-wifi-$(1)/install-overlay
-    $$$$(foreach IPQ_WIFI_BOARD_FILE,$$$$(wildcard board-$(1).*),\
-      $$$$(call ipq-wifi-install-one,$$$$(IPQ_WIFI_BOARD_FILE),$$(1)))
-  endef
-
-  PREV_BOARD+=ipq-wifi-$(1)
-endef
-
-# Add board name to ALLWIFIBOARDS
-# Place files in this directory as board-<devicename>.<qca4019|qca9888|qca9984>
-# Add $(eval $(call generate-ipq-wifi-package,<devicename>,<display name>))
-
-$(eval $(call generate-ipq-wifi-package,8dev_habanero-dvk,8devices Habanero DVK))
-$(eval $(call generate-ipq-wifi-package,aruba_ap-303,Aruba AP-303))
-$(eval $(call generate-ipq-wifi-package,avm_fritzrepeater-1200,AVM FRITZRepeater 1200))
-$(eval $(call generate-ipq-wifi-package,buffalo_wtr-m2133hp,Buffalo WTR-M2133HP))
-$(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW))
-$(eval $(call generate-ipq-wifi-package,devolo_magic-2-wifi-next,devolo Magic 2 WiFi next))
-$(eval $(call generate-ipq-wifi-package,dlink_dap2610,D-Link DAP-2610))
-$(eval $(call generate-ipq-wifi-package,edgecore_ecw5410,Edgecore ECW5410))
-$(eval $(call generate-ipq-wifi-package,edgecore_ssw2ac2600,Edgecore SSW2AC2600))
-$(eval $(call generate-ipq-wifi-package,edgecore_oap100,Edgecore OAP100))
-$(eval $(call generate-ipq-wifi-package,engenius_eap2200,EnGenius EAP2200))
-$(eval $(call generate-ipq-wifi-package,engenius_emd1,EnGenius EMD1))
-$(eval $(call generate-ipq-wifi-package,engenius_emr3500,EnGenius EMR3500))
-$(eval $(call generate-ipq-wifi-package,ezviz_cs-w3-wd1200g-eup,EZVIZ CS-W3-WD1200G EUP))
-$(eval $(call generate-ipq-wifi-package,glinet_gl-ap1300,GL.iNet GL-AP1300))
-$(eval $(call generate-ipq-wifi-package,glinet_gl-s1300,GL.iNet GL-S1300))
-$(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300))
-$(eval $(call generate-ipq-wifi-package,linksys_mr8300-v0,Linksys MR8300))
-$(eval $(call generate-ipq-wifi-package,luma_wrtq-329acn,Luma WRTQ-329ACN))
-$(eval $(call generate-ipq-wifi-package,mikrotik_hap-ac2,Mikrotik hAP ac2))
-$(eval $(call generate-ipq-wifi-package,mikrotik_sxtsq-5-ac,MikroTik SXTsq 5 ac))
-$(eval $(call generate-ipq-wifi-package,mobipromo_cm520-79f,MobiPromo CM520-79F))
-$(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3))
-$(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
-$(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
-$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
-$(eval $(call generate-ipq-wifi-package,cig_wf610d,CIG WF_610D))
-$(eval $(call generate-ipq-wifi-package,tp-link_ec420-g1,tp-link EC420-G1))
-$(eval $(call generate-ipq-wifi-package,wallys_dr40x9,Wallys DR40X9))
-$(eval $(call generate-ipq-wifi-package,hfcl_ion4,HFCL ION4))
-$(eval $(call generate-ipq-wifi-package,udaya-a5-id2,udaya A5 ID2))
-
-$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))

feeds/ipq40xx/ipq40xx/Makefile

@@ -1,31 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-ARCH:=arm
-BOARD:=ipq40xx
-BOARDNAME:=Qualcomm Atheros IPQ40XX
-FEATURES:=squashfs fpu ramdisk nand
-CPU_TYPE:=cortex-a7
-CPU_SUBTYPE:=neon-vfpv4
-SUBTARGETS:=generic mikrotik
-
-KERNEL_PATCHVER:=5.4
-KERNEL_TESTING_PATCHVER:=5.4
-DEVICE_TYPE:=qsdk
-
-KERNELNAME:=zImage Image dtbs
-
-GENERIC_BACKPORT_DIR := ${CURDIR}/backport-$(KERNEL_PATCHVER)
-GENERIC_PATCH_DIR := ${CURDIR}/pending-$(KERNEL_PATCHVER)
-GENERIC_HACK_DIR := ${CURDIR}/hack-$(KERNEL_PATCHVER)
-GENERIC_FILES_DIR := 
-GENERIC_LINUX_CONFIG:=${CURDIR}/config-$(KERNEL_PATCHVER)-ipq40xx
-
-include $(INCLUDE_DIR)/target.mk
-DEFAULT_PACKAGES += \
-	kmod-usb-dwc3-qcom \
-	kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
-	kmod-ath10k-ct wpad-basic-wolfssl \
-	kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct \
-	uboot-envtools
-
-$(eval $(call BuildTarget))

feeds/ipq40xx/ipq40xx/backport-5.4/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch

@@ -1,30 +0,0 @@
-From 13b1ecc3401653a355798eb1dee10cc1608202f4 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Mon, 18 Jan 2016 12:27:49 +0100
-Subject: [PATCH 33/34] Kbuild: don't hardcode path to awk in
- scripts/ld-version.sh
-
-On some systems /usr/bin/awk does not exist, or is broken. Find it via
-$PATH instead.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- scripts/ld-version.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/scripts/ld-version.sh
-+++ b/scripts/ld-version.sh
-@@ -1,6 +1,7 @@
--#!/usr/bin/awk -f
-+#!/bin/sh
- # SPDX-License-Identifier: GPL-2.0
- # extract linker version number from stdin and turn into single number
-+exec awk '
- 	{
- 	gsub(".*\\)", "");
- 	gsub(".*version ", "");
-@@ -9,3 +10,4 @@
- 	print a[1]*100000000 + a[2]*1000000 + a[3]*10000;
- 	exit
- 	}
-+'

feeds/ipq40xx/ipq40xx/backport-5.4/011-kbuild-export-SUBARCH.patch

@@ -1,21 +0,0 @@
-From 173019b66dcc9d68ad9333aa744dad1e369b5aa8 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sun, 9 Jul 2017 00:26:53 +0200
-Subject: [PATCH 34/34] kernel: add compile fix for linux 4.9 on x86
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -493,7 +493,7 @@ KBUILD_LDFLAGS :=
- GCC_PLUGINS_CFLAGS :=
- CLANG_FLAGS :=
- 
--export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC
-+export ARCH SRCARCH SUBARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC
- export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE LEX YACC AWK INSTALLKERNEL
- export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX
- export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ

feeds/ipq40xx/ipq40xx/backport-5.4/030-modpost-add-a-helper-to-get-data-pointed-by-a-symbol.patch

@@ -1,53 +0,0 @@
-From afa0459daa7b08c7b2c879705b69d39b734a11d0 Mon Sep 17 00:00:00 2001
-From: Masahiro Yamada <yamada.masahiro@socionext.com>
-Date: Fri, 15 Nov 2019 02:42:21 +0900
-Subject: [PATCH] modpost: add a helper to get data pointed by a symbol
-
-When CONFIG_MODULE_REL_CRCS is enabled, the value of __crc_* is not
-an absolute value, but the address to the CRC data embedded in the
-.rodata section.
-
-Getting the data pointed by the symbol value is somewhat complex.
-Split it out into a new helper, sym_get_data().
-
-I will reuse it to refactor namespace_from_kstrtabns() in the next
-commit.
-
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
----
- scripts/mod/modpost.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
---- a/scripts/mod/modpost.c
-+++ b/scripts/mod/modpost.c
-@@ -312,6 +312,18 @@ static const char *sec_name(struct elf_i
- 	return sech_name(elf, &elf->sechdrs[secindex]);
- }
- 
-+static void *sym_get_data(const struct elf_info *info, const Elf_Sym *sym)
-+{
-+	Elf_Shdr *sechdr = &info->sechdrs[sym->st_shndx];
-+	unsigned long offset;
-+
-+	offset = sym->st_value;
-+	if (info->hdr->e_type != ET_REL)
-+		offset -= sechdr->sh_addr;
-+
-+	return (void *)info->hdr + sechdr->sh_offset + offset;
-+}
-+
- #define strstarts(str, prefix) (strncmp(str, prefix, strlen(prefix)) == 0)
- 
- static enum export export_from_secname(struct elf_info *elf, unsigned int sec)
-@@ -701,10 +713,7 @@ static void handle_modversions(struct mo
- 			unsigned int *crcp;
- 
- 			/* symbol points to the CRC in the ELF object */
--			crcp = (void *)info->hdr + sym->st_value +
--			       info->sechdrs[sym->st_shndx].sh_offset -
--			       (info->hdr->e_type != ET_REL ?
--				info->sechdrs[sym->st_shndx].sh_addr : 0);
-+			crcp = sym_get_data(info, sym);
- 			crc = TO_NATIVE(*crcp);
- 		}
- 		sym_update_crc(symname + strlen("__crc_"), mod, crc,

feeds/ipq40xx/ipq40xx/backport-5.4/031-modpost-refactor-namespace_from_kstrtabns-to-not-har.patch

@@ -1,62 +0,0 @@
-From e84f9fbbece1585f45a03ccc11eeabe121cadc1b Mon Sep 17 00:00:00 2001
-From: Masahiro Yamada <yamada.masahiro@socionext.com>
-Date: Fri, 15 Nov 2019 02:42:22 +0900
-Subject: [PATCH] modpost: refactor namespace_from_kstrtabns() to not hard-code
- section name
-
-Currently, namespace_from_kstrtabns() relies on the fact that
-namespace strings are recorded in the __ksymtab_strings section.
-Actually, it is coded in include/linux/export.h, but modpost does
-not need to hard-code the section name.
-
-Elf_Sym::st_shndx holds the index of the relevant section. Using it is
-a more portable way to get the namespace string.
-
-Make namespace_from_kstrtabns() simply call sym_get_data(), and delete
-the info->ksymtab_strings .
-
-While I was here, I added more 'const' qualifiers to pointers.
-
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
----
- scripts/mod/modpost.c | 10 +++-------
- scripts/mod/modpost.h |  1 -
- 2 files changed, 3 insertions(+), 8 deletions(-)
-
---- a/scripts/mod/modpost.c
-+++ b/scripts/mod/modpost.c
-@@ -360,10 +360,10 @@ static enum export export_from_sec(struc
- 		return export_unknown;
- }
- 
--static const char *namespace_from_kstrtabns(struct elf_info *info,
--					    Elf_Sym *kstrtabns)
-+static const char *namespace_from_kstrtabns(const struct elf_info *info,
-+					    const Elf_Sym *sym)
- {
--	char *value = info->ksymtab_strings + kstrtabns->st_value;
-+	const char *value = sym_get_data(info, sym);
- 	return value[0] ? value : NULL;
- }
- 
-@@ -605,10 +605,6 @@ static int parse_elf(struct elf_info *in
- 			info->export_unused_gpl_sec = i;
- 		else if (strcmp(secname, "__ksymtab_gpl_future") == 0)
- 			info->export_gpl_future_sec = i;
--		else if (strcmp(secname, "__ksymtab_strings") == 0)
--			info->ksymtab_strings = (void *)hdr +
--						sechdrs[i].sh_offset -
--						sechdrs[i].sh_addr;
- 
- 		if (sechdrs[i].sh_type == SHT_SYMTAB) {
- 			unsigned int sh_link_idx;
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -143,7 +143,6 @@ struct elf_info {
- 	Elf_Section  export_gpl_sec;
- 	Elf_Section  export_unused_gpl_sec;
- 	Elf_Section  export_gpl_future_sec;
--	char	     *ksymtab_strings;
- 	char         *strtab;
- 	char	     *modinfo;
- 	unsigned int modinfo_len;

feeds/ipq40xx/ipq40xx/backport-5.4/041-v5.5-arm64-Implement-optimised-checksum-routine.patch

@@ -1,176 +0,0 @@
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Wed, 15 Jan 2020 16:42:39 +0000
-Subject: [PATCH] arm64: Implement optimised checksum routine
-
-Apparently there exist certain workloads which rely heavily on software
-checksumming, for which the generic do_csum() implementation becomes a
-significant bottleneck. Therefore let's give arm64 its own optimised
-version - for ease of maintenance this foregoes assembly or intrisics,
-and is thus not actually arm64-specific, but does rely heavily on C
-idioms that translate well to the A64 ISA and the typical load/store
-capabilities of most ARMv8 CPU cores.
-
-The resulting increase in checksum throughput scales nicely with buffer
-size, tending towards 4x for a small in-order core (Cortex-A53), and up
-to 6x or more for an aggressive big core (Ampere eMAG).
-
-Reported-by: Lingyan Huang <huanglingyan2@huawei.com>
-Tested-by: Lingyan Huang <huanglingyan2@huawei.com>
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Signed-off-by: Will Deacon <will@kernel.org>
----
- create mode 100644 arch/arm64/lib/csum.c
-
---- a/arch/arm64/include/asm/checksum.h
-+++ b/arch/arm64/include/asm/checksum.h
-@@ -36,6 +36,9 @@ static inline __sum16 ip_fast_csum(const
- }
- #define ip_fast_csum ip_fast_csum
- 
-+extern unsigned int do_csum(const unsigned char *buff, int len);
-+#define do_csum do_csum
-+
- #include <asm-generic/checksum.h>
- 
- #endif	/* __ASM_CHECKSUM_H */
---- a/arch/arm64/lib/Makefile
-+++ b/arch/arm64/lib/Makefile
-@@ -1,9 +1,9 @@
- # SPDX-License-Identifier: GPL-2.0
- lib-y		:= clear_user.o delay.o copy_from_user.o		\
- 		   copy_to_user.o copy_in_user.o copy_page.o		\
--		   clear_page.o memchr.o memcpy.o memmove.o memset.o	\
--		   memcmp.o strcmp.o strncmp.o strlen.o strnlen.o	\
--		   strchr.o strrchr.o tishift.o
-+		   clear_page.o csum.o memchr.o memcpy.o memmove.o	\
-+		   memset.o memcmp.o strcmp.o strncmp.o strlen.o	\
-+		   strnlen.o strchr.o strrchr.o tishift.o
- 
- ifeq ($(CONFIG_KERNEL_MODE_NEON), y)
- obj-$(CONFIG_XOR_BLOCKS)	+= xor-neon.o
---- /dev/null
-+++ b/arch/arm64/lib/csum.c
-@@ -0,0 +1,123 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Copyright (C) 2019-2020 Arm Ltd.
-+
-+#include <linux/compiler.h>
-+#include <linux/kasan-checks.h>
-+#include <linux/kernel.h>
-+
-+#include <net/checksum.h>
-+
-+/* Looks dumb, but generates nice-ish code */
-+static u64 accumulate(u64 sum, u64 data)
-+{
-+	__uint128_t tmp = (__uint128_t)sum + data;
-+	return tmp + (tmp >> 64);
-+}
-+
-+unsigned int do_csum(const unsigned char *buff, int len)
-+{
-+	unsigned int offset, shift, sum;
-+	const u64 *ptr;
-+	u64 data, sum64 = 0;
-+
-+	offset = (unsigned long)buff & 7;
-+	/*
-+	 * This is to all intents and purposes safe, since rounding down cannot
-+	 * result in a different page or cache line being accessed, and @buff
-+	 * should absolutely not be pointing to anything read-sensitive. We do,
-+	 * however, have to be careful not to piss off KASAN, which means using
-+	 * unchecked reads to accommodate the head and tail, for which we'll
-+	 * compensate with an explicit check up-front.
-+	 */
-+	kasan_check_read(buff, len);
-+	ptr = (u64 *)(buff - offset);
-+	len = len + offset - 8;
-+
-+	/*
-+	 * Head: zero out any excess leading bytes. Shifting back by the same
-+	 * amount should be at least as fast as any other way of handling the
-+	 * odd/even alignment, and means we can ignore it until the very end.
-+	 */
-+	shift = offset * 8;
-+	data = READ_ONCE_NOCHECK(*ptr++);
-+#ifdef __LITTLE_ENDIAN
-+	data = (data >> shift) << shift;
-+#else
-+	data = (data << shift) >> shift;
-+#endif
-+
-+	/*
-+	 * Body: straightforward aligned loads from here on (the paired loads
-+	 * underlying the quadword type still only need dword alignment). The
-+	 * main loop strictly excludes the tail, so the second loop will always
-+	 * run at least once.
-+	 */
-+	while (unlikely(len > 64)) {
-+		__uint128_t tmp1, tmp2, tmp3, tmp4;
-+
-+		tmp1 = READ_ONCE_NOCHECK(*(__uint128_t *)ptr);
-+		tmp2 = READ_ONCE_NOCHECK(*(__uint128_t *)(ptr + 2));
-+		tmp3 = READ_ONCE_NOCHECK(*(__uint128_t *)(ptr + 4));
-+		tmp4 = READ_ONCE_NOCHECK(*(__uint128_t *)(ptr + 6));
-+
-+		len -= 64;
-+		ptr += 8;
-+
-+		/* This is the "don't dump the carry flag into a GPR" idiom */
-+		tmp1 += (tmp1 >> 64) | (tmp1 << 64);
-+		tmp2 += (tmp2 >> 64) | (tmp2 << 64);
-+		tmp3 += (tmp3 >> 64) | (tmp3 << 64);
-+		tmp4 += (tmp4 >> 64) | (tmp4 << 64);
-+		tmp1 = ((tmp1 >> 64) << 64) | (tmp2 >> 64);
-+		tmp1 += (tmp1 >> 64) | (tmp1 << 64);
-+		tmp3 = ((tmp3 >> 64) << 64) | (tmp4 >> 64);
-+		tmp3 += (tmp3 >> 64) | (tmp3 << 64);
-+		tmp1 = ((tmp1 >> 64) << 64) | (tmp3 >> 64);
-+		tmp1 += (tmp1 >> 64) | (tmp1 << 64);
-+		tmp1 = ((tmp1 >> 64) << 64) | sum64;
-+		tmp1 += (tmp1 >> 64) | (tmp1 << 64);
-+		sum64 = tmp1 >> 64;
-+	}
-+	while (len > 8) {
-+		__uint128_t tmp;
-+
-+		sum64 = accumulate(sum64, data);
-+		tmp = READ_ONCE_NOCHECK(*(__uint128_t *)ptr);
-+
-+		len -= 16;
-+		ptr += 2;
-+
-+#ifdef __LITTLE_ENDIAN
-+		data = tmp >> 64;
-+		sum64 = accumulate(sum64, tmp);
-+#else
-+		data = tmp;
-+		sum64 = accumulate(sum64, tmp >> 64);
-+#endif
-+	}
-+	if (len > 0) {
-+		sum64 = accumulate(sum64, data);
-+		data = READ_ONCE_NOCHECK(*ptr);
-+		len -= 8;
-+	}
-+	/*
-+	 * Tail: zero any over-read bytes similarly to the head, again
-+	 * preserving odd/even alignment.
-+	 */
-+	shift = len * -8;
-+#ifdef __LITTLE_ENDIAN
-+	data = (data << shift) >> shift;
-+#else
-+	data = (data >> shift) << shift;
-+#endif
-+	sum64 = accumulate(sum64, data);
-+
-+	/* Finally, folding */
-+	sum64 += (sum64 >> 32) | (sum64 << 32);
-+	sum = sum64 >> 32;
-+	sum += (sum >> 16) | (sum << 16);
-+	if (offset & 1)
-+		return (u16)swab32(sum);
-+
-+	return sum >> 16;
-+}

feeds/ipq40xx/ipq40xx/backport-5.4/042-v5.5-arm64-csum-Fix-pathological-zero-length-calls.patch

@@ -1,28 +0,0 @@
-From: Robin Murphy <robin.murphy@arm.com>
-Date: Fri, 17 Jan 2020 15:48:39 +0000
-Subject: [PATCH] arm64: csum: Fix pathological zero-length calls
-
-In validating the checksumming results of the new routine, I sadly
-neglected to test its not-checksumming results. Thus it slipped through
-that the one case where @buff is already dword-aligned and @len = 0
-manages to defeat the tail-masking logic and behave as if @len = 8.
-For a zero length it doesn't make much sense to deference @buff anyway,
-so just add an early return (which has essentially zero impact on
-performance).
-
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Signed-off-by: Will Deacon <will@kernel.org>
----
-
---- a/arch/arm64/lib/csum.c
-+++ b/arch/arm64/lib/csum.c
-@@ -20,6 +20,9 @@ unsigned int do_csum(const unsigned char
- 	const u64 *ptr;
- 	u64 data, sum64 = 0;
- 
-+	if (unlikely(len == 0))
-+		return 0;
-+
- 	offset = (unsigned long)buff & 7;
- 	/*
- 	 * This is to all intents and purposes safe, since rounding down cannot

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0001-crypto-lib-tidy-up-lib-crypto-Kconfig-and-Makefile.patch

@@ -1,112 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:07 +0100
-Subject: [PATCH] crypto: lib - tidy up lib/crypto Kconfig and Makefile
-
-commit 746b2e024c67aa605ac12d135cd7085a49cf9dc4 upstream.
-
-In preparation of introducing a set of crypto library interfaces, tidy
-up the Makefile and split off the Kconfig symbols into a separate file.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- crypto/Kconfig      | 13 +------------
- lib/crypto/Kconfig  | 15 +++++++++++++++
- lib/crypto/Makefile | 16 ++++++++--------
- 3 files changed, 24 insertions(+), 20 deletions(-)
- create mode 100644 lib/crypto/Kconfig
-
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -878,9 +878,6 @@ config CRYPTO_SHA1_PPC_SPE
- 	  SHA-1 secure hash standard (DFIPS 180-4) implemented
- 	  using powerpc SPE SIMD instruction set.
- 
--config CRYPTO_LIB_SHA256
--	tristate
--
- config CRYPTO_SHA256
- 	tristate "SHA224 and SHA256 digest algorithm"
- 	select CRYPTO_HASH
-@@ -1019,9 +1016,6 @@ config CRYPTO_GHASH_CLMUL_NI_INTEL
- 
- comment "Ciphers"
- 
--config CRYPTO_LIB_AES
--	tristate
--
- config CRYPTO_AES
- 	tristate "AES cipher algorithms"
- 	select CRYPTO_ALGAPI
-@@ -1150,9 +1144,6 @@ config CRYPTO_ANUBIS
- 	  <https://www.cosic.esat.kuleuven.be/nessie/reports/>
- 	  <http://www.larc.usp.br/~pbarreto/AnubisPage.html>
- 
--config CRYPTO_LIB_ARC4
--	tristate
--
- config CRYPTO_ARC4
- 	tristate "ARC4 cipher algorithm"
- 	select CRYPTO_BLKCIPHER
-@@ -1339,9 +1330,6 @@ config CRYPTO_CAST6_AVX_X86_64
- 	  This module provides the Cast6 cipher algorithm that processes
- 	  eight blocks parallel using the AVX instruction set.
- 
--config CRYPTO_LIB_DES
--	tristate
--
- config CRYPTO_DES
- 	tristate "DES and Triple DES EDE cipher algorithms"
- 	select CRYPTO_ALGAPI
-@@ -1845,6 +1833,7 @@ config CRYPTO_STATS
- config CRYPTO_HASH_INFO
- 	bool
- 
-+source "lib/crypto/Kconfig"
- source "drivers/crypto/Kconfig"
- source "crypto/asymmetric_keys/Kconfig"
- source "certs/Kconfig"
---- /dev/null
-+++ b/lib/crypto/Kconfig
-@@ -0,0 +1,15 @@
-+# SPDX-License-Identifier: GPL-2.0
-+
-+comment "Crypto library routines"
-+
-+config CRYPTO_LIB_AES
-+	tristate
-+
-+config CRYPTO_LIB_ARC4
-+	tristate
-+
-+config CRYPTO_LIB_DES
-+	tristate
-+
-+config CRYPTO_LIB_SHA256
-+	tristate
---- a/lib/crypto/Makefile
-+++ b/lib/crypto/Makefile
-@@ -1,13 +1,13 @@
- # SPDX-License-Identifier: GPL-2.0
- 
--obj-$(CONFIG_CRYPTO_LIB_AES) += libaes.o
--libaes-y := aes.o
-+obj-$(CONFIG_CRYPTO_LIB_AES)			+= libaes.o
-+libaes-y					:= aes.o
- 
--obj-$(CONFIG_CRYPTO_LIB_ARC4) += libarc4.o
--libarc4-y := arc4.o
-+obj-$(CONFIG_CRYPTO_LIB_ARC4)			+= libarc4.o
-+libarc4-y					:= arc4.o
- 
--obj-$(CONFIG_CRYPTO_LIB_DES) += libdes.o
--libdes-y := des.o
-+obj-$(CONFIG_CRYPTO_LIB_DES)			+= libdes.o
-+libdes-y					:= des.o
- 
--obj-$(CONFIG_CRYPTO_LIB_SHA256) += libsha256.o
--libsha256-y := sha256.o
-+obj-$(CONFIG_CRYPTO_LIB_SHA256)			+= libsha256.o
-+libsha256-y					:= sha256.o

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0002-crypto-chacha-move-existing-library-code-into-lib-cr.patch

@@ -1,668 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:08 +0100
-Subject: [PATCH] crypto: chacha - move existing library code into lib/crypto
-
-commit 5fb8ef25803ef33e2eb60b626435828b937bed75 upstream.
-
-Currently, our generic ChaCha implementation consists of a permute
-function in lib/chacha.c that operates on the 64-byte ChaCha state
-directly [and which is always included into the core kernel since it
-is used by the /dev/random driver], and the crypto API plumbing to
-expose it as a skcipher.
-
-In order to support in-kernel users that need the ChaCha streamcipher
-but have no need [or tolerance] for going through the abstractions of
-the crypto API, let's expose the streamcipher bits via a library API
-as well, in a way that permits the implementation to be superseded by
-an architecture specific one if provided.
-
-So move the streamcipher code into a separate module in lib/crypto,
-and expose the init() and crypt() routines to users of the library.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/arm/crypto/chacha-neon-glue.c   |  2 +-
- arch/arm64/crypto/chacha-neon-glue.c |  2 +-
- arch/x86/crypto/chacha_glue.c        |  2 +-
- crypto/Kconfig                       |  1 +
- crypto/chacha_generic.c              | 60 ++--------------------
- include/crypto/chacha.h              | 77 ++++++++++++++++++++++------
- include/crypto/internal/chacha.h     | 53 +++++++++++++++++++
- lib/Makefile                         |  3 +-
- lib/crypto/Kconfig                   | 26 ++++++++++
- lib/crypto/Makefile                  |  4 ++
- lib/{ => crypto}/chacha.c            | 20 ++++----
- lib/crypto/libchacha.c               | 35 +++++++++++++
- 12 files changed, 199 insertions(+), 86 deletions(-)
- create mode 100644 include/crypto/internal/chacha.h
- rename lib/{ => crypto}/chacha.c (88%)
- create mode 100644 lib/crypto/libchacha.c
-
---- a/arch/arm/crypto/chacha-neon-glue.c
-+++ b/arch/arm/crypto/chacha-neon-glue.c
-@@ -20,7 +20,7 @@
-  */
- 
- #include <crypto/algapi.h>
--#include <crypto/chacha.h>
-+#include <crypto/internal/chacha.h>
- #include <crypto/internal/simd.h>
- #include <crypto/internal/skcipher.h>
- #include <linux/kernel.h>
---- a/arch/arm64/crypto/chacha-neon-glue.c
-+++ b/arch/arm64/crypto/chacha-neon-glue.c
-@@ -20,7 +20,7 @@
-  */
- 
- #include <crypto/algapi.h>
--#include <crypto/chacha.h>
-+#include <crypto/internal/chacha.h>
- #include <crypto/internal/simd.h>
- #include <crypto/internal/skcipher.h>
- #include <linux/kernel.h>
---- a/arch/x86/crypto/chacha_glue.c
-+++ b/arch/x86/crypto/chacha_glue.c
-@@ -7,7 +7,7 @@
-  */
- 
- #include <crypto/algapi.h>
--#include <crypto/chacha.h>
-+#include <crypto/internal/chacha.h>
- #include <crypto/internal/simd.h>
- #include <crypto/internal/skcipher.h>
- #include <linux/kernel.h>
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -1393,6 +1393,7 @@ config CRYPTO_SALSA20
- 
- config CRYPTO_CHACHA20
- 	tristate "ChaCha stream cipher algorithms"
-+	select CRYPTO_LIB_CHACHA_GENERIC
- 	select CRYPTO_BLKCIPHER
- 	help
- 	  The ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms.
---- a/crypto/chacha_generic.c
-+++ b/crypto/chacha_generic.c
-@@ -8,29 +8,10 @@
- 
- #include <asm/unaligned.h>
- #include <crypto/algapi.h>
--#include <crypto/chacha.h>
-+#include <crypto/internal/chacha.h>
- #include <crypto/internal/skcipher.h>
- #include <linux/module.h>
- 
--static void chacha_docrypt(u32 *state, u8 *dst, const u8 *src,
--			   unsigned int bytes, int nrounds)
--{
--	/* aligned to potentially speed up crypto_xor() */
--	u8 stream[CHACHA_BLOCK_SIZE] __aligned(sizeof(long));
--
--	while (bytes >= CHACHA_BLOCK_SIZE) {
--		chacha_block(state, stream, nrounds);
--		crypto_xor_cpy(dst, src, stream, CHACHA_BLOCK_SIZE);
--		bytes -= CHACHA_BLOCK_SIZE;
--		dst += CHACHA_BLOCK_SIZE;
--		src += CHACHA_BLOCK_SIZE;
--	}
--	if (bytes) {
--		chacha_block(state, stream, nrounds);
--		crypto_xor_cpy(dst, src, stream, bytes);
--	}
--}
--
- static int chacha_stream_xor(struct skcipher_request *req,
- 			     const struct chacha_ctx *ctx, const u8 *iv)
- {
-@@ -48,8 +29,8 @@ static int chacha_stream_xor(struct skci
- 		if (nbytes < walk.total)
- 			nbytes = round_down(nbytes, CHACHA_BLOCK_SIZE);
- 
--		chacha_docrypt(state, walk.dst.virt.addr, walk.src.virt.addr,
--			       nbytes, ctx->nrounds);
-+		chacha_crypt_generic(state, walk.dst.virt.addr,
-+				     walk.src.virt.addr, nbytes, ctx->nrounds);
- 		err = skcipher_walk_done(&walk, walk.nbytes - nbytes);
- 	}
- 
-@@ -58,41 +39,10 @@ static int chacha_stream_xor(struct skci
- 
- void crypto_chacha_init(u32 *state, const struct chacha_ctx *ctx, const u8 *iv)
- {
--	state[0]  = 0x61707865; /* "expa" */
--	state[1]  = 0x3320646e; /* "nd 3" */
--	state[2]  = 0x79622d32; /* "2-by" */
--	state[3]  = 0x6b206574; /* "te k" */
--	state[4]  = ctx->key[0];
--	state[5]  = ctx->key[1];
--	state[6]  = ctx->key[2];
--	state[7]  = ctx->key[3];
--	state[8]  = ctx->key[4];
--	state[9]  = ctx->key[5];
--	state[10] = ctx->key[6];
--	state[11] = ctx->key[7];
--	state[12] = get_unaligned_le32(iv +  0);
--	state[13] = get_unaligned_le32(iv +  4);
--	state[14] = get_unaligned_le32(iv +  8);
--	state[15] = get_unaligned_le32(iv + 12);
-+	chacha_init_generic(state, ctx->key, iv);
- }
- EXPORT_SYMBOL_GPL(crypto_chacha_init);
- 
--static int chacha_setkey(struct crypto_skcipher *tfm, const u8 *key,
--			 unsigned int keysize, int nrounds)
--{
--	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
--	int i;
--
--	if (keysize != CHACHA_KEY_SIZE)
--		return -EINVAL;
--
--	for (i = 0; i < ARRAY_SIZE(ctx->key); i++)
--		ctx->key[i] = get_unaligned_le32(key + i * sizeof(u32));
--
--	ctx->nrounds = nrounds;
--	return 0;
--}
--
- int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
- 			   unsigned int keysize)
- {
-@@ -126,7 +76,7 @@ int crypto_xchacha_crypt(struct skcipher
- 
- 	/* Compute the subkey given the original key and first 128 nonce bits */
- 	crypto_chacha_init(state, ctx, req->iv);
--	hchacha_block(state, subctx.key, ctx->nrounds);
-+	hchacha_block_generic(state, subctx.key, ctx->nrounds);
- 	subctx.nrounds = ctx->nrounds;
- 
- 	/* Build the real IV */
---- a/include/crypto/chacha.h
-+++ b/include/crypto/chacha.h
-@@ -15,9 +15,8 @@
- #ifndef _CRYPTO_CHACHA_H
- #define _CRYPTO_CHACHA_H
- 
--#include <crypto/skcipher.h>
-+#include <asm/unaligned.h>
- #include <linux/types.h>
--#include <linux/crypto.h>
- 
- /* 32-bit stream position, then 96-bit nonce (RFC7539 convention) */
- #define CHACHA_IV_SIZE		16
-@@ -29,26 +28,70 @@
- /* 192-bit nonce, then 64-bit stream position */
- #define XCHACHA_IV_SIZE		32
- 
--struct chacha_ctx {
--	u32 key[8];
--	int nrounds;
--};
--
--void chacha_block(u32 *state, u8 *stream, int nrounds);
-+void chacha_block_generic(u32 *state, u8 *stream, int nrounds);
- static inline void chacha20_block(u32 *state, u8 *stream)
- {
--	chacha_block(state, stream, 20);
-+	chacha_block_generic(state, stream, 20);
- }
--void hchacha_block(const u32 *in, u32 *out, int nrounds);
- 
--void crypto_chacha_init(u32 *state, const struct chacha_ctx *ctx, const u8 *iv);
-+void hchacha_block_arch(const u32 *state, u32 *out, int nrounds);
-+void hchacha_block_generic(const u32 *state, u32 *out, int nrounds);
-+
-+static inline void hchacha_block(const u32 *state, u32 *out, int nrounds)
-+{
-+	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA))
-+		hchacha_block_arch(state, out, nrounds);
-+	else
-+		hchacha_block_generic(state, out, nrounds);
-+}
- 
--int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
--			   unsigned int keysize);
--int crypto_chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
--			   unsigned int keysize);
-+void chacha_init_arch(u32 *state, const u32 *key, const u8 *iv);
-+static inline void chacha_init_generic(u32 *state, const u32 *key, const u8 *iv)
-+{
-+	state[0]  = 0x61707865; /* "expa" */
-+	state[1]  = 0x3320646e; /* "nd 3" */
-+	state[2]  = 0x79622d32; /* "2-by" */
-+	state[3]  = 0x6b206574; /* "te k" */
-+	state[4]  = key[0];
-+	state[5]  = key[1];
-+	state[6]  = key[2];
-+	state[7]  = key[3];
-+	state[8]  = key[4];
-+	state[9]  = key[5];
-+	state[10] = key[6];
-+	state[11] = key[7];
-+	state[12] = get_unaligned_le32(iv +  0);
-+	state[13] = get_unaligned_le32(iv +  4);
-+	state[14] = get_unaligned_le32(iv +  8);
-+	state[15] = get_unaligned_le32(iv + 12);
-+}
- 
--int crypto_chacha_crypt(struct skcipher_request *req);
--int crypto_xchacha_crypt(struct skcipher_request *req);
-+static inline void chacha_init(u32 *state, const u32 *key, const u8 *iv)
-+{
-+	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA))
-+		chacha_init_arch(state, key, iv);
-+	else
-+		chacha_init_generic(state, key, iv);
-+}
-+
-+void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src,
-+		       unsigned int bytes, int nrounds);
-+void chacha_crypt_generic(u32 *state, u8 *dst, const u8 *src,
-+			  unsigned int bytes, int nrounds);
-+
-+static inline void chacha_crypt(u32 *state, u8 *dst, const u8 *src,
-+				unsigned int bytes, int nrounds)
-+{
-+	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA))
-+		chacha_crypt_arch(state, dst, src, bytes, nrounds);
-+	else
-+		chacha_crypt_generic(state, dst, src, bytes, nrounds);
-+}
-+
-+static inline void chacha20_crypt(u32 *state, u8 *dst, const u8 *src,
-+				  unsigned int bytes)
-+{
-+	chacha_crypt(state, dst, src, bytes, 20);
-+}
- 
- #endif /* _CRYPTO_CHACHA_H */
---- /dev/null
-+++ b/include/crypto/internal/chacha.h
-@@ -0,0 +1,53 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+
-+#ifndef _CRYPTO_INTERNAL_CHACHA_H
-+#define _CRYPTO_INTERNAL_CHACHA_H
-+
-+#include <crypto/chacha.h>
-+#include <crypto/internal/skcipher.h>
-+#include <linux/crypto.h>
-+
-+struct chacha_ctx {
-+	u32 key[8];
-+	int nrounds;
-+};
-+
-+void crypto_chacha_init(u32 *state, const struct chacha_ctx *ctx, const u8 *iv);
-+
-+static inline int chacha_setkey(struct crypto_skcipher *tfm, const u8 *key,
-+				unsigned int keysize, int nrounds)
-+{
-+	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
-+	int i;
-+
-+	if (keysize != CHACHA_KEY_SIZE)
-+		return -EINVAL;
-+
-+	for (i = 0; i < ARRAY_SIZE(ctx->key); i++)
-+		ctx->key[i] = get_unaligned_le32(key + i * sizeof(u32));
-+
-+	ctx->nrounds = nrounds;
-+	return 0;
-+}
-+
-+static inline int chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
-+				  unsigned int keysize)
-+{
-+	return chacha_setkey(tfm, key, keysize, 20);
-+}
-+
-+static int inline chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
-+				  unsigned int keysize)
-+{
-+	return chacha_setkey(tfm, key, keysize, 12);
-+}
-+
-+int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
-+			   unsigned int keysize);
-+int crypto_chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
-+			   unsigned int keysize);
-+
-+int crypto_chacha_crypt(struct skcipher_request *req);
-+int crypto_xchacha_crypt(struct skcipher_request *req);
-+
-+#endif /* _CRYPTO_CHACHA_H */
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -26,8 +26,7 @@ endif
- 
- lib-y := ctype.o string.o vsprintf.o cmdline.o \
- 	 rbtree.o radix-tree.o timerqueue.o xarray.o \
--	 idr.o extable.o \
--	 sha1.o chacha.o irq_regs.o argv_split.o \
-+	 idr.o extable.o sha1.o irq_regs.o argv_split.o \
- 	 flex_proportions.o ratelimit.o show_mem.o \
- 	 is_single_threaded.o plist.o decompress.o kobject_uevent.o \
- 	 earlycpio.o seq_buf.o siphash.o dec_and_lock.o \
---- a/lib/crypto/Kconfig
-+++ b/lib/crypto/Kconfig
-@@ -8,6 +8,32 @@ config CRYPTO_LIB_AES
- config CRYPTO_LIB_ARC4
- 	tristate
- 
-+config CRYPTO_ARCH_HAVE_LIB_CHACHA
-+	tristate
-+	help
-+	  Declares whether the architecture provides an arch-specific
-+	  accelerated implementation of the ChaCha library interface,
-+	  either builtin or as a module.
-+
-+config CRYPTO_LIB_CHACHA_GENERIC
-+	tristate
-+	select CRYPTO_ALGAPI
-+	help
-+	  This symbol can be depended upon by arch implementations of the
-+	  ChaCha library interface that require the generic code as a
-+	  fallback, e.g., for SIMD implementations. If no arch specific
-+	  implementation is enabled, this implementation serves the users
-+	  of CRYPTO_LIB_CHACHA.
-+
-+config CRYPTO_LIB_CHACHA
-+	tristate "ChaCha library interface"
-+	depends on CRYPTO_ARCH_HAVE_LIB_CHACHA || !CRYPTO_ARCH_HAVE_LIB_CHACHA
-+	select CRYPTO_LIB_CHACHA_GENERIC if CRYPTO_ARCH_HAVE_LIB_CHACHA=n
-+	help
-+	  Enable the ChaCha library interface. This interface may be fulfilled
-+	  by either the generic implementation or an arch-specific one, if one
-+	  is available and enabled.
-+
- config CRYPTO_LIB_DES
- 	tristate
- 
---- a/lib/crypto/Makefile
-+++ b/lib/crypto/Makefile
-@@ -1,5 +1,9 @@
- # SPDX-License-Identifier: GPL-2.0
- 
-+# chacha is used by the /dev/random driver which is always builtin
-+obj-y						+= chacha.o
-+obj-$(CONFIG_CRYPTO_LIB_CHACHA_GENERIC)		+= libchacha.o
-+
- obj-$(CONFIG_CRYPTO_LIB_AES)			+= libaes.o
- libaes-y					:= aes.o
- 
---- a/lib/chacha.c
-+++ /dev/null
-@@ -1,113 +0,0 @@
--// SPDX-License-Identifier: GPL-2.0-or-later
--/*
-- * The "hash function" used as the core of the ChaCha stream cipher (RFC7539)
-- *
-- * Copyright (C) 2015 Martin Willi
-- */
--
--#include <linux/kernel.h>
--#include <linux/export.h>
--#include <linux/bitops.h>
--#include <linux/cryptohash.h>
--#include <asm/unaligned.h>
--#include <crypto/chacha.h>
--
--static void chacha_permute(u32 *x, int nrounds)
--{
--	int i;
--
--	/* whitelist the allowed round counts */
--	WARN_ON_ONCE(nrounds != 20 && nrounds != 12);
--
--	for (i = 0; i < nrounds; i += 2) {
--		x[0]  += x[4];    x[12] = rol32(x[12] ^ x[0],  16);
--		x[1]  += x[5];    x[13] = rol32(x[13] ^ x[1],  16);
--		x[2]  += x[6];    x[14] = rol32(x[14] ^ x[2],  16);
--		x[3]  += x[7];    x[15] = rol32(x[15] ^ x[3],  16);
--
--		x[8]  += x[12];   x[4]  = rol32(x[4]  ^ x[8],  12);
--		x[9]  += x[13];   x[5]  = rol32(x[5]  ^ x[9],  12);
--		x[10] += x[14];   x[6]  = rol32(x[6]  ^ x[10], 12);
--		x[11] += x[15];   x[7]  = rol32(x[7]  ^ x[11], 12);
--
--		x[0]  += x[4];    x[12] = rol32(x[12] ^ x[0],   8);
--		x[1]  += x[5];    x[13] = rol32(x[13] ^ x[1],   8);
--		x[2]  += x[6];    x[14] = rol32(x[14] ^ x[2],   8);
--		x[3]  += x[7];    x[15] = rol32(x[15] ^ x[3],   8);
--
--		x[8]  += x[12];   x[4]  = rol32(x[4]  ^ x[8],   7);
--		x[9]  += x[13];   x[5]  = rol32(x[5]  ^ x[9],   7);
--		x[10] += x[14];   x[6]  = rol32(x[6]  ^ x[10],  7);
--		x[11] += x[15];   x[7]  = rol32(x[7]  ^ x[11],  7);
--
--		x[0]  += x[5];    x[15] = rol32(x[15] ^ x[0],  16);
--		x[1]  += x[6];    x[12] = rol32(x[12] ^ x[1],  16);
--		x[2]  += x[7];    x[13] = rol32(x[13] ^ x[2],  16);
--		x[3]  += x[4];    x[14] = rol32(x[14] ^ x[3],  16);
--
--		x[10] += x[15];   x[5]  = rol32(x[5]  ^ x[10], 12);
--		x[11] += x[12];   x[6]  = rol32(x[6]  ^ x[11], 12);
--		x[8]  += x[13];   x[7]  = rol32(x[7]  ^ x[8],  12);
--		x[9]  += x[14];   x[4]  = rol32(x[4]  ^ x[9],  12);
--
--		x[0]  += x[5];    x[15] = rol32(x[15] ^ x[0],   8);
--		x[1]  += x[6];    x[12] = rol32(x[12] ^ x[1],   8);
--		x[2]  += x[7];    x[13] = rol32(x[13] ^ x[2],   8);
--		x[3]  += x[4];    x[14] = rol32(x[14] ^ x[3],   8);
--
--		x[10] += x[15];   x[5]  = rol32(x[5]  ^ x[10],  7);
--		x[11] += x[12];   x[6]  = rol32(x[6]  ^ x[11],  7);
--		x[8]  += x[13];   x[7]  = rol32(x[7]  ^ x[8],   7);
--		x[9]  += x[14];   x[4]  = rol32(x[4]  ^ x[9],   7);
--	}
--}
--
--/**
-- * chacha_block - generate one keystream block and increment block counter
-- * @state: input state matrix (16 32-bit words)
-- * @stream: output keystream block (64 bytes)
-- * @nrounds: number of rounds (20 or 12; 20 is recommended)
-- *
-- * This is the ChaCha core, a function from 64-byte strings to 64-byte strings.
-- * The caller has already converted the endianness of the input.  This function
-- * also handles incrementing the block counter in the input matrix.
-- */
--void chacha_block(u32 *state, u8 *stream, int nrounds)
--{
--	u32 x[16];
--	int i;
--
--	memcpy(x, state, 64);
--
--	chacha_permute(x, nrounds);
--
--	for (i = 0; i < ARRAY_SIZE(x); i++)
--		put_unaligned_le32(x[i] + state[i], &stream[i * sizeof(u32)]);
--
--	state[12]++;
--}
--EXPORT_SYMBOL(chacha_block);
--
--/**
-- * hchacha_block - abbreviated ChaCha core, for XChaCha
-- * @in: input state matrix (16 32-bit words)
-- * @out: output (8 32-bit words)
-- * @nrounds: number of rounds (20 or 12; 20 is recommended)
-- *
-- * HChaCha is the ChaCha equivalent of HSalsa and is an intermediate step
-- * towards XChaCha (see https://cr.yp.to/snuffle/xsalsa-20081128.pdf).  HChaCha
-- * skips the final addition of the initial state, and outputs only certain words
-- * of the state.  It should not be used for streaming directly.
-- */
--void hchacha_block(const u32 *in, u32 *out, int nrounds)
--{
--	u32 x[16];
--
--	memcpy(x, in, 64);
--
--	chacha_permute(x, nrounds);
--
--	memcpy(&out[0], &x[0], 16);
--	memcpy(&out[4], &x[12], 16);
--}
--EXPORT_SYMBOL(hchacha_block);
---- /dev/null
-+++ b/lib/crypto/chacha.c
-@@ -0,0 +1,115 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * The "hash function" used as the core of the ChaCha stream cipher (RFC7539)
-+ *
-+ * Copyright (C) 2015 Martin Willi
-+ */
-+
-+#include <linux/bug.h>
-+#include <linux/kernel.h>
-+#include <linux/export.h>
-+#include <linux/bitops.h>
-+#include <linux/string.h>
-+#include <linux/cryptohash.h>
-+#include <asm/unaligned.h>
-+#include <crypto/chacha.h>
-+
-+static void chacha_permute(u32 *x, int nrounds)
-+{
-+	int i;
-+
-+	/* whitelist the allowed round counts */
-+	WARN_ON_ONCE(nrounds != 20 && nrounds != 12);
-+
-+	for (i = 0; i < nrounds; i += 2) {
-+		x[0]  += x[4];    x[12] = rol32(x[12] ^ x[0],  16);
-+		x[1]  += x[5];    x[13] = rol32(x[13] ^ x[1],  16);
-+		x[2]  += x[6];    x[14] = rol32(x[14] ^ x[2],  16);
-+		x[3]  += x[7];    x[15] = rol32(x[15] ^ x[3],  16);
-+
-+		x[8]  += x[12];   x[4]  = rol32(x[4]  ^ x[8],  12);
-+		x[9]  += x[13];   x[5]  = rol32(x[5]  ^ x[9],  12);
-+		x[10] += x[14];   x[6]  = rol32(x[6]  ^ x[10], 12);
-+		x[11] += x[15];   x[7]  = rol32(x[7]  ^ x[11], 12);
-+
-+		x[0]  += x[4];    x[12] = rol32(x[12] ^ x[0],   8);
-+		x[1]  += x[5];    x[13] = rol32(x[13] ^ x[1],   8);
-+		x[2]  += x[6];    x[14] = rol32(x[14] ^ x[2],   8);
-+		x[3]  += x[7];    x[15] = rol32(x[15] ^ x[3],   8);
-+
-+		x[8]  += x[12];   x[4]  = rol32(x[4]  ^ x[8],   7);
-+		x[9]  += x[13];   x[5]  = rol32(x[5]  ^ x[9],   7);
-+		x[10] += x[14];   x[6]  = rol32(x[6]  ^ x[10],  7);
-+		x[11] += x[15];   x[7]  = rol32(x[7]  ^ x[11],  7);
-+
-+		x[0]  += x[5];    x[15] = rol32(x[15] ^ x[0],  16);
-+		x[1]  += x[6];    x[12] = rol32(x[12] ^ x[1],  16);
-+		x[2]  += x[7];    x[13] = rol32(x[13] ^ x[2],  16);
-+		x[3]  += x[4];    x[14] = rol32(x[14] ^ x[3],  16);
-+
-+		x[10] += x[15];   x[5]  = rol32(x[5]  ^ x[10], 12);
-+		x[11] += x[12];   x[6]  = rol32(x[6]  ^ x[11], 12);
-+		x[8]  += x[13];   x[7]  = rol32(x[7]  ^ x[8],  12);
-+		x[9]  += x[14];   x[4]  = rol32(x[4]  ^ x[9],  12);
-+
-+		x[0]  += x[5];    x[15] = rol32(x[15] ^ x[0],   8);
-+		x[1]  += x[6];    x[12] = rol32(x[12] ^ x[1],   8);
-+		x[2]  += x[7];    x[13] = rol32(x[13] ^ x[2],   8);
-+		x[3]  += x[4];    x[14] = rol32(x[14] ^ x[3],   8);
-+
-+		x[10] += x[15];   x[5]  = rol32(x[5]  ^ x[10],  7);
-+		x[11] += x[12];   x[6]  = rol32(x[6]  ^ x[11],  7);
-+		x[8]  += x[13];   x[7]  = rol32(x[7]  ^ x[8],   7);
-+		x[9]  += x[14];   x[4]  = rol32(x[4]  ^ x[9],   7);
-+	}
-+}
-+
-+/**
-+ * chacha_block - generate one keystream block and increment block counter
-+ * @state: input state matrix (16 32-bit words)
-+ * @stream: output keystream block (64 bytes)
-+ * @nrounds: number of rounds (20 or 12; 20 is recommended)
-+ *
-+ * This is the ChaCha core, a function from 64-byte strings to 64-byte strings.
-+ * The caller has already converted the endianness of the input.  This function
-+ * also handles incrementing the block counter in the input matrix.
-+ */
-+void chacha_block_generic(u32 *state, u8 *stream, int nrounds)
-+{
-+	u32 x[16];
-+	int i;
-+
-+	memcpy(x, state, 64);
-+
-+	chacha_permute(x, nrounds);
-+
-+	for (i = 0; i < ARRAY_SIZE(x); i++)
-+		put_unaligned_le32(x[i] + state[i], &stream[i * sizeof(u32)]);
-+
-+	state[12]++;
-+}
-+EXPORT_SYMBOL(chacha_block_generic);
-+
-+/**
-+ * hchacha_block_generic - abbreviated ChaCha core, for XChaCha
-+ * @state: input state matrix (16 32-bit words)
-+ * @out: output (8 32-bit words)
-+ * @nrounds: number of rounds (20 or 12; 20 is recommended)
-+ *
-+ * HChaCha is the ChaCha equivalent of HSalsa and is an intermediate step
-+ * towards XChaCha (see https://cr.yp.to/snuffle/xsalsa-20081128.pdf).  HChaCha
-+ * skips the final addition of the initial state, and outputs only certain words
-+ * of the state.  It should not be used for streaming directly.
-+ */
-+void hchacha_block_generic(const u32 *state, u32 *stream, int nrounds)
-+{
-+	u32 x[16];
-+
-+	memcpy(x, state, 64);
-+
-+	chacha_permute(x, nrounds);
-+
-+	memcpy(&stream[0], &x[0], 16);
-+	memcpy(&stream[4], &x[12], 16);
-+}
-+EXPORT_SYMBOL(hchacha_block_generic);
---- /dev/null
-+++ b/lib/crypto/libchacha.c
-@@ -0,0 +1,35 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * The ChaCha stream cipher (RFC7539)
-+ *
-+ * Copyright (C) 2015 Martin Willi
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/export.h>
-+#include <linux/module.h>
-+
-+#include <crypto/algapi.h> // for crypto_xor_cpy
-+#include <crypto/chacha.h>
-+
-+void chacha_crypt_generic(u32 *state, u8 *dst, const u8 *src,
-+			  unsigned int bytes, int nrounds)
-+{
-+	/* aligned to potentially speed up crypto_xor() */
-+	u8 stream[CHACHA_BLOCK_SIZE] __aligned(sizeof(long));
-+
-+	while (bytes >= CHACHA_BLOCK_SIZE) {
-+		chacha_block_generic(state, stream, nrounds);
-+		crypto_xor_cpy(dst, src, stream, CHACHA_BLOCK_SIZE);
-+		bytes -= CHACHA_BLOCK_SIZE;
-+		dst += CHACHA_BLOCK_SIZE;
-+		src += CHACHA_BLOCK_SIZE;
-+	}
-+	if (bytes) {
-+		chacha_block_generic(state, stream, nrounds);
-+		crypto_xor_cpy(dst, src, stream, bytes);
-+	}
-+}
-+EXPORT_SYMBOL(chacha_crypt_generic);
-+
-+MODULE_LICENSE("GPL");

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0003-crypto-x86-chacha-depend-on-generic-chacha-library-i.patch

@@ -1,192 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:09 +0100
-Subject: [PATCH] crypto: x86/chacha - depend on generic chacha library instead
- of crypto driver
-
-commit 28e8d89b1ce8d2e7badfb5f69971dd635acb8863 upstream.
-
-In preparation of extending the x86 ChaCha driver to also expose the ChaCha
-library interface, drop the dependency on the chacha_generic crypto driver
-as a non-SIMD fallback, and depend on the generic ChaCha library directly.
-This way, we only pull in the code we actually need, without registering
-a set of ChaCha skciphers that we will never use.
-
-Since turning the FPU on and off is cheap these days, simplify the SIMD
-routine by dropping the per-page yield, which makes for a cleaner switch
-to the library API as well. This also allows use to invoke the skcipher
-walk routines in non-atomic mode.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/x86/crypto/chacha_glue.c | 90 ++++++++++++++---------------------
- crypto/Kconfig                |  2 +-
- 2 files changed, 36 insertions(+), 56 deletions(-)
-
---- a/arch/x86/crypto/chacha_glue.c
-+++ b/arch/x86/crypto/chacha_glue.c
-@@ -123,37 +123,38 @@ static void chacha_dosimd(u32 *state, u8
- 	}
- }
- 
--static int chacha_simd_stream_xor(struct skcipher_walk *walk,
-+static int chacha_simd_stream_xor(struct skcipher_request *req,
- 				  const struct chacha_ctx *ctx, const u8 *iv)
- {
- 	u32 *state, state_buf[16 + 2] __aligned(8);
--	int next_yield = 4096; /* bytes until next FPU yield */
--	int err = 0;
-+	struct skcipher_walk walk;
-+	int err;
-+
-+	err = skcipher_walk_virt(&walk, req, false);
- 
- 	BUILD_BUG_ON(CHACHA_STATE_ALIGN != 16);
- 	state = PTR_ALIGN(state_buf + 0, CHACHA_STATE_ALIGN);
- 
--	crypto_chacha_init(state, ctx, iv);
-+	chacha_init_generic(state, ctx->key, iv);
- 
--	while (walk->nbytes > 0) {
--		unsigned int nbytes = walk->nbytes;
-+	while (walk.nbytes > 0) {
-+		unsigned int nbytes = walk.nbytes;
- 
--		if (nbytes < walk->total) {
--			nbytes = round_down(nbytes, walk->stride);
--			next_yield -= nbytes;
--		}
--
--		chacha_dosimd(state, walk->dst.virt.addr, walk->src.virt.addr,
--			      nbytes, ctx->nrounds);
-+		if (nbytes < walk.total)
-+			nbytes = round_down(nbytes, walk.stride);
- 
--		if (next_yield <= 0) {
--			/* temporarily allow preemption */
--			kernel_fpu_end();
-+		if (!crypto_simd_usable()) {
-+			chacha_crypt_generic(state, walk.dst.virt.addr,
-+					     walk.src.virt.addr, nbytes,
-+					     ctx->nrounds);
-+		} else {
- 			kernel_fpu_begin();
--			next_yield = 4096;
-+			chacha_dosimd(state, walk.dst.virt.addr,
-+				      walk.src.virt.addr, nbytes,
-+				      ctx->nrounds);
-+			kernel_fpu_end();
- 		}
--
--		err = skcipher_walk_done(walk, walk->nbytes - nbytes);
-+		err = skcipher_walk_done(&walk, walk.nbytes - nbytes);
- 	}
- 
- 	return err;
-@@ -163,55 +164,34 @@ static int chacha_simd(struct skcipher_r
- {
- 	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
- 	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
--	struct skcipher_walk walk;
--	int err;
--
--	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !crypto_simd_usable())
--		return crypto_chacha_crypt(req);
- 
--	err = skcipher_walk_virt(&walk, req, true);
--	if (err)
--		return err;
--
--	kernel_fpu_begin();
--	err = chacha_simd_stream_xor(&walk, ctx, req->iv);
--	kernel_fpu_end();
--	return err;
-+	return chacha_simd_stream_xor(req, ctx, req->iv);
- }
- 
- static int xchacha_simd(struct skcipher_request *req)
- {
- 	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
- 	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
--	struct skcipher_walk walk;
--	struct chacha_ctx subctx;
- 	u32 *state, state_buf[16 + 2] __aligned(8);
-+	struct chacha_ctx subctx;
- 	u8 real_iv[16];
--	int err;
--
--	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !crypto_simd_usable())
--		return crypto_xchacha_crypt(req);
--
--	err = skcipher_walk_virt(&walk, req, true);
--	if (err)
--		return err;
- 
- 	BUILD_BUG_ON(CHACHA_STATE_ALIGN != 16);
- 	state = PTR_ALIGN(state_buf + 0, CHACHA_STATE_ALIGN);
--	crypto_chacha_init(state, ctx, req->iv);
-+	chacha_init_generic(state, ctx->key, req->iv);
- 
--	kernel_fpu_begin();
--
--	hchacha_block_ssse3(state, subctx.key, ctx->nrounds);
-+	if (req->cryptlen > CHACHA_BLOCK_SIZE && crypto_simd_usable()) {
-+		kernel_fpu_begin();
-+		hchacha_block_ssse3(state, subctx.key, ctx->nrounds);
-+		kernel_fpu_end();
-+	} else {
-+		hchacha_block_generic(state, subctx.key, ctx->nrounds);
-+	}
- 	subctx.nrounds = ctx->nrounds;
- 
- 	memcpy(&real_iv[0], req->iv + 24, 8);
- 	memcpy(&real_iv[8], req->iv + 16, 8);
--	err = chacha_simd_stream_xor(&walk, &subctx, real_iv);
--
--	kernel_fpu_end();
--
--	return err;
-+	return chacha_simd_stream_xor(req, &subctx, real_iv);
- }
- 
- static struct skcipher_alg algs[] = {
-@@ -227,7 +207,7 @@ static struct skcipher_alg algs[] = {
- 		.max_keysize		= CHACHA_KEY_SIZE,
- 		.ivsize			= CHACHA_IV_SIZE,
- 		.chunksize		= CHACHA_BLOCK_SIZE,
--		.setkey			= crypto_chacha20_setkey,
-+		.setkey			= chacha20_setkey,
- 		.encrypt		= chacha_simd,
- 		.decrypt		= chacha_simd,
- 	}, {
-@@ -242,7 +222,7 @@ static struct skcipher_alg algs[] = {
- 		.max_keysize		= CHACHA_KEY_SIZE,
- 		.ivsize			= XCHACHA_IV_SIZE,
- 		.chunksize		= CHACHA_BLOCK_SIZE,
--		.setkey			= crypto_chacha20_setkey,
-+		.setkey			= chacha20_setkey,
- 		.encrypt		= xchacha_simd,
- 		.decrypt		= xchacha_simd,
- 	}, {
-@@ -257,7 +237,7 @@ static struct skcipher_alg algs[] = {
- 		.max_keysize		= CHACHA_KEY_SIZE,
- 		.ivsize			= XCHACHA_IV_SIZE,
- 		.chunksize		= CHACHA_BLOCK_SIZE,
--		.setkey			= crypto_chacha12_setkey,
-+		.setkey			= chacha12_setkey,
- 		.encrypt		= xchacha_simd,
- 		.decrypt		= xchacha_simd,
- 	},
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -1417,7 +1417,7 @@ config CRYPTO_CHACHA20_X86_64
- 	tristate "ChaCha stream cipher algorithms (x86_64/SSSE3/AVX2/AVX-512VL)"
- 	depends on X86 && 64BIT
- 	select CRYPTO_BLKCIPHER
--	select CRYPTO_CHACHA20
-+	select CRYPTO_LIB_CHACHA_GENERIC
- 	help
- 	  SSSE3, AVX2, and AVX-512VL optimized implementations of the ChaCha20,
- 	  XChaCha20, and XChaCha12 stream ciphers.

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0004-crypto-x86-chacha-expose-SIMD-ChaCha-routine-as-libr.patch

@@ -1,205 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:10 +0100
-Subject: [PATCH] crypto: x86/chacha - expose SIMD ChaCha routine as library
- function
-
-commit 84e03fa39fbe95a5567d43bff458c6d3b3a23ad1 upstream.
-
-Wire the existing x86 SIMD ChaCha code into the new ChaCha library
-interface, so that users of the library interface will get the
-accelerated version when available.
-
-Given that calls into the library API will always go through the
-routines in this module if it is enabled, switch to static keys
-to select the optimal implementation available (which may be none
-at all, in which case we defer to the generic implementation for
-all invocations).
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/x86/crypto/chacha_glue.c | 91 +++++++++++++++++++++++++----------
- crypto/Kconfig                |  1 +
- include/crypto/chacha.h       |  6 +++
- 3 files changed, 73 insertions(+), 25 deletions(-)
-
---- a/arch/x86/crypto/chacha_glue.c
-+++ b/arch/x86/crypto/chacha_glue.c
-@@ -21,24 +21,24 @@ asmlinkage void chacha_block_xor_ssse3(u
- asmlinkage void chacha_4block_xor_ssse3(u32 *state, u8 *dst, const u8 *src,
- 					unsigned int len, int nrounds);
- asmlinkage void hchacha_block_ssse3(const u32 *state, u32 *out, int nrounds);
--#ifdef CONFIG_AS_AVX2
-+
- asmlinkage void chacha_2block_xor_avx2(u32 *state, u8 *dst, const u8 *src,
- 				       unsigned int len, int nrounds);
- asmlinkage void chacha_4block_xor_avx2(u32 *state, u8 *dst, const u8 *src,
- 				       unsigned int len, int nrounds);
- asmlinkage void chacha_8block_xor_avx2(u32 *state, u8 *dst, const u8 *src,
- 				       unsigned int len, int nrounds);
--static bool chacha_use_avx2;
--#ifdef CONFIG_AS_AVX512
-+
- asmlinkage void chacha_2block_xor_avx512vl(u32 *state, u8 *dst, const u8 *src,
- 					   unsigned int len, int nrounds);
- asmlinkage void chacha_4block_xor_avx512vl(u32 *state, u8 *dst, const u8 *src,
- 					   unsigned int len, int nrounds);
- asmlinkage void chacha_8block_xor_avx512vl(u32 *state, u8 *dst, const u8 *src,
- 					   unsigned int len, int nrounds);
--static bool chacha_use_avx512vl;
--#endif
--#endif
-+
-+static __ro_after_init DEFINE_STATIC_KEY_FALSE(chacha_use_simd);
-+static __ro_after_init DEFINE_STATIC_KEY_FALSE(chacha_use_avx2);
-+static __ro_after_init DEFINE_STATIC_KEY_FALSE(chacha_use_avx512vl);
- 
- static unsigned int chacha_advance(unsigned int len, unsigned int maxblocks)
- {
-@@ -49,9 +49,8 @@ static unsigned int chacha_advance(unsig
- static void chacha_dosimd(u32 *state, u8 *dst, const u8 *src,
- 			  unsigned int bytes, int nrounds)
- {
--#ifdef CONFIG_AS_AVX2
--#ifdef CONFIG_AS_AVX512
--	if (chacha_use_avx512vl) {
-+	if (IS_ENABLED(CONFIG_AS_AVX512) &&
-+	    static_branch_likely(&chacha_use_avx512vl)) {
- 		while (bytes >= CHACHA_BLOCK_SIZE * 8) {
- 			chacha_8block_xor_avx512vl(state, dst, src, bytes,
- 						   nrounds);
-@@ -79,8 +78,9 @@ static void chacha_dosimd(u32 *state, u8
- 			return;
- 		}
- 	}
--#endif
--	if (chacha_use_avx2) {
-+
-+	if (IS_ENABLED(CONFIG_AS_AVX2) &&
-+	    static_branch_likely(&chacha_use_avx2)) {
- 		while (bytes >= CHACHA_BLOCK_SIZE * 8) {
- 			chacha_8block_xor_avx2(state, dst, src, bytes, nrounds);
- 			bytes -= CHACHA_BLOCK_SIZE * 8;
-@@ -104,7 +104,7 @@ static void chacha_dosimd(u32 *state, u8
- 			return;
- 		}
- 	}
--#endif
-+
- 	while (bytes >= CHACHA_BLOCK_SIZE * 4) {
- 		chacha_4block_xor_ssse3(state, dst, src, bytes, nrounds);
- 		bytes -= CHACHA_BLOCK_SIZE * 4;
-@@ -123,6 +123,43 @@ static void chacha_dosimd(u32 *state, u8
- 	}
- }
- 
-+void hchacha_block_arch(const u32 *state, u32 *stream, int nrounds)
-+{
-+	state = PTR_ALIGN(state, CHACHA_STATE_ALIGN);
-+
-+	if (!static_branch_likely(&chacha_use_simd) || !crypto_simd_usable()) {
-+		hchacha_block_generic(state, stream, nrounds);
-+	} else {
-+		kernel_fpu_begin();
-+		hchacha_block_ssse3(state, stream, nrounds);
-+		kernel_fpu_end();
-+	}
-+}
-+EXPORT_SYMBOL(hchacha_block_arch);
-+
-+void chacha_init_arch(u32 *state, const u32 *key, const u8 *iv)
-+{
-+	state = PTR_ALIGN(state, CHACHA_STATE_ALIGN);
-+
-+	chacha_init_generic(state, key, iv);
-+}
-+EXPORT_SYMBOL(chacha_init_arch);
-+
-+void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src, unsigned int bytes,
-+		       int nrounds)
-+{
-+	state = PTR_ALIGN(state, CHACHA_STATE_ALIGN);
-+
-+	if (!static_branch_likely(&chacha_use_simd) || !crypto_simd_usable() ||
-+	    bytes <= CHACHA_BLOCK_SIZE)
-+		return chacha_crypt_generic(state, dst, src, bytes, nrounds);
-+
-+	kernel_fpu_begin();
-+	chacha_dosimd(state, dst, src, bytes, nrounds);
-+	kernel_fpu_end();
-+}
-+EXPORT_SYMBOL(chacha_crypt_arch);
-+
- static int chacha_simd_stream_xor(struct skcipher_request *req,
- 				  const struct chacha_ctx *ctx, const u8 *iv)
- {
-@@ -143,7 +180,8 @@ static int chacha_simd_stream_xor(struct
- 		if (nbytes < walk.total)
- 			nbytes = round_down(nbytes, walk.stride);
- 
--		if (!crypto_simd_usable()) {
-+		if (!static_branch_likely(&chacha_use_simd) ||
-+		    !crypto_simd_usable()) {
- 			chacha_crypt_generic(state, walk.dst.virt.addr,
- 					     walk.src.virt.addr, nbytes,
- 					     ctx->nrounds);
-@@ -246,18 +284,21 @@ static struct skcipher_alg algs[] = {
- static int __init chacha_simd_mod_init(void)
- {
- 	if (!boot_cpu_has(X86_FEATURE_SSSE3))
--		return -ENODEV;
-+		return 0;
- 
--#ifdef CONFIG_AS_AVX2
--	chacha_use_avx2 = boot_cpu_has(X86_FEATURE_AVX) &&
--			  boot_cpu_has(X86_FEATURE_AVX2) &&
--			  cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL);
--#ifdef CONFIG_AS_AVX512
--	chacha_use_avx512vl = chacha_use_avx2 &&
--			      boot_cpu_has(X86_FEATURE_AVX512VL) &&
--			      boot_cpu_has(X86_FEATURE_AVX512BW); /* kmovq */
--#endif
--#endif
-+	static_branch_enable(&chacha_use_simd);
-+
-+	if (IS_ENABLED(CONFIG_AS_AVX2) &&
-+	    boot_cpu_has(X86_FEATURE_AVX) &&
-+	    boot_cpu_has(X86_FEATURE_AVX2) &&
-+	    cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL)) {
-+		static_branch_enable(&chacha_use_avx2);
-+
-+		if (IS_ENABLED(CONFIG_AS_AVX512) &&
-+		    boot_cpu_has(X86_FEATURE_AVX512VL) &&
-+		    boot_cpu_has(X86_FEATURE_AVX512BW)) /* kmovq */
-+			static_branch_enable(&chacha_use_avx512vl);
-+	}
- 	return crypto_register_skciphers(algs, ARRAY_SIZE(algs));
- }
- 
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -1418,6 +1418,7 @@ config CRYPTO_CHACHA20_X86_64
- 	depends on X86 && 64BIT
- 	select CRYPTO_BLKCIPHER
- 	select CRYPTO_LIB_CHACHA_GENERIC
-+	select CRYPTO_ARCH_HAVE_LIB_CHACHA
- 	help
- 	  SSSE3, AVX2, and AVX-512VL optimized implementations of the ChaCha20,
- 	  XChaCha20, and XChaCha12 stream ciphers.
---- a/include/crypto/chacha.h
-+++ b/include/crypto/chacha.h
-@@ -25,6 +25,12 @@
- #define CHACHA_BLOCK_SIZE	64
- #define CHACHAPOLY_IV_SIZE	12
- 
-+#ifdef CONFIG_X86_64
-+#define CHACHA_STATE_WORDS	((CHACHA_BLOCK_SIZE + 12) / sizeof(u32))
-+#else
-+#define CHACHA_STATE_WORDS	(CHACHA_BLOCK_SIZE / sizeof(u32))
-+#endif
-+
- /* 192-bit nonce, then 64-bit stream position */
- #define XCHACHA_IV_SIZE		32
- 

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0005-crypto-arm64-chacha-depend-on-generic-chacha-library.patch

@@ -1,129 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:11 +0100
-Subject: [PATCH] crypto: arm64/chacha - depend on generic chacha library
- instead of crypto driver
-
-commit c77da4867cbb7841177275dbb250f5c09679fae4 upstream.
-
-Depend on the generic ChaCha library routines instead of pulling in the
-generic ChaCha skcipher driver, which is more than we need, and makes
-managing the dependencies between the generic library, generic driver,
-accelerated library and driver more complicated.
-
-While at it, drop the logic to prefer the scalar code on short inputs.
-Turning the NEON on and off is cheap these days, and one major use case
-for ChaCha20 is ChaCha20-Poly1305, which is guaranteed to hit the scalar
-path upon every invocation  (when doing the Poly1305 nonce generation)
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/arm64/crypto/Kconfig            |  2 +-
- arch/arm64/crypto/chacha-neon-glue.c | 40 +++++++++++++++-------------
- 2 files changed, 23 insertions(+), 19 deletions(-)
-
---- a/arch/arm64/crypto/Kconfig
-+++ b/arch/arm64/crypto/Kconfig
-@@ -103,7 +103,7 @@ config CRYPTO_CHACHA20_NEON
- 	tristate "ChaCha20, XChaCha20, and XChaCha12 stream ciphers using NEON instructions"
- 	depends on KERNEL_MODE_NEON
- 	select CRYPTO_BLKCIPHER
--	select CRYPTO_CHACHA20
-+	select CRYPTO_LIB_CHACHA_GENERIC
- 
- config CRYPTO_NHPOLY1305_NEON
- 	tristate "NHPoly1305 hash function using NEON instructions (for Adiantum)"
---- a/arch/arm64/crypto/chacha-neon-glue.c
-+++ b/arch/arm64/crypto/chacha-neon-glue.c
-@@ -68,7 +68,7 @@ static int chacha_neon_stream_xor(struct
- 
- 	err = skcipher_walk_virt(&walk, req, false);
- 
--	crypto_chacha_init(state, ctx, iv);
-+	chacha_init_generic(state, ctx->key, iv);
- 
- 	while (walk.nbytes > 0) {
- 		unsigned int nbytes = walk.nbytes;
-@@ -76,10 +76,16 @@ static int chacha_neon_stream_xor(struct
- 		if (nbytes < walk.total)
- 			nbytes = rounddown(nbytes, walk.stride);
- 
--		kernel_neon_begin();
--		chacha_doneon(state, walk.dst.virt.addr, walk.src.virt.addr,
--			      nbytes, ctx->nrounds);
--		kernel_neon_end();
-+		if (!crypto_simd_usable()) {
-+			chacha_crypt_generic(state, walk.dst.virt.addr,
-+					     walk.src.virt.addr, nbytes,
-+					     ctx->nrounds);
-+		} else {
-+			kernel_neon_begin();
-+			chacha_doneon(state, walk.dst.virt.addr,
-+				      walk.src.virt.addr, nbytes, ctx->nrounds);
-+			kernel_neon_end();
-+		}
- 		err = skcipher_walk_done(&walk, walk.nbytes - nbytes);
- 	}
- 
-@@ -91,9 +97,6 @@ static int chacha_neon(struct skcipher_r
- 	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
- 	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
- 
--	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !crypto_simd_usable())
--		return crypto_chacha_crypt(req);
--
- 	return chacha_neon_stream_xor(req, ctx, req->iv);
- }
- 
-@@ -105,14 +108,15 @@ static int xchacha_neon(struct skcipher_
- 	u32 state[16];
- 	u8 real_iv[16];
- 
--	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !crypto_simd_usable())
--		return crypto_xchacha_crypt(req);
--
--	crypto_chacha_init(state, ctx, req->iv);
-+	chacha_init_generic(state, ctx->key, req->iv);
- 
--	kernel_neon_begin();
--	hchacha_block_neon(state, subctx.key, ctx->nrounds);
--	kernel_neon_end();
-+	if (crypto_simd_usable()) {
-+		kernel_neon_begin();
-+		hchacha_block_neon(state, subctx.key, ctx->nrounds);
-+		kernel_neon_end();
-+	} else {
-+		hchacha_block_generic(state, subctx.key, ctx->nrounds);
-+	}
- 	subctx.nrounds = ctx->nrounds;
- 
- 	memcpy(&real_iv[0], req->iv + 24, 8);
-@@ -134,7 +138,7 @@ static struct skcipher_alg algs[] = {
- 		.ivsize			= CHACHA_IV_SIZE,
- 		.chunksize		= CHACHA_BLOCK_SIZE,
- 		.walksize		= 5 * CHACHA_BLOCK_SIZE,
--		.setkey			= crypto_chacha20_setkey,
-+		.setkey			= chacha20_setkey,
- 		.encrypt		= chacha_neon,
- 		.decrypt		= chacha_neon,
- 	}, {
-@@ -150,7 +154,7 @@ static struct skcipher_alg algs[] = {
- 		.ivsize			= XCHACHA_IV_SIZE,
- 		.chunksize		= CHACHA_BLOCK_SIZE,
- 		.walksize		= 5 * CHACHA_BLOCK_SIZE,
--		.setkey			= crypto_chacha20_setkey,
-+		.setkey			= chacha20_setkey,
- 		.encrypt		= xchacha_neon,
- 		.decrypt		= xchacha_neon,
- 	}, {
-@@ -166,7 +170,7 @@ static struct skcipher_alg algs[] = {
- 		.ivsize			= XCHACHA_IV_SIZE,
- 		.chunksize		= CHACHA_BLOCK_SIZE,
- 		.walksize		= 5 * CHACHA_BLOCK_SIZE,
--		.setkey			= crypto_chacha12_setkey,
-+		.setkey			= chacha12_setkey,
- 		.encrypt		= xchacha_neon,
- 		.decrypt		= xchacha_neon,
- 	}

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0006-crypto-arm64-chacha-expose-arm64-ChaCha-routine-as-l.patch

@@ -1,138 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:12 +0100
-Subject: [PATCH] crypto: arm64/chacha - expose arm64 ChaCha routine as library
- function
-
-commit b3aad5bad26a01a4bd8c49a5c5f52aec665f3b7c upstream.
-
-Expose the accelerated NEON ChaCha routine directly as a symbol
-export so that users of the ChaCha library API can use it directly.
-
-Given that calls into the library API will always go through the
-routines in this module if it is enabled, switch to static keys
-to select the optimal implementation available (which may be none
-at all, in which case we defer to the generic implementation for
-all invocations).
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/arm64/crypto/Kconfig            |  1 +
- arch/arm64/crypto/chacha-neon-glue.c | 53 ++++++++++++++++++++++------
- 2 files changed, 43 insertions(+), 11 deletions(-)
-
---- a/arch/arm64/crypto/Kconfig
-+++ b/arch/arm64/crypto/Kconfig
-@@ -104,6 +104,7 @@ config CRYPTO_CHACHA20_NEON
- 	depends on KERNEL_MODE_NEON
- 	select CRYPTO_BLKCIPHER
- 	select CRYPTO_LIB_CHACHA_GENERIC
-+	select CRYPTO_ARCH_HAVE_LIB_CHACHA
- 
- config CRYPTO_NHPOLY1305_NEON
- 	tristate "NHPoly1305 hash function using NEON instructions (for Adiantum)"
---- a/arch/arm64/crypto/chacha-neon-glue.c
-+++ b/arch/arm64/crypto/chacha-neon-glue.c
-@@ -23,6 +23,7 @@
- #include <crypto/internal/chacha.h>
- #include <crypto/internal/simd.h>
- #include <crypto/internal/skcipher.h>
-+#include <linux/jump_label.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- 
-@@ -36,6 +37,8 @@ asmlinkage void chacha_4block_xor_neon(u
- 				       int nrounds, int bytes);
- asmlinkage void hchacha_block_neon(const u32 *state, u32 *out, int nrounds);
- 
-+static __ro_after_init DEFINE_STATIC_KEY_FALSE(have_neon);
-+
- static void chacha_doneon(u32 *state, u8 *dst, const u8 *src,
- 			  int bytes, int nrounds)
- {
-@@ -59,6 +62,37 @@ static void chacha_doneon(u32 *state, u8
- 	}
- }
- 
-+void hchacha_block_arch(const u32 *state, u32 *stream, int nrounds)
-+{
-+	if (!static_branch_likely(&have_neon) || !crypto_simd_usable()) {
-+		hchacha_block_generic(state, stream, nrounds);
-+	} else {
-+		kernel_neon_begin();
-+		hchacha_block_neon(state, stream, nrounds);
-+		kernel_neon_end();
-+	}
-+}
-+EXPORT_SYMBOL(hchacha_block_arch);
-+
-+void chacha_init_arch(u32 *state, const u32 *key, const u8 *iv)
-+{
-+	chacha_init_generic(state, key, iv);
-+}
-+EXPORT_SYMBOL(chacha_init_arch);
-+
-+void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src, unsigned int bytes,
-+		       int nrounds)
-+{
-+	if (!static_branch_likely(&have_neon) || bytes <= CHACHA_BLOCK_SIZE ||
-+	    !crypto_simd_usable())
-+		return chacha_crypt_generic(state, dst, src, bytes, nrounds);
-+
-+	kernel_neon_begin();
-+	chacha_doneon(state, dst, src, bytes, nrounds);
-+	kernel_neon_end();
-+}
-+EXPORT_SYMBOL(chacha_crypt_arch);
-+
- static int chacha_neon_stream_xor(struct skcipher_request *req,
- 				  const struct chacha_ctx *ctx, const u8 *iv)
- {
-@@ -76,7 +110,8 @@ static int chacha_neon_stream_xor(struct
- 		if (nbytes < walk.total)
- 			nbytes = rounddown(nbytes, walk.stride);
- 
--		if (!crypto_simd_usable()) {
-+		if (!static_branch_likely(&have_neon) ||
-+		    !crypto_simd_usable()) {
- 			chacha_crypt_generic(state, walk.dst.virt.addr,
- 					     walk.src.virt.addr, nbytes,
- 					     ctx->nrounds);
-@@ -109,14 +144,7 @@ static int xchacha_neon(struct skcipher_
- 	u8 real_iv[16];
- 
- 	chacha_init_generic(state, ctx->key, req->iv);
--
--	if (crypto_simd_usable()) {
--		kernel_neon_begin();
--		hchacha_block_neon(state, subctx.key, ctx->nrounds);
--		kernel_neon_end();
--	} else {
--		hchacha_block_generic(state, subctx.key, ctx->nrounds);
--	}
-+	hchacha_block_arch(state, subctx.key, ctx->nrounds);
- 	subctx.nrounds = ctx->nrounds;
- 
- 	memcpy(&real_iv[0], req->iv + 24, 8);
-@@ -179,14 +207,17 @@ static struct skcipher_alg algs[] = {
- static int __init chacha_simd_mod_init(void)
- {
- 	if (!cpu_have_named_feature(ASIMD))
--		return -ENODEV;
-+		return 0;
-+
-+	static_branch_enable(&have_neon);
- 
- 	return crypto_register_skciphers(algs, ARRAY_SIZE(algs));
- }
- 
- static void __exit chacha_simd_mod_fini(void)
- {
--	crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));
-+	if (cpu_have_named_feature(ASIMD))
-+		crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));
- }
- 
- module_init(chacha_simd_mod_init);

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0007-crypto-arm-chacha-import-Eric-Biggers-s-scalar-accel.patch

@@ -1,480 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:13 +0100
-Subject: [PATCH] crypto: arm/chacha - import Eric Biggers's scalar accelerated
- ChaCha code
-
-commit 29621d099f9c642b22a69dc8e7e20c108473a392 upstream.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/arm/crypto/chacha-scalar-core.S | 461 +++++++++++++++++++++++++++
- 1 file changed, 461 insertions(+)
- create mode 100644 arch/arm/crypto/chacha-scalar-core.S
-
---- /dev/null
-+++ b/arch/arm/crypto/chacha-scalar-core.S
-@@ -0,0 +1,461 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Copyright (C) 2018 Google, Inc.
-+ */
-+
-+#include <linux/linkage.h>
-+#include <asm/assembler.h>
-+
-+/*
-+ * Design notes:
-+ *
-+ * 16 registers would be needed to hold the state matrix, but only 14 are
-+ * available because 'sp' and 'pc' cannot be used.  So we spill the elements
-+ * (x8, x9) to the stack and swap them out with (x10, x11).  This adds one
-+ * 'ldrd' and one 'strd' instruction per round.
-+ *
-+ * All rotates are performed using the implicit rotate operand accepted by the
-+ * 'add' and 'eor' instructions.  This is faster than using explicit rotate
-+ * instructions.  To make this work, we allow the values in the second and last
-+ * rows of the ChaCha state matrix (rows 'b' and 'd') to temporarily have the
-+ * wrong rotation amount.  The rotation amount is then fixed up just in time
-+ * when the values are used.  'brot' is the number of bits the values in row 'b'
-+ * need to be rotated right to arrive at the correct values, and 'drot'
-+ * similarly for row 'd'.  (brot, drot) start out as (0, 0) but we make it such
-+ * that they end up as (25, 24) after every round.
-+ */
-+
-+	// ChaCha state registers
-+	X0	.req	r0
-+	X1	.req	r1
-+	X2	.req	r2
-+	X3	.req	r3
-+	X4	.req	r4
-+	X5	.req	r5
-+	X6	.req	r6
-+	X7	.req	r7
-+	X8_X10	.req	r8	// shared by x8 and x10
-+	X9_X11	.req	r9	// shared by x9 and x11
-+	X12	.req	r10
-+	X13	.req	r11
-+	X14	.req	r12
-+	X15	.req	r14
-+
-+.Lexpand_32byte_k:
-+	// "expand 32-byte k"
-+	.word	0x61707865, 0x3320646e, 0x79622d32, 0x6b206574
-+
-+#ifdef __thumb2__
-+#  define adrl adr
-+#endif
-+
-+.macro __rev		out, in,  t0, t1, t2
-+.if __LINUX_ARM_ARCH__ >= 6
-+	rev		\out, \in
-+.else
-+	lsl		\t0, \in, #24
-+	and		\t1, \in, #0xff00
-+	and		\t2, \in, #0xff0000
-+	orr		\out, \t0, \in, lsr #24
-+	orr		\out, \out, \t1, lsl #8
-+	orr		\out, \out, \t2, lsr #8
-+.endif
-+.endm
-+
-+.macro _le32_bswap	x,  t0, t1, t2
-+#ifdef __ARMEB__
-+	__rev		\x, \x,  \t0, \t1, \t2
-+#endif
-+.endm
-+
-+.macro _le32_bswap_4x	a, b, c, d,  t0, t1, t2
-+	_le32_bswap	\a,  \t0, \t1, \t2
-+	_le32_bswap	\b,  \t0, \t1, \t2
-+	_le32_bswap	\c,  \t0, \t1, \t2
-+	_le32_bswap	\d,  \t0, \t1, \t2
-+.endm
-+
-+.macro __ldrd		a, b, src, offset
-+#if __LINUX_ARM_ARCH__ >= 6
-+	ldrd		\a, \b, [\src, #\offset]
-+#else
-+	ldr		\a, [\src, #\offset]
-+	ldr		\b, [\src, #\offset + 4]
-+#endif
-+.endm
-+
-+.macro __strd		a, b, dst, offset
-+#if __LINUX_ARM_ARCH__ >= 6
-+	strd		\a, \b, [\dst, #\offset]
-+#else
-+	str		\a, [\dst, #\offset]
-+	str		\b, [\dst, #\offset + 4]
-+#endif
-+.endm
-+
-+.macro _halfround	a1, b1, c1, d1,  a2, b2, c2, d2
-+
-+	// a += b; d ^= a; d = rol(d, 16);
-+	add		\a1, \a1, \b1, ror #brot
-+	add		\a2, \a2, \b2, ror #brot
-+	eor		\d1, \a1, \d1, ror #drot
-+	eor		\d2, \a2, \d2, ror #drot
-+	// drot == 32 - 16 == 16
-+
-+	// c += d; b ^= c; b = rol(b, 12);
-+	add		\c1, \c1, \d1, ror #16
-+	add		\c2, \c2, \d2, ror #16
-+	eor		\b1, \c1, \b1, ror #brot
-+	eor		\b2, \c2, \b2, ror #brot
-+	// brot == 32 - 12 == 20
-+
-+	// a += b; d ^= a; d = rol(d, 8);
-+	add		\a1, \a1, \b1, ror #20
-+	add		\a2, \a2, \b2, ror #20
-+	eor		\d1, \a1, \d1, ror #16
-+	eor		\d2, \a2, \d2, ror #16
-+	// drot == 32 - 8 == 24
-+
-+	// c += d; b ^= c; b = rol(b, 7);
-+	add		\c1, \c1, \d1, ror #24
-+	add		\c2, \c2, \d2, ror #24
-+	eor		\b1, \c1, \b1, ror #20
-+	eor		\b2, \c2, \b2, ror #20
-+	// brot == 32 - 7 == 25
-+.endm
-+
-+.macro _doubleround
-+
-+	// column round
-+
-+	// quarterrounds: (x0, x4, x8, x12) and (x1, x5, x9, x13)
-+	_halfround	X0, X4, X8_X10, X12,  X1, X5, X9_X11, X13
-+
-+	// save (x8, x9); restore (x10, x11)
-+	__strd		X8_X10, X9_X11, sp, 0
-+	__ldrd		X8_X10, X9_X11, sp, 8
-+
-+	// quarterrounds: (x2, x6, x10, x14) and (x3, x7, x11, x15)
-+	_halfround	X2, X6, X8_X10, X14,  X3, X7, X9_X11, X15
-+
-+	.set brot, 25
-+	.set drot, 24
-+
-+	// diagonal round
-+
-+	// quarterrounds: (x0, x5, x10, x15) and (x1, x6, x11, x12)
-+	_halfround	X0, X5, X8_X10, X15,  X1, X6, X9_X11, X12
-+
-+	// save (x10, x11); restore (x8, x9)
-+	__strd		X8_X10, X9_X11, sp, 8
-+	__ldrd		X8_X10, X9_X11, sp, 0
-+
-+	// quarterrounds: (x2, x7, x8, x13) and (x3, x4, x9, x14)
-+	_halfround	X2, X7, X8_X10, X13,  X3, X4, X9_X11, X14
-+.endm
-+
-+.macro _chacha_permute	nrounds
-+	.set brot, 0
-+	.set drot, 0
-+	.rept \nrounds / 2
-+	 _doubleround
-+	.endr
-+.endm
-+
-+.macro _chacha		nrounds
-+
-+.Lnext_block\@:
-+	// Stack: unused0-unused1 x10-x11 x0-x15 OUT IN LEN
-+	// Registers contain x0-x9,x12-x15.
-+
-+	// Do the core ChaCha permutation to update x0-x15.
-+	_chacha_permute	\nrounds
-+
-+	add		sp, #8
-+	// Stack: x10-x11 orig_x0-orig_x15 OUT IN LEN
-+	// Registers contain x0-x9,x12-x15.
-+	// x4-x7 are rotated by 'brot'; x12-x15 are rotated by 'drot'.
-+
-+	// Free up some registers (r8-r12,r14) by pushing (x8-x9,x12-x15).
-+	push		{X8_X10, X9_X11, X12, X13, X14, X15}
-+
-+	// Load (OUT, IN, LEN).
-+	ldr		r14, [sp, #96]
-+	ldr		r12, [sp, #100]
-+	ldr		r11, [sp, #104]
-+
-+	orr		r10, r14, r12
-+
-+	// Use slow path if fewer than 64 bytes remain.
-+	cmp		r11, #64
-+	blt		.Lxor_slowpath\@
-+
-+	// Use slow path if IN and/or OUT isn't 4-byte aligned.  Needed even on
-+	// ARMv6+, since ldmia and stmia (used below) still require alignment.
-+	tst		r10, #3
-+	bne		.Lxor_slowpath\@
-+
-+	// Fast path: XOR 64 bytes of aligned data.
-+
-+	// Stack: x8-x9 x12-x15 x10-x11 orig_x0-orig_x15 OUT IN LEN
-+	// Registers: r0-r7 are x0-x7; r8-r11 are free; r12 is IN; r14 is OUT.
-+	// x4-x7 are rotated by 'brot'; x12-x15 are rotated by 'drot'.
-+
-+	// x0-x3
-+	__ldrd		r8, r9, sp, 32
-+	__ldrd		r10, r11, sp, 40
-+	add		X0, X0, r8
-+	add		X1, X1, r9
-+	add		X2, X2, r10
-+	add		X3, X3, r11
-+	_le32_bswap_4x	X0, X1, X2, X3,  r8, r9, r10
-+	ldmia		r12!, {r8-r11}
-+	eor		X0, X0, r8
-+	eor		X1, X1, r9
-+	eor		X2, X2, r10
-+	eor		X3, X3, r11
-+	stmia		r14!, {X0-X3}
-+
-+	// x4-x7
-+	__ldrd		r8, r9, sp, 48
-+	__ldrd		r10, r11, sp, 56
-+	add		X4, r8, X4, ror #brot
-+	add		X5, r9, X5, ror #brot
-+	ldmia		r12!, {X0-X3}
-+	add		X6, r10, X6, ror #brot
-+	add		X7, r11, X7, ror #brot
-+	_le32_bswap_4x	X4, X5, X6, X7,  r8, r9, r10
-+	eor		X4, X4, X0
-+	eor		X5, X5, X1
-+	eor		X6, X6, X2
-+	eor		X7, X7, X3
-+	stmia		r14!, {X4-X7}
-+
-+	// x8-x15
-+	pop		{r0-r7}			// (x8-x9,x12-x15,x10-x11)
-+	__ldrd		r8, r9, sp, 32
-+	__ldrd		r10, r11, sp, 40
-+	add		r0, r0, r8		// x8
-+	add		r1, r1, r9		// x9
-+	add		r6, r6, r10		// x10
-+	add		r7, r7, r11		// x11
-+	_le32_bswap_4x	r0, r1, r6, r7,  r8, r9, r10
-+	ldmia		r12!, {r8-r11}
-+	eor		r0, r0, r8		// x8
-+	eor		r1, r1, r9		// x9
-+	eor		r6, r6, r10		// x10
-+	eor		r7, r7, r11		// x11
-+	stmia		r14!, {r0,r1,r6,r7}
-+	ldmia		r12!, {r0,r1,r6,r7}
-+	__ldrd		r8, r9, sp, 48
-+	__ldrd		r10, r11, sp, 56
-+	add		r2, r8, r2, ror #drot	// x12
-+	add		r3, r9, r3, ror #drot	// x13
-+	add		r4, r10, r4, ror #drot	// x14
-+	add		r5, r11, r5, ror #drot	// x15
-+	_le32_bswap_4x	r2, r3, r4, r5,  r9, r10, r11
-+	  ldr		r9, [sp, #72]		// load LEN
-+	eor		r2, r2, r0		// x12
-+	eor		r3, r3, r1		// x13
-+	eor		r4, r4, r6		// x14
-+	eor		r5, r5, r7		// x15
-+	  subs		r9, #64			// decrement and check LEN
-+	stmia		r14!, {r2-r5}
-+
-+	beq		.Ldone\@
-+
-+.Lprepare_for_next_block\@:
-+
-+	// Stack: x0-x15 OUT IN LEN
-+
-+	// Increment block counter (x12)
-+	add		r8, #1
-+
-+	// Store updated (OUT, IN, LEN)
-+	str		r14, [sp, #64]
-+	str		r12, [sp, #68]
-+	str		r9, [sp, #72]
-+
-+	  mov		r14, sp
-+
-+	// Store updated block counter (x12)
-+	str		r8, [sp, #48]
-+
-+	  sub		sp, #16
-+
-+	// Reload state and do next block
-+	ldmia		r14!, {r0-r11}		// load x0-x11
-+	__strd		r10, r11, sp, 8		// store x10-x11 before state
-+	ldmia		r14, {r10-r12,r14}	// load x12-x15
-+	b		.Lnext_block\@
-+
-+.Lxor_slowpath\@:
-+	// Slow path: < 64 bytes remaining, or unaligned input or output buffer.
-+	// We handle it by storing the 64 bytes of keystream to the stack, then
-+	// XOR-ing the needed portion with the data.
-+
-+	// Allocate keystream buffer
-+	sub		sp, #64
-+	mov		r14, sp
-+
-+	// Stack: ks0-ks15 x8-x9 x12-x15 x10-x11 orig_x0-orig_x15 OUT IN LEN
-+	// Registers: r0-r7 are x0-x7; r8-r11 are free; r12 is IN; r14 is &ks0.
-+	// x4-x7 are rotated by 'brot'; x12-x15 are rotated by 'drot'.
-+
-+	// Save keystream for x0-x3
-+	__ldrd		r8, r9, sp, 96
-+	__ldrd		r10, r11, sp, 104
-+	add		X0, X0, r8
-+	add		X1, X1, r9
-+	add		X2, X2, r10
-+	add		X3, X3, r11
-+	_le32_bswap_4x	X0, X1, X2, X3,  r8, r9, r10
-+	stmia		r14!, {X0-X3}
-+
-+	// Save keystream for x4-x7
-+	__ldrd		r8, r9, sp, 112
-+	__ldrd		r10, r11, sp, 120
-+	add		X4, r8, X4, ror #brot
-+	add		X5, r9, X5, ror #brot
-+	add		X6, r10, X6, ror #brot
-+	add		X7, r11, X7, ror #brot
-+	_le32_bswap_4x	X4, X5, X6, X7,  r8, r9, r10
-+	  add		r8, sp, #64
-+	stmia		r14!, {X4-X7}
-+
-+	// Save keystream for x8-x15
-+	ldm		r8, {r0-r7}		// (x8-x9,x12-x15,x10-x11)
-+	__ldrd		r8, r9, sp, 128
-+	__ldrd		r10, r11, sp, 136
-+	add		r0, r0, r8		// x8
-+	add		r1, r1, r9		// x9
-+	add		r6, r6, r10		// x10
-+	add		r7, r7, r11		// x11
-+	_le32_bswap_4x	r0, r1, r6, r7,  r8, r9, r10
-+	stmia		r14!, {r0,r1,r6,r7}
-+	__ldrd		r8, r9, sp, 144
-+	__ldrd		r10, r11, sp, 152
-+	add		r2, r8, r2, ror #drot	// x12
-+	add		r3, r9, r3, ror #drot	// x13
-+	add		r4, r10, r4, ror #drot	// x14
-+	add		r5, r11, r5, ror #drot	// x15
-+	_le32_bswap_4x	r2, r3, r4, r5,  r9, r10, r11
-+	stmia		r14, {r2-r5}
-+
-+	// Stack: ks0-ks15 unused0-unused7 x0-x15 OUT IN LEN
-+	// Registers: r8 is block counter, r12 is IN.
-+
-+	ldr		r9, [sp, #168]		// LEN
-+	ldr		r14, [sp, #160]		// OUT
-+	cmp		r9, #64
-+	  mov		r0, sp
-+	movle		r1, r9
-+	movgt		r1, #64
-+	// r1 is number of bytes to XOR, in range [1, 64]
-+
-+.if __LINUX_ARM_ARCH__ < 6
-+	orr		r2, r12, r14
-+	tst		r2, #3			// IN or OUT misaligned?
-+	bne		.Lxor_next_byte\@
-+.endif
-+
-+	// XOR a word at a time
-+.rept 16
-+	subs		r1, #4
-+	blt		.Lxor_words_done\@
-+	ldr		r2, [r12], #4
-+	ldr		r3, [r0], #4
-+	eor		r2, r2, r3
-+	str		r2, [r14], #4
-+.endr
-+	b		.Lxor_slowpath_done\@
-+.Lxor_words_done\@:
-+	ands		r1, r1, #3
-+	beq		.Lxor_slowpath_done\@
-+
-+	// XOR a byte at a time
-+.Lxor_next_byte\@:
-+	ldrb		r2, [r12], #1
-+	ldrb		r3, [r0], #1
-+	eor		r2, r2, r3
-+	strb		r2, [r14], #1
-+	subs		r1, #1
-+	bne		.Lxor_next_byte\@
-+
-+.Lxor_slowpath_done\@:
-+	subs		r9, #64
-+	add		sp, #96
-+	bgt		.Lprepare_for_next_block\@
-+
-+.Ldone\@:
-+.endm	// _chacha
-+
-+/*
-+ * void chacha20_arm(u8 *out, const u8 *in, size_t len, const u32 key[8],
-+ *		     const u32 iv[4]);
-+ */
-+ENTRY(chacha20_arm)
-+	cmp		r2, #0			// len == 0?
-+	reteq		lr
-+
-+	push		{r0-r2,r4-r11,lr}
-+
-+	// Push state x0-x15 onto stack.
-+	// Also store an extra copy of x10-x11 just before the state.
-+
-+	ldr		r4, [sp, #48]		// iv
-+	mov		r0, sp
-+	sub		sp, #80
-+
-+	// iv: x12-x15
-+	ldm		r4, {X12,X13,X14,X15}
-+	stmdb		r0!, {X12,X13,X14,X15}
-+
-+	// key: x4-x11
-+	__ldrd		X8_X10, X9_X11, r3, 24
-+	__strd		X8_X10, X9_X11, sp, 8
-+	stmdb		r0!, {X8_X10, X9_X11}
-+	ldm		r3, {X4-X9_X11}
-+	stmdb		r0!, {X4-X9_X11}
-+
-+	// constants: x0-x3
-+	adrl		X3, .Lexpand_32byte_k
-+	ldm		X3, {X0-X3}
-+	__strd		X0, X1, sp, 16
-+	__strd		X2, X3, sp, 24
-+
-+	_chacha		20
-+
-+	add		sp, #76
-+	pop		{r4-r11, pc}
-+ENDPROC(chacha20_arm)
-+
-+/*
-+ * void hchacha20_arm(const u32 state[16], u32 out[8]);
-+ */
-+ENTRY(hchacha20_arm)
-+	push		{r1,r4-r11,lr}
-+
-+	mov		r14, r0
-+	ldmia		r14!, {r0-r11}		// load x0-x11
-+	push		{r10-r11}		// store x10-x11 to stack
-+	ldm		r14, {r10-r12,r14}	// load x12-x15
-+	sub		sp, #8
-+
-+	_chacha_permute	20
-+
-+	// Skip over (unused0-unused1, x10-x11)
-+	add		sp, #16
-+
-+	// Fix up rotations of x12-x15
-+	ror		X12, X12, #drot
-+	ror		X13, X13, #drot
-+	  pop		{r4}			// load 'out'
-+	ror		X14, X14, #drot
-+	ror		X15, X15, #drot
-+
-+	// Store (x0-x3,x12-x15) to 'out'
-+	stm		r4, {X0,X1,X2,X3,X12,X13,X14,X15}
-+
-+	pop		{r4-r11,pc}
-+ENDPROC(hchacha20_arm)

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0008-crypto-arm-chacha-remove-dependency-on-generic-ChaCh.patch

@@ -1,691 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:14 +0100
-Subject: [PATCH] crypto: arm/chacha - remove dependency on generic ChaCha
- driver
-
-commit b36d8c09e710c71f6a9690b6586fea2d1c9e1e27 upstream.
-
-Instead of falling back to the generic ChaCha skcipher driver for
-non-SIMD cases, use a fast scalar implementation for ARM authored
-by Eric Biggers. This removes the module dependency on chacha-generic
-altogether, which also simplifies things when we expose the ChaCha
-library interface from this module.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/arm/crypto/Kconfig              |   4 +-
- arch/arm/crypto/Makefile             |   3 +-
- arch/arm/crypto/chacha-glue.c        | 304 +++++++++++++++++++++++++++
- arch/arm/crypto/chacha-neon-glue.c   | 202 ------------------
- arch/arm/crypto/chacha-scalar-core.S |  65 +++---
- arch/arm64/crypto/chacha-neon-glue.c |   2 +-
- 6 files changed, 340 insertions(+), 240 deletions(-)
- create mode 100644 arch/arm/crypto/chacha-glue.c
- delete mode 100644 arch/arm/crypto/chacha-neon-glue.c
-
---- a/arch/arm/crypto/Kconfig
-+++ b/arch/arm/crypto/Kconfig
-@@ -127,10 +127,8 @@ config CRYPTO_CRC32_ARM_CE
- 	select CRYPTO_HASH
- 
- config CRYPTO_CHACHA20_NEON
--	tristate "NEON accelerated ChaCha stream cipher algorithms"
--	depends on KERNEL_MODE_NEON
-+	tristate "NEON and scalar accelerated ChaCha stream cipher algorithms"
- 	select CRYPTO_BLKCIPHER
--	select CRYPTO_CHACHA20
- 
- config CRYPTO_NHPOLY1305_NEON
- 	tristate "NEON accelerated NHPoly1305 hash function (for Adiantum)"
---- a/arch/arm/crypto/Makefile
-+++ b/arch/arm/crypto/Makefile
-@@ -53,7 +53,8 @@ aes-arm-ce-y	:= aes-ce-core.o aes-ce-glu
- ghash-arm-ce-y	:= ghash-ce-core.o ghash-ce-glue.o
- crct10dif-arm-ce-y	:= crct10dif-ce-core.o crct10dif-ce-glue.o
- crc32-arm-ce-y:= crc32-ce-core.o crc32-ce-glue.o
--chacha-neon-y := chacha-neon-core.o chacha-neon-glue.o
-+chacha-neon-y := chacha-scalar-core.o chacha-glue.o
-+chacha-neon-$(CONFIG_KERNEL_MODE_NEON) += chacha-neon-core.o
- nhpoly1305-neon-y := nh-neon-core.o nhpoly1305-neon-glue.o
- 
- ifdef REGENERATE_ARM_CRYPTO
---- /dev/null
-+++ b/arch/arm/crypto/chacha-glue.c
-@@ -0,0 +1,304 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * ARM NEON accelerated ChaCha and XChaCha stream ciphers,
-+ * including ChaCha20 (RFC7539)
-+ *
-+ * Copyright (C) 2016-2019 Linaro, Ltd. <ard.biesheuvel@linaro.org>
-+ * Copyright (C) 2015 Martin Willi
-+ */
-+
-+#include <crypto/algapi.h>
-+#include <crypto/internal/chacha.h>
-+#include <crypto/internal/simd.h>
-+#include <crypto/internal/skcipher.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+
-+#include <asm/cputype.h>
-+#include <asm/hwcap.h>
-+#include <asm/neon.h>
-+#include <asm/simd.h>
-+
-+asmlinkage void chacha_block_xor_neon(const u32 *state, u8 *dst, const u8 *src,
-+				      int nrounds);
-+asmlinkage void chacha_4block_xor_neon(const u32 *state, u8 *dst, const u8 *src,
-+				       int nrounds);
-+asmlinkage void hchacha_block_arm(const u32 *state, u32 *out, int nrounds);
-+asmlinkage void hchacha_block_neon(const u32 *state, u32 *out, int nrounds);
-+
-+asmlinkage void chacha_doarm(u8 *dst, const u8 *src, unsigned int bytes,
-+			     const u32 *state, int nrounds);
-+
-+static inline bool neon_usable(void)
-+{
-+	return crypto_simd_usable();
-+}
-+
-+static void chacha_doneon(u32 *state, u8 *dst, const u8 *src,
-+			  unsigned int bytes, int nrounds)
-+{
-+	u8 buf[CHACHA_BLOCK_SIZE];
-+
-+	while (bytes >= CHACHA_BLOCK_SIZE * 4) {
-+		chacha_4block_xor_neon(state, dst, src, nrounds);
-+		bytes -= CHACHA_BLOCK_SIZE * 4;
-+		src += CHACHA_BLOCK_SIZE * 4;
-+		dst += CHACHA_BLOCK_SIZE * 4;
-+		state[12] += 4;
-+	}
-+	while (bytes >= CHACHA_BLOCK_SIZE) {
-+		chacha_block_xor_neon(state, dst, src, nrounds);
-+		bytes -= CHACHA_BLOCK_SIZE;
-+		src += CHACHA_BLOCK_SIZE;
-+		dst += CHACHA_BLOCK_SIZE;
-+		state[12]++;
-+	}
-+	if (bytes) {
-+		memcpy(buf, src, bytes);
-+		chacha_block_xor_neon(state, buf, buf, nrounds);
-+		memcpy(dst, buf, bytes);
-+	}
-+}
-+
-+static int chacha_stream_xor(struct skcipher_request *req,
-+			     const struct chacha_ctx *ctx, const u8 *iv,
-+			     bool neon)
-+{
-+	struct skcipher_walk walk;
-+	u32 state[16];
-+	int err;
-+
-+	err = skcipher_walk_virt(&walk, req, false);
-+
-+	chacha_init_generic(state, ctx->key, iv);
-+
-+	while (walk.nbytes > 0) {
-+		unsigned int nbytes = walk.nbytes;
-+
-+		if (nbytes < walk.total)
-+			nbytes = round_down(nbytes, walk.stride);
-+
-+		if (!neon) {
-+			chacha_doarm(walk.dst.virt.addr, walk.src.virt.addr,
-+				     nbytes, state, ctx->nrounds);
-+			state[12] += DIV_ROUND_UP(nbytes, CHACHA_BLOCK_SIZE);
-+		} else {
-+			kernel_neon_begin();
-+			chacha_doneon(state, walk.dst.virt.addr,
-+				      walk.src.virt.addr, nbytes, ctx->nrounds);
-+			kernel_neon_end();
-+		}
-+		err = skcipher_walk_done(&walk, walk.nbytes - nbytes);
-+	}
-+
-+	return err;
-+}
-+
-+static int do_chacha(struct skcipher_request *req, bool neon)
-+{
-+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
-+	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
-+
-+	return chacha_stream_xor(req, ctx, req->iv, neon);
-+}
-+
-+static int chacha_arm(struct skcipher_request *req)
-+{
-+	return do_chacha(req, false);
-+}
-+
-+static int chacha_neon(struct skcipher_request *req)
-+{
-+	return do_chacha(req, neon_usable());
-+}
-+
-+static int do_xchacha(struct skcipher_request *req, bool neon)
-+{
-+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
-+	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
-+	struct chacha_ctx subctx;
-+	u32 state[16];
-+	u8 real_iv[16];
-+
-+	chacha_init_generic(state, ctx->key, req->iv);
-+
-+	if (!neon) {
-+		hchacha_block_arm(state, subctx.key, ctx->nrounds);
-+	} else {
-+		kernel_neon_begin();
-+		hchacha_block_neon(state, subctx.key, ctx->nrounds);
-+		kernel_neon_end();
-+	}
-+	subctx.nrounds = ctx->nrounds;
-+
-+	memcpy(&real_iv[0], req->iv + 24, 8);
-+	memcpy(&real_iv[8], req->iv + 16, 8);
-+	return chacha_stream_xor(req, &subctx, real_iv, neon);
-+}
-+
-+static int xchacha_arm(struct skcipher_request *req)
-+{
-+	return do_xchacha(req, false);
-+}
-+
-+static int xchacha_neon(struct skcipher_request *req)
-+{
-+	return do_xchacha(req, neon_usable());
-+}
-+
-+static struct skcipher_alg arm_algs[] = {
-+	{
-+		.base.cra_name		= "chacha20",
-+		.base.cra_driver_name	= "chacha20-arm",
-+		.base.cra_priority	= 200,
-+		.base.cra_blocksize	= 1,
-+		.base.cra_ctxsize	= sizeof(struct chacha_ctx),
-+		.base.cra_module	= THIS_MODULE,
-+
-+		.min_keysize		= CHACHA_KEY_SIZE,
-+		.max_keysize		= CHACHA_KEY_SIZE,
-+		.ivsize			= CHACHA_IV_SIZE,
-+		.chunksize		= CHACHA_BLOCK_SIZE,
-+		.setkey			= chacha20_setkey,
-+		.encrypt		= chacha_arm,
-+		.decrypt		= chacha_arm,
-+	}, {
-+		.base.cra_name		= "xchacha20",
-+		.base.cra_driver_name	= "xchacha20-arm",
-+		.base.cra_priority	= 200,
-+		.base.cra_blocksize	= 1,
-+		.base.cra_ctxsize	= sizeof(struct chacha_ctx),
-+		.base.cra_module	= THIS_MODULE,
-+
-+		.min_keysize		= CHACHA_KEY_SIZE,
-+		.max_keysize		= CHACHA_KEY_SIZE,
-+		.ivsize			= XCHACHA_IV_SIZE,
-+		.chunksize		= CHACHA_BLOCK_SIZE,
-+		.setkey			= chacha20_setkey,
-+		.encrypt		= xchacha_arm,
-+		.decrypt		= xchacha_arm,
-+	}, {
-+		.base.cra_name		= "xchacha12",
-+		.base.cra_driver_name	= "xchacha12-arm",
-+		.base.cra_priority	= 200,
-+		.base.cra_blocksize	= 1,
-+		.base.cra_ctxsize	= sizeof(struct chacha_ctx),
-+		.base.cra_module	= THIS_MODULE,
-+
-+		.min_keysize		= CHACHA_KEY_SIZE,
-+		.max_keysize		= CHACHA_KEY_SIZE,
-+		.ivsize			= XCHACHA_IV_SIZE,
-+		.chunksize		= CHACHA_BLOCK_SIZE,
-+		.setkey			= chacha12_setkey,
-+		.encrypt		= xchacha_arm,
-+		.decrypt		= xchacha_arm,
-+	},
-+};
-+
-+static struct skcipher_alg neon_algs[] = {
-+	{
-+		.base.cra_name		= "chacha20",
-+		.base.cra_driver_name	= "chacha20-neon",
-+		.base.cra_priority	= 300,
-+		.base.cra_blocksize	= 1,
-+		.base.cra_ctxsize	= sizeof(struct chacha_ctx),
-+		.base.cra_module	= THIS_MODULE,
-+
-+		.min_keysize		= CHACHA_KEY_SIZE,
-+		.max_keysize		= CHACHA_KEY_SIZE,
-+		.ivsize			= CHACHA_IV_SIZE,
-+		.chunksize		= CHACHA_BLOCK_SIZE,
-+		.walksize		= 4 * CHACHA_BLOCK_SIZE,
-+		.setkey			= chacha20_setkey,
-+		.encrypt		= chacha_neon,
-+		.decrypt		= chacha_neon,
-+	}, {
-+		.base.cra_name		= "xchacha20",
-+		.base.cra_driver_name	= "xchacha20-neon",
-+		.base.cra_priority	= 300,
-+		.base.cra_blocksize	= 1,
-+		.base.cra_ctxsize	= sizeof(struct chacha_ctx),
-+		.base.cra_module	= THIS_MODULE,
-+
-+		.min_keysize		= CHACHA_KEY_SIZE,
-+		.max_keysize		= CHACHA_KEY_SIZE,
-+		.ivsize			= XCHACHA_IV_SIZE,
-+		.chunksize		= CHACHA_BLOCK_SIZE,
-+		.walksize		= 4 * CHACHA_BLOCK_SIZE,
-+		.setkey			= chacha20_setkey,
-+		.encrypt		= xchacha_neon,
-+		.decrypt		= xchacha_neon,
-+	}, {
-+		.base.cra_name		= "xchacha12",
-+		.base.cra_driver_name	= "xchacha12-neon",
-+		.base.cra_priority	= 300,
-+		.base.cra_blocksize	= 1,
-+		.base.cra_ctxsize	= sizeof(struct chacha_ctx),
-+		.base.cra_module	= THIS_MODULE,
-+
-+		.min_keysize		= CHACHA_KEY_SIZE,
-+		.max_keysize		= CHACHA_KEY_SIZE,
-+		.ivsize			= XCHACHA_IV_SIZE,
-+		.chunksize		= CHACHA_BLOCK_SIZE,
-+		.walksize		= 4 * CHACHA_BLOCK_SIZE,
-+		.setkey			= chacha12_setkey,
-+		.encrypt		= xchacha_neon,
-+		.decrypt		= xchacha_neon,
-+	}
-+};
-+
-+static int __init chacha_simd_mod_init(void)
-+{
-+	int err;
-+
-+	err = crypto_register_skciphers(arm_algs, ARRAY_SIZE(arm_algs));
-+	if (err)
-+		return err;
-+
-+	if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && (elf_hwcap & HWCAP_NEON)) {
-+		int i;
-+
-+		switch (read_cpuid_part()) {
-+		case ARM_CPU_PART_CORTEX_A7:
-+		case ARM_CPU_PART_CORTEX_A5:
-+			/*
-+			 * The Cortex-A7 and Cortex-A5 do not perform well with
-+			 * the NEON implementation but do incredibly with the
-+			 * scalar one and use less power.
-+			 */
-+			for (i = 0; i < ARRAY_SIZE(neon_algs); i++)
-+				neon_algs[i].base.cra_priority = 0;
-+			break;
-+		}
-+
-+		err = crypto_register_skciphers(neon_algs, ARRAY_SIZE(neon_algs));
-+		if (err)
-+			crypto_unregister_skciphers(arm_algs, ARRAY_SIZE(arm_algs));
-+	}
-+	return err;
-+}
-+
-+static void __exit chacha_simd_mod_fini(void)
-+{
-+	crypto_unregister_skciphers(arm_algs, ARRAY_SIZE(arm_algs));
-+	if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && (elf_hwcap & HWCAP_NEON))
-+		crypto_unregister_skciphers(neon_algs, ARRAY_SIZE(neon_algs));
-+}
-+
-+module_init(chacha_simd_mod_init);
-+module_exit(chacha_simd_mod_fini);
-+
-+MODULE_DESCRIPTION("ChaCha and XChaCha stream ciphers (scalar and NEON accelerated)");
-+MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
-+MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS_CRYPTO("chacha20");
-+MODULE_ALIAS_CRYPTO("chacha20-arm");
-+MODULE_ALIAS_CRYPTO("xchacha20");
-+MODULE_ALIAS_CRYPTO("xchacha20-arm");
-+MODULE_ALIAS_CRYPTO("xchacha12");
-+MODULE_ALIAS_CRYPTO("xchacha12-arm");
-+#ifdef CONFIG_KERNEL_MODE_NEON
-+MODULE_ALIAS_CRYPTO("chacha20-neon");
-+MODULE_ALIAS_CRYPTO("xchacha20-neon");
-+MODULE_ALIAS_CRYPTO("xchacha12-neon");
-+#endif
---- a/arch/arm/crypto/chacha-neon-glue.c
-+++ /dev/null
-@@ -1,202 +0,0 @@
--/*
-- * ARM NEON accelerated ChaCha and XChaCha stream ciphers,
-- * including ChaCha20 (RFC7539)
-- *
-- * Copyright (C) 2016 Linaro, Ltd. <ard.biesheuvel@linaro.org>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License version 2 as
-- * published by the Free Software Foundation.
-- *
-- * Based on:
-- * ChaCha20 256-bit cipher algorithm, RFC7539, SIMD glue code
-- *
-- * Copyright (C) 2015 Martin Willi
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- */
--
--#include <crypto/algapi.h>
--#include <crypto/internal/chacha.h>
--#include <crypto/internal/simd.h>
--#include <crypto/internal/skcipher.h>
--#include <linux/kernel.h>
--#include <linux/module.h>
--
--#include <asm/hwcap.h>
--#include <asm/neon.h>
--#include <asm/simd.h>
--
--asmlinkage void chacha_block_xor_neon(const u32 *state, u8 *dst, const u8 *src,
--				      int nrounds);
--asmlinkage void chacha_4block_xor_neon(const u32 *state, u8 *dst, const u8 *src,
--				       int nrounds);
--asmlinkage void hchacha_block_neon(const u32 *state, u32 *out, int nrounds);
--
--static void chacha_doneon(u32 *state, u8 *dst, const u8 *src,
--			  unsigned int bytes, int nrounds)
--{
--	u8 buf[CHACHA_BLOCK_SIZE];
--
--	while (bytes >= CHACHA_BLOCK_SIZE * 4) {
--		chacha_4block_xor_neon(state, dst, src, nrounds);
--		bytes -= CHACHA_BLOCK_SIZE * 4;
--		src += CHACHA_BLOCK_SIZE * 4;
--		dst += CHACHA_BLOCK_SIZE * 4;
--		state[12] += 4;
--	}
--	while (bytes >= CHACHA_BLOCK_SIZE) {
--		chacha_block_xor_neon(state, dst, src, nrounds);
--		bytes -= CHACHA_BLOCK_SIZE;
--		src += CHACHA_BLOCK_SIZE;
--		dst += CHACHA_BLOCK_SIZE;
--		state[12]++;
--	}
--	if (bytes) {
--		memcpy(buf, src, bytes);
--		chacha_block_xor_neon(state, buf, buf, nrounds);
--		memcpy(dst, buf, bytes);
--	}
--}
--
--static int chacha_neon_stream_xor(struct skcipher_request *req,
--				  const struct chacha_ctx *ctx, const u8 *iv)
--{
--	struct skcipher_walk walk;
--	u32 state[16];
--	int err;
--
--	err = skcipher_walk_virt(&walk, req, false);
--
--	crypto_chacha_init(state, ctx, iv);
--
--	while (walk.nbytes > 0) {
--		unsigned int nbytes = walk.nbytes;
--
--		if (nbytes < walk.total)
--			nbytes = round_down(nbytes, walk.stride);
--
--		kernel_neon_begin();
--		chacha_doneon(state, walk.dst.virt.addr, walk.src.virt.addr,
--			      nbytes, ctx->nrounds);
--		kernel_neon_end();
--		err = skcipher_walk_done(&walk, walk.nbytes - nbytes);
--	}
--
--	return err;
--}
--
--static int chacha_neon(struct skcipher_request *req)
--{
--	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
--	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
--
--	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !crypto_simd_usable())
--		return crypto_chacha_crypt(req);
--
--	return chacha_neon_stream_xor(req, ctx, req->iv);
--}
--
--static int xchacha_neon(struct skcipher_request *req)
--{
--	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
--	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
--	struct chacha_ctx subctx;
--	u32 state[16];
--	u8 real_iv[16];
--
--	if (req->cryptlen <= CHACHA_BLOCK_SIZE || !crypto_simd_usable())
--		return crypto_xchacha_crypt(req);
--
--	crypto_chacha_init(state, ctx, req->iv);
--
--	kernel_neon_begin();
--	hchacha_block_neon(state, subctx.key, ctx->nrounds);
--	kernel_neon_end();
--	subctx.nrounds = ctx->nrounds;
--
--	memcpy(&real_iv[0], req->iv + 24, 8);
--	memcpy(&real_iv[8], req->iv + 16, 8);
--	return chacha_neon_stream_xor(req, &subctx, real_iv);
--}
--
--static struct skcipher_alg algs[] = {
--	{
--		.base.cra_name		= "chacha20",
--		.base.cra_driver_name	= "chacha20-neon",
--		.base.cra_priority	= 300,
--		.base.cra_blocksize	= 1,
--		.base.cra_ctxsize	= sizeof(struct chacha_ctx),
--		.base.cra_module	= THIS_MODULE,
--
--		.min_keysize		= CHACHA_KEY_SIZE,
--		.max_keysize		= CHACHA_KEY_SIZE,
--		.ivsize			= CHACHA_IV_SIZE,
--		.chunksize		= CHACHA_BLOCK_SIZE,
--		.walksize		= 4 * CHACHA_BLOCK_SIZE,
--		.setkey			= crypto_chacha20_setkey,
--		.encrypt		= chacha_neon,
--		.decrypt		= chacha_neon,
--	}, {
--		.base.cra_name		= "xchacha20",
--		.base.cra_driver_name	= "xchacha20-neon",
--		.base.cra_priority	= 300,
--		.base.cra_blocksize	= 1,
--		.base.cra_ctxsize	= sizeof(struct chacha_ctx),
--		.base.cra_module	= THIS_MODULE,
--
--		.min_keysize		= CHACHA_KEY_SIZE,
--		.max_keysize		= CHACHA_KEY_SIZE,
--		.ivsize			= XCHACHA_IV_SIZE,
--		.chunksize		= CHACHA_BLOCK_SIZE,
--		.walksize		= 4 * CHACHA_BLOCK_SIZE,
--		.setkey			= crypto_chacha20_setkey,
--		.encrypt		= xchacha_neon,
--		.decrypt		= xchacha_neon,
--	}, {
--		.base.cra_name		= "xchacha12",
--		.base.cra_driver_name	= "xchacha12-neon",
--		.base.cra_priority	= 300,
--		.base.cra_blocksize	= 1,
--		.base.cra_ctxsize	= sizeof(struct chacha_ctx),
--		.base.cra_module	= THIS_MODULE,
--
--		.min_keysize		= CHACHA_KEY_SIZE,
--		.max_keysize		= CHACHA_KEY_SIZE,
--		.ivsize			= XCHACHA_IV_SIZE,
--		.chunksize		= CHACHA_BLOCK_SIZE,
--		.walksize		= 4 * CHACHA_BLOCK_SIZE,
--		.setkey			= crypto_chacha12_setkey,
--		.encrypt		= xchacha_neon,
--		.decrypt		= xchacha_neon,
--	}
--};
--
--static int __init chacha_simd_mod_init(void)
--{
--	if (!(elf_hwcap & HWCAP_NEON))
--		return -ENODEV;
--
--	return crypto_register_skciphers(algs, ARRAY_SIZE(algs));
--}
--
--static void __exit chacha_simd_mod_fini(void)
--{
--	crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));
--}
--
--module_init(chacha_simd_mod_init);
--module_exit(chacha_simd_mod_fini);
--
--MODULE_DESCRIPTION("ChaCha and XChaCha stream ciphers (NEON accelerated)");
--MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
--MODULE_LICENSE("GPL v2");
--MODULE_ALIAS_CRYPTO("chacha20");
--MODULE_ALIAS_CRYPTO("chacha20-neon");
--MODULE_ALIAS_CRYPTO("xchacha20");
--MODULE_ALIAS_CRYPTO("xchacha20-neon");
--MODULE_ALIAS_CRYPTO("xchacha12");
--MODULE_ALIAS_CRYPTO("xchacha12-neon");
---- a/arch/arm/crypto/chacha-scalar-core.S
-+++ b/arch/arm/crypto/chacha-scalar-core.S
-@@ -41,14 +41,6 @@
- 	X14	.req	r12
- 	X15	.req	r14
- 
--.Lexpand_32byte_k:
--	// "expand 32-byte k"
--	.word	0x61707865, 0x3320646e, 0x79622d32, 0x6b206574
--
--#ifdef __thumb2__
--#  define adrl adr
--#endif
--
- .macro __rev		out, in,  t0, t1, t2
- .if __LINUX_ARM_ARCH__ >= 6
- 	rev		\out, \in
-@@ -391,61 +383,65 @@
- .endm	// _chacha
- 
- /*
-- * void chacha20_arm(u8 *out, const u8 *in, size_t len, const u32 key[8],
-- *		     const u32 iv[4]);
-+ * void chacha_doarm(u8 *dst, const u8 *src, unsigned int bytes,
-+ *		     const u32 *state, int nrounds);
-  */
--ENTRY(chacha20_arm)
-+ENTRY(chacha_doarm)
- 	cmp		r2, #0			// len == 0?
- 	reteq		lr
- 
-+	ldr		ip, [sp]
-+	cmp		ip, #12
-+
- 	push		{r0-r2,r4-r11,lr}
- 
- 	// Push state x0-x15 onto stack.
- 	// Also store an extra copy of x10-x11 just before the state.
- 
--	ldr		r4, [sp, #48]		// iv
--	mov		r0, sp
--	sub		sp, #80
--
--	// iv: x12-x15
--	ldm		r4, {X12,X13,X14,X15}
--	stmdb		r0!, {X12,X13,X14,X15}
-+	add		X12, r3, #48
-+	ldm		X12, {X12,X13,X14,X15}
-+	push		{X12,X13,X14,X15}
-+	sub		sp, sp, #64
- 
--	// key: x4-x11
--	__ldrd		X8_X10, X9_X11, r3, 24
-+	__ldrd		X8_X10, X9_X11, r3, 40
- 	__strd		X8_X10, X9_X11, sp, 8
--	stmdb		r0!, {X8_X10, X9_X11}
--	ldm		r3, {X4-X9_X11}
--	stmdb		r0!, {X4-X9_X11}
--
--	// constants: x0-x3
--	adrl		X3, .Lexpand_32byte_k
--	ldm		X3, {X0-X3}
-+	__strd		X8_X10, X9_X11, sp, 56
-+	ldm		r3, {X0-X9_X11}
- 	__strd		X0, X1, sp, 16
- 	__strd		X2, X3, sp, 24
-+	__strd		X4, X5, sp, 32
-+	__strd		X6, X7, sp, 40
-+	__strd		X8_X10, X9_X11, sp, 48
- 
-+	beq		1f
- 	_chacha		20
- 
--	add		sp, #76
-+0:	add		sp, #76
- 	pop		{r4-r11, pc}
--ENDPROC(chacha20_arm)
-+
-+1:	_chacha		12
-+	b		0b
-+ENDPROC(chacha_doarm)
- 
- /*
-- * void hchacha20_arm(const u32 state[16], u32 out[8]);
-+ * void hchacha_block_arm(const u32 state[16], u32 out[8], int nrounds);
-  */
--ENTRY(hchacha20_arm)
-+ENTRY(hchacha_block_arm)
- 	push		{r1,r4-r11,lr}
- 
-+	cmp		r2, #12			// ChaCha12 ?
-+
- 	mov		r14, r0
- 	ldmia		r14!, {r0-r11}		// load x0-x11
- 	push		{r10-r11}		// store x10-x11 to stack
- 	ldm		r14, {r10-r12,r14}	// load x12-x15
- 	sub		sp, #8
- 
-+	beq		1f
- 	_chacha_permute	20
- 
- 	// Skip over (unused0-unused1, x10-x11)
--	add		sp, #16
-+0:	add		sp, #16
- 
- 	// Fix up rotations of x12-x15
- 	ror		X12, X12, #drot
-@@ -458,4 +454,7 @@ ENTRY(hchacha20_arm)
- 	stm		r4, {X0,X1,X2,X3,X12,X13,X14,X15}
- 
- 	pop		{r4-r11,pc}
--ENDPROC(hchacha20_arm)
-+
-+1:	_chacha_permute	12
-+	b		0b
-+ENDPROC(hchacha_block_arm)
---- a/arch/arm64/crypto/chacha-neon-glue.c
-+++ b/arch/arm64/crypto/chacha-neon-glue.c
-@@ -1,5 +1,5 @@
- /*
-- * ARM NEON accelerated ChaCha and XChaCha stream ciphers,
-+ * ARM NEON and scalar accelerated ChaCha and XChaCha stream ciphers,
-  * including ChaCha20 (RFC7539)
-  *
-  * Copyright (C) 2016 - 2017 Linaro, Ltd. <ard.biesheuvel@linaro.org>

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0009-crypto-arm-chacha-expose-ARM-ChaCha-routine-as-libra.patch

@@ -1,108 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:15 +0100
-Subject: [PATCH] crypto: arm/chacha - expose ARM ChaCha routine as library
- function
-
-commit a44a3430d71bad4ee56788a59fff099b291ea54c upstream.
-
-Expose the accelerated NEON ChaCha routine directly as a symbol
-export so that users of the ChaCha library API can use it directly.
-
-Given that calls into the library API will always go through the
-routines in this module if it is enabled, switch to static keys
-to select the optimal implementation available (which may be none
-at all, in which case we defer to the generic implementation for
-all invocations).
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/arm/crypto/Kconfig       |  1 +
- arch/arm/crypto/chacha-glue.c | 41 ++++++++++++++++++++++++++++++++++-
- 2 files changed, 41 insertions(+), 1 deletion(-)
-
---- a/arch/arm/crypto/Kconfig
-+++ b/arch/arm/crypto/Kconfig
-@@ -129,6 +129,7 @@ config CRYPTO_CRC32_ARM_CE
- config CRYPTO_CHACHA20_NEON
- 	tristate "NEON and scalar accelerated ChaCha stream cipher algorithms"
- 	select CRYPTO_BLKCIPHER
-+	select CRYPTO_ARCH_HAVE_LIB_CHACHA
- 
- config CRYPTO_NHPOLY1305_NEON
- 	tristate "NEON accelerated NHPoly1305 hash function (for Adiantum)"
---- a/arch/arm/crypto/chacha-glue.c
-+++ b/arch/arm/crypto/chacha-glue.c
-@@ -11,6 +11,7 @@
- #include <crypto/internal/chacha.h>
- #include <crypto/internal/simd.h>
- #include <crypto/internal/skcipher.h>
-+#include <linux/jump_label.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- 
-@@ -29,9 +30,11 @@ asmlinkage void hchacha_block_neon(const
- asmlinkage void chacha_doarm(u8 *dst, const u8 *src, unsigned int bytes,
- 			     const u32 *state, int nrounds);
- 
-+static __ro_after_init DEFINE_STATIC_KEY_FALSE(use_neon);
-+
- static inline bool neon_usable(void)
- {
--	return crypto_simd_usable();
-+	return static_branch_likely(&use_neon) && crypto_simd_usable();
- }
- 
- static void chacha_doneon(u32 *state, u8 *dst, const u8 *src,
-@@ -60,6 +63,40 @@ static void chacha_doneon(u32 *state, u8
- 	}
- }
- 
-+void hchacha_block_arch(const u32 *state, u32 *stream, int nrounds)
-+{
-+	if (!IS_ENABLED(CONFIG_KERNEL_MODE_NEON) || !neon_usable()) {
-+		hchacha_block_arm(state, stream, nrounds);
-+	} else {
-+		kernel_neon_begin();
-+		hchacha_block_neon(state, stream, nrounds);
-+		kernel_neon_end();
-+	}
-+}
-+EXPORT_SYMBOL(hchacha_block_arch);
-+
-+void chacha_init_arch(u32 *state, const u32 *key, const u8 *iv)
-+{
-+	chacha_init_generic(state, key, iv);
-+}
-+EXPORT_SYMBOL(chacha_init_arch);
-+
-+void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src, unsigned int bytes,
-+		       int nrounds)
-+{
-+	if (!IS_ENABLED(CONFIG_KERNEL_MODE_NEON) || !neon_usable() ||
-+	    bytes <= CHACHA_BLOCK_SIZE) {
-+		chacha_doarm(dst, src, bytes, state, nrounds);
-+		state[12] += DIV_ROUND_UP(bytes, CHACHA_BLOCK_SIZE);
-+		return;
-+	}
-+
-+	kernel_neon_begin();
-+	chacha_doneon(state, dst, src, bytes, nrounds);
-+	kernel_neon_end();
-+}
-+EXPORT_SYMBOL(chacha_crypt_arch);
-+
- static int chacha_stream_xor(struct skcipher_request *req,
- 			     const struct chacha_ctx *ctx, const u8 *iv,
- 			     bool neon)
-@@ -269,6 +306,8 @@ static int __init chacha_simd_mod_init(v
- 			for (i = 0; i < ARRAY_SIZE(neon_algs); i++)
- 				neon_algs[i].base.cra_priority = 0;
- 			break;
-+		default:
-+			static_branch_enable(&use_neon);
- 		}
- 
- 		err = crypto_register_skciphers(neon_algs, ARRAY_SIZE(neon_algs));

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0010-crypto-mips-chacha-import-32r2-ChaCha-code-from-Zinc.patch

@@ -1,451 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Fri, 8 Nov 2019 13:22:16 +0100
-Subject: [PATCH] crypto: mips/chacha - import 32r2 ChaCha code from Zinc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 49aa7c00eddf8d8f462b0256bd82e81762d7b0c6 upstream.
-
-This imports the accelerated MIPS 32r2 ChaCha20 implementation from the
-Zinc patch set.
-
-Co-developed-by: René van Dorst <opensource@vdorst.com>
-Signed-off-by: René van Dorst <opensource@vdorst.com>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/mips/crypto/chacha-core.S | 424 +++++++++++++++++++++++++++++++++
- 1 file changed, 424 insertions(+)
- create mode 100644 arch/mips/crypto/chacha-core.S
-
---- /dev/null
-+++ b/arch/mips/crypto/chacha-core.S
-@@ -0,0 +1,424 @@
-+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
-+/*
-+ * Copyright (C) 2016-2018 René van Dorst <opensource@vdorst.com>. All Rights Reserved.
-+ * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
-+ */
-+
-+#define MASK_U32		0x3c
-+#define CHACHA20_BLOCK_SIZE	64
-+#define STACK_SIZE		32
-+
-+#define X0	$t0
-+#define X1	$t1
-+#define X2	$t2
-+#define X3	$t3
-+#define X4	$t4
-+#define X5	$t5
-+#define X6	$t6
-+#define X7	$t7
-+#define X8	$t8
-+#define X9	$t9
-+#define X10	$v1
-+#define X11	$s6
-+#define X12	$s5
-+#define X13	$s4
-+#define X14	$s3
-+#define X15	$s2
-+/* Use regs which are overwritten on exit for Tx so we don't leak clear data. */
-+#define T0	$s1
-+#define T1	$s0
-+#define T(n)	T ## n
-+#define X(n)	X ## n
-+
-+/* Input arguments */
-+#define STATE		$a0
-+#define OUT		$a1
-+#define IN		$a2
-+#define BYTES		$a3
-+
-+/* Output argument */
-+/* NONCE[0] is kept in a register and not in memory.
-+ * We don't want to touch original value in memory.
-+ * Must be incremented every loop iteration.
-+ */
-+#define NONCE_0		$v0
-+
-+/* SAVED_X and SAVED_CA are set in the jump table.
-+ * Use regs which are overwritten on exit else we don't leak clear data.
-+ * They are used to handling the last bytes which are not multiple of 4.
-+ */
-+#define SAVED_X		X15
-+#define SAVED_CA	$s7
-+
-+#define IS_UNALIGNED	$s7
-+
-+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-+#define MSB 0
-+#define LSB 3
-+#define ROTx rotl
-+#define ROTR(n) rotr n, 24
-+#define	CPU_TO_LE32(n) \
-+	wsbh	n; \
-+	rotr	n, 16;
-+#else
-+#define MSB 3
-+#define LSB 0
-+#define ROTx rotr
-+#define CPU_TO_LE32(n)
-+#define ROTR(n)
-+#endif
-+
-+#define FOR_EACH_WORD(x) \
-+	x( 0); \
-+	x( 1); \
-+	x( 2); \
-+	x( 3); \
-+	x( 4); \
-+	x( 5); \
-+	x( 6); \
-+	x( 7); \
-+	x( 8); \
-+	x( 9); \
-+	x(10); \
-+	x(11); \
-+	x(12); \
-+	x(13); \
-+	x(14); \
-+	x(15);
-+
-+#define FOR_EACH_WORD_REV(x) \
-+	x(15); \
-+	x(14); \
-+	x(13); \
-+	x(12); \
-+	x(11); \
-+	x(10); \
-+	x( 9); \
-+	x( 8); \
-+	x( 7); \
-+	x( 6); \
-+	x( 5); \
-+	x( 4); \
-+	x( 3); \
-+	x( 2); \
-+	x( 1); \
-+	x( 0);
-+
-+#define PLUS_ONE_0	 1
-+#define PLUS_ONE_1	 2
-+#define PLUS_ONE_2	 3
-+#define PLUS_ONE_3	 4
-+#define PLUS_ONE_4	 5
-+#define PLUS_ONE_5	 6
-+#define PLUS_ONE_6	 7
-+#define PLUS_ONE_7	 8
-+#define PLUS_ONE_8	 9
-+#define PLUS_ONE_9	10
-+#define PLUS_ONE_10	11
-+#define PLUS_ONE_11	12
-+#define PLUS_ONE_12	13
-+#define PLUS_ONE_13	14
-+#define PLUS_ONE_14	15
-+#define PLUS_ONE_15	16
-+#define PLUS_ONE(x)	PLUS_ONE_ ## x
-+#define _CONCAT3(a,b,c)	a ## b ## c
-+#define CONCAT3(a,b,c)	_CONCAT3(a,b,c)
-+
-+#define STORE_UNALIGNED(x) \
-+CONCAT3(.Lchacha20_mips_xor_unaligned_, PLUS_ONE(x), _b: ;) \
-+	.if (x != 12); \
-+		lw	T0, (x*4)(STATE); \
-+	.endif; \
-+	lwl	T1, (x*4)+MSB ## (IN); \
-+	lwr	T1, (x*4)+LSB ## (IN); \
-+	.if (x == 12); \
-+		addu	X ## x, NONCE_0; \
-+	.else; \
-+		addu	X ## x, T0; \
-+	.endif; \
-+	CPU_TO_LE32(X ## x); \
-+	xor	X ## x, T1; \
-+	swl	X ## x, (x*4)+MSB ## (OUT); \
-+	swr	X ## x, (x*4)+LSB ## (OUT);
-+
-+#define STORE_ALIGNED(x) \
-+CONCAT3(.Lchacha20_mips_xor_aligned_, PLUS_ONE(x), _b: ;) \
-+	.if (x != 12); \
-+		lw	T0, (x*4)(STATE); \
-+	.endif; \
-+	lw	T1, (x*4) ## (IN); \
-+	.if (x == 12); \
-+		addu	X ## x, NONCE_0; \
-+	.else; \
-+		addu	X ## x, T0; \
-+	.endif; \
-+	CPU_TO_LE32(X ## x); \
-+	xor	X ## x, T1; \
-+	sw	X ## x, (x*4) ## (OUT);
-+
-+/* Jump table macro.
-+ * Used for setup and handling the last bytes, which are not multiple of 4.
-+ * X15 is free to store Xn
-+ * Every jumptable entry must be equal in size.
-+ */
-+#define JMPTBL_ALIGNED(x) \
-+.Lchacha20_mips_jmptbl_aligned_ ## x: ; \
-+	.set	noreorder; \
-+	b	.Lchacha20_mips_xor_aligned_ ## x ## _b; \
-+	.if (x == 12); \
-+		addu	SAVED_X, X ## x, NONCE_0; \
-+	.else; \
-+		addu	SAVED_X, X ## x, SAVED_CA; \
-+	.endif; \
-+	.set	reorder
-+
-+#define JMPTBL_UNALIGNED(x) \
-+.Lchacha20_mips_jmptbl_unaligned_ ## x: ; \
-+	.set	noreorder; \
-+	b	.Lchacha20_mips_xor_unaligned_ ## x ## _b; \
-+	.if (x == 12); \
-+		addu	SAVED_X, X ## x, NONCE_0; \
-+	.else; \
-+		addu	SAVED_X, X ## x, SAVED_CA; \
-+	.endif; \
-+	.set	reorder
-+
-+#define AXR(A, B, C, D,  K, L, M, N,  V, W, Y, Z,  S) \
-+	addu	X(A), X(K); \
-+	addu	X(B), X(L); \
-+	addu	X(C), X(M); \
-+	addu	X(D), X(N); \
-+	xor	X(V), X(A); \
-+	xor	X(W), X(B); \
-+	xor	X(Y), X(C); \
-+	xor	X(Z), X(D); \
-+	rotl	X(V), S;    \
-+	rotl	X(W), S;    \
-+	rotl	X(Y), S;    \
-+	rotl	X(Z), S;
-+
-+.text
-+.set	reorder
-+.set	noat
-+.globl	chacha20_mips
-+.ent	chacha20_mips
-+chacha20_mips:
-+	.frame	$sp, STACK_SIZE, $ra
-+
-+	addiu	$sp, -STACK_SIZE
-+
-+	/* Return bytes = 0. */
-+	beqz	BYTES, .Lchacha20_mips_end
-+
-+	lw	NONCE_0, 48(STATE)
-+
-+	/* Save s0-s7 */
-+	sw	$s0,  0($sp)
-+	sw	$s1,  4($sp)
-+	sw	$s2,  8($sp)
-+	sw	$s3, 12($sp)
-+	sw	$s4, 16($sp)
-+	sw	$s5, 20($sp)
-+	sw	$s6, 24($sp)
-+	sw	$s7, 28($sp)
-+
-+	/* Test IN or OUT is unaligned.
-+	 * IS_UNALIGNED = ( IN | OUT ) & 0x00000003
-+	 */
-+	or	IS_UNALIGNED, IN, OUT
-+	andi	IS_UNALIGNED, 0x3
-+
-+	/* Set number of rounds */
-+	li	$at, 20
-+
-+	b	.Lchacha20_rounds_start
-+
-+.align 4
-+.Loop_chacha20_rounds:
-+	addiu	IN,  CHACHA20_BLOCK_SIZE
-+	addiu	OUT, CHACHA20_BLOCK_SIZE
-+	addiu	NONCE_0, 1
-+
-+.Lchacha20_rounds_start:
-+	lw	X0,  0(STATE)
-+	lw	X1,  4(STATE)
-+	lw	X2,  8(STATE)
-+	lw	X3,  12(STATE)
-+
-+	lw	X4,  16(STATE)
-+	lw	X5,  20(STATE)
-+	lw	X6,  24(STATE)
-+	lw	X7,  28(STATE)
-+	lw	X8,  32(STATE)
-+	lw	X9,  36(STATE)
-+	lw	X10, 40(STATE)
-+	lw	X11, 44(STATE)
-+
-+	move	X12, NONCE_0
-+	lw	X13, 52(STATE)
-+	lw	X14, 56(STATE)
-+	lw	X15, 60(STATE)
-+
-+.Loop_chacha20_xor_rounds:
-+	addiu	$at, -2
-+	AXR( 0, 1, 2, 3,  4, 5, 6, 7, 12,13,14,15, 16);
-+	AXR( 8, 9,10,11, 12,13,14,15,  4, 5, 6, 7, 12);
-+	AXR( 0, 1, 2, 3,  4, 5, 6, 7, 12,13,14,15,  8);
-+	AXR( 8, 9,10,11, 12,13,14,15,  4, 5, 6, 7,  7);
-+	AXR( 0, 1, 2, 3,  5, 6, 7, 4, 15,12,13,14, 16);
-+	AXR(10,11, 8, 9, 15,12,13,14,  5, 6, 7, 4, 12);
-+	AXR( 0, 1, 2, 3,  5, 6, 7, 4, 15,12,13,14,  8);
-+	AXR(10,11, 8, 9, 15,12,13,14,  5, 6, 7, 4,  7);
-+	bnez	$at, .Loop_chacha20_xor_rounds
-+
-+	addiu	BYTES, -(CHACHA20_BLOCK_SIZE)
-+
-+	/* Is data src/dst unaligned? Jump */
-+	bnez	IS_UNALIGNED, .Loop_chacha20_unaligned
-+
-+	/* Set number rounds here to fill delayslot. */
-+	li	$at, 20
-+
-+	/* BYTES < 0, it has no full block. */
-+	bltz	BYTES, .Lchacha20_mips_no_full_block_aligned
-+
-+	FOR_EACH_WORD_REV(STORE_ALIGNED)
-+
-+	/* BYTES > 0? Loop again. */
-+	bgtz	BYTES, .Loop_chacha20_rounds
-+
-+	/* Place this here to fill delay slot */
-+	addiu	NONCE_0, 1
-+
-+	/* BYTES < 0? Handle last bytes */
-+	bltz	BYTES, .Lchacha20_mips_xor_bytes
-+
-+.Lchacha20_mips_xor_done:
-+	/* Restore used registers */
-+	lw	$s0,  0($sp)
-+	lw	$s1,  4($sp)
-+	lw	$s2,  8($sp)
-+	lw	$s3, 12($sp)
-+	lw	$s4, 16($sp)
-+	lw	$s5, 20($sp)
-+	lw	$s6, 24($sp)
-+	lw	$s7, 28($sp)
-+
-+	/* Write NONCE_0 back to right location in state */
-+	sw	NONCE_0, 48(STATE)
-+
-+.Lchacha20_mips_end:
-+	addiu	$sp, STACK_SIZE
-+	jr	$ra
-+
-+.Lchacha20_mips_no_full_block_aligned:
-+	/* Restore the offset on BYTES */
-+	addiu	BYTES, CHACHA20_BLOCK_SIZE
-+
-+	/* Get number of full WORDS */
-+	andi	$at, BYTES, MASK_U32
-+
-+	/* Load upper half of jump table addr */
-+	lui	T0, %hi(.Lchacha20_mips_jmptbl_aligned_0)
-+
-+	/* Calculate lower half jump table offset */
-+	ins	T0, $at, 1, 6
-+
-+	/* Add offset to STATE */
-+	addu	T1, STATE, $at
-+
-+	/* Add lower half jump table addr */
-+	addiu	T0, %lo(.Lchacha20_mips_jmptbl_aligned_0)
-+
-+	/* Read value from STATE */
-+	lw	SAVED_CA, 0(T1)
-+
-+	/* Store remaining bytecounter as negative value */
-+	subu	BYTES, $at, BYTES
-+
-+	jr	T0
-+
-+	/* Jump table */
-+	FOR_EACH_WORD(JMPTBL_ALIGNED)
-+
-+
-+.Loop_chacha20_unaligned:
-+	/* Set number rounds here to fill delayslot. */
-+	li	$at, 20
-+
-+	/* BYTES > 0, it has no full block. */
-+	bltz	BYTES, .Lchacha20_mips_no_full_block_unaligned
-+
-+	FOR_EACH_WORD_REV(STORE_UNALIGNED)
-+
-+	/* BYTES > 0? Loop again. */
-+	bgtz	BYTES, .Loop_chacha20_rounds
-+
-+	/* Write NONCE_0 back to right location in state */
-+	sw	NONCE_0, 48(STATE)
-+
-+	.set noreorder
-+	/* Fall through to byte handling */
-+	bgez	BYTES, .Lchacha20_mips_xor_done
-+.Lchacha20_mips_xor_unaligned_0_b:
-+.Lchacha20_mips_xor_aligned_0_b:
-+	/* Place this here to fill delay slot */
-+	addiu	NONCE_0, 1
-+	.set reorder
-+
-+.Lchacha20_mips_xor_bytes:
-+	addu	IN, $at
-+	addu	OUT, $at
-+	/* First byte */
-+	lbu	T1, 0(IN)
-+	addiu	$at, BYTES, 1
-+	CPU_TO_LE32(SAVED_X)
-+	ROTR(SAVED_X)
-+	xor	T1, SAVED_X
-+	sb	T1, 0(OUT)
-+	beqz	$at, .Lchacha20_mips_xor_done
-+	/* Second byte */
-+	lbu	T1, 1(IN)
-+	addiu	$at, BYTES, 2
-+	ROTx	SAVED_X, 8
-+	xor	T1, SAVED_X
-+	sb	T1, 1(OUT)
-+	beqz	$at, .Lchacha20_mips_xor_done
-+	/* Third byte */
-+	lbu	T1, 2(IN)
-+	ROTx	SAVED_X, 8
-+	xor	T1, SAVED_X
-+	sb	T1, 2(OUT)
-+	b	.Lchacha20_mips_xor_done
-+
-+.Lchacha20_mips_no_full_block_unaligned:
-+	/* Restore the offset on BYTES */
-+	addiu	BYTES, CHACHA20_BLOCK_SIZE
-+
-+	/* Get number of full WORDS */
-+	andi	$at, BYTES, MASK_U32
-+
-+	/* Load upper half of jump table addr */
-+	lui	T0, %hi(.Lchacha20_mips_jmptbl_unaligned_0)
-+
-+	/* Calculate lower half jump table offset */
-+	ins	T0, $at, 1, 6
-+
-+	/* Add offset to STATE */
-+	addu	T1, STATE, $at
-+
-+	/* Add lower half jump table addr */
-+	addiu	T0, %lo(.Lchacha20_mips_jmptbl_unaligned_0)
-+
-+	/* Read value from STATE */
-+	lw	SAVED_CA, 0(T1)
-+
-+	/* Store remaining bytecounter as negative value */
-+	subu	BYTES, $at, BYTES
-+
-+	jr	T0
-+
-+	/* Jump table */
-+	FOR_EACH_WORD(JMPTBL_UNALIGNED)
-+.end chacha20_mips
-+.set at

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0011-crypto-mips-chacha-wire-up-accelerated-32r2-code-fro.patch

@@ -1,559 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:17 +0100
-Subject: [PATCH] crypto: mips/chacha - wire up accelerated 32r2 code from Zinc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 3a2f58f3ba4f6f44e33d1a48240d5eadb882cb59 upstream.
-
-This integrates the accelerated MIPS 32r2 implementation of ChaCha
-into both the API and library interfaces of the kernel crypto stack.
-
-The significance of this is that, in addition to becoming available
-as an accelerated library implementation, it can also be used by
-existing crypto API code such as Adiantum (for block encryption on
-ultra low performance cores) or IPsec using chacha20poly1305. These
-are use cases that have already opted into using the abstract crypto
-API. In order to support Adiantum, the core assembler routine has
-been adapted to take the round count as a function argument rather
-than hardcoding it to 20.
-
-Co-developed-by: René van Dorst <opensource@vdorst.com>
-Signed-off-by: René van Dorst <opensource@vdorst.com>
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/mips/Makefile             |   2 +-
- arch/mips/crypto/Makefile      |   4 +
- arch/mips/crypto/chacha-core.S | 159 ++++++++++++++++++++++++---------
- arch/mips/crypto/chacha-glue.c | 150 +++++++++++++++++++++++++++++++
- crypto/Kconfig                 |   6 ++
- 5 files changed, 277 insertions(+), 44 deletions(-)
- create mode 100644 arch/mips/crypto/chacha-glue.c
-
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -334,7 +334,7 @@ libs-$(CONFIG_MIPS_FP_SUPPORT) += arch/m
- # See arch/mips/Kbuild for content of core part of the kernel
- core-y += arch/mips/
- 
--drivers-$(CONFIG_MIPS_CRC_SUPPORT) += arch/mips/crypto/
-+drivers-y			+= arch/mips/crypto/
- drivers-$(CONFIG_OPROFILE)	+= arch/mips/oprofile/
- 
- # suspend and hibernation support
---- a/arch/mips/crypto/Makefile
-+++ b/arch/mips/crypto/Makefile
-@@ -4,3 +4,7 @@
- #
- 
- obj-$(CONFIG_CRYPTO_CRC32_MIPS) += crc32-mips.o
-+
-+obj-$(CONFIG_CRYPTO_CHACHA_MIPS) += chacha-mips.o
-+chacha-mips-y := chacha-core.o chacha-glue.o
-+AFLAGS_chacha-core.o += -O2 # needed to fill branch delay slots
---- a/arch/mips/crypto/chacha-core.S
-+++ b/arch/mips/crypto/chacha-core.S
-@@ -125,7 +125,7 @@
- #define CONCAT3(a,b,c)	_CONCAT3(a,b,c)
- 
- #define STORE_UNALIGNED(x) \
--CONCAT3(.Lchacha20_mips_xor_unaligned_, PLUS_ONE(x), _b: ;) \
-+CONCAT3(.Lchacha_mips_xor_unaligned_, PLUS_ONE(x), _b: ;) \
- 	.if (x != 12); \
- 		lw	T0, (x*4)(STATE); \
- 	.endif; \
-@@ -142,7 +142,7 @@ CONCAT3(.Lchacha20_mips_xor_unaligned_,
- 	swr	X ## x, (x*4)+LSB ## (OUT);
- 
- #define STORE_ALIGNED(x) \
--CONCAT3(.Lchacha20_mips_xor_aligned_, PLUS_ONE(x), _b: ;) \
-+CONCAT3(.Lchacha_mips_xor_aligned_, PLUS_ONE(x), _b: ;) \
- 	.if (x != 12); \
- 		lw	T0, (x*4)(STATE); \
- 	.endif; \
-@@ -162,9 +162,9 @@ CONCAT3(.Lchacha20_mips_xor_aligned_, PL
-  * Every jumptable entry must be equal in size.
-  */
- #define JMPTBL_ALIGNED(x) \
--.Lchacha20_mips_jmptbl_aligned_ ## x: ; \
-+.Lchacha_mips_jmptbl_aligned_ ## x: ; \
- 	.set	noreorder; \
--	b	.Lchacha20_mips_xor_aligned_ ## x ## _b; \
-+	b	.Lchacha_mips_xor_aligned_ ## x ## _b; \
- 	.if (x == 12); \
- 		addu	SAVED_X, X ## x, NONCE_0; \
- 	.else; \
-@@ -173,9 +173,9 @@ CONCAT3(.Lchacha20_mips_xor_aligned_, PL
- 	.set	reorder
- 
- #define JMPTBL_UNALIGNED(x) \
--.Lchacha20_mips_jmptbl_unaligned_ ## x: ; \
-+.Lchacha_mips_jmptbl_unaligned_ ## x: ; \
- 	.set	noreorder; \
--	b	.Lchacha20_mips_xor_unaligned_ ## x ## _b; \
-+	b	.Lchacha_mips_xor_unaligned_ ## x ## _b; \
- 	.if (x == 12); \
- 		addu	SAVED_X, X ## x, NONCE_0; \
- 	.else; \
-@@ -200,15 +200,18 @@ CONCAT3(.Lchacha20_mips_xor_aligned_, PL
- .text
- .set	reorder
- .set	noat
--.globl	chacha20_mips
--.ent	chacha20_mips
--chacha20_mips:
-+.globl	chacha_crypt_arch
-+.ent	chacha_crypt_arch
-+chacha_crypt_arch:
- 	.frame	$sp, STACK_SIZE, $ra
- 
-+	/* Load number of rounds */
-+	lw	$at, 16($sp)
-+
- 	addiu	$sp, -STACK_SIZE
- 
- 	/* Return bytes = 0. */
--	beqz	BYTES, .Lchacha20_mips_end
-+	beqz	BYTES, .Lchacha_mips_end
- 
- 	lw	NONCE_0, 48(STATE)
- 
-@@ -228,18 +231,15 @@ chacha20_mips:
- 	or	IS_UNALIGNED, IN, OUT
- 	andi	IS_UNALIGNED, 0x3
- 
--	/* Set number of rounds */
--	li	$at, 20
--
--	b	.Lchacha20_rounds_start
-+	b	.Lchacha_rounds_start
- 
- .align 4
--.Loop_chacha20_rounds:
-+.Loop_chacha_rounds:
- 	addiu	IN,  CHACHA20_BLOCK_SIZE
- 	addiu	OUT, CHACHA20_BLOCK_SIZE
- 	addiu	NONCE_0, 1
- 
--.Lchacha20_rounds_start:
-+.Lchacha_rounds_start:
- 	lw	X0,  0(STATE)
- 	lw	X1,  4(STATE)
- 	lw	X2,  8(STATE)
-@@ -259,7 +259,7 @@ chacha20_mips:
- 	lw	X14, 56(STATE)
- 	lw	X15, 60(STATE)
- 
--.Loop_chacha20_xor_rounds:
-+.Loop_chacha_xor_rounds:
- 	addiu	$at, -2
- 	AXR( 0, 1, 2, 3,  4, 5, 6, 7, 12,13,14,15, 16);
- 	AXR( 8, 9,10,11, 12,13,14,15,  4, 5, 6, 7, 12);
-@@ -269,31 +269,31 @@ chacha20_mips:
- 	AXR(10,11, 8, 9, 15,12,13,14,  5, 6, 7, 4, 12);
- 	AXR( 0, 1, 2, 3,  5, 6, 7, 4, 15,12,13,14,  8);
- 	AXR(10,11, 8, 9, 15,12,13,14,  5, 6, 7, 4,  7);
--	bnez	$at, .Loop_chacha20_xor_rounds
-+	bnez	$at, .Loop_chacha_xor_rounds
- 
- 	addiu	BYTES, -(CHACHA20_BLOCK_SIZE)
- 
- 	/* Is data src/dst unaligned? Jump */
--	bnez	IS_UNALIGNED, .Loop_chacha20_unaligned
-+	bnez	IS_UNALIGNED, .Loop_chacha_unaligned
- 
- 	/* Set number rounds here to fill delayslot. */
--	li	$at, 20
-+	lw	$at, (STACK_SIZE+16)($sp)
- 
- 	/* BYTES < 0, it has no full block. */
--	bltz	BYTES, .Lchacha20_mips_no_full_block_aligned
-+	bltz	BYTES, .Lchacha_mips_no_full_block_aligned
- 
- 	FOR_EACH_WORD_REV(STORE_ALIGNED)
- 
- 	/* BYTES > 0? Loop again. */
--	bgtz	BYTES, .Loop_chacha20_rounds
-+	bgtz	BYTES, .Loop_chacha_rounds
- 
- 	/* Place this here to fill delay slot */
- 	addiu	NONCE_0, 1
- 
- 	/* BYTES < 0? Handle last bytes */
--	bltz	BYTES, .Lchacha20_mips_xor_bytes
-+	bltz	BYTES, .Lchacha_mips_xor_bytes
- 
--.Lchacha20_mips_xor_done:
-+.Lchacha_mips_xor_done:
- 	/* Restore used registers */
- 	lw	$s0,  0($sp)
- 	lw	$s1,  4($sp)
-@@ -307,11 +307,11 @@ chacha20_mips:
- 	/* Write NONCE_0 back to right location in state */
- 	sw	NONCE_0, 48(STATE)
- 
--.Lchacha20_mips_end:
-+.Lchacha_mips_end:
- 	addiu	$sp, STACK_SIZE
- 	jr	$ra
- 
--.Lchacha20_mips_no_full_block_aligned:
-+.Lchacha_mips_no_full_block_aligned:
- 	/* Restore the offset on BYTES */
- 	addiu	BYTES, CHACHA20_BLOCK_SIZE
- 
-@@ -319,7 +319,7 @@ chacha20_mips:
- 	andi	$at, BYTES, MASK_U32
- 
- 	/* Load upper half of jump table addr */
--	lui	T0, %hi(.Lchacha20_mips_jmptbl_aligned_0)
-+	lui	T0, %hi(.Lchacha_mips_jmptbl_aligned_0)
- 
- 	/* Calculate lower half jump table offset */
- 	ins	T0, $at, 1, 6
-@@ -328,7 +328,7 @@ chacha20_mips:
- 	addu	T1, STATE, $at
- 
- 	/* Add lower half jump table addr */
--	addiu	T0, %lo(.Lchacha20_mips_jmptbl_aligned_0)
-+	addiu	T0, %lo(.Lchacha_mips_jmptbl_aligned_0)
- 
- 	/* Read value from STATE */
- 	lw	SAVED_CA, 0(T1)
-@@ -342,31 +342,31 @@ chacha20_mips:
- 	FOR_EACH_WORD(JMPTBL_ALIGNED)
- 
- 
--.Loop_chacha20_unaligned:
-+.Loop_chacha_unaligned:
- 	/* Set number rounds here to fill delayslot. */
--	li	$at, 20
-+	lw	$at, (STACK_SIZE+16)($sp)
- 
- 	/* BYTES > 0, it has no full block. */
--	bltz	BYTES, .Lchacha20_mips_no_full_block_unaligned
-+	bltz	BYTES, .Lchacha_mips_no_full_block_unaligned
- 
- 	FOR_EACH_WORD_REV(STORE_UNALIGNED)
- 
- 	/* BYTES > 0? Loop again. */
--	bgtz	BYTES, .Loop_chacha20_rounds
-+	bgtz	BYTES, .Loop_chacha_rounds
- 
- 	/* Write NONCE_0 back to right location in state */
- 	sw	NONCE_0, 48(STATE)
- 
- 	.set noreorder
- 	/* Fall through to byte handling */
--	bgez	BYTES, .Lchacha20_mips_xor_done
--.Lchacha20_mips_xor_unaligned_0_b:
--.Lchacha20_mips_xor_aligned_0_b:
-+	bgez	BYTES, .Lchacha_mips_xor_done
-+.Lchacha_mips_xor_unaligned_0_b:
-+.Lchacha_mips_xor_aligned_0_b:
- 	/* Place this here to fill delay slot */
- 	addiu	NONCE_0, 1
- 	.set reorder
- 
--.Lchacha20_mips_xor_bytes:
-+.Lchacha_mips_xor_bytes:
- 	addu	IN, $at
- 	addu	OUT, $at
- 	/* First byte */
-@@ -376,22 +376,22 @@ chacha20_mips:
- 	ROTR(SAVED_X)
- 	xor	T1, SAVED_X
- 	sb	T1, 0(OUT)
--	beqz	$at, .Lchacha20_mips_xor_done
-+	beqz	$at, .Lchacha_mips_xor_done
- 	/* Second byte */
- 	lbu	T1, 1(IN)
- 	addiu	$at, BYTES, 2
- 	ROTx	SAVED_X, 8
- 	xor	T1, SAVED_X
- 	sb	T1, 1(OUT)
--	beqz	$at, .Lchacha20_mips_xor_done
-+	beqz	$at, .Lchacha_mips_xor_done
- 	/* Third byte */
- 	lbu	T1, 2(IN)
- 	ROTx	SAVED_X, 8
- 	xor	T1, SAVED_X
- 	sb	T1, 2(OUT)
--	b	.Lchacha20_mips_xor_done
-+	b	.Lchacha_mips_xor_done
- 
--.Lchacha20_mips_no_full_block_unaligned:
-+.Lchacha_mips_no_full_block_unaligned:
- 	/* Restore the offset on BYTES */
- 	addiu	BYTES, CHACHA20_BLOCK_SIZE
- 
-@@ -399,7 +399,7 @@ chacha20_mips:
- 	andi	$at, BYTES, MASK_U32
- 
- 	/* Load upper half of jump table addr */
--	lui	T0, %hi(.Lchacha20_mips_jmptbl_unaligned_0)
-+	lui	T0, %hi(.Lchacha_mips_jmptbl_unaligned_0)
- 
- 	/* Calculate lower half jump table offset */
- 	ins	T0, $at, 1, 6
-@@ -408,7 +408,7 @@ chacha20_mips:
- 	addu	T1, STATE, $at
- 
- 	/* Add lower half jump table addr */
--	addiu	T0, %lo(.Lchacha20_mips_jmptbl_unaligned_0)
-+	addiu	T0, %lo(.Lchacha_mips_jmptbl_unaligned_0)
- 
- 	/* Read value from STATE */
- 	lw	SAVED_CA, 0(T1)
-@@ -420,5 +420,78 @@ chacha20_mips:
- 
- 	/* Jump table */
- 	FOR_EACH_WORD(JMPTBL_UNALIGNED)
--.end chacha20_mips
-+.end chacha_crypt_arch
-+.set at
-+
-+/* Input arguments
-+ * STATE	$a0
-+ * OUT		$a1
-+ * NROUND	$a2
-+ */
-+
-+#undef X12
-+#undef X13
-+#undef X14
-+#undef X15
-+
-+#define X12	$a3
-+#define X13	$at
-+#define X14	$v0
-+#define X15	STATE
-+
-+.set noat
-+.globl	hchacha_block_arch
-+.ent	hchacha_block_arch
-+hchacha_block_arch:
-+	.frame	$sp, STACK_SIZE, $ra
-+
-+	addiu	$sp, -STACK_SIZE
-+
-+	/* Save X11(s6) */
-+	sw	X11, 0($sp)
-+
-+	lw	X0,  0(STATE)
-+	lw	X1,  4(STATE)
-+	lw	X2,  8(STATE)
-+	lw	X3,  12(STATE)
-+	lw	X4,  16(STATE)
-+	lw	X5,  20(STATE)
-+	lw	X6,  24(STATE)
-+	lw	X7,  28(STATE)
-+	lw	X8,  32(STATE)
-+	lw	X9,  36(STATE)
-+	lw	X10, 40(STATE)
-+	lw	X11, 44(STATE)
-+	lw	X12, 48(STATE)
-+	lw	X13, 52(STATE)
-+	lw	X14, 56(STATE)
-+	lw	X15, 60(STATE)
-+
-+.Loop_hchacha_xor_rounds:
-+	addiu	$a2, -2
-+	AXR( 0, 1, 2, 3,  4, 5, 6, 7, 12,13,14,15, 16);
-+	AXR( 8, 9,10,11, 12,13,14,15,  4, 5, 6, 7, 12);
-+	AXR( 0, 1, 2, 3,  4, 5, 6, 7, 12,13,14,15,  8);
-+	AXR( 8, 9,10,11, 12,13,14,15,  4, 5, 6, 7,  7);
-+	AXR( 0, 1, 2, 3,  5, 6, 7, 4, 15,12,13,14, 16);
-+	AXR(10,11, 8, 9, 15,12,13,14,  5, 6, 7, 4, 12);
-+	AXR( 0, 1, 2, 3,  5, 6, 7, 4, 15,12,13,14,  8);
-+	AXR(10,11, 8, 9, 15,12,13,14,  5, 6, 7, 4,  7);
-+	bnez	$a2, .Loop_hchacha_xor_rounds
-+
-+	/* Restore used register */
-+	lw	X11, 0($sp)
-+
-+	sw	X0,  0(OUT)
-+	sw	X1,  4(OUT)
-+	sw	X2,  8(OUT)
-+	sw	X3,  12(OUT)
-+	sw	X12, 16(OUT)
-+	sw	X13, 20(OUT)
-+	sw	X14, 24(OUT)
-+	sw	X15, 28(OUT)
-+
-+	addiu	$sp, STACK_SIZE
-+	jr	$ra
-+.end hchacha_block_arch
- .set at
---- /dev/null
-+++ b/arch/mips/crypto/chacha-glue.c
-@@ -0,0 +1,150 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * MIPS accelerated ChaCha and XChaCha stream ciphers,
-+ * including ChaCha20 (RFC7539)
-+ *
-+ * Copyright (C) 2019 Linaro, Ltd. <ard.biesheuvel@linaro.org>
-+ */
-+
-+#include <asm/byteorder.h>
-+#include <crypto/algapi.h>
-+#include <crypto/internal/chacha.h>
-+#include <crypto/internal/skcipher.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+
-+asmlinkage void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src,
-+				  unsigned int bytes, int nrounds);
-+EXPORT_SYMBOL(chacha_crypt_arch);
-+
-+asmlinkage void hchacha_block_arch(const u32 *state, u32 *stream, int nrounds);
-+EXPORT_SYMBOL(hchacha_block_arch);
-+
-+void chacha_init_arch(u32 *state, const u32 *key, const u8 *iv)
-+{
-+	chacha_init_generic(state, key, iv);
-+}
-+EXPORT_SYMBOL(chacha_init_arch);
-+
-+static int chacha_mips_stream_xor(struct skcipher_request *req,
-+				  const struct chacha_ctx *ctx, const u8 *iv)
-+{
-+	struct skcipher_walk walk;
-+	u32 state[16];
-+	int err;
-+
-+	err = skcipher_walk_virt(&walk, req, false);
-+
-+	chacha_init_generic(state, ctx->key, iv);
-+
-+	while (walk.nbytes > 0) {
-+		unsigned int nbytes = walk.nbytes;
-+
-+		if (nbytes < walk.total)
-+			nbytes = round_down(nbytes, walk.stride);
-+
-+		chacha_crypt(state, walk.dst.virt.addr, walk.src.virt.addr,
-+			     nbytes, ctx->nrounds);
-+		err = skcipher_walk_done(&walk, walk.nbytes - nbytes);
-+	}
-+
-+	return err;
-+}
-+
-+static int chacha_mips(struct skcipher_request *req)
-+{
-+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
-+	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
-+
-+	return chacha_mips_stream_xor(req, ctx, req->iv);
-+}
-+
-+static int xchacha_mips(struct skcipher_request *req)
-+{
-+	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
-+	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
-+	struct chacha_ctx subctx;
-+	u32 state[16];
-+	u8 real_iv[16];
-+
-+	chacha_init_generic(state, ctx->key, req->iv);
-+
-+	hchacha_block(state, subctx.key, ctx->nrounds);
-+	subctx.nrounds = ctx->nrounds;
-+
-+	memcpy(&real_iv[0], req->iv + 24, 8);
-+	memcpy(&real_iv[8], req->iv + 16, 8);
-+	return chacha_mips_stream_xor(req, &subctx, real_iv);
-+}
-+
-+static struct skcipher_alg algs[] = {
-+	{
-+		.base.cra_name		= "chacha20",
-+		.base.cra_driver_name	= "chacha20-mips",
-+		.base.cra_priority	= 200,
-+		.base.cra_blocksize	= 1,
-+		.base.cra_ctxsize	= sizeof(struct chacha_ctx),
-+		.base.cra_module	= THIS_MODULE,
-+
-+		.min_keysize		= CHACHA_KEY_SIZE,
-+		.max_keysize		= CHACHA_KEY_SIZE,
-+		.ivsize			= CHACHA_IV_SIZE,
-+		.chunksize		= CHACHA_BLOCK_SIZE,
-+		.setkey			= chacha20_setkey,
-+		.encrypt		= chacha_mips,
-+		.decrypt		= chacha_mips,
-+	}, {
-+		.base.cra_name		= "xchacha20",
-+		.base.cra_driver_name	= "xchacha20-mips",
-+		.base.cra_priority	= 200,
-+		.base.cra_blocksize	= 1,
-+		.base.cra_ctxsize	= sizeof(struct chacha_ctx),
-+		.base.cra_module	= THIS_MODULE,
-+
-+		.min_keysize		= CHACHA_KEY_SIZE,
-+		.max_keysize		= CHACHA_KEY_SIZE,
-+		.ivsize			= XCHACHA_IV_SIZE,
-+		.chunksize		= CHACHA_BLOCK_SIZE,
-+		.setkey			= chacha20_setkey,
-+		.encrypt		= xchacha_mips,
-+		.decrypt		= xchacha_mips,
-+	}, {
-+		.base.cra_name		= "xchacha12",
-+		.base.cra_driver_name	= "xchacha12-mips",
-+		.base.cra_priority	= 200,
-+		.base.cra_blocksize	= 1,
-+		.base.cra_ctxsize	= sizeof(struct chacha_ctx),
-+		.base.cra_module	= THIS_MODULE,
-+
-+		.min_keysize		= CHACHA_KEY_SIZE,
-+		.max_keysize		= CHACHA_KEY_SIZE,
-+		.ivsize			= XCHACHA_IV_SIZE,
-+		.chunksize		= CHACHA_BLOCK_SIZE,
-+		.setkey			= chacha12_setkey,
-+		.encrypt		= xchacha_mips,
-+		.decrypt		= xchacha_mips,
-+	}
-+};
-+
-+static int __init chacha_simd_mod_init(void)
-+{
-+	return crypto_register_skciphers(algs, ARRAY_SIZE(algs));
-+}
-+
-+static void __exit chacha_simd_mod_fini(void)
-+{
-+	crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));
-+}
-+
-+module_init(chacha_simd_mod_init);
-+module_exit(chacha_simd_mod_fini);
-+
-+MODULE_DESCRIPTION("ChaCha and XChaCha stream ciphers (MIPS accelerated)");
-+MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
-+MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS_CRYPTO("chacha20");
-+MODULE_ALIAS_CRYPTO("chacha20-mips");
-+MODULE_ALIAS_CRYPTO("xchacha20");
-+MODULE_ALIAS_CRYPTO("xchacha20-mips");
-+MODULE_ALIAS_CRYPTO("xchacha12");
-+MODULE_ALIAS_CRYPTO("xchacha12-mips");
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -1423,6 +1423,12 @@ config CRYPTO_CHACHA20_X86_64
- 	  SSSE3, AVX2, and AVX-512VL optimized implementations of the ChaCha20,
- 	  XChaCha20, and XChaCha12 stream ciphers.
- 
-+config CRYPTO_CHACHA_MIPS
-+	tristate "ChaCha stream cipher algorithms (MIPS 32r2 optimized)"
-+	depends on CPU_MIPS32_R2
-+	select CRYPTO_BLKCIPHER
-+	select CRYPTO_ARCH_HAVE_LIB_CHACHA
-+
- config CRYPTO_SEED
- 	tristate "SEED cipher algorithm"
- 	select CRYPTO_ALGAPI

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0012-crypto-chacha-unexport-chacha_generic-routines.patch

@@ -1,115 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:18 +0100
-Subject: [PATCH] crypto: chacha - unexport chacha_generic routines
-
-commit 22cf705360707ced15f9fe5423938f313c7df536 upstream.
-
-Now that all users of generic ChaCha code have moved to the core library,
-there is no longer a need for the generic ChaCha skcpiher driver to
-export parts of it implementation for reuse by other drivers. So drop
-the exports, and make the symbols static.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- crypto/chacha_generic.c          | 26 ++++++++------------------
- include/crypto/internal/chacha.h | 10 ----------
- 2 files changed, 8 insertions(+), 28 deletions(-)
-
---- a/crypto/chacha_generic.c
-+++ b/crypto/chacha_generic.c
-@@ -21,7 +21,7 @@ static int chacha_stream_xor(struct skci
- 
- 	err = skcipher_walk_virt(&walk, req, false);
- 
--	crypto_chacha_init(state, ctx, iv);
-+	chacha_init_generic(state, ctx->key, iv);
- 
- 	while (walk.nbytes > 0) {
- 		unsigned int nbytes = walk.nbytes;
-@@ -37,36 +37,27 @@ static int chacha_stream_xor(struct skci
- 	return err;
- }
- 
--void crypto_chacha_init(u32 *state, const struct chacha_ctx *ctx, const u8 *iv)
--{
--	chacha_init_generic(state, ctx->key, iv);
--}
--EXPORT_SYMBOL_GPL(crypto_chacha_init);
--
--int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
--			   unsigned int keysize)
-+static int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
-+				  unsigned int keysize)
- {
- 	return chacha_setkey(tfm, key, keysize, 20);
- }
--EXPORT_SYMBOL_GPL(crypto_chacha20_setkey);
- 
--int crypto_chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
--			   unsigned int keysize)
-+static int crypto_chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
-+				 unsigned int keysize)
- {
- 	return chacha_setkey(tfm, key, keysize, 12);
- }
--EXPORT_SYMBOL_GPL(crypto_chacha12_setkey);
- 
--int crypto_chacha_crypt(struct skcipher_request *req)
-+static int crypto_chacha_crypt(struct skcipher_request *req)
- {
- 	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
- 	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
- 
- 	return chacha_stream_xor(req, ctx, req->iv);
- }
--EXPORT_SYMBOL_GPL(crypto_chacha_crypt);
- 
--int crypto_xchacha_crypt(struct skcipher_request *req)
-+static int crypto_xchacha_crypt(struct skcipher_request *req)
- {
- 	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
- 	struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
-@@ -75,7 +66,7 @@ int crypto_xchacha_crypt(struct skcipher
- 	u8 real_iv[16];
- 
- 	/* Compute the subkey given the original key and first 128 nonce bits */
--	crypto_chacha_init(state, ctx, req->iv);
-+	chacha_init_generic(state, ctx->key, req->iv);
- 	hchacha_block_generic(state, subctx.key, ctx->nrounds);
- 	subctx.nrounds = ctx->nrounds;
- 
-@@ -86,7 +77,6 @@ int crypto_xchacha_crypt(struct skcipher
- 	/* Generate the stream and XOR it with the data */
- 	return chacha_stream_xor(req, &subctx, real_iv);
- }
--EXPORT_SYMBOL_GPL(crypto_xchacha_crypt);
- 
- static struct skcipher_alg algs[] = {
- 	{
---- a/include/crypto/internal/chacha.h
-+++ b/include/crypto/internal/chacha.h
-@@ -12,8 +12,6 @@ struct chacha_ctx {
- 	int nrounds;
- };
- 
--void crypto_chacha_init(u32 *state, const struct chacha_ctx *ctx, const u8 *iv);
--
- static inline int chacha_setkey(struct crypto_skcipher *tfm, const u8 *key,
- 				unsigned int keysize, int nrounds)
- {
-@@ -42,12 +40,4 @@ static int inline chacha12_setkey(struct
- 	return chacha_setkey(tfm, key, keysize, 12);
- }
- 
--int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
--			   unsigned int keysize);
--int crypto_chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
--			   unsigned int keysize);
--
--int crypto_chacha_crypt(struct skcipher_request *req);
--int crypto_xchacha_crypt(struct skcipher_request *req);
--
- #endif /* _CRYPTO_CHACHA_H */

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0013-crypto-poly1305-move-core-routines-into-a-separate-l.patch

@@ -1,649 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:19 +0100
-Subject: [PATCH] crypto: poly1305 - move core routines into a separate library
-
-commit 48ea8c6ebc96bc0990e12ee1c43d0832c23576bb upstream.
-
-Move the core Poly1305 routines shared between the generic Poly1305
-shash driver and the Adiantum and NHPoly1305 drivers into a separate
-library so that using just this pieces does not pull in the crypto
-API pieces of the generic Poly1305 routine.
-
-In a subsequent patch, we will augment this generic library with
-init/update/final routines so that Poyl1305 algorithm can be used
-directly without the need for using the crypto API's shash abstraction.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/x86/crypto/poly1305_glue.c    |   2 +-
- crypto/Kconfig                     |   5 +-
- crypto/adiantum.c                  |   5 +-
- crypto/nhpoly1305.c                |   3 +-
- crypto/poly1305_generic.c          | 195 ++---------------------------
- include/crypto/internal/poly1305.h |  67 ++++++++++
- include/crypto/poly1305.h          |  23 ----
- lib/crypto/Kconfig                 |   3 +
- lib/crypto/Makefile                |   3 +
- lib/crypto/poly1305.c              | 158 +++++++++++++++++++++++
- 10 files changed, 248 insertions(+), 216 deletions(-)
- create mode 100644 include/crypto/internal/poly1305.h
- create mode 100644 lib/crypto/poly1305.c
-
---- a/arch/x86/crypto/poly1305_glue.c
-+++ b/arch/x86/crypto/poly1305_glue.c
-@@ -7,8 +7,8 @@
- 
- #include <crypto/algapi.h>
- #include <crypto/internal/hash.h>
-+#include <crypto/internal/poly1305.h>
- #include <crypto/internal/simd.h>
--#include <crypto/poly1305.h>
- #include <linux/crypto.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -446,7 +446,7 @@ config CRYPTO_KEYWRAP
- config CRYPTO_NHPOLY1305
- 	tristate
- 	select CRYPTO_HASH
--	select CRYPTO_POLY1305
-+	select CRYPTO_LIB_POLY1305_GENERIC
- 
- config CRYPTO_NHPOLY1305_SSE2
- 	tristate "NHPoly1305 hash function (x86_64 SSE2 implementation)"
-@@ -467,7 +467,7 @@ config CRYPTO_NHPOLY1305_AVX2
- config CRYPTO_ADIANTUM
- 	tristate "Adiantum support"
- 	select CRYPTO_CHACHA20
--	select CRYPTO_POLY1305
-+	select CRYPTO_LIB_POLY1305_GENERIC
- 	select CRYPTO_NHPOLY1305
- 	select CRYPTO_MANAGER
- 	help
-@@ -686,6 +686,7 @@ config CRYPTO_GHASH
- config CRYPTO_POLY1305
- 	tristate "Poly1305 authenticator algorithm"
- 	select CRYPTO_HASH
-+	select CRYPTO_LIB_POLY1305_GENERIC
- 	help
- 	  Poly1305 authenticator algorithm, RFC7539.
- 
---- a/crypto/adiantum.c
-+++ b/crypto/adiantum.c
-@@ -33,6 +33,7 @@
- #include <crypto/b128ops.h>
- #include <crypto/chacha.h>
- #include <crypto/internal/hash.h>
-+#include <crypto/internal/poly1305.h>
- #include <crypto/internal/skcipher.h>
- #include <crypto/nhpoly1305.h>
- #include <crypto/scatterwalk.h>
-@@ -242,11 +243,11 @@ static void adiantum_hash_header(struct
- 
- 	BUILD_BUG_ON(sizeof(header) % POLY1305_BLOCK_SIZE != 0);
- 	poly1305_core_blocks(&state, &tctx->header_hash_key,
--			     &header, sizeof(header) / POLY1305_BLOCK_SIZE);
-+			     &header, sizeof(header) / POLY1305_BLOCK_SIZE, 1);
- 
- 	BUILD_BUG_ON(TWEAK_SIZE % POLY1305_BLOCK_SIZE != 0);
- 	poly1305_core_blocks(&state, &tctx->header_hash_key, req->iv,
--			     TWEAK_SIZE / POLY1305_BLOCK_SIZE);
-+			     TWEAK_SIZE / POLY1305_BLOCK_SIZE, 1);
- 
- 	poly1305_core_emit(&state, &rctx->header_hash);
- }
---- a/crypto/nhpoly1305.c
-+++ b/crypto/nhpoly1305.c
-@@ -33,6 +33,7 @@
- #include <asm/unaligned.h>
- #include <crypto/algapi.h>
- #include <crypto/internal/hash.h>
-+#include <crypto/internal/poly1305.h>
- #include <crypto/nhpoly1305.h>
- #include <linux/crypto.h>
- #include <linux/kernel.h>
-@@ -78,7 +79,7 @@ static void process_nh_hash_value(struct
- 	BUILD_BUG_ON(NH_HASH_BYTES % POLY1305_BLOCK_SIZE != 0);
- 
- 	poly1305_core_blocks(&state->poly_state, &key->poly_key, state->nh_hash,
--			     NH_HASH_BYTES / POLY1305_BLOCK_SIZE);
-+			     NH_HASH_BYTES / POLY1305_BLOCK_SIZE, 1);
- }
- 
- /*
---- a/crypto/poly1305_generic.c
-+++ b/crypto/poly1305_generic.c
-@@ -13,27 +13,12 @@
- 
- #include <crypto/algapi.h>
- #include <crypto/internal/hash.h>
--#include <crypto/poly1305.h>
-+#include <crypto/internal/poly1305.h>
- #include <linux/crypto.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <asm/unaligned.h>
- 
--static inline u64 mlt(u64 a, u64 b)
--{
--	return a * b;
--}
--
--static inline u32 sr(u64 v, u_char n)
--{
--	return v >> n;
--}
--
--static inline u32 and(u32 v, u32 mask)
--{
--	return v & mask;
--}
--
- int crypto_poly1305_init(struct shash_desc *desc)
- {
- 	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
-@@ -47,124 +32,8 @@ int crypto_poly1305_init(struct shash_de
- }
- EXPORT_SYMBOL_GPL(crypto_poly1305_init);
- 
--void poly1305_core_setkey(struct poly1305_key *key, const u8 *raw_key)
--{
--	/* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
--	key->r[0] = (get_unaligned_le32(raw_key +  0) >> 0) & 0x3ffffff;
--	key->r[1] = (get_unaligned_le32(raw_key +  3) >> 2) & 0x3ffff03;
--	key->r[2] = (get_unaligned_le32(raw_key +  6) >> 4) & 0x3ffc0ff;
--	key->r[3] = (get_unaligned_le32(raw_key +  9) >> 6) & 0x3f03fff;
--	key->r[4] = (get_unaligned_le32(raw_key + 12) >> 8) & 0x00fffff;
--}
--EXPORT_SYMBOL_GPL(poly1305_core_setkey);
--
--/*
-- * Poly1305 requires a unique key for each tag, which implies that we can't set
-- * it on the tfm that gets accessed by multiple users simultaneously. Instead we
-- * expect the key as the first 32 bytes in the update() call.
-- */
--unsigned int crypto_poly1305_setdesckey(struct poly1305_desc_ctx *dctx,
--					const u8 *src, unsigned int srclen)
--{
--	if (!dctx->sset) {
--		if (!dctx->rset && srclen >= POLY1305_BLOCK_SIZE) {
--			poly1305_core_setkey(&dctx->r, src);
--			src += POLY1305_BLOCK_SIZE;
--			srclen -= POLY1305_BLOCK_SIZE;
--			dctx->rset = true;
--		}
--		if (srclen >= POLY1305_BLOCK_SIZE) {
--			dctx->s[0] = get_unaligned_le32(src +  0);
--			dctx->s[1] = get_unaligned_le32(src +  4);
--			dctx->s[2] = get_unaligned_le32(src +  8);
--			dctx->s[3] = get_unaligned_le32(src + 12);
--			src += POLY1305_BLOCK_SIZE;
--			srclen -= POLY1305_BLOCK_SIZE;
--			dctx->sset = true;
--		}
--	}
--	return srclen;
--}
--EXPORT_SYMBOL_GPL(crypto_poly1305_setdesckey);
--
--static void poly1305_blocks_internal(struct poly1305_state *state,
--				     const struct poly1305_key *key,
--				     const void *src, unsigned int nblocks,
--				     u32 hibit)
--{
--	u32 r0, r1, r2, r3, r4;
--	u32 s1, s2, s3, s4;
--	u32 h0, h1, h2, h3, h4;
--	u64 d0, d1, d2, d3, d4;
--
--	if (!nblocks)
--		return;
--
--	r0 = key->r[0];
--	r1 = key->r[1];
--	r2 = key->r[2];
--	r3 = key->r[3];
--	r4 = key->r[4];
--
--	s1 = r1 * 5;
--	s2 = r2 * 5;
--	s3 = r3 * 5;
--	s4 = r4 * 5;
--
--	h0 = state->h[0];
--	h1 = state->h[1];
--	h2 = state->h[2];
--	h3 = state->h[3];
--	h4 = state->h[4];
--
--	do {
--		/* h += m[i] */
--		h0 += (get_unaligned_le32(src +  0) >> 0) & 0x3ffffff;
--		h1 += (get_unaligned_le32(src +  3) >> 2) & 0x3ffffff;
--		h2 += (get_unaligned_le32(src +  6) >> 4) & 0x3ffffff;
--		h3 += (get_unaligned_le32(src +  9) >> 6) & 0x3ffffff;
--		h4 += (get_unaligned_le32(src + 12) >> 8) | hibit;
--
--		/* h *= r */
--		d0 = mlt(h0, r0) + mlt(h1, s4) + mlt(h2, s3) +
--		     mlt(h3, s2) + mlt(h4, s1);
--		d1 = mlt(h0, r1) + mlt(h1, r0) + mlt(h2, s4) +
--		     mlt(h3, s3) + mlt(h4, s2);
--		d2 = mlt(h0, r2) + mlt(h1, r1) + mlt(h2, r0) +
--		     mlt(h3, s4) + mlt(h4, s3);
--		d3 = mlt(h0, r3) + mlt(h1, r2) + mlt(h2, r1) +
--		     mlt(h3, r0) + mlt(h4, s4);
--		d4 = mlt(h0, r4) + mlt(h1, r3) + mlt(h2, r2) +
--		     mlt(h3, r1) + mlt(h4, r0);
--
--		/* (partial) h %= p */
--		d1 += sr(d0, 26);     h0 = and(d0, 0x3ffffff);
--		d2 += sr(d1, 26);     h1 = and(d1, 0x3ffffff);
--		d3 += sr(d2, 26);     h2 = and(d2, 0x3ffffff);
--		d4 += sr(d3, 26);     h3 = and(d3, 0x3ffffff);
--		h0 += sr(d4, 26) * 5; h4 = and(d4, 0x3ffffff);
--		h1 += h0 >> 26;       h0 = h0 & 0x3ffffff;
--
--		src += POLY1305_BLOCK_SIZE;
--	} while (--nblocks);
--
--	state->h[0] = h0;
--	state->h[1] = h1;
--	state->h[2] = h2;
--	state->h[3] = h3;
--	state->h[4] = h4;
--}
--
--void poly1305_core_blocks(struct poly1305_state *state,
--			  const struct poly1305_key *key,
--			  const void *src, unsigned int nblocks)
--{
--	poly1305_blocks_internal(state, key, src, nblocks, 1 << 24);
--}
--EXPORT_SYMBOL_GPL(poly1305_core_blocks);
--
--static void poly1305_blocks(struct poly1305_desc_ctx *dctx,
--			    const u8 *src, unsigned int srclen, u32 hibit)
-+static void poly1305_blocks(struct poly1305_desc_ctx *dctx, const u8 *src,
-+			    unsigned int srclen)
- {
- 	unsigned int datalen;
- 
-@@ -174,8 +43,8 @@ static void poly1305_blocks(struct poly1
- 		srclen = datalen;
- 	}
- 
--	poly1305_blocks_internal(&dctx->h, &dctx->r,
--				 src, srclen / POLY1305_BLOCK_SIZE, hibit);
-+	poly1305_core_blocks(&dctx->h, &dctx->r, src,
-+			     srclen / POLY1305_BLOCK_SIZE, 1);
- }
- 
- int crypto_poly1305_update(struct shash_desc *desc,
-@@ -193,13 +62,13 @@ int crypto_poly1305_update(struct shash_
- 
- 		if (dctx->buflen == POLY1305_BLOCK_SIZE) {
- 			poly1305_blocks(dctx, dctx->buf,
--					POLY1305_BLOCK_SIZE, 1 << 24);
-+					POLY1305_BLOCK_SIZE);
- 			dctx->buflen = 0;
- 		}
- 	}
- 
- 	if (likely(srclen >= POLY1305_BLOCK_SIZE)) {
--		poly1305_blocks(dctx, src, srclen, 1 << 24);
-+		poly1305_blocks(dctx, src, srclen);
- 		src += srclen - (srclen % POLY1305_BLOCK_SIZE);
- 		srclen %= POLY1305_BLOCK_SIZE;
- 	}
-@@ -213,54 +82,6 @@ int crypto_poly1305_update(struct shash_
- }
- EXPORT_SYMBOL_GPL(crypto_poly1305_update);
- 
--void poly1305_core_emit(const struct poly1305_state *state, void *dst)
--{
--	u32 h0, h1, h2, h3, h4;
--	u32 g0, g1, g2, g3, g4;
--	u32 mask;
--
--	/* fully carry h */
--	h0 = state->h[0];
--	h1 = state->h[1];
--	h2 = state->h[2];
--	h3 = state->h[3];
--	h4 = state->h[4];
--
--	h2 += (h1 >> 26);     h1 = h1 & 0x3ffffff;
--	h3 += (h2 >> 26);     h2 = h2 & 0x3ffffff;
--	h4 += (h3 >> 26);     h3 = h3 & 0x3ffffff;
--	h0 += (h4 >> 26) * 5; h4 = h4 & 0x3ffffff;
--	h1 += (h0 >> 26);     h0 = h0 & 0x3ffffff;
--
--	/* compute h + -p */
--	g0 = h0 + 5;
--	g1 = h1 + (g0 >> 26);             g0 &= 0x3ffffff;
--	g2 = h2 + (g1 >> 26);             g1 &= 0x3ffffff;
--	g3 = h3 + (g2 >> 26);             g2 &= 0x3ffffff;
--	g4 = h4 + (g3 >> 26) - (1 << 26); g3 &= 0x3ffffff;
--
--	/* select h if h < p, or h + -p if h >= p */
--	mask = (g4 >> ((sizeof(u32) * 8) - 1)) - 1;
--	g0 &= mask;
--	g1 &= mask;
--	g2 &= mask;
--	g3 &= mask;
--	g4 &= mask;
--	mask = ~mask;
--	h0 = (h0 & mask) | g0;
--	h1 = (h1 & mask) | g1;
--	h2 = (h2 & mask) | g2;
--	h3 = (h3 & mask) | g3;
--	h4 = (h4 & mask) | g4;
--
--	/* h = h % (2^128) */
--	put_unaligned_le32((h0 >>  0) | (h1 << 26), dst +  0);
--	put_unaligned_le32((h1 >>  6) | (h2 << 20), dst +  4);
--	put_unaligned_le32((h2 >> 12) | (h3 << 14), dst +  8);
--	put_unaligned_le32((h3 >> 18) | (h4 <<  8), dst + 12);
--}
--EXPORT_SYMBOL_GPL(poly1305_core_emit);
--
- int crypto_poly1305_final(struct shash_desc *desc, u8 *dst)
- {
- 	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
-@@ -274,7 +95,7 @@ int crypto_poly1305_final(struct shash_d
- 		dctx->buf[dctx->buflen++] = 1;
- 		memset(dctx->buf + dctx->buflen, 0,
- 		       POLY1305_BLOCK_SIZE - dctx->buflen);
--		poly1305_blocks(dctx, dctx->buf, POLY1305_BLOCK_SIZE, 0);
-+		poly1305_core_blocks(&dctx->h, &dctx->r, dctx->buf, 1, 0);
- 	}
- 
- 	poly1305_core_emit(&dctx->h, digest);
---- /dev/null
-+++ b/include/crypto/internal/poly1305.h
-@@ -0,0 +1,67 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Common values for the Poly1305 algorithm
-+ */
-+
-+#ifndef _CRYPTO_INTERNAL_POLY1305_H
-+#define _CRYPTO_INTERNAL_POLY1305_H
-+
-+#include <asm/unaligned.h>
-+#include <linux/types.h>
-+#include <crypto/poly1305.h>
-+
-+struct shash_desc;
-+
-+/*
-+ * Poly1305 core functions.  These implement the ε-almost-∆-universal hash
-+ * function underlying the Poly1305 MAC, i.e. they don't add an encrypted nonce
-+ * ("s key") at the end.  They also only support block-aligned inputs.
-+ */
-+void poly1305_core_setkey(struct poly1305_key *key, const u8 *raw_key);
-+static inline void poly1305_core_init(struct poly1305_state *state)
-+{
-+	*state = (struct poly1305_state){};
-+}
-+
-+void poly1305_core_blocks(struct poly1305_state *state,
-+			  const struct poly1305_key *key, const void *src,
-+			  unsigned int nblocks, u32 hibit);
-+void poly1305_core_emit(const struct poly1305_state *state, void *dst);
-+
-+/* Crypto API helper functions for the Poly1305 MAC */
-+int crypto_poly1305_init(struct shash_desc *desc);
-+
-+int crypto_poly1305_update(struct shash_desc *desc,
-+			   const u8 *src, unsigned int srclen);
-+int crypto_poly1305_final(struct shash_desc *desc, u8 *dst);
-+
-+/*
-+ * Poly1305 requires a unique key for each tag, which implies that we can't set
-+ * it on the tfm that gets accessed by multiple users simultaneously. Instead we
-+ * expect the key as the first 32 bytes in the update() call.
-+ */
-+static inline
-+unsigned int crypto_poly1305_setdesckey(struct poly1305_desc_ctx *dctx,
-+					const u8 *src, unsigned int srclen)
-+{
-+	if (!dctx->sset) {
-+		if (!dctx->rset && srclen >= POLY1305_BLOCK_SIZE) {
-+			poly1305_core_setkey(&dctx->r, src);
-+			src += POLY1305_BLOCK_SIZE;
-+			srclen -= POLY1305_BLOCK_SIZE;
-+			dctx->rset = true;
-+		}
-+		if (srclen >= POLY1305_BLOCK_SIZE) {
-+			dctx->s[0] = get_unaligned_le32(src +  0);
-+			dctx->s[1] = get_unaligned_le32(src +  4);
-+			dctx->s[2] = get_unaligned_le32(src +  8);
-+			dctx->s[3] = get_unaligned_le32(src + 12);
-+			src += POLY1305_BLOCK_SIZE;
-+			srclen -= POLY1305_BLOCK_SIZE;
-+			dctx->sset = true;
-+		}
-+	}
-+	return srclen;
-+}
-+
-+#endif
---- a/include/crypto/poly1305.h
-+++ b/include/crypto/poly1305.h
-@@ -38,27 +38,4 @@ struct poly1305_desc_ctx {
- 	bool sset;
- };
- 
--/*
-- * Poly1305 core functions.  These implement the ε-almost-∆-universal hash
-- * function underlying the Poly1305 MAC, i.e. they don't add an encrypted nonce
-- * ("s key") at the end.  They also only support block-aligned inputs.
-- */
--void poly1305_core_setkey(struct poly1305_key *key, const u8 *raw_key);
--static inline void poly1305_core_init(struct poly1305_state *state)
--{
--	memset(state->h, 0, sizeof(state->h));
--}
--void poly1305_core_blocks(struct poly1305_state *state,
--			  const struct poly1305_key *key,
--			  const void *src, unsigned int nblocks);
--void poly1305_core_emit(const struct poly1305_state *state, void *dst);
--
--/* Crypto API helper functions for the Poly1305 MAC */
--int crypto_poly1305_init(struct shash_desc *desc);
--unsigned int crypto_poly1305_setdesckey(struct poly1305_desc_ctx *dctx,
--					const u8 *src, unsigned int srclen);
--int crypto_poly1305_update(struct shash_desc *desc,
--			   const u8 *src, unsigned int srclen);
--int crypto_poly1305_final(struct shash_desc *desc, u8 *dst);
--
- #endif
---- a/lib/crypto/Kconfig
-+++ b/lib/crypto/Kconfig
-@@ -37,5 +37,8 @@ config CRYPTO_LIB_CHACHA
- config CRYPTO_LIB_DES
- 	tristate
- 
-+config CRYPTO_LIB_POLY1305_GENERIC
-+	tristate
-+
- config CRYPTO_LIB_SHA256
- 	tristate
---- a/lib/crypto/Makefile
-+++ b/lib/crypto/Makefile
-@@ -13,5 +13,8 @@ libarc4-y					:= arc4.o
- obj-$(CONFIG_CRYPTO_LIB_DES)			+= libdes.o
- libdes-y					:= des.o
- 
-+obj-$(CONFIG_CRYPTO_LIB_POLY1305_GENERIC)	+= libpoly1305.o
-+libpoly1305-y					:= poly1305.o
-+
- obj-$(CONFIG_CRYPTO_LIB_SHA256)			+= libsha256.o
- libsha256-y					:= sha256.o
---- /dev/null
-+++ b/lib/crypto/poly1305.c
-@@ -0,0 +1,158 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * Poly1305 authenticator algorithm, RFC7539
-+ *
-+ * Copyright (C) 2015 Martin Willi
-+ *
-+ * Based on public domain code by Andrew Moon and Daniel J. Bernstein.
-+ */
-+
-+#include <crypto/internal/poly1305.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <asm/unaligned.h>
-+
-+static inline u64 mlt(u64 a, u64 b)
-+{
-+	return a * b;
-+}
-+
-+static inline u32 sr(u64 v, u_char n)
-+{
-+	return v >> n;
-+}
-+
-+static inline u32 and(u32 v, u32 mask)
-+{
-+	return v & mask;
-+}
-+
-+void poly1305_core_setkey(struct poly1305_key *key, const u8 *raw_key)
-+{
-+	/* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
-+	key->r[0] = (get_unaligned_le32(raw_key +  0) >> 0) & 0x3ffffff;
-+	key->r[1] = (get_unaligned_le32(raw_key +  3) >> 2) & 0x3ffff03;
-+	key->r[2] = (get_unaligned_le32(raw_key +  6) >> 4) & 0x3ffc0ff;
-+	key->r[3] = (get_unaligned_le32(raw_key +  9) >> 6) & 0x3f03fff;
-+	key->r[4] = (get_unaligned_le32(raw_key + 12) >> 8) & 0x00fffff;
-+}
-+EXPORT_SYMBOL_GPL(poly1305_core_setkey);
-+
-+void poly1305_core_blocks(struct poly1305_state *state,
-+			  const struct poly1305_key *key, const void *src,
-+			  unsigned int nblocks, u32 hibit)
-+{
-+	u32 r0, r1, r2, r3, r4;
-+	u32 s1, s2, s3, s4;
-+	u32 h0, h1, h2, h3, h4;
-+	u64 d0, d1, d2, d3, d4;
-+
-+	if (!nblocks)
-+		return;
-+
-+	r0 = key->r[0];
-+	r1 = key->r[1];
-+	r2 = key->r[2];
-+	r3 = key->r[3];
-+	r4 = key->r[4];
-+
-+	s1 = r1 * 5;
-+	s2 = r2 * 5;
-+	s3 = r3 * 5;
-+	s4 = r4 * 5;
-+
-+	h0 = state->h[0];
-+	h1 = state->h[1];
-+	h2 = state->h[2];
-+	h3 = state->h[3];
-+	h4 = state->h[4];
-+
-+	do {
-+		/* h += m[i] */
-+		h0 += (get_unaligned_le32(src +  0) >> 0) & 0x3ffffff;
-+		h1 += (get_unaligned_le32(src +  3) >> 2) & 0x3ffffff;
-+		h2 += (get_unaligned_le32(src +  6) >> 4) & 0x3ffffff;
-+		h3 += (get_unaligned_le32(src +  9) >> 6) & 0x3ffffff;
-+		h4 += (get_unaligned_le32(src + 12) >> 8) | (hibit << 24);
-+
-+		/* h *= r */
-+		d0 = mlt(h0, r0) + mlt(h1, s4) + mlt(h2, s3) +
-+		     mlt(h3, s2) + mlt(h4, s1);
-+		d1 = mlt(h0, r1) + mlt(h1, r0) + mlt(h2, s4) +
-+		     mlt(h3, s3) + mlt(h4, s2);
-+		d2 = mlt(h0, r2) + mlt(h1, r1) + mlt(h2, r0) +
-+		     mlt(h3, s4) + mlt(h4, s3);
-+		d3 = mlt(h0, r3) + mlt(h1, r2) + mlt(h2, r1) +
-+		     mlt(h3, r0) + mlt(h4, s4);
-+		d4 = mlt(h0, r4) + mlt(h1, r3) + mlt(h2, r2) +
-+		     mlt(h3, r1) + mlt(h4, r0);
-+
-+		/* (partial) h %= p */
-+		d1 += sr(d0, 26);     h0 = and(d0, 0x3ffffff);
-+		d2 += sr(d1, 26);     h1 = and(d1, 0x3ffffff);
-+		d3 += sr(d2, 26);     h2 = and(d2, 0x3ffffff);
-+		d4 += sr(d3, 26);     h3 = and(d3, 0x3ffffff);
-+		h0 += sr(d4, 26) * 5; h4 = and(d4, 0x3ffffff);
-+		h1 += h0 >> 26;       h0 = h0 & 0x3ffffff;
-+
-+		src += POLY1305_BLOCK_SIZE;
-+	} while (--nblocks);
-+
-+	state->h[0] = h0;
-+	state->h[1] = h1;
-+	state->h[2] = h2;
-+	state->h[3] = h3;
-+	state->h[4] = h4;
-+}
-+EXPORT_SYMBOL_GPL(poly1305_core_blocks);
-+
-+void poly1305_core_emit(const struct poly1305_state *state, void *dst)
-+{
-+	u32 h0, h1, h2, h3, h4;
-+	u32 g0, g1, g2, g3, g4;
-+	u32 mask;
-+
-+	/* fully carry h */
-+	h0 = state->h[0];
-+	h1 = state->h[1];
-+	h2 = state->h[2];
-+	h3 = state->h[3];
-+	h4 = state->h[4];
-+
-+	h2 += (h1 >> 26);     h1 = h1 & 0x3ffffff;
-+	h3 += (h2 >> 26);     h2 = h2 & 0x3ffffff;
-+	h4 += (h3 >> 26);     h3 = h3 & 0x3ffffff;
-+	h0 += (h4 >> 26) * 5; h4 = h4 & 0x3ffffff;
-+	h1 += (h0 >> 26);     h0 = h0 & 0x3ffffff;
-+
-+	/* compute h + -p */
-+	g0 = h0 + 5;
-+	g1 = h1 + (g0 >> 26);             g0 &= 0x3ffffff;
-+	g2 = h2 + (g1 >> 26);             g1 &= 0x3ffffff;
-+	g3 = h3 + (g2 >> 26);             g2 &= 0x3ffffff;
-+	g4 = h4 + (g3 >> 26) - (1 << 26); g3 &= 0x3ffffff;
-+
-+	/* select h if h < p, or h + -p if h >= p */
-+	mask = (g4 >> ((sizeof(u32) * 8) - 1)) - 1;
-+	g0 &= mask;
-+	g1 &= mask;
-+	g2 &= mask;
-+	g3 &= mask;
-+	g4 &= mask;
-+	mask = ~mask;
-+	h0 = (h0 & mask) | g0;
-+	h1 = (h1 & mask) | g1;
-+	h2 = (h2 & mask) | g2;
-+	h3 = (h3 & mask) | g3;
-+	h4 = (h4 & mask) | g4;
-+
-+	/* h = h % (2^128) */
-+	put_unaligned_le32((h0 >>  0) | (h1 << 26), dst +  0);
-+	put_unaligned_le32((h1 >>  6) | (h2 << 20), dst +  4);
-+	put_unaligned_le32((h2 >> 12) | (h3 << 14), dst +  8);
-+	put_unaligned_le32((h3 >> 18) | (h4 <<  8), dst + 12);
-+}
-+EXPORT_SYMBOL_GPL(poly1305_core_emit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Martin Willi <martin@strongswan.org>");

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0014-crypto-x86-poly1305-unify-Poly1305-state-struct-with.patch

@@ -1,251 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:20 +0100
-Subject: [PATCH] crypto: x86/poly1305 - unify Poly1305 state struct with
- generic code
-
-commit ad8f5b88383ea685f2b8df2a12ee3e08089a1287 upstream.
-
-In preparation of exposing a Poly1305 library interface directly from
-the accelerated x86 driver, align the state descriptor of the x86 code
-with the one used by the generic driver. This is needed to make the
-library interface unified between all implementations.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/x86/crypto/poly1305_glue.c    | 88 ++++++++++--------------------
- crypto/poly1305_generic.c          |  6 +-
- include/crypto/internal/poly1305.h |  4 +-
- include/crypto/poly1305.h          | 18 +++---
- 4 files changed, 43 insertions(+), 73 deletions(-)
-
---- a/arch/x86/crypto/poly1305_glue.c
-+++ b/arch/x86/crypto/poly1305_glue.c
-@@ -14,40 +14,14 @@
- #include <linux/module.h>
- #include <asm/simd.h>
- 
--struct poly1305_simd_desc_ctx {
--	struct poly1305_desc_ctx base;
--	/* derived key u set? */
--	bool uset;
--#ifdef CONFIG_AS_AVX2
--	/* derived keys r^3, r^4 set? */
--	bool wset;
--#endif
--	/* derived Poly1305 key r^2 */
--	u32 u[5];
--	/* ... silently appended r^3 and r^4 when using AVX2 */
--};
--
- asmlinkage void poly1305_block_sse2(u32 *h, const u8 *src,
- 				    const u32 *r, unsigned int blocks);
- asmlinkage void poly1305_2block_sse2(u32 *h, const u8 *src, const u32 *r,
- 				     unsigned int blocks, const u32 *u);
--#ifdef CONFIG_AS_AVX2
- asmlinkage void poly1305_4block_avx2(u32 *h, const u8 *src, const u32 *r,
- 				     unsigned int blocks, const u32 *u);
--static bool poly1305_use_avx2;
--#endif
- 
--static int poly1305_simd_init(struct shash_desc *desc)
--{
--	struct poly1305_simd_desc_ctx *sctx = shash_desc_ctx(desc);
--
--	sctx->uset = false;
--#ifdef CONFIG_AS_AVX2
--	sctx->wset = false;
--#endif
--
--	return crypto_poly1305_init(desc);
--}
-+static bool poly1305_use_avx2 __ro_after_init;
- 
- static void poly1305_simd_mult(u32 *a, const u32 *b)
- {
-@@ -63,53 +37,49 @@ static void poly1305_simd_mult(u32 *a, c
- static unsigned int poly1305_simd_blocks(struct poly1305_desc_ctx *dctx,
- 					 const u8 *src, unsigned int srclen)
- {
--	struct poly1305_simd_desc_ctx *sctx;
- 	unsigned int blocks, datalen;
- 
--	BUILD_BUG_ON(offsetof(struct poly1305_simd_desc_ctx, base));
--	sctx = container_of(dctx, struct poly1305_simd_desc_ctx, base);
--
- 	if (unlikely(!dctx->sset)) {
- 		datalen = crypto_poly1305_setdesckey(dctx, src, srclen);
- 		src += srclen - datalen;
- 		srclen = datalen;
- 	}
- 
--#ifdef CONFIG_AS_AVX2
--	if (poly1305_use_avx2 && srclen >= POLY1305_BLOCK_SIZE * 4) {
--		if (unlikely(!sctx->wset)) {
--			if (!sctx->uset) {
--				memcpy(sctx->u, dctx->r.r, sizeof(sctx->u));
--				poly1305_simd_mult(sctx->u, dctx->r.r);
--				sctx->uset = true;
-+	if (IS_ENABLED(CONFIG_AS_AVX2) &&
-+	    poly1305_use_avx2 &&
-+	    srclen >= POLY1305_BLOCK_SIZE * 4) {
-+		if (unlikely(dctx->rset < 4)) {
-+			if (dctx->rset < 2) {
-+				dctx->r[1] = dctx->r[0];
-+				poly1305_simd_mult(dctx->r[1].r, dctx->r[0].r);
- 			}
--			memcpy(sctx->u + 5, sctx->u, sizeof(sctx->u));
--			poly1305_simd_mult(sctx->u + 5, dctx->r.r);
--			memcpy(sctx->u + 10, sctx->u + 5, sizeof(sctx->u));
--			poly1305_simd_mult(sctx->u + 10, dctx->r.r);
--			sctx->wset = true;
-+			dctx->r[2] = dctx->r[1];
-+			poly1305_simd_mult(dctx->r[2].r, dctx->r[0].r);
-+			dctx->r[3] = dctx->r[2];
-+			poly1305_simd_mult(dctx->r[3].r, dctx->r[0].r);
-+			dctx->rset = 4;
- 		}
- 		blocks = srclen / (POLY1305_BLOCK_SIZE * 4);
--		poly1305_4block_avx2(dctx->h.h, src, dctx->r.r, blocks,
--				     sctx->u);
-+		poly1305_4block_avx2(dctx->h.h, src, dctx->r[0].r, blocks,
-+				     dctx->r[1].r);
- 		src += POLY1305_BLOCK_SIZE * 4 * blocks;
- 		srclen -= POLY1305_BLOCK_SIZE * 4 * blocks;
- 	}
--#endif
-+
- 	if (likely(srclen >= POLY1305_BLOCK_SIZE * 2)) {
--		if (unlikely(!sctx->uset)) {
--			memcpy(sctx->u, dctx->r.r, sizeof(sctx->u));
--			poly1305_simd_mult(sctx->u, dctx->r.r);
--			sctx->uset = true;
-+		if (unlikely(dctx->rset < 2)) {
-+			dctx->r[1] = dctx->r[0];
-+			poly1305_simd_mult(dctx->r[1].r, dctx->r[0].r);
-+			dctx->rset = 2;
- 		}
- 		blocks = srclen / (POLY1305_BLOCK_SIZE * 2);
--		poly1305_2block_sse2(dctx->h.h, src, dctx->r.r, blocks,
--				     sctx->u);
-+		poly1305_2block_sse2(dctx->h.h, src, dctx->r[0].r,
-+				     blocks, dctx->r[1].r);
- 		src += POLY1305_BLOCK_SIZE * 2 * blocks;
- 		srclen -= POLY1305_BLOCK_SIZE * 2 * blocks;
- 	}
- 	if (srclen >= POLY1305_BLOCK_SIZE) {
--		poly1305_block_sse2(dctx->h.h, src, dctx->r.r, 1);
-+		poly1305_block_sse2(dctx->h.h, src, dctx->r[0].r, 1);
- 		srclen -= POLY1305_BLOCK_SIZE;
- 	}
- 	return srclen;
-@@ -159,10 +129,10 @@ static int poly1305_simd_update(struct s
- 
- static struct shash_alg alg = {
- 	.digestsize	= POLY1305_DIGEST_SIZE,
--	.init		= poly1305_simd_init,
-+	.init		= crypto_poly1305_init,
- 	.update		= poly1305_simd_update,
- 	.final		= crypto_poly1305_final,
--	.descsize	= sizeof(struct poly1305_simd_desc_ctx),
-+	.descsize	= sizeof(struct poly1305_desc_ctx),
- 	.base		= {
- 		.cra_name		= "poly1305",
- 		.cra_driver_name	= "poly1305-simd",
-@@ -177,14 +147,14 @@ static int __init poly1305_simd_mod_init
- 	if (!boot_cpu_has(X86_FEATURE_XMM2))
- 		return -ENODEV;
- 
--#ifdef CONFIG_AS_AVX2
--	poly1305_use_avx2 = boot_cpu_has(X86_FEATURE_AVX) &&
-+	poly1305_use_avx2 = IS_ENABLED(CONFIG_AS_AVX2) &&
-+			    boot_cpu_has(X86_FEATURE_AVX) &&
- 			    boot_cpu_has(X86_FEATURE_AVX2) &&
- 			    cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL);
--	alg.descsize = sizeof(struct poly1305_simd_desc_ctx);
-+	alg.descsize = sizeof(struct poly1305_desc_ctx) + 5 * sizeof(u32);
- 	if (poly1305_use_avx2)
- 		alg.descsize += 10 * sizeof(u32);
--#endif
-+
- 	return crypto_register_shash(&alg);
- }
- 
---- a/crypto/poly1305_generic.c
-+++ b/crypto/poly1305_generic.c
-@@ -25,7 +25,7 @@ int crypto_poly1305_init(struct shash_de
- 
- 	poly1305_core_init(&dctx->h);
- 	dctx->buflen = 0;
--	dctx->rset = false;
-+	dctx->rset = 0;
- 	dctx->sset = false;
- 
- 	return 0;
-@@ -43,7 +43,7 @@ static void poly1305_blocks(struct poly1
- 		srclen = datalen;
- 	}
- 
--	poly1305_core_blocks(&dctx->h, &dctx->r, src,
-+	poly1305_core_blocks(&dctx->h, dctx->r, src,
- 			     srclen / POLY1305_BLOCK_SIZE, 1);
- }
- 
-@@ -95,7 +95,7 @@ int crypto_poly1305_final(struct shash_d
- 		dctx->buf[dctx->buflen++] = 1;
- 		memset(dctx->buf + dctx->buflen, 0,
- 		       POLY1305_BLOCK_SIZE - dctx->buflen);
--		poly1305_core_blocks(&dctx->h, &dctx->r, dctx->buf, 1, 0);
-+		poly1305_core_blocks(&dctx->h, dctx->r, dctx->buf, 1, 0);
- 	}
- 
- 	poly1305_core_emit(&dctx->h, digest);
---- a/include/crypto/internal/poly1305.h
-+++ b/include/crypto/internal/poly1305.h
-@@ -46,10 +46,10 @@ unsigned int crypto_poly1305_setdesckey(
- {
- 	if (!dctx->sset) {
- 		if (!dctx->rset && srclen >= POLY1305_BLOCK_SIZE) {
--			poly1305_core_setkey(&dctx->r, src);
-+			poly1305_core_setkey(dctx->r, src);
- 			src += POLY1305_BLOCK_SIZE;
- 			srclen -= POLY1305_BLOCK_SIZE;
--			dctx->rset = true;
-+			dctx->rset = 1;
- 		}
- 		if (srclen >= POLY1305_BLOCK_SIZE) {
- 			dctx->s[0] = get_unaligned_le32(src +  0);
---- a/include/crypto/poly1305.h
-+++ b/include/crypto/poly1305.h
-@@ -22,20 +22,20 @@ struct poly1305_state {
- };
- 
- struct poly1305_desc_ctx {
--	/* key */
--	struct poly1305_key r;
--	/* finalize key */
--	u32 s[4];
--	/* accumulator */
--	struct poly1305_state h;
- 	/* partial buffer */
- 	u8 buf[POLY1305_BLOCK_SIZE];
- 	/* bytes used in partial buffer */
- 	unsigned int buflen;
--	/* r key has been set */
--	bool rset;
--	/* s key has been set */
-+	/* how many keys have been set in r[] */
-+	unsigned short rset;
-+	/* whether s[] has been set */
- 	bool sset;
-+	/* finalize key */
-+	u32 s[4];
-+	/* accumulator */
-+	struct poly1305_state h;
-+	/* key */
-+	struct poly1305_key r[1];
- };
- 
- #endif

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0015-crypto-poly1305-expose-init-update-final-library-int.patch

@@ -1,224 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:21 +0100
-Subject: [PATCH] crypto: poly1305 - expose init/update/final library interface
-
-commit a1d93064094cc5e24d64e35cf093e7191d0c9344 upstream.
-
-Expose the existing generic Poly1305 code via a init/update/final
-library interface so that callers are not required to go through
-the crypto API's shash abstraction to access it. At the same time,
-make some preparations so that the library implementation can be
-superseded by an accelerated arch-specific version in the future.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- crypto/poly1305_generic.c | 22 +-----------
- include/crypto/poly1305.h | 38 +++++++++++++++++++-
- lib/crypto/Kconfig        | 26 ++++++++++++++
- lib/crypto/poly1305.c     | 74 +++++++++++++++++++++++++++++++++++++++
- 4 files changed, 138 insertions(+), 22 deletions(-)
-
---- a/crypto/poly1305_generic.c
-+++ b/crypto/poly1305_generic.c
-@@ -85,31 +85,11 @@ EXPORT_SYMBOL_GPL(crypto_poly1305_update
- int crypto_poly1305_final(struct shash_desc *desc, u8 *dst)
- {
- 	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
--	__le32 digest[4];
--	u64 f = 0;
- 
- 	if (unlikely(!dctx->sset))
- 		return -ENOKEY;
- 
--	if (unlikely(dctx->buflen)) {
--		dctx->buf[dctx->buflen++] = 1;
--		memset(dctx->buf + dctx->buflen, 0,
--		       POLY1305_BLOCK_SIZE - dctx->buflen);
--		poly1305_core_blocks(&dctx->h, dctx->r, dctx->buf, 1, 0);
--	}
--
--	poly1305_core_emit(&dctx->h, digest);
--
--	/* mac = (h + s) % (2^128) */
--	f = (f >> 32) + le32_to_cpu(digest[0]) + dctx->s[0];
--	put_unaligned_le32(f, dst + 0);
--	f = (f >> 32) + le32_to_cpu(digest[1]) + dctx->s[1];
--	put_unaligned_le32(f, dst + 4);
--	f = (f >> 32) + le32_to_cpu(digest[2]) + dctx->s[2];
--	put_unaligned_le32(f, dst + 8);
--	f = (f >> 32) + le32_to_cpu(digest[3]) + dctx->s[3];
--	put_unaligned_le32(f, dst + 12);
--
-+	poly1305_final_generic(dctx, dst);
- 	return 0;
- }
- EXPORT_SYMBOL_GPL(crypto_poly1305_final);
---- a/include/crypto/poly1305.h
-+++ b/include/crypto/poly1305.h
-@@ -35,7 +35,43 @@ struct poly1305_desc_ctx {
- 	/* accumulator */
- 	struct poly1305_state h;
- 	/* key */
--	struct poly1305_key r[1];
-+	struct poly1305_key r[CONFIG_CRYPTO_LIB_POLY1305_RSIZE];
- };
- 
-+void poly1305_init_arch(struct poly1305_desc_ctx *desc, const u8 *key);
-+void poly1305_init_generic(struct poly1305_desc_ctx *desc, const u8 *key);
-+
-+static inline void poly1305_init(struct poly1305_desc_ctx *desc, const u8 *key)
-+{
-+	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305))
-+		poly1305_init_arch(desc, key);
-+	else
-+		poly1305_init_generic(desc, key);
-+}
-+
-+void poly1305_update_arch(struct poly1305_desc_ctx *desc, const u8 *src,
-+			  unsigned int nbytes);
-+void poly1305_update_generic(struct poly1305_desc_ctx *desc, const u8 *src,
-+			     unsigned int nbytes);
-+
-+static inline void poly1305_update(struct poly1305_desc_ctx *desc,
-+				   const u8 *src, unsigned int nbytes)
-+{
-+	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305))
-+		poly1305_update_arch(desc, src, nbytes);
-+	else
-+		poly1305_update_generic(desc, src, nbytes);
-+}
-+
-+void poly1305_final_arch(struct poly1305_desc_ctx *desc, u8 *digest);
-+void poly1305_final_generic(struct poly1305_desc_ctx *desc, u8 *digest);
-+
-+static inline void poly1305_final(struct poly1305_desc_ctx *desc, u8 *digest)
-+{
-+	if (IS_ENABLED(CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305))
-+		poly1305_final_arch(desc, digest);
-+	else
-+		poly1305_final_generic(desc, digest);
-+}
-+
- #endif
---- a/lib/crypto/Kconfig
-+++ b/lib/crypto/Kconfig
-@@ -37,8 +37,34 @@ config CRYPTO_LIB_CHACHA
- config CRYPTO_LIB_DES
- 	tristate
- 
-+config CRYPTO_LIB_POLY1305_RSIZE
-+	int
-+	default 1
-+
-+config CRYPTO_ARCH_HAVE_LIB_POLY1305
-+	tristate
-+	help
-+	  Declares whether the architecture provides an arch-specific
-+	  accelerated implementation of the Poly1305 library interface,
-+	  either builtin or as a module.
-+
- config CRYPTO_LIB_POLY1305_GENERIC
- 	tristate
-+	help
-+	  This symbol can be depended upon by arch implementations of the
-+	  Poly1305 library interface that require the generic code as a
-+	  fallback, e.g., for SIMD implementations. If no arch specific
-+	  implementation is enabled, this implementation serves the users
-+	  of CRYPTO_LIB_POLY1305.
-+
-+config CRYPTO_LIB_POLY1305
-+	tristate "Poly1305 library interface"
-+	depends on CRYPTO_ARCH_HAVE_LIB_POLY1305 || !CRYPTO_ARCH_HAVE_LIB_POLY1305
-+	select CRYPTO_LIB_POLY1305_GENERIC if CRYPTO_ARCH_HAVE_LIB_POLY1305=n
-+	help
-+	  Enable the Poly1305 library interface. This interface may be fulfilled
-+	  by either the generic implementation or an arch-specific one, if one
-+	  is available and enabled.
- 
- config CRYPTO_LIB_SHA256
- 	tristate
---- a/lib/crypto/poly1305.c
-+++ b/lib/crypto/poly1305.c
-@@ -154,5 +154,79 @@ void poly1305_core_emit(const struct pol
- }
- EXPORT_SYMBOL_GPL(poly1305_core_emit);
- 
-+void poly1305_init_generic(struct poly1305_desc_ctx *desc, const u8 *key)
-+{
-+	poly1305_core_setkey(desc->r, key);
-+	desc->s[0] = get_unaligned_le32(key + 16);
-+	desc->s[1] = get_unaligned_le32(key + 20);
-+	desc->s[2] = get_unaligned_le32(key + 24);
-+	desc->s[3] = get_unaligned_le32(key + 28);
-+	poly1305_core_init(&desc->h);
-+	desc->buflen = 0;
-+	desc->sset = true;
-+	desc->rset = 1;
-+}
-+EXPORT_SYMBOL_GPL(poly1305_init_generic);
-+
-+void poly1305_update_generic(struct poly1305_desc_ctx *desc, const u8 *src,
-+			     unsigned int nbytes)
-+{
-+	unsigned int bytes;
-+
-+	if (unlikely(desc->buflen)) {
-+		bytes = min(nbytes, POLY1305_BLOCK_SIZE - desc->buflen);
-+		memcpy(desc->buf + desc->buflen, src, bytes);
-+		src += bytes;
-+		nbytes -= bytes;
-+		desc->buflen += bytes;
-+
-+		if (desc->buflen == POLY1305_BLOCK_SIZE) {
-+			poly1305_core_blocks(&desc->h, desc->r, desc->buf, 1, 1);
-+			desc->buflen = 0;
-+		}
-+	}
-+
-+	if (likely(nbytes >= POLY1305_BLOCK_SIZE)) {
-+		poly1305_core_blocks(&desc->h, desc->r, src,
-+				     nbytes / POLY1305_BLOCK_SIZE, 1);
-+		src += nbytes - (nbytes % POLY1305_BLOCK_SIZE);
-+		nbytes %= POLY1305_BLOCK_SIZE;
-+	}
-+
-+	if (unlikely(nbytes)) {
-+		desc->buflen = nbytes;
-+		memcpy(desc->buf, src, nbytes);
-+	}
-+}
-+EXPORT_SYMBOL_GPL(poly1305_update_generic);
-+
-+void poly1305_final_generic(struct poly1305_desc_ctx *desc, u8 *dst)
-+{
-+	__le32 digest[4];
-+	u64 f = 0;
-+
-+	if (unlikely(desc->buflen)) {
-+		desc->buf[desc->buflen++] = 1;
-+		memset(desc->buf + desc->buflen, 0,
-+		       POLY1305_BLOCK_SIZE - desc->buflen);
-+		poly1305_core_blocks(&desc->h, desc->r, desc->buf, 1, 0);
-+	}
-+
-+	poly1305_core_emit(&desc->h, digest);
-+
-+	/* mac = (h + s) % (2^128) */
-+	f = (f >> 32) + le32_to_cpu(digest[0]) + desc->s[0];
-+	put_unaligned_le32(f, dst + 0);
-+	f = (f >> 32) + le32_to_cpu(digest[1]) + desc->s[1];
-+	put_unaligned_le32(f, dst + 4);
-+	f = (f >> 32) + le32_to_cpu(digest[2]) + desc->s[2];
-+	put_unaligned_le32(f, dst + 8);
-+	f = (f >> 32) + le32_to_cpu(digest[3]) + desc->s[3];
-+	put_unaligned_le32(f, dst + 12);
-+
-+	*desc = (struct poly1305_desc_ctx){};
-+}
-+EXPORT_SYMBOL_GPL(poly1305_final_generic);
-+
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR("Martin Willi <martin@strongswan.org>");

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0016-crypto-x86-poly1305-depend-on-generic-library-not-ge.patch

@@ -1,217 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:22 +0100
-Subject: [PATCH] crypto: x86/poly1305 - depend on generic library not generic
- shash
-
-commit 1b2c6a5120489d41c8ea3b8dacd0b4586289b158 upstream.
-
-Remove the dependency on the generic Poly1305 driver. Instead, depend
-on the generic library so that we only reuse code without pulling in
-the generic skcipher implementation as well.
-
-While at it, remove the logic that prefers the non-SIMD path for short
-inputs - this is no longer necessary after recent FPU handling changes
-on x86.
-
-Since this removes the last remaining user of the routines exported
-by the generic shash driver, unexport them and make them static.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/x86/crypto/poly1305_glue.c    | 66 +++++++++++++++++++++++++-----
- crypto/Kconfig                     |  2 +-
- crypto/poly1305_generic.c          | 11 ++---
- include/crypto/internal/poly1305.h |  9 ----
- 4 files changed, 60 insertions(+), 28 deletions(-)
-
---- a/arch/x86/crypto/poly1305_glue.c
-+++ b/arch/x86/crypto/poly1305_glue.c
-@@ -34,6 +34,24 @@ static void poly1305_simd_mult(u32 *a, c
- 	poly1305_block_sse2(a, m, b, 1);
- }
- 
-+static unsigned int poly1305_scalar_blocks(struct poly1305_desc_ctx *dctx,
-+					   const u8 *src, unsigned int srclen)
-+{
-+	unsigned int datalen;
-+
-+	if (unlikely(!dctx->sset)) {
-+		datalen = crypto_poly1305_setdesckey(dctx, src, srclen);
-+		src += srclen - datalen;
-+		srclen = datalen;
-+	}
-+	if (srclen >= POLY1305_BLOCK_SIZE) {
-+		poly1305_core_blocks(&dctx->h, dctx->r, src,
-+				     srclen / POLY1305_BLOCK_SIZE, 1);
-+		srclen %= POLY1305_BLOCK_SIZE;
-+	}
-+	return srclen;
-+}
-+
- static unsigned int poly1305_simd_blocks(struct poly1305_desc_ctx *dctx,
- 					 const u8 *src, unsigned int srclen)
- {
-@@ -91,12 +109,6 @@ static int poly1305_simd_update(struct s
- 	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
- 	unsigned int bytes;
- 
--	/* kernel_fpu_begin/end is costly, use fallback for small updates */
--	if (srclen <= 288 || !crypto_simd_usable())
--		return crypto_poly1305_update(desc, src, srclen);
--
--	kernel_fpu_begin();
--
- 	if (unlikely(dctx->buflen)) {
- 		bytes = min(srclen, POLY1305_BLOCK_SIZE - dctx->buflen);
- 		memcpy(dctx->buf + dctx->buflen, src, bytes);
-@@ -105,25 +117,57 @@ static int poly1305_simd_update(struct s
- 		dctx->buflen += bytes;
- 
- 		if (dctx->buflen == POLY1305_BLOCK_SIZE) {
--			poly1305_simd_blocks(dctx, dctx->buf,
--					     POLY1305_BLOCK_SIZE);
-+			if (likely(crypto_simd_usable())) {
-+				kernel_fpu_begin();
-+				poly1305_simd_blocks(dctx, dctx->buf,
-+						     POLY1305_BLOCK_SIZE);
-+				kernel_fpu_end();
-+			} else {
-+				poly1305_scalar_blocks(dctx, dctx->buf,
-+						       POLY1305_BLOCK_SIZE);
-+			}
- 			dctx->buflen = 0;
- 		}
- 	}
- 
- 	if (likely(srclen >= POLY1305_BLOCK_SIZE)) {
--		bytes = poly1305_simd_blocks(dctx, src, srclen);
-+		if (likely(crypto_simd_usable())) {
-+			kernel_fpu_begin();
-+			bytes = poly1305_simd_blocks(dctx, src, srclen);
-+			kernel_fpu_end();
-+		} else {
-+			bytes = poly1305_scalar_blocks(dctx, src, srclen);
-+		}
- 		src += srclen - bytes;
- 		srclen = bytes;
- 	}
- 
--	kernel_fpu_end();
--
- 	if (unlikely(srclen)) {
- 		dctx->buflen = srclen;
- 		memcpy(dctx->buf, src, srclen);
- 	}
-+}
-+
-+static int crypto_poly1305_init(struct shash_desc *desc)
-+{
-+	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
-+
-+	poly1305_core_init(&dctx->h);
-+	dctx->buflen = 0;
-+	dctx->rset = 0;
-+	dctx->sset = false;
-+
-+	return 0;
-+}
-+
-+static int crypto_poly1305_final(struct shash_desc *desc, u8 *dst)
-+{
-+	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
-+
-+	if (unlikely(!dctx->sset))
-+		return -ENOKEY;
- 
-+	poly1305_final_generic(dctx, dst);
- 	return 0;
- }
- 
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -697,7 +697,7 @@ config CRYPTO_POLY1305
- config CRYPTO_POLY1305_X86_64
- 	tristate "Poly1305 authenticator algorithm (x86_64/SSE2/AVX2)"
- 	depends on X86 && 64BIT
--	select CRYPTO_POLY1305
-+	select CRYPTO_LIB_POLY1305_GENERIC
- 	help
- 	  Poly1305 authenticator algorithm, RFC7539.
- 
---- a/crypto/poly1305_generic.c
-+++ b/crypto/poly1305_generic.c
-@@ -19,7 +19,7 @@
- #include <linux/module.h>
- #include <asm/unaligned.h>
- 
--int crypto_poly1305_init(struct shash_desc *desc)
-+static int crypto_poly1305_init(struct shash_desc *desc)
- {
- 	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
- 
-@@ -30,7 +30,6 @@ int crypto_poly1305_init(struct shash_de
- 
- 	return 0;
- }
--EXPORT_SYMBOL_GPL(crypto_poly1305_init);
- 
- static void poly1305_blocks(struct poly1305_desc_ctx *dctx, const u8 *src,
- 			    unsigned int srclen)
-@@ -47,8 +46,8 @@ static void poly1305_blocks(struct poly1
- 			     srclen / POLY1305_BLOCK_SIZE, 1);
- }
- 
--int crypto_poly1305_update(struct shash_desc *desc,
--			   const u8 *src, unsigned int srclen)
-+static int crypto_poly1305_update(struct shash_desc *desc,
-+				  const u8 *src, unsigned int srclen)
- {
- 	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
- 	unsigned int bytes;
-@@ -80,9 +79,8 @@ int crypto_poly1305_update(struct shash_
- 
- 	return 0;
- }
--EXPORT_SYMBOL_GPL(crypto_poly1305_update);
- 
--int crypto_poly1305_final(struct shash_desc *desc, u8 *dst)
-+static int crypto_poly1305_final(struct shash_desc *desc, u8 *dst)
- {
- 	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
- 
-@@ -92,7 +90,6 @@ int crypto_poly1305_final(struct shash_d
- 	poly1305_final_generic(dctx, dst);
- 	return 0;
- }
--EXPORT_SYMBOL_GPL(crypto_poly1305_final);
- 
- static struct shash_alg poly1305_alg = {
- 	.digestsize	= POLY1305_DIGEST_SIZE,
---- a/include/crypto/internal/poly1305.h
-+++ b/include/crypto/internal/poly1305.h
-@@ -10,8 +10,6 @@
- #include <linux/types.h>
- #include <crypto/poly1305.h>
- 
--struct shash_desc;
--
- /*
-  * Poly1305 core functions.  These implement the ε-almost-∆-universal hash
-  * function underlying the Poly1305 MAC, i.e. they don't add an encrypted nonce
-@@ -28,13 +26,6 @@ void poly1305_core_blocks(struct poly130
- 			  unsigned int nblocks, u32 hibit);
- void poly1305_core_emit(const struct poly1305_state *state, void *dst);
- 
--/* Crypto API helper functions for the Poly1305 MAC */
--int crypto_poly1305_init(struct shash_desc *desc);
--
--int crypto_poly1305_update(struct shash_desc *desc,
--			   const u8 *src, unsigned int srclen);
--int crypto_poly1305_final(struct shash_desc *desc, u8 *dst);
--
- /*
-  * Poly1305 requires a unique key for each tag, which implies that we can't set
-  * it on the tfm that gets accessed by multiple users simultaneously. Instead we

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0017-crypto-x86-poly1305-expose-existing-driver-as-poly13.patch

@@ -1,163 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:23 +0100
-Subject: [PATCH] crypto: x86/poly1305 - expose existing driver as poly1305
- library
-
-commit f0e89bcfbb894e5844cd1bbf6b3cf7c63cb0f5ac upstream.
-
-Implement the arch init/update/final Poly1305 library routines in the
-accelerated SIMD driver for x86 so they are accessible to users of
-the Poly1305 library interface as well.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/x86/crypto/poly1305_glue.c | 57 ++++++++++++++++++++++++---------
- crypto/Kconfig                  |  1 +
- lib/crypto/Kconfig              |  1 +
- 3 files changed, 43 insertions(+), 16 deletions(-)
-
---- a/arch/x86/crypto/poly1305_glue.c
-+++ b/arch/x86/crypto/poly1305_glue.c
-@@ -10,6 +10,7 @@
- #include <crypto/internal/poly1305.h>
- #include <crypto/internal/simd.h>
- #include <linux/crypto.h>
-+#include <linux/jump_label.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <asm/simd.h>
-@@ -21,7 +22,8 @@ asmlinkage void poly1305_2block_sse2(u32
- asmlinkage void poly1305_4block_avx2(u32 *h, const u8 *src, const u32 *r,
- 				     unsigned int blocks, const u32 *u);
- 
--static bool poly1305_use_avx2 __ro_after_init;
-+static __ro_after_init DEFINE_STATIC_KEY_FALSE(poly1305_use_simd);
-+static __ro_after_init DEFINE_STATIC_KEY_FALSE(poly1305_use_avx2);
- 
- static void poly1305_simd_mult(u32 *a, const u32 *b)
- {
-@@ -64,7 +66,7 @@ static unsigned int poly1305_simd_blocks
- 	}
- 
- 	if (IS_ENABLED(CONFIG_AS_AVX2) &&
--	    poly1305_use_avx2 &&
-+	    static_branch_likely(&poly1305_use_avx2) &&
- 	    srclen >= POLY1305_BLOCK_SIZE * 4) {
- 		if (unlikely(dctx->rset < 4)) {
- 			if (dctx->rset < 2) {
-@@ -103,10 +105,15 @@ static unsigned int poly1305_simd_blocks
- 	return srclen;
- }
- 
--static int poly1305_simd_update(struct shash_desc *desc,
--				const u8 *src, unsigned int srclen)
-+void poly1305_init_arch(struct poly1305_desc_ctx *desc, const u8 *key)
-+{
-+	poly1305_init_generic(desc, key);
-+}
-+EXPORT_SYMBOL(poly1305_init_arch);
-+
-+void poly1305_update_arch(struct poly1305_desc_ctx *dctx, const u8 *src,
-+			  unsigned int srclen)
- {
--	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
- 	unsigned int bytes;
- 
- 	if (unlikely(dctx->buflen)) {
-@@ -117,7 +124,8 @@ static int poly1305_simd_update(struct s
- 		dctx->buflen += bytes;
- 
- 		if (dctx->buflen == POLY1305_BLOCK_SIZE) {
--			if (likely(crypto_simd_usable())) {
-+			if (static_branch_likely(&poly1305_use_simd) &&
-+			    likely(crypto_simd_usable())) {
- 				kernel_fpu_begin();
- 				poly1305_simd_blocks(dctx, dctx->buf,
- 						     POLY1305_BLOCK_SIZE);
-@@ -131,7 +139,8 @@ static int poly1305_simd_update(struct s
- 	}
- 
- 	if (likely(srclen >= POLY1305_BLOCK_SIZE)) {
--		if (likely(crypto_simd_usable())) {
-+		if (static_branch_likely(&poly1305_use_simd) &&
-+		    likely(crypto_simd_usable())) {
- 			kernel_fpu_begin();
- 			bytes = poly1305_simd_blocks(dctx, src, srclen);
- 			kernel_fpu_end();
-@@ -147,6 +156,13 @@ static int poly1305_simd_update(struct s
- 		memcpy(dctx->buf, src, srclen);
- 	}
- }
-+EXPORT_SYMBOL(poly1305_update_arch);
-+
-+void poly1305_final_arch(struct poly1305_desc_ctx *desc, u8 *digest)
-+{
-+	poly1305_final_generic(desc, digest);
-+}
-+EXPORT_SYMBOL(poly1305_final_arch);
- 
- static int crypto_poly1305_init(struct shash_desc *desc)
- {
-@@ -171,6 +187,15 @@ static int crypto_poly1305_final(struct
- 	return 0;
- }
- 
-+static int poly1305_simd_update(struct shash_desc *desc,
-+				const u8 *src, unsigned int srclen)
-+{
-+	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);
-+
-+	poly1305_update_arch(dctx, src, srclen);
-+	return 0;
-+}
-+
- static struct shash_alg alg = {
- 	.digestsize	= POLY1305_DIGEST_SIZE,
- 	.init		= crypto_poly1305_init,
-@@ -189,15 +214,15 @@ static struct shash_alg alg = {
- static int __init poly1305_simd_mod_init(void)
- {
- 	if (!boot_cpu_has(X86_FEATURE_XMM2))
--		return -ENODEV;
-+		return 0;
- 
--	poly1305_use_avx2 = IS_ENABLED(CONFIG_AS_AVX2) &&
--			    boot_cpu_has(X86_FEATURE_AVX) &&
--			    boot_cpu_has(X86_FEATURE_AVX2) &&
--			    cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL);
--	alg.descsize = sizeof(struct poly1305_desc_ctx) + 5 * sizeof(u32);
--	if (poly1305_use_avx2)
--		alg.descsize += 10 * sizeof(u32);
-+	static_branch_enable(&poly1305_use_simd);
-+
-+	if (IS_ENABLED(CONFIG_AS_AVX2) &&
-+	    boot_cpu_has(X86_FEATURE_AVX) &&
-+	    boot_cpu_has(X86_FEATURE_AVX2) &&
-+	    cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL))
-+		static_branch_enable(&poly1305_use_avx2);
- 
- 	return crypto_register_shash(&alg);
- }
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -698,6 +698,7 @@ config CRYPTO_POLY1305_X86_64
- 	tristate "Poly1305 authenticator algorithm (x86_64/SSE2/AVX2)"
- 	depends on X86 && 64BIT
- 	select CRYPTO_LIB_POLY1305_GENERIC
-+	select CRYPTO_ARCH_HAVE_LIB_POLY1305
- 	help
- 	  Poly1305 authenticator algorithm, RFC7539.
- 
---- a/lib/crypto/Kconfig
-+++ b/lib/crypto/Kconfig
-@@ -39,6 +39,7 @@ config CRYPTO_LIB_DES
- 
- config CRYPTO_LIB_POLY1305_RSIZE
- 	int
-+	default 4 if X86_64
- 	default 1
- 
- config CRYPTO_ARCH_HAVE_LIB_POLY1305

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0022-crypto-testmgr-add-test-cases-for-Blake2s.patch

@@ -1,322 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:29 +0100
-Subject: [PATCH] crypto: testmgr - add test cases for Blake2s
-
-commit 17e1df67023a5c9ccaeb5de8bf5b88f63127ecf7 upstream.
-
-As suggested by Eric for the Blake2b implementation contributed by
-David, introduce a set of test vectors for Blake2s covering different
-digest and key sizes.
-
-          blake2s-128  blake2s-160  blake2s-224  blake2s-256
-         ---------------------------------------------------
-len=0   | klen=0       klen=1       klen=16      klen=32
-len=1   | klen=16      klen=32      klen=0       klen=1
-len=7   | klen=32      klen=0       klen=1       klen=16
-len=15  | klen=1       klen=16      klen=32      klen=0
-len=64  | klen=0       klen=1       klen=16      klen=32
-len=247 | klen=16      klen=32      klen=0       klen=1
-len=256 | klen=32      klen=0       klen=1       klen=16
-
-Cc: David Sterba <dsterba@suse.com>
-Cc: Eric Biggers <ebiggers@google.com>
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- crypto/testmgr.c |  24 +++++
- crypto/testmgr.h | 251 +++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 275 insertions(+)
-
---- a/crypto/testmgr.c
-+++ b/crypto/testmgr.c
-@@ -4035,6 +4035,30 @@ static const struct alg_test_desc alg_te
- 		.test = alg_test_null,
- 		.fips_allowed = 1,
- 	}, {
-+		.alg = "blake2s-128",
-+		.test = alg_test_hash,
-+		.suite = {
-+			.hash = __VECS(blakes2s_128_tv_template)
-+		}
-+	}, {
-+		.alg = "blake2s-160",
-+		.test = alg_test_hash,
-+		.suite = {
-+			.hash = __VECS(blakes2s_160_tv_template)
-+		}
-+	}, {
-+		.alg = "blake2s-224",
-+		.test = alg_test_hash,
-+		.suite = {
-+			.hash = __VECS(blakes2s_224_tv_template)
-+		}
-+	}, {
-+		.alg = "blake2s-256",
-+		.test = alg_test_hash,
-+		.suite = {
-+			.hash = __VECS(blakes2s_256_tv_template)
-+		}
-+	}, {
- 		.alg = "cbc(aes)",
- 		.test = alg_test_skcipher,
- 		.fips_allowed = 1,
---- a/crypto/testmgr.h
-+++ b/crypto/testmgr.h
-@@ -31567,4 +31567,255 @@ static const struct aead_testvec essiv_h
- 	},
- };
- 
-+static const char blake2_ordered_sequence[] =
-+	"\x00\x01\x02\x03\x04\x05\x06\x07"
-+	"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-+	"\x10\x11\x12\x13\x14\x15\x16\x17"
-+	"\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
-+	"\x20\x21\x22\x23\x24\x25\x26\x27"
-+	"\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
-+	"\x30\x31\x32\x33\x34\x35\x36\x37"
-+	"\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
-+	"\x40\x41\x42\x43\x44\x45\x46\x47"
-+	"\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
-+	"\x50\x51\x52\x53\x54\x55\x56\x57"
-+	"\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
-+	"\x60\x61\x62\x63\x64\x65\x66\x67"
-+	"\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"
-+	"\x70\x71\x72\x73\x74\x75\x76\x77"
-+	"\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"
-+	"\x80\x81\x82\x83\x84\x85\x86\x87"
-+	"\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
-+	"\x90\x91\x92\x93\x94\x95\x96\x97"
-+	"\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
-+	"\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
-+	"\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
-+	"\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"
-+	"\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
-+	"\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
-+	"\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
-+	"\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
-+	"\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"
-+	"\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"
-+	"\xe8\xe9\xea\xeb\xec\xed\xee\xef"
-+	"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"
-+	"\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff";
-+
-+static const struct hash_testvec blakes2s_128_tv_template[] = {{
-+	.digest = (u8[]){ 0x64, 0x55, 0x0d, 0x6f, 0xfe, 0x2c, 0x0a, 0x01,
-+			  0xa1, 0x4a, 0xba, 0x1e, 0xad, 0xe0, 0x20, 0x0c, },
-+}, {
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 64,
-+	.digest = (u8[]){ 0xdc, 0x66, 0xca, 0x8f, 0x03, 0x86, 0x58, 0x01,
-+			  0xb0, 0xff, 0xe0, 0x6e, 0xd8, 0xa1, 0xa9, 0x0e, },
-+}, {
-+	.ksize = 16,
-+	.key = blake2_ordered_sequence,
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 1,
-+	.digest = (u8[]){ 0x88, 0x1e, 0x42, 0xe7, 0xbb, 0x35, 0x80, 0x82,
-+			  0x63, 0x7c, 0x0a, 0x0f, 0xd7, 0xec, 0x6c, 0x2f, },
-+}, {
-+	.ksize = 32,
-+	.key = blake2_ordered_sequence,
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 7,
-+	.digest = (u8[]){ 0xcf, 0x9e, 0x07, 0x2a, 0xd5, 0x22, 0xf2, 0xcd,
-+			  0xa2, 0xd8, 0x25, 0x21, 0x80, 0x86, 0x73, 0x1c, },
-+}, {
-+	.ksize = 1,
-+	.key = "B",
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 15,
-+	.digest = (u8[]){ 0xf6, 0x33, 0x5a, 0x2c, 0x22, 0xa0, 0x64, 0xb2,
-+			  0xb6, 0x3f, 0xeb, 0xbc, 0xd1, 0xc3, 0xe5, 0xb2, },
-+}, {
-+	.ksize = 16,
-+	.key = blake2_ordered_sequence,
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 247,
-+	.digest = (u8[]){ 0x72, 0x66, 0x49, 0x60, 0xf9, 0x4a, 0xea, 0xbe,
-+			  0x1f, 0xf4, 0x60, 0xce, 0xb7, 0x81, 0xcb, 0x09, },
-+}, {
-+	.ksize = 32,
-+	.key = blake2_ordered_sequence,
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 256,
-+	.digest = (u8[]){ 0xd5, 0xa4, 0x0e, 0xc3, 0x16, 0xc7, 0x51, 0xa6,
-+			  0x3c, 0xd0, 0xd9, 0x11, 0x57, 0xfa, 0x1e, 0xbb, },
-+}};
-+
-+static const struct hash_testvec blakes2s_160_tv_template[] = {{
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 7,
-+	.digest = (u8[]){ 0xb4, 0xf2, 0x03, 0x49, 0x37, 0xed, 0xb1, 0x3e,
-+			  0x5b, 0x2a, 0xca, 0x64, 0x82, 0x74, 0xf6, 0x62,
-+			  0xe3, 0xf2, 0x84, 0xff, },
-+}, {
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 256,
-+	.digest = (u8[]){ 0xaa, 0x56, 0x9b, 0xdc, 0x98, 0x17, 0x75, 0xf2,
-+			  0xb3, 0x68, 0x83, 0xb7, 0x9b, 0x8d, 0x48, 0xb1,
-+			  0x9b, 0x2d, 0x35, 0x05, },
-+}, {
-+	.ksize = 1,
-+	.key = "B",
-+	.digest = (u8[]){ 0x50, 0x16, 0xe7, 0x0c, 0x01, 0xd0, 0xd3, 0xc3,
-+			  0xf4, 0x3e, 0xb1, 0x6e, 0x97, 0xa9, 0x4e, 0xd1,
-+			  0x79, 0x65, 0x32, 0x93, },
-+}, {
-+	.ksize = 32,
-+	.key = blake2_ordered_sequence,
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 1,
-+	.digest = (u8[]){ 0x1c, 0x2b, 0xcd, 0x9a, 0x68, 0xca, 0x8c, 0x71,
-+			  0x90, 0x29, 0x6c, 0x54, 0xfa, 0x56, 0x4a, 0xef,
-+			  0xa2, 0x3a, 0x56, 0x9c, },
-+}, {
-+	.ksize = 16,
-+	.key = blake2_ordered_sequence,
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 15,
-+	.digest = (u8[]){ 0x36, 0xc3, 0x5f, 0x9a, 0xdc, 0x7e, 0xbf, 0x19,
-+			  0x68, 0xaa, 0xca, 0xd8, 0x81, 0xbf, 0x09, 0x34,
-+			  0x83, 0x39, 0x0f, 0x30, },
-+}, {
-+	.ksize = 1,
-+	.key = "B",
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 64,
-+	.digest = (u8[]){ 0x86, 0x80, 0x78, 0xa4, 0x14, 0xec, 0x03, 0xe5,
-+			  0xb6, 0x9a, 0x52, 0x0e, 0x42, 0xee, 0x39, 0x9d,
-+			  0xac, 0xa6, 0x81, 0x63, },
-+}, {
-+	.ksize = 32,
-+	.key = blake2_ordered_sequence,
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 247,
-+	.digest = (u8[]){ 0x2d, 0xd8, 0xd2, 0x53, 0x66, 0xfa, 0xa9, 0x01,
-+			  0x1c, 0x9c, 0xaf, 0xa3, 0xe2, 0x9d, 0x9b, 0x10,
-+			  0x0a, 0xf6, 0x73, 0xe8, },
-+}};
-+
-+static const struct hash_testvec blakes2s_224_tv_template[] = {{
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 1,
-+	.digest = (u8[]){ 0x61, 0xb9, 0x4e, 0xc9, 0x46, 0x22, 0xa3, 0x91,
-+			  0xd2, 0xae, 0x42, 0xe6, 0x45, 0x6c, 0x90, 0x12,
-+			  0xd5, 0x80, 0x07, 0x97, 0xb8, 0x86, 0x5a, 0xfc,
-+			  0x48, 0x21, 0x97, 0xbb, },
-+}, {
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 247,
-+	.digest = (u8[]){ 0x9e, 0xda, 0xc7, 0x20, 0x2c, 0xd8, 0x48, 0x2e,
-+			  0x31, 0x94, 0xab, 0x46, 0x6d, 0x94, 0xd8, 0xb4,
-+			  0x69, 0xcd, 0xae, 0x19, 0x6d, 0x9e, 0x41, 0xcc,
-+			  0x2b, 0xa4, 0xd5, 0xf6, },
-+}, {
-+	.ksize = 16,
-+	.key = blake2_ordered_sequence,
-+	.digest = (u8[]){ 0x32, 0xc0, 0xac, 0xf4, 0x3b, 0xd3, 0x07, 0x9f,
-+			  0xbe, 0xfb, 0xfa, 0x4d, 0x6b, 0x4e, 0x56, 0xb3,
-+			  0xaa, 0xd3, 0x27, 0xf6, 0x14, 0xbf, 0xb9, 0x32,
-+			  0xa7, 0x19, 0xfc, 0xb8, },
-+}, {
-+	.ksize = 1,
-+	.key = "B",
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 7,
-+	.digest = (u8[]){ 0x73, 0xad, 0x5e, 0x6d, 0xb9, 0x02, 0x8e, 0x76,
-+			  0xf2, 0x66, 0x42, 0x4b, 0x4c, 0xfa, 0x1f, 0xe6,
-+			  0x2e, 0x56, 0x40, 0xe5, 0xa2, 0xb0, 0x3c, 0xe8,
-+			  0x7b, 0x45, 0xfe, 0x05, },
-+}, {
-+	.ksize = 32,
-+	.key = blake2_ordered_sequence,
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 15,
-+	.digest = (u8[]){ 0x16, 0x60, 0xfb, 0x92, 0x54, 0xb3, 0x6e, 0x36,
-+			  0x81, 0xf4, 0x16, 0x41, 0xc3, 0x3d, 0xd3, 0x43,
-+			  0x84, 0xed, 0x10, 0x6f, 0x65, 0x80, 0x7a, 0x3e,
-+			  0x25, 0xab, 0xc5, 0x02, },
-+}, {
-+	.ksize = 16,
-+	.key = blake2_ordered_sequence,
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 64,
-+	.digest = (u8[]){ 0xca, 0xaa, 0x39, 0x67, 0x9c, 0xf7, 0x6b, 0xc7,
-+			  0xb6, 0x82, 0xca, 0x0e, 0x65, 0x36, 0x5b, 0x7c,
-+			  0x24, 0x00, 0xfa, 0x5f, 0xda, 0x06, 0x91, 0x93,
-+			  0x6a, 0x31, 0x83, 0xb5, },
-+}, {
-+	.ksize = 1,
-+	.key = "B",
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 256,
-+	.digest = (u8[]){ 0x90, 0x02, 0x26, 0xb5, 0x06, 0x9c, 0x36, 0x86,
-+			  0x94, 0x91, 0x90, 0x1e, 0x7d, 0x2a, 0x71, 0xb2,
-+			  0x48, 0xb5, 0xe8, 0x16, 0xfd, 0x64, 0x33, 0x45,
-+			  0xb3, 0xd7, 0xec, 0xcc, },
-+}};
-+
-+static const struct hash_testvec blakes2s_256_tv_template[] = {{
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 15,
-+	.digest = (u8[]){ 0xd9, 0x7c, 0x82, 0x8d, 0x81, 0x82, 0xa7, 0x21,
-+			  0x80, 0xa0, 0x6a, 0x78, 0x26, 0x83, 0x30, 0x67,
-+			  0x3f, 0x7c, 0x4e, 0x06, 0x35, 0x94, 0x7c, 0x04,
-+			  0xc0, 0x23, 0x23, 0xfd, 0x45, 0xc0, 0xa5, 0x2d, },
-+}, {
-+	.ksize = 32,
-+	.key = blake2_ordered_sequence,
-+	.digest = (u8[]){ 0x48, 0xa8, 0x99, 0x7d, 0xa4, 0x07, 0x87, 0x6b,
-+			  0x3d, 0x79, 0xc0, 0xd9, 0x23, 0x25, 0xad, 0x3b,
-+			  0x89, 0xcb, 0xb7, 0x54, 0xd8, 0x6a, 0xb7, 0x1a,
-+			  0xee, 0x04, 0x7a, 0xd3, 0x45, 0xfd, 0x2c, 0x49, },
-+}, {
-+	.ksize = 1,
-+	.key = "B",
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 1,
-+	.digest = (u8[]){ 0x22, 0x27, 0xae, 0xaa, 0x6e, 0x81, 0x56, 0x03,
-+			  0xa7, 0xe3, 0xa1, 0x18, 0xa5, 0x9a, 0x2c, 0x18,
-+			  0xf4, 0x63, 0xbc, 0x16, 0x70, 0xf1, 0xe7, 0x4b,
-+			  0x00, 0x6d, 0x66, 0x16, 0xae, 0x9e, 0x74, 0x4e, },
-+}, {
-+	.ksize = 16,
-+	.key = blake2_ordered_sequence,
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 7,
-+	.digest = (u8[]){ 0x58, 0x5d, 0xa8, 0x60, 0x1c, 0xa4, 0xd8, 0x03,
-+			  0x86, 0x86, 0x84, 0x64, 0xd7, 0xa0, 0x8e, 0x15,
-+			  0x2f, 0x05, 0xa2, 0x1b, 0xbc, 0xef, 0x7a, 0x34,
-+			  0xb3, 0xc5, 0xbc, 0x4b, 0xf0, 0x32, 0xeb, 0x12, },
-+}, {
-+	.ksize = 32,
-+	.key = blake2_ordered_sequence,
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 64,
-+	.digest = (u8[]){ 0x89, 0x75, 0xb0, 0x57, 0x7f, 0xd3, 0x55, 0x66,
-+			  0xd7, 0x50, 0xb3, 0x62, 0xb0, 0x89, 0x7a, 0x26,
-+			  0xc3, 0x99, 0x13, 0x6d, 0xf0, 0x7b, 0xab, 0xab,
-+			  0xbd, 0xe6, 0x20, 0x3f, 0xf2, 0x95, 0x4e, 0xd4, },
-+}, {
-+	.ksize = 1,
-+	.key = "B",
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 247,
-+	.digest = (u8[]){ 0x2e, 0x74, 0x1c, 0x1d, 0x03, 0xf4, 0x9d, 0x84,
-+			  0x6f, 0xfc, 0x86, 0x32, 0x92, 0x49, 0x7e, 0x66,
-+			  0xd7, 0xc3, 0x10, 0x88, 0xfe, 0x28, 0xb3, 0xe0,
-+			  0xbf, 0x50, 0x75, 0xad, 0x8e, 0xa4, 0xe6, 0xb2, },
-+}, {
-+	.ksize = 16,
-+	.key = blake2_ordered_sequence,
-+	.plaintext = blake2_ordered_sequence,
-+	.psize = 256,
-+	.digest = (u8[]){ 0xb9, 0xd2, 0x81, 0x0e, 0x3a, 0xb1, 0x62, 0x9b,
-+			  0xad, 0x44, 0x05, 0xf4, 0x92, 0x2e, 0x99, 0xc1,
-+			  0x4a, 0x47, 0xbb, 0x5b, 0x6f, 0xb2, 0x96, 0xed,
-+			  0xd5, 0x06, 0xb5, 0x3a, 0x7c, 0x7a, 0x65, 0x1d, },
-+}};
-+
- #endif	/* _CRYPTO_TESTMGR_H */

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0023-crypto-blake2s-implement-generic-shash-driver.patch

@@ -1,245 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:30 +0100
-Subject: [PATCH] crypto: blake2s - implement generic shash driver
-
-commit 7f9b0880925f1f9d7d59504ea0892d2ae9cfc233 upstream.
-
-Wire up our newly added Blake2s implementation via the shash API.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- crypto/Kconfig                    |  18 ++++
- crypto/Makefile                   |   1 +
- crypto/blake2s_generic.c          | 171 ++++++++++++++++++++++++++++++
- include/crypto/internal/blake2s.h |   5 +
- 4 files changed, 195 insertions(+)
- create mode 100644 crypto/blake2s_generic.c
-
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -639,6 +639,24 @@ config CRYPTO_XXHASH
- 	  xxHash non-cryptographic hash algorithm. Extremely fast, working at
- 	  speeds close to RAM limits.
- 
-+config CRYPTO_BLAKE2S
-+	tristate "BLAKE2s digest algorithm"
-+	select CRYPTO_LIB_BLAKE2S_GENERIC
-+	select CRYPTO_HASH
-+	help
-+	  Implementation of cryptographic hash function BLAKE2s
-+	  optimized for 8-32bit platforms and can produce digests of any size
-+	  between 1 to 32.  The keyed hash is also implemented.
-+
-+	  This module provides the following algorithms:
-+
-+	  - blake2s-128
-+	  - blake2s-160
-+	  - blake2s-224
-+	  - blake2s-256
-+
-+	  See https://blake2.net for further information.
-+
- config CRYPTO_CRCT10DIF
- 	tristate "CRCT10DIF algorithm"
- 	select CRYPTO_HASH
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -74,6 +74,7 @@ obj-$(CONFIG_CRYPTO_STREEBOG) += streebo
- obj-$(CONFIG_CRYPTO_WP512) += wp512.o
- CFLAGS_wp512.o := $(call cc-option,-fno-schedule-insns)  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149
- obj-$(CONFIG_CRYPTO_TGR192) += tgr192.o
-+obj-$(CONFIG_CRYPTO_BLAKE2S) += blake2s_generic.o
- obj-$(CONFIG_CRYPTO_GF128MUL) += gf128mul.o
- obj-$(CONFIG_CRYPTO_ECB) += ecb.o
- obj-$(CONFIG_CRYPTO_CBC) += cbc.o
---- /dev/null
-+++ b/crypto/blake2s_generic.c
-@@ -0,0 +1,171 @@
-+// SPDX-License-Identifier: GPL-2.0 OR MIT
-+/*
-+ * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
-+ */
-+
-+#include <crypto/internal/blake2s.h>
-+#include <crypto/internal/simd.h>
-+#include <crypto/internal/hash.h>
-+
-+#include <linux/types.h>
-+#include <linux/jump_label.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+
-+static int crypto_blake2s_setkey(struct crypto_shash *tfm, const u8 *key,
-+				 unsigned int keylen)
-+{
-+	struct blake2s_tfm_ctx *tctx = crypto_shash_ctx(tfm);
-+
-+	if (keylen == 0 || keylen > BLAKE2S_KEY_SIZE) {
-+		crypto_shash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
-+		return -EINVAL;
-+	}
-+
-+	memcpy(tctx->key, key, keylen);
-+	tctx->keylen = keylen;
-+
-+	return 0;
-+}
-+
-+static int crypto_blake2s_init(struct shash_desc *desc)
-+{
-+	struct blake2s_tfm_ctx *tctx = crypto_shash_ctx(desc->tfm);
-+	struct blake2s_state *state = shash_desc_ctx(desc);
-+	const int outlen = crypto_shash_digestsize(desc->tfm);
-+
-+	if (tctx->keylen)
-+		blake2s_init_key(state, outlen, tctx->key, tctx->keylen);
-+	else
-+		blake2s_init(state, outlen);
-+
-+	return 0;
-+}
-+
-+static int crypto_blake2s_update(struct shash_desc *desc, const u8 *in,
-+				 unsigned int inlen)
-+{
-+	struct blake2s_state *state = shash_desc_ctx(desc);
-+	const size_t fill = BLAKE2S_BLOCK_SIZE - state->buflen;
-+
-+	if (unlikely(!inlen))
-+		return 0;
-+	if (inlen > fill) {
-+		memcpy(state->buf + state->buflen, in, fill);
-+		blake2s_compress_generic(state, state->buf, 1, BLAKE2S_BLOCK_SIZE);
-+		state->buflen = 0;
-+		in += fill;
-+		inlen -= fill;
-+	}
-+	if (inlen > BLAKE2S_BLOCK_SIZE) {
-+		const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_SIZE);
-+		/* Hash one less (full) block than strictly possible */
-+		blake2s_compress_generic(state, in, nblocks - 1, BLAKE2S_BLOCK_SIZE);
-+		in += BLAKE2S_BLOCK_SIZE * (nblocks - 1);
-+		inlen -= BLAKE2S_BLOCK_SIZE * (nblocks - 1);
-+	}
-+	memcpy(state->buf + state->buflen, in, inlen);
-+	state->buflen += inlen;
-+
-+	return 0;
-+}
-+
-+static int crypto_blake2s_final(struct shash_desc *desc, u8 *out)
-+{
-+	struct blake2s_state *state = shash_desc_ctx(desc);
-+
-+	blake2s_set_lastblock(state);
-+	memset(state->buf + state->buflen, 0,
-+	       BLAKE2S_BLOCK_SIZE - state->buflen); /* Padding */
-+	blake2s_compress_generic(state, state->buf, 1, state->buflen);
-+	cpu_to_le32_array(state->h, ARRAY_SIZE(state->h));
-+	memcpy(out, state->h, state->outlen);
-+	memzero_explicit(state, sizeof(*state));
-+
-+	return 0;
-+}
-+
-+static struct shash_alg blake2s_algs[] = {{
-+	.base.cra_name		= "blake2s-128",
-+	.base.cra_driver_name	= "blake2s-128-generic",
-+	.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,
-+	.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx),
-+	.base.cra_priority	= 200,
-+	.base.cra_blocksize     = BLAKE2S_BLOCK_SIZE,
-+	.base.cra_module	= THIS_MODULE,
-+
-+	.digestsize		= BLAKE2S_128_HASH_SIZE,
-+	.setkey			= crypto_blake2s_setkey,
-+	.init			= crypto_blake2s_init,
-+	.update			= crypto_blake2s_update,
-+	.final			= crypto_blake2s_final,
-+	.descsize		= sizeof(struct blake2s_state),
-+}, {
-+	.base.cra_name		= "blake2s-160",
-+	.base.cra_driver_name	= "blake2s-160-generic",
-+	.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,
-+	.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx),
-+	.base.cra_priority	= 200,
-+	.base.cra_blocksize     = BLAKE2S_BLOCK_SIZE,
-+	.base.cra_module	= THIS_MODULE,
-+
-+	.digestsize		= BLAKE2S_160_HASH_SIZE,
-+	.setkey			= crypto_blake2s_setkey,
-+	.init			= crypto_blake2s_init,
-+	.update			= crypto_blake2s_update,
-+	.final			= crypto_blake2s_final,
-+	.descsize		= sizeof(struct blake2s_state),
-+}, {
-+	.base.cra_name		= "blake2s-224",
-+	.base.cra_driver_name	= "blake2s-224-generic",
-+	.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,
-+	.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx),
-+	.base.cra_priority	= 200,
-+	.base.cra_blocksize     = BLAKE2S_BLOCK_SIZE,
-+	.base.cra_module	= THIS_MODULE,
-+
-+	.digestsize		= BLAKE2S_224_HASH_SIZE,
-+	.setkey			= crypto_blake2s_setkey,
-+	.init			= crypto_blake2s_init,
-+	.update			= crypto_blake2s_update,
-+	.final			= crypto_blake2s_final,
-+	.descsize		= sizeof(struct blake2s_state),
-+}, {
-+	.base.cra_name		= "blake2s-256",
-+	.base.cra_driver_name	= "blake2s-256-generic",
-+	.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,
-+	.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx),
-+	.base.cra_priority	= 200,
-+	.base.cra_blocksize     = BLAKE2S_BLOCK_SIZE,
-+	.base.cra_module	= THIS_MODULE,
-+
-+	.digestsize		= BLAKE2S_256_HASH_SIZE,
-+	.setkey			= crypto_blake2s_setkey,
-+	.init			= crypto_blake2s_init,
-+	.update			= crypto_blake2s_update,
-+	.final			= crypto_blake2s_final,
-+	.descsize		= sizeof(struct blake2s_state),
-+}};
-+
-+static int __init blake2s_mod_init(void)
-+{
-+	return crypto_register_shashes(blake2s_algs, ARRAY_SIZE(blake2s_algs));
-+}
-+
-+static void __exit blake2s_mod_exit(void)
-+{
-+	crypto_unregister_shashes(blake2s_algs, ARRAY_SIZE(blake2s_algs));
-+}
-+
-+subsys_initcall(blake2s_mod_init);
-+module_exit(blake2s_mod_exit);
-+
-+MODULE_ALIAS_CRYPTO("blake2s-128");
-+MODULE_ALIAS_CRYPTO("blake2s-128-generic");
-+MODULE_ALIAS_CRYPTO("blake2s-160");
-+MODULE_ALIAS_CRYPTO("blake2s-160-generic");
-+MODULE_ALIAS_CRYPTO("blake2s-224");
-+MODULE_ALIAS_CRYPTO("blake2s-224-generic");
-+MODULE_ALIAS_CRYPTO("blake2s-256");
-+MODULE_ALIAS_CRYPTO("blake2s-256-generic");
-+MODULE_LICENSE("GPL v2");
---- a/include/crypto/internal/blake2s.h
-+++ b/include/crypto/internal/blake2s.h
-@@ -5,6 +5,11 @@
- 
- #include <crypto/blake2s.h>
- 
-+struct blake2s_tfm_ctx {
-+	u8 key[BLAKE2S_KEY_SIZE];
-+	unsigned int keylen;
-+};
-+
- void blake2s_compress_generic(struct blake2s_state *state,const u8 *block,
- 			      size_t nblocks, const u32 inc);
- 

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0024-crypto-blake2s-x86_64-SIMD-implementation.patch

@@ -1,557 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Fri, 8 Nov 2019 13:22:31 +0100
-Subject: [PATCH] crypto: blake2s - x86_64 SIMD implementation
-
-commit ed0356eda153f6a95649e11feb7b07083caf9e20 upstream.
-
-These implementations from Samuel Neves support AVX and AVX-512VL.
-Originally this used AVX-512F, but Skylake thermal throttling made
-AVX-512VL more attractive and possible to do with negligable difference.
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-Signed-off-by: Samuel Neves <sneves@dei.uc.pt>
-Co-developed-by: Samuel Neves <sneves@dei.uc.pt>
-[ardb: move to arch/x86/crypto, wire into lib/crypto framework]
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- arch/x86/crypto/Makefile       |   2 +
- arch/x86/crypto/blake2s-core.S | 258 +++++++++++++++++++++++++++++++++
- arch/x86/crypto/blake2s-glue.c | 233 +++++++++++++++++++++++++++++
- crypto/Kconfig                 |   6 +
- 4 files changed, 499 insertions(+)
- create mode 100644 arch/x86/crypto/blake2s-core.S
- create mode 100644 arch/x86/crypto/blake2s-glue.c
-
---- a/arch/x86/crypto/Makefile
-+++ b/arch/x86/crypto/Makefile
-@@ -48,6 +48,7 @@ ifeq ($(avx_supported),yes)
- 	obj-$(CONFIG_CRYPTO_CAST6_AVX_X86_64) += cast6-avx-x86_64.o
- 	obj-$(CONFIG_CRYPTO_TWOFISH_AVX_X86_64) += twofish-avx-x86_64.o
- 	obj-$(CONFIG_CRYPTO_SERPENT_AVX_X86_64) += serpent-avx-x86_64.o
-+	obj-$(CONFIG_CRYPTO_BLAKE2S_X86) += blake2s-x86_64.o
- endif
- 
- # These modules require assembler to support AVX2.
-@@ -70,6 +71,7 @@ serpent-sse2-x86_64-y := serpent-sse2-x8
- aegis128-aesni-y := aegis128-aesni-asm.o aegis128-aesni-glue.o
- 
- nhpoly1305-sse2-y := nh-sse2-x86_64.o nhpoly1305-sse2-glue.o
-+blake2s-x86_64-y := blake2s-core.o blake2s-glue.o
- 
- ifeq ($(avx_supported),yes)
- 	camellia-aesni-avx-x86_64-y := camellia-aesni-avx-asm_64.o \
---- /dev/null
-+++ b/arch/x86/crypto/blake2s-core.S
-@@ -0,0 +1,258 @@
-+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
-+/*
-+ * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
-+ * Copyright (C) 2017-2019 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved.
-+ */
-+
-+#include <linux/linkage.h>
-+
-+.section .rodata.cst32.BLAKE2S_IV, "aM", @progbits, 32
-+.align 32
-+IV:	.octa 0xA54FF53A3C6EF372BB67AE856A09E667
-+	.octa 0x5BE0CD191F83D9AB9B05688C510E527F
-+.section .rodata.cst16.ROT16, "aM", @progbits, 16
-+.align 16
-+ROT16:	.octa 0x0D0C0F0E09080B0A0504070601000302
-+.section .rodata.cst16.ROR328, "aM", @progbits, 16
-+.align 16
-+ROR328:	.octa 0x0C0F0E0D080B0A090407060500030201
-+.section .rodata.cst64.BLAKE2S_SIGMA, "aM", @progbits, 160
-+.align 64
-+SIGMA:
-+.byte  0,  2,  4,  6,  1,  3,  5,  7, 14,  8, 10, 12, 15,  9, 11, 13
-+.byte 14,  4,  9, 13, 10,  8, 15,  6,  5,  1,  0, 11,  3, 12,  2,  7
-+.byte 11, 12,  5, 15,  8,  0,  2, 13,  9, 10,  3,  7,  4, 14,  6,  1
-+.byte  7,  3, 13, 11,  9,  1, 12, 14, 15,  2,  5,  4,  8,  6, 10,  0
-+.byte  9,  5,  2, 10,  0,  7,  4, 15,  3, 14, 11,  6, 13,  1, 12,  8
-+.byte  2,  6,  0,  8, 12, 10, 11,  3,  1,  4,  7, 15,  9, 13,  5, 14
-+.byte 12,  1, 14,  4,  5, 15, 13, 10,  8,  0,  6,  9, 11,  7,  3,  2
-+.byte 13,  7, 12,  3, 11, 14,  1,  9,  2,  5, 15,  8, 10,  0,  4,  6
-+.byte  6, 14, 11,  0, 15,  9,  3,  8, 10, 12, 13,  1,  5,  2,  7,  4
-+.byte 10,  8,  7,  1,  2,  4,  6,  5, 13, 15,  9,  3,  0, 11, 14, 12
-+#ifdef CONFIG_AS_AVX512
-+.section .rodata.cst64.BLAKE2S_SIGMA2, "aM", @progbits, 640
-+.align 64
-+SIGMA2:
-+.long  0,  2,  4,  6,  1,  3,  5,  7, 14,  8, 10, 12, 15,  9, 11, 13
-+.long  8,  2, 13, 15, 10,  9, 12,  3,  6,  4,  0, 14,  5, 11,  1,  7
-+.long 11, 13,  8,  6,  5, 10, 14,  3,  2,  4, 12, 15,  1,  0,  7,  9
-+.long 11, 10,  7,  0,  8, 15,  1, 13,  3,  6,  2, 12,  4, 14,  9,  5
-+.long  4, 10,  9, 14, 15,  0, 11,  8,  1,  7,  3, 13,  2,  5,  6, 12
-+.long  2, 11,  4, 15, 14,  3, 10,  8, 13,  6,  5,  7,  0, 12,  1,  9
-+.long  4,  8, 15,  9, 14, 11, 13,  5,  3,  2,  1, 12,  6, 10,  7,  0
-+.long  6, 13,  0, 14, 12,  2,  1, 11, 15,  4,  5,  8,  7,  9,  3, 10
-+.long 15,  5,  4, 13, 10,  7,  3, 11, 12,  2,  0,  6,  9,  8,  1, 14
-+.long  8,  7, 14, 11, 13, 15,  0, 12, 10,  4,  5,  6,  3,  2,  1,  9
-+#endif /* CONFIG_AS_AVX512 */
-+
-+.text
-+#ifdef CONFIG_AS_SSSE3
-+ENTRY(blake2s_compress_ssse3)
-+	testq		%rdx,%rdx
-+	je		.Lendofloop
-+	movdqu		(%rdi),%xmm0
-+	movdqu		0x10(%rdi),%xmm1
-+	movdqa		ROT16(%rip),%xmm12
-+	movdqa		ROR328(%rip),%xmm13
-+	movdqu		0x20(%rdi),%xmm14
-+	movq		%rcx,%xmm15
-+	leaq		SIGMA+0xa0(%rip),%r8
-+	jmp		.Lbeginofloop
-+	.align		32
-+.Lbeginofloop:
-+	movdqa		%xmm0,%xmm10
-+	movdqa		%xmm1,%xmm11
-+	paddq		%xmm15,%xmm14
-+	movdqa		IV(%rip),%xmm2
-+	movdqa		%xmm14,%xmm3
-+	pxor		IV+0x10(%rip),%xmm3
-+	leaq		SIGMA(%rip),%rcx
-+.Lroundloop:
-+	movzbl		(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm4
-+	movzbl		0x1(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm5
-+	movzbl		0x2(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm6
-+	movzbl		0x3(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm7
-+	punpckldq	%xmm5,%xmm4
-+	punpckldq	%xmm7,%xmm6
-+	punpcklqdq	%xmm6,%xmm4
-+	paddd		%xmm4,%xmm0
-+	paddd		%xmm1,%xmm0
-+	pxor		%xmm0,%xmm3
-+	pshufb		%xmm12,%xmm3
-+	paddd		%xmm3,%xmm2
-+	pxor		%xmm2,%xmm1
-+	movdqa		%xmm1,%xmm8
-+	psrld		$0xc,%xmm1
-+	pslld		$0x14,%xmm8
-+	por		%xmm8,%xmm1
-+	movzbl		0x4(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm5
-+	movzbl		0x5(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm6
-+	movzbl		0x6(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm7
-+	movzbl		0x7(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm4
-+	punpckldq	%xmm6,%xmm5
-+	punpckldq	%xmm4,%xmm7
-+	punpcklqdq	%xmm7,%xmm5
-+	paddd		%xmm5,%xmm0
-+	paddd		%xmm1,%xmm0
-+	pxor		%xmm0,%xmm3
-+	pshufb		%xmm13,%xmm3
-+	paddd		%xmm3,%xmm2
-+	pxor		%xmm2,%xmm1
-+	movdqa		%xmm1,%xmm8
-+	psrld		$0x7,%xmm1
-+	pslld		$0x19,%xmm8
-+	por		%xmm8,%xmm1
-+	pshufd		$0x93,%xmm0,%xmm0
-+	pshufd		$0x4e,%xmm3,%xmm3
-+	pshufd		$0x39,%xmm2,%xmm2
-+	movzbl		0x8(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm6
-+	movzbl		0x9(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm7
-+	movzbl		0xa(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm4
-+	movzbl		0xb(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm5
-+	punpckldq	%xmm7,%xmm6
-+	punpckldq	%xmm5,%xmm4
-+	punpcklqdq	%xmm4,%xmm6
-+	paddd		%xmm6,%xmm0
-+	paddd		%xmm1,%xmm0
-+	pxor		%xmm0,%xmm3
-+	pshufb		%xmm12,%xmm3
-+	paddd		%xmm3,%xmm2
-+	pxor		%xmm2,%xmm1
-+	movdqa		%xmm1,%xmm8
-+	psrld		$0xc,%xmm1
-+	pslld		$0x14,%xmm8
-+	por		%xmm8,%xmm1
-+	movzbl		0xc(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm7
-+	movzbl		0xd(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm4
-+	movzbl		0xe(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm5
-+	movzbl		0xf(%rcx),%eax
-+	movd		(%rsi,%rax,4),%xmm6
-+	punpckldq	%xmm4,%xmm7
-+	punpckldq	%xmm6,%xmm5
-+	punpcklqdq	%xmm5,%xmm7
-+	paddd		%xmm7,%xmm0
-+	paddd		%xmm1,%xmm0
-+	pxor		%xmm0,%xmm3
-+	pshufb		%xmm13,%xmm3
-+	paddd		%xmm3,%xmm2
-+	pxor		%xmm2,%xmm1
-+	movdqa		%xmm1,%xmm8
-+	psrld		$0x7,%xmm1
-+	pslld		$0x19,%xmm8
-+	por		%xmm8,%xmm1
-+	pshufd		$0x39,%xmm0,%xmm0
-+	pshufd		$0x4e,%xmm3,%xmm3
-+	pshufd		$0x93,%xmm2,%xmm2
-+	addq		$0x10,%rcx
-+	cmpq		%r8,%rcx
-+	jnz		.Lroundloop
-+	pxor		%xmm2,%xmm0
-+	pxor		%xmm3,%xmm1
-+	pxor		%xmm10,%xmm0
-+	pxor		%xmm11,%xmm1
-+	addq		$0x40,%rsi
-+	decq		%rdx
-+	jnz		.Lbeginofloop
-+	movdqu		%xmm0,(%rdi)
-+	movdqu		%xmm1,0x10(%rdi)
-+	movdqu		%xmm14,0x20(%rdi)
-+.Lendofloop:
-+	ret
-+ENDPROC(blake2s_compress_ssse3)
-+#endif /* CONFIG_AS_SSSE3 */
-+
-+#ifdef CONFIG_AS_AVX512
-+ENTRY(blake2s_compress_avx512)
-+	vmovdqu		(%rdi),%xmm0
-+	vmovdqu		0x10(%rdi),%xmm1
-+	vmovdqu		0x20(%rdi),%xmm4
-+	vmovq		%rcx,%xmm5
-+	vmovdqa		IV(%rip),%xmm14
-+	vmovdqa		IV+16(%rip),%xmm15
-+	jmp		.Lblake2s_compress_avx512_mainloop
-+.align 32
-+.Lblake2s_compress_avx512_mainloop:
-+	vmovdqa		%xmm0,%xmm10
-+	vmovdqa		%xmm1,%xmm11
-+	vpaddq		%xmm5,%xmm4,%xmm4
-+	vmovdqa		%xmm14,%xmm2
-+	vpxor		%xmm15,%xmm4,%xmm3
-+	vmovdqu		(%rsi),%ymm6
-+	vmovdqu		0x20(%rsi),%ymm7
-+	addq		$0x40,%rsi
-+	leaq		SIGMA2(%rip),%rax
-+	movb		$0xa,%cl
-+.Lblake2s_compress_avx512_roundloop:
-+	addq		$0x40,%rax
-+	vmovdqa		-0x40(%rax),%ymm8
-+	vmovdqa		-0x20(%rax),%ymm9
-+	vpermi2d	%ymm7,%ymm6,%ymm8
-+	vpermi2d	%ymm7,%ymm6,%ymm9
-+	vmovdqa		%ymm8,%ymm6
-+	vmovdqa		%ymm9,%ymm7
-+	vpaddd		%xmm8,%xmm0,%xmm0
-+	vpaddd		%xmm1,%xmm0,%xmm0
-+	vpxor		%xmm0,%xmm3,%xmm3
-+	vprord		$0x10,%xmm3,%xmm3
-+	vpaddd		%xmm3,%xmm2,%xmm2
-+	vpxor		%xmm2,%xmm1,%xmm1
-+	vprord		$0xc,%xmm1,%xmm1
-+	vextracti128	$0x1,%ymm8,%xmm8
-+	vpaddd		%xmm8,%xmm0,%xmm0
-+	vpaddd		%xmm1,%xmm0,%xmm0
-+	vpxor		%xmm0,%xmm3,%xmm3
-+	vprord		$0x8,%xmm3,%xmm3
-+	vpaddd		%xmm3,%xmm2,%xmm2
-+	vpxor		%xmm2,%xmm1,%xmm1
-+	vprord		$0x7,%xmm1,%xmm1
-+	vpshufd		$0x93,%xmm0,%xmm0
-+	vpshufd		$0x4e,%xmm3,%xmm3
-+	vpshufd		$0x39,%xmm2,%xmm2
-+	vpaddd		%xmm9,%xmm0,%xmm0
-+	vpaddd		%xmm1,%xmm0,%xmm0
-+	vpxor		%xmm0,%xmm3,%xmm3
-+	vprord		$0x10,%xmm3,%xmm3
-+	vpaddd		%xmm3,%xmm2,%xmm2
-+	vpxor		%xmm2,%xmm1,%xmm1
-+	vprord		$0xc,%xmm1,%xmm1
-+	vextracti128	$0x1,%ymm9,%xmm9
-+	vpaddd		%xmm9,%xmm0,%xmm0
-+	vpaddd		%xmm1,%xmm0,%xmm0
-+	vpxor		%xmm0,%xmm3,%xmm3
-+	vprord		$0x8,%xmm3,%xmm3
-+	vpaddd		%xmm3,%xmm2,%xmm2
-+	vpxor		%xmm2,%xmm1,%xmm1
-+	vprord		$0x7,%xmm1,%xmm1
-+	vpshufd		$0x39,%xmm0,%xmm0
-+	vpshufd		$0x4e,%xmm3,%xmm3
-+	vpshufd		$0x93,%xmm2,%xmm2
-+	decb		%cl
-+	jne		.Lblake2s_compress_avx512_roundloop
-+	vpxor		%xmm10,%xmm0,%xmm0
-+	vpxor		%xmm11,%xmm1,%xmm1
-+	vpxor		%xmm2,%xmm0,%xmm0
-+	vpxor		%xmm3,%xmm1,%xmm1
-+	decq		%rdx
-+	jne		.Lblake2s_compress_avx512_mainloop
-+	vmovdqu		%xmm0,(%rdi)
-+	vmovdqu		%xmm1,0x10(%rdi)
-+	vmovdqu		%xmm4,0x20(%rdi)
-+	vzeroupper
-+	retq
-+ENDPROC(blake2s_compress_avx512)
-+#endif /* CONFIG_AS_AVX512 */
---- /dev/null
-+++ b/arch/x86/crypto/blake2s-glue.c
-@@ -0,0 +1,233 @@
-+// SPDX-License-Identifier: GPL-2.0 OR MIT
-+/*
-+ * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
-+ */
-+
-+#include <crypto/internal/blake2s.h>
-+#include <crypto/internal/simd.h>
-+#include <crypto/internal/hash.h>
-+
-+#include <linux/types.h>
-+#include <linux/jump_label.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+
-+#include <asm/cpufeature.h>
-+#include <asm/fpu/api.h>
-+#include <asm/processor.h>
-+#include <asm/simd.h>
-+
-+asmlinkage void blake2s_compress_ssse3(struct blake2s_state *state,
-+				       const u8 *block, const size_t nblocks,
-+				       const u32 inc);
-+asmlinkage void blake2s_compress_avx512(struct blake2s_state *state,
-+					const u8 *block, const size_t nblocks,
-+					const u32 inc);
-+
-+static __ro_after_init DEFINE_STATIC_KEY_FALSE(blake2s_use_ssse3);
-+static __ro_after_init DEFINE_STATIC_KEY_FALSE(blake2s_use_avx512);
-+
-+void blake2s_compress_arch(struct blake2s_state *state,
-+			   const u8 *block, size_t nblocks,
-+			   const u32 inc)
-+{
-+	/* SIMD disables preemption, so relax after processing each page. */
-+	BUILD_BUG_ON(PAGE_SIZE / BLAKE2S_BLOCK_SIZE < 8);
-+
-+	if (!static_branch_likely(&blake2s_use_ssse3) || !crypto_simd_usable()) {
-+		blake2s_compress_generic(state, block, nblocks, inc);
-+		return;
-+	}
-+
-+	for (;;) {
-+		const size_t blocks = min_t(size_t, nblocks,
-+					    PAGE_SIZE / BLAKE2S_BLOCK_SIZE);
-+
-+		kernel_fpu_begin();
-+		if (IS_ENABLED(CONFIG_AS_AVX512) &&
-+		    static_branch_likely(&blake2s_use_avx512))
-+			blake2s_compress_avx512(state, block, blocks, inc);
-+		else
-+			blake2s_compress_ssse3(state, block, blocks, inc);
-+		kernel_fpu_end();
-+
-+		nblocks -= blocks;
-+		if (!nblocks)
-+			break;
-+		block += blocks * BLAKE2S_BLOCK_SIZE;
-+	}
-+}
-+EXPORT_SYMBOL(blake2s_compress_arch);
-+
-+static int crypto_blake2s_setkey(struct crypto_shash *tfm, const u8 *key,
-+				 unsigned int keylen)
-+{
-+	struct blake2s_tfm_ctx *tctx = crypto_shash_ctx(tfm);
-+
-+	if (keylen == 0 || keylen > BLAKE2S_KEY_SIZE) {
-+		crypto_shash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
-+		return -EINVAL;
-+	}
-+
-+	memcpy(tctx->key, key, keylen);
-+	tctx->keylen = keylen;
-+
-+	return 0;
-+}
-+
-+static int crypto_blake2s_init(struct shash_desc *desc)
-+{
-+	struct blake2s_tfm_ctx *tctx = crypto_shash_ctx(desc->tfm);
-+	struct blake2s_state *state = shash_desc_ctx(desc);
-+	const int outlen = crypto_shash_digestsize(desc->tfm);
-+
-+	if (tctx->keylen)
-+		blake2s_init_key(state, outlen, tctx->key, tctx->keylen);
-+	else
-+		blake2s_init(state, outlen);
-+
-+	return 0;
-+}
-+
-+static int crypto_blake2s_update(struct shash_desc *desc, const u8 *in,
-+				 unsigned int inlen)
-+{
-+	struct blake2s_state *state = shash_desc_ctx(desc);
-+	const size_t fill = BLAKE2S_BLOCK_SIZE - state->buflen;
-+
-+	if (unlikely(!inlen))
-+		return 0;
-+	if (inlen > fill) {
-+		memcpy(state->buf + state->buflen, in, fill);
-+		blake2s_compress_arch(state, state->buf, 1, BLAKE2S_BLOCK_SIZE);
-+		state->buflen = 0;
-+		in += fill;
-+		inlen -= fill;
-+	}
-+	if (inlen > BLAKE2S_BLOCK_SIZE) {
-+		const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_SIZE);
-+		/* Hash one less (full) block than strictly possible */
-+		blake2s_compress_arch(state, in, nblocks - 1, BLAKE2S_BLOCK_SIZE);
-+		in += BLAKE2S_BLOCK_SIZE * (nblocks - 1);
-+		inlen -= BLAKE2S_BLOCK_SIZE * (nblocks - 1);
-+	}
-+	memcpy(state->buf + state->buflen, in, inlen);
-+	state->buflen += inlen;
-+
-+	return 0;
-+}
-+
-+static int crypto_blake2s_final(struct shash_desc *desc, u8 *out)
-+{
-+	struct blake2s_state *state = shash_desc_ctx(desc);
-+
-+	blake2s_set_lastblock(state);
-+	memset(state->buf + state->buflen, 0,
-+	       BLAKE2S_BLOCK_SIZE - state->buflen); /* Padding */
-+	blake2s_compress_arch(state, state->buf, 1, state->buflen);
-+	cpu_to_le32_array(state->h, ARRAY_SIZE(state->h));
-+	memcpy(out, state->h, state->outlen);
-+	memzero_explicit(state, sizeof(*state));
-+
-+	return 0;
-+}
-+
-+static struct shash_alg blake2s_algs[] = {{
-+	.base.cra_name		= "blake2s-128",
-+	.base.cra_driver_name	= "blake2s-128-x86",
-+	.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,
-+	.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx),
-+	.base.cra_priority	= 200,
-+	.base.cra_blocksize     = BLAKE2S_BLOCK_SIZE,
-+	.base.cra_module	= THIS_MODULE,
-+
-+	.digestsize		= BLAKE2S_128_HASH_SIZE,
-+	.setkey			= crypto_blake2s_setkey,
-+	.init			= crypto_blake2s_init,
-+	.update			= crypto_blake2s_update,
-+	.final			= crypto_blake2s_final,
-+	.descsize		= sizeof(struct blake2s_state),
-+}, {
-+	.base.cra_name		= "blake2s-160",
-+	.base.cra_driver_name	= "blake2s-160-x86",
-+	.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,
-+	.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx),
-+	.base.cra_priority	= 200,
-+	.base.cra_blocksize     = BLAKE2S_BLOCK_SIZE,
-+	.base.cra_module	= THIS_MODULE,
-+
-+	.digestsize		= BLAKE2S_160_HASH_SIZE,
-+	.setkey			= crypto_blake2s_setkey,
-+	.init			= crypto_blake2s_init,
-+	.update			= crypto_blake2s_update,
-+	.final			= crypto_blake2s_final,
-+	.descsize		= sizeof(struct blake2s_state),
-+}, {
-+	.base.cra_name		= "blake2s-224",
-+	.base.cra_driver_name	= "blake2s-224-x86",
-+	.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,
-+	.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx),
-+	.base.cra_priority	= 200,
-+	.base.cra_blocksize     = BLAKE2S_BLOCK_SIZE,
-+	.base.cra_module	= THIS_MODULE,
-+
-+	.digestsize		= BLAKE2S_224_HASH_SIZE,
-+	.setkey			= crypto_blake2s_setkey,
-+	.init			= crypto_blake2s_init,
-+	.update			= crypto_blake2s_update,
-+	.final			= crypto_blake2s_final,
-+	.descsize		= sizeof(struct blake2s_state),
-+}, {
-+	.base.cra_name		= "blake2s-256",
-+	.base.cra_driver_name	= "blake2s-256-x86",
-+	.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,
-+	.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx),
-+	.base.cra_priority	= 200,
-+	.base.cra_blocksize     = BLAKE2S_BLOCK_SIZE,
-+	.base.cra_module	= THIS_MODULE,
-+
-+	.digestsize		= BLAKE2S_256_HASH_SIZE,
-+	.setkey			= crypto_blake2s_setkey,
-+	.init			= crypto_blake2s_init,
-+	.update			= crypto_blake2s_update,
-+	.final			= crypto_blake2s_final,
-+	.descsize		= sizeof(struct blake2s_state),
-+}};
-+
-+static int __init blake2s_mod_init(void)
-+{
-+	if (!boot_cpu_has(X86_FEATURE_SSSE3))
-+		return 0;
-+
-+	static_branch_enable(&blake2s_use_ssse3);
-+
-+	if (IS_ENABLED(CONFIG_AS_AVX512) &&
-+	    boot_cpu_has(X86_FEATURE_AVX) &&
-+	    boot_cpu_has(X86_FEATURE_AVX2) &&
-+	    boot_cpu_has(X86_FEATURE_AVX512F) &&
-+	    boot_cpu_has(X86_FEATURE_AVX512VL) &&
-+	    cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM |
-+			      XFEATURE_MASK_AVX512, NULL))
-+		static_branch_enable(&blake2s_use_avx512);
-+
-+	return crypto_register_shashes(blake2s_algs, ARRAY_SIZE(blake2s_algs));
-+}
-+
-+static void __exit blake2s_mod_exit(void)
-+{
-+	if (boot_cpu_has(X86_FEATURE_SSSE3))
-+		crypto_unregister_shashes(blake2s_algs, ARRAY_SIZE(blake2s_algs));
-+}
-+
-+module_init(blake2s_mod_init);
-+module_exit(blake2s_mod_exit);
-+
-+MODULE_ALIAS_CRYPTO("blake2s-128");
-+MODULE_ALIAS_CRYPTO("blake2s-128-x86");
-+MODULE_ALIAS_CRYPTO("blake2s-160");
-+MODULE_ALIAS_CRYPTO("blake2s-160-x86");
-+MODULE_ALIAS_CRYPTO("blake2s-224");
-+MODULE_ALIAS_CRYPTO("blake2s-224-x86");
-+MODULE_ALIAS_CRYPTO("blake2s-256");
-+MODULE_ALIAS_CRYPTO("blake2s-256-x86");
-+MODULE_LICENSE("GPL v2");
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -657,6 +657,12 @@ config CRYPTO_BLAKE2S
- 
- 	  See https://blake2.net for further information.
- 
-+config CRYPTO_BLAKE2S_X86
-+	tristate "BLAKE2s digest algorithm (x86 accelerated version)"
-+	depends on X86 && 64BIT
-+	select CRYPTO_LIB_BLAKE2S_GENERIC
-+	select CRYPTO_ARCH_HAVE_LIB_BLAKE2S
-+
- config CRYPTO_CRCT10DIF
- 	tristate "CRCT10DIF algorithm"
- 	select CRYPTO_HASH

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0027-crypto-curve25519-implement-generic-KPP-driver.patch

@@ -1,136 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:34 +0100
-Subject: [PATCH] crypto: curve25519 - implement generic KPP driver
-
-commit ee772cb641135739c1530647391d5a04c39db192 upstream.
-
-Expose the generic Curve25519 library via the crypto API KPP interface.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- crypto/Kconfig              |  5 +++
- crypto/Makefile             |  1 +
- crypto/curve25519-generic.c | 90 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 96 insertions(+)
- create mode 100644 crypto/curve25519-generic.c
-
---- a/crypto/Kconfig
-+++ b/crypto/Kconfig
-@@ -264,6 +264,11 @@ config CRYPTO_ECRDSA
- 	  standard algorithms (called GOST algorithms). Only signature verification
- 	  is implemented.
- 
-+config CRYPTO_CURVE25519
-+	tristate "Curve25519 algorithm"
-+	select CRYPTO_KPP
-+	select CRYPTO_LIB_CURVE25519_GENERIC
-+
- comment "Authenticated Encryption with Associated Data"
- 
- config CRYPTO_CCM
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -167,6 +167,7 @@ obj-$(CONFIG_CRYPTO_ZSTD) += zstd.o
- obj-$(CONFIG_CRYPTO_OFB) += ofb.o
- obj-$(CONFIG_CRYPTO_ECC) += ecc.o
- obj-$(CONFIG_CRYPTO_ESSIV) += essiv.o
-+obj-$(CONFIG_CRYPTO_CURVE25519) += curve25519-generic.o
- 
- ecdh_generic-y += ecdh.o
- ecdh_generic-y += ecdh_helper.o
---- /dev/null
-+++ b/crypto/curve25519-generic.c
-@@ -0,0 +1,90 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+
-+#include <crypto/curve25519.h>
-+#include <crypto/internal/kpp.h>
-+#include <crypto/kpp.h>
-+#include <linux/module.h>
-+#include <linux/scatterlist.h>
-+
-+static int curve25519_set_secret(struct crypto_kpp *tfm, const void *buf,
-+				 unsigned int len)
-+{
-+	u8 *secret = kpp_tfm_ctx(tfm);
-+
-+	if (!len)
-+		curve25519_generate_secret(secret);
-+	else if (len == CURVE25519_KEY_SIZE &&
-+		 crypto_memneq(buf, curve25519_null_point, CURVE25519_KEY_SIZE))
-+		memcpy(secret, buf, CURVE25519_KEY_SIZE);
-+	else
-+		return -EINVAL;
-+	return 0;
-+}
-+
-+static int curve25519_compute_value(struct kpp_request *req)
-+{
-+	struct crypto_kpp *tfm = crypto_kpp_reqtfm(req);
-+	const u8 *secret = kpp_tfm_ctx(tfm);
-+	u8 public_key[CURVE25519_KEY_SIZE];
-+	u8 buf[CURVE25519_KEY_SIZE];
-+	int copied, nbytes;
-+	u8 const *bp;
-+
-+	if (req->src) {
-+		copied = sg_copy_to_buffer(req->src,
-+					   sg_nents_for_len(req->src,
-+							    CURVE25519_KEY_SIZE),
-+					   public_key, CURVE25519_KEY_SIZE);
-+		if (copied != CURVE25519_KEY_SIZE)
-+			return -EINVAL;
-+		bp = public_key;
-+	} else {
-+		bp = curve25519_base_point;
-+	}
-+
-+	curve25519_generic(buf, secret, bp);
-+
-+	/* might want less than we've got */
-+	nbytes = min_t(size_t, CURVE25519_KEY_SIZE, req->dst_len);
-+	copied = sg_copy_from_buffer(req->dst, sg_nents_for_len(req->dst,
-+								nbytes),
-+				     buf, nbytes);
-+	if (copied != nbytes)
-+		return -EINVAL;
-+	return 0;
-+}
-+
-+static unsigned int curve25519_max_size(struct crypto_kpp *tfm)
-+{
-+	return CURVE25519_KEY_SIZE;
-+}
-+
-+static struct kpp_alg curve25519_alg = {
-+	.base.cra_name		= "curve25519",
-+	.base.cra_driver_name	= "curve25519-generic",
-+	.base.cra_priority	= 100,
-+	.base.cra_module	= THIS_MODULE,
-+	.base.cra_ctxsize	= CURVE25519_KEY_SIZE,
-+
-+	.set_secret		= curve25519_set_secret,
-+	.generate_public_key	= curve25519_compute_value,
-+	.compute_shared_secret	= curve25519_compute_value,
-+	.max_size		= curve25519_max_size,
-+};
-+
-+static int curve25519_init(void)
-+{
-+	return crypto_register_kpp(&curve25519_alg);
-+}
-+
-+static void curve25519_exit(void)
-+{
-+	crypto_unregister_kpp(&curve25519_alg);
-+}
-+
-+subsys_initcall(curve25519_init);
-+module_exit(curve25519_exit);
-+
-+MODULE_ALIAS_CRYPTO("curve25519");
-+MODULE_ALIAS_CRYPTO("curve25519-generic");
-+MODULE_LICENSE("GPL");

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0028-crypto-lib-curve25519-work-around-Clang-stack-spilli.patch

@@ -1,75 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:35 +0100
-Subject: [PATCH] crypto: lib/curve25519 - work around Clang stack spilling
- issue
-
-commit 660bb8e1f833ea63185fe80fde847e3e42f18e3b upstream.
-
-Arnd reports that the 32-bit generic library code for Curve25119 ends
-up using an excessive amount of stack space when built with Clang:
-
-  lib/crypto/curve25519-fiat32.c:756:6: error: stack frame size
-      of 1384 bytes in function 'curve25519_generic'
-      [-Werror,-Wframe-larger-than=]
-
-Let's give some hints to the compiler regarding which routines should
-not be inlined, to prevent it from running out of registers and spilling
-to the stack. The resulting code performs identically under both GCC
-and Clang, and makes the warning go away.
-
-Suggested-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- lib/crypto/curve25519-fiat32.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/lib/crypto/curve25519-fiat32.c
-+++ b/lib/crypto/curve25519-fiat32.c
-@@ -223,7 +223,7 @@ static __always_inline void fe_1(fe *h)
- 	h->v[0] = 1;
- }
- 
--static void fe_add_impl(u32 out[10], const u32 in1[10], const u32 in2[10])
-+static noinline void fe_add_impl(u32 out[10], const u32 in1[10], const u32 in2[10])
- {
- 	{ const u32 x20 = in1[9];
- 	{ const u32 x21 = in1[8];
-@@ -266,7 +266,7 @@ static __always_inline void fe_add(fe_lo
- 	fe_add_impl(h->v, f->v, g->v);
- }
- 
--static void fe_sub_impl(u32 out[10], const u32 in1[10], const u32 in2[10])
-+static noinline void fe_sub_impl(u32 out[10], const u32 in1[10], const u32 in2[10])
- {
- 	{ const u32 x20 = in1[9];
- 	{ const u32 x21 = in1[8];
-@@ -309,7 +309,7 @@ static __always_inline void fe_sub(fe_lo
- 	fe_sub_impl(h->v, f->v, g->v);
- }
- 
--static void fe_mul_impl(u32 out[10], const u32 in1[10], const u32 in2[10])
-+static noinline void fe_mul_impl(u32 out[10], const u32 in1[10], const u32 in2[10])
- {
- 	{ const u32 x20 = in1[9];
- 	{ const u32 x21 = in1[8];
-@@ -441,7 +441,7 @@ fe_mul_tll(fe *h, const fe_loose *f, con
- 	fe_mul_impl(h->v, f->v, g->v);
- }
- 
--static void fe_sqr_impl(u32 out[10], const u32 in1[10])
-+static noinline void fe_sqr_impl(u32 out[10], const u32 in1[10])
- {
- 	{ const u32 x17 = in1[9];
- 	{ const u32 x18 = in1[8];
-@@ -619,7 +619,7 @@ static __always_inline void fe_invert(fe
-  *
-  * Preconditions: b in {0,1}
-  */
--static __always_inline void fe_cswap(fe *f, fe *g, unsigned int b)
-+static noinline void fe_cswap(fe *f, fe *g, unsigned int b)
- {
- 	unsigned i;
- 	b = 0 - b;

feeds/ipq40xx/ipq40xx/backport-5.4/080-wireguard-0033-crypto-lib-chacha20poly1305-reimplement-crypt_from_s.patch

@@ -1,295 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Fri, 8 Nov 2019 13:22:40 +0100
-Subject: [PATCH] crypto: lib/chacha20poly1305 - reimplement crypt_from_sg()
- routine
-
-commit d95312a3ccc0cd544d374be2fc45aeaa803e5fd9 upstream.
-
-Reimplement the library routines to perform chacha20poly1305 en/decryption
-on scatterlists, without [ab]using the [deprecated] blkcipher interface,
-which is rather heavyweight and does things we don't really need.
-
-Instead, we use the sg_miter API in a novel and clever way, to iterate
-over the scatterlist in-place (i.e., source == destination, which is the
-only way this library is expected to be used). That way, we don't have to
-iterate over two scatterlists in parallel.
-
-Another optimization is that, instead of relying on the blkcipher walker
-to present the input in suitable chunks, we recognize that ChaCha is a
-streamcipher, and so we can simply deal with partial blocks by keeping a
-block of cipherstream on the stack and use crypto_xor() to mix it with
-the in/output.
-
-Finally, we omit the scatterwalk_and_copy() call if the last element of
-the scatterlist covers the MAC as well (which is the common case),
-avoiding the need to walk the scatterlist and kmap() the page twice.
-
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- include/crypto/chacha20poly1305.h      |  11 ++
- lib/crypto/chacha20poly1305-selftest.c |  45 ++++++++
- lib/crypto/chacha20poly1305.c          | 150 +++++++++++++++++++++++++
- 3 files changed, 206 insertions(+)
-
---- a/include/crypto/chacha20poly1305.h
-+++ b/include/crypto/chacha20poly1305.h
-@@ -7,6 +7,7 @@
- #define __CHACHA20POLY1305_H
- 
- #include <linux/types.h>
-+#include <linux/scatterlist.h>
- 
- enum chacha20poly1305_lengths {
- 	XCHACHA20POLY1305_NONCE_SIZE = 24,
-@@ -34,4 +35,14 @@ bool __must_check xchacha20poly1305_decr
- 	const size_t ad_len, const u8 nonce[XCHACHA20POLY1305_NONCE_SIZE],
- 	const u8 key[CHACHA20POLY1305_KEY_SIZE]);
- 
-+bool chacha20poly1305_encrypt_sg_inplace(struct scatterlist *src, size_t src_len,
-+					 const u8 *ad, const size_t ad_len,
-+					 const u64 nonce,
-+					 const u8 key[CHACHA20POLY1305_KEY_SIZE]);
-+
-+bool chacha20poly1305_decrypt_sg_inplace(struct scatterlist *src, size_t src_len,
-+					 const u8 *ad, const size_t ad_len,
-+					 const u64 nonce,
-+					 const u8 key[CHACHA20POLY1305_KEY_SIZE]);
-+
- #endif /* __CHACHA20POLY1305_H */
---- a/lib/crypto/chacha20poly1305-selftest.c
-+++ b/lib/crypto/chacha20poly1305-selftest.c
-@@ -7250,6 +7250,7 @@ bool __init chacha20poly1305_selftest(vo
- 	enum { MAXIMUM_TEST_BUFFER_LEN = 1UL << 12 };
- 	size_t i;
- 	u8 *computed_output = NULL, *heap_src = NULL;
-+	struct scatterlist sg_src;
- 	bool success = true, ret;
- 
- 	heap_src = kmalloc(MAXIMUM_TEST_BUFFER_LEN, GFP_KERNEL);
-@@ -7280,6 +7281,29 @@ bool __init chacha20poly1305_selftest(vo
- 		}
- 	}
- 
-+	for (i = 0; i < ARRAY_SIZE(chacha20poly1305_enc_vectors); ++i) {
-+		if (chacha20poly1305_enc_vectors[i].nlen != 8)
-+			continue;
-+		memcpy(heap_src, chacha20poly1305_enc_vectors[i].input,
-+		       chacha20poly1305_enc_vectors[i].ilen);
-+		sg_init_one(&sg_src, heap_src,
-+			    chacha20poly1305_enc_vectors[i].ilen + POLY1305_DIGEST_SIZE);
-+		chacha20poly1305_encrypt_sg_inplace(&sg_src,
-+			chacha20poly1305_enc_vectors[i].ilen,
-+			chacha20poly1305_enc_vectors[i].assoc,
-+			chacha20poly1305_enc_vectors[i].alen,
-+			get_unaligned_le64(chacha20poly1305_enc_vectors[i].nonce),
-+			chacha20poly1305_enc_vectors[i].key);
-+		if (memcmp(heap_src,
-+				   chacha20poly1305_enc_vectors[i].output,
-+				   chacha20poly1305_enc_vectors[i].ilen +
-+							POLY1305_DIGEST_SIZE)) {
-+			pr_err("chacha20poly1305 sg encryption self-test %zu: FAIL\n",
-+			       i + 1);
-+			success = false;
-+		}
-+	}
-+
- 	for (i = 0; i < ARRAY_SIZE(chacha20poly1305_dec_vectors); ++i) {
- 		memset(computed_output, 0, MAXIMUM_TEST_BUFFER_LEN);
- 		ret = chacha20poly1305_decrypt(computed_output,
-@@ -7301,6 +7325,27 @@ bool __init chacha20poly1305_selftest(vo
- 		}
- 	}
- 
-+	for (i = 0; i < ARRAY_SIZE(chacha20poly1305_dec_vectors); ++i) {
-+		memcpy(heap_src, chacha20poly1305_dec_vectors[i].input,
-+		       chacha20poly1305_dec_vectors[i].ilen);
-+		sg_init_one(&sg_src, heap_src,
-+			    chacha20poly1305_dec_vectors[i].ilen);
-+		ret = chacha20poly1305_decrypt_sg_inplace(&sg_src,
-+			chacha20poly1305_dec_vectors[i].ilen,
-+			chacha20poly1305_dec_vectors[i].assoc,
-+			chacha20poly1305_dec_vectors[i].alen,
-+			get_unaligned_le64(chacha20poly1305_dec_vectors[i].nonce),
-+			chacha20poly1305_dec_vectors[i].key);
-+		if (!decryption_success(ret,
-+			chacha20poly1305_dec_vectors[i].failure,
-+			memcmp(heap_src, chacha20poly1305_dec_vectors[i].output,
-+			       chacha20poly1305_dec_vectors[i].ilen -
-+							POLY1305_DIGEST_SIZE))) {
-+			pr_err("chacha20poly1305 sg decryption self-test %zu: FAIL\n",
-+			       i + 1);
-+			success = false;
-+		}
-+	}
- 
- 	for (i = 0; i < ARRAY_SIZE(xchacha20poly1305_enc_vectors); ++i) {
- 		memset(computed_output, 0, MAXIMUM_TEST_BUFFER_LEN);
---- a/lib/crypto/chacha20poly1305.c
-+++ b/lib/crypto/chacha20poly1305.c
-@@ -11,6 +11,7 @@
- #include <crypto/chacha20poly1305.h>
- #include <crypto/chacha.h>
- #include <crypto/poly1305.h>
-+#include <crypto/scatterwalk.h>
- 
- #include <asm/unaligned.h>
- #include <linux/kernel.h>
-@@ -205,6 +206,155 @@ bool xchacha20poly1305_decrypt(u8 *dst,
- }
- EXPORT_SYMBOL(xchacha20poly1305_decrypt);
- 
-+static
-+bool chacha20poly1305_crypt_sg_inplace(struct scatterlist *src,
-+				       const size_t src_len,
-+				       const u8 *ad, const size_t ad_len,
-+				       const u64 nonce,
-+				       const u8 key[CHACHA20POLY1305_KEY_SIZE],
-+				       int encrypt)
-+{
-+	const u8 *pad0 = page_address(ZERO_PAGE(0));
-+	struct poly1305_desc_ctx poly1305_state;
-+	u32 chacha_state[CHACHA_STATE_WORDS];
-+	struct sg_mapping_iter miter;
-+	size_t partial = 0;
-+	unsigned int flags;
-+	bool ret = true;
-+	int sl;
-+	union {
-+		struct {
-+			u32 k[CHACHA_KEY_WORDS];
-+			__le64 iv[2];
-+		};
-+		u8 block0[POLY1305_KEY_SIZE];
-+		u8 chacha_stream[CHACHA_BLOCK_SIZE];
-+		struct {
-+			u8 mac[2][POLY1305_DIGEST_SIZE];
-+		};
-+		__le64 lens[2];
-+	} b __aligned(16);
-+
-+	chacha_load_key(b.k, key);
-+
-+	b.iv[0] = 0;
-+	b.iv[1] = cpu_to_le64(nonce);
-+
-+	chacha_init(chacha_state, b.k, (u8 *)b.iv);
-+	chacha_crypt(chacha_state, b.block0, pad0, sizeof(b.block0), 20);
-+	poly1305_init(&poly1305_state, b.block0);
-+
-+	if (unlikely(ad_len)) {
-+		poly1305_update(&poly1305_state, ad, ad_len);
-+		if (ad_len & 0xf)
-+			poly1305_update(&poly1305_state, pad0, 0x10 - (ad_len & 0xf));
-+	}
-+
-+	flags = SG_MITER_TO_SG;
-+	if (!preemptible())
-+		flags |= SG_MITER_ATOMIC;
-+
-+	sg_miter_start(&miter, src, sg_nents(src), flags);
-+
-+	for (sl = src_len; sl > 0 && sg_miter_next(&miter); sl -= miter.length) {
-+		u8 *addr = miter.addr;
-+		size_t length = min_t(size_t, sl, miter.length);
-+
-+		if (!encrypt)
-+			poly1305_update(&poly1305_state, addr, length);
-+
-+		if (unlikely(partial)) {
-+			size_t l = min(length, CHACHA_BLOCK_SIZE - partial);
-+
-+			crypto_xor(addr, b.chacha_stream + partial, l);
-+			partial = (partial + l) & (CHACHA_BLOCK_SIZE - 1);
-+
-+			addr += l;
-+			length -= l;
-+		}
-+
-+		if (likely(length >= CHACHA_BLOCK_SIZE || length == sl)) {
-+			size_t l = length;
-+
-+			if (unlikely(length < sl))
-+				l &= ~(CHACHA_BLOCK_SIZE - 1);
-+			chacha_crypt(chacha_state, addr, addr, l, 20);
-+			addr += l;
-+			length -= l;
-+		}
-+
-+		if (unlikely(length > 0)) {
-+			chacha_crypt(chacha_state, b.chacha_stream, pad0,
-+				     CHACHA_BLOCK_SIZE, 20);
-+			crypto_xor(addr, b.chacha_stream, length);
-+			partial = length;
-+		}
-+
-+		if (encrypt)
-+			poly1305_update(&poly1305_state, miter.addr,
-+					min_t(size_t, sl, miter.length));
-+	}
-+
-+	if (src_len & 0xf)
-+		poly1305_update(&poly1305_state, pad0, 0x10 - (src_len & 0xf));
-+
-+	b.lens[0] = cpu_to_le64(ad_len);
-+	b.lens[1] = cpu_to_le64(src_len);
-+	poly1305_update(&poly1305_state, (u8 *)b.lens, sizeof(b.lens));
-+
-+	if (likely(sl <= -POLY1305_DIGEST_SIZE)) {
-+		if (encrypt) {
-+			poly1305_final(&poly1305_state,
-+				       miter.addr + miter.length + sl);
-+			ret = true;
-+		} else {
-+			poly1305_final(&poly1305_state, b.mac[0]);
-+			ret = !crypto_memneq(b.mac[0],
-+					     miter.addr + miter.length + sl,
-+					     POLY1305_DIGEST_SIZE);
-+		}
-+	}
-+
-+	sg_miter_stop(&miter);
-+
-+	if (unlikely(sl > -POLY1305_DIGEST_SIZE)) {
-+		poly1305_final(&poly1305_state, b.mac[1]);
-+		scatterwalk_map_and_copy(b.mac[encrypt], src, src_len,
-+					 sizeof(b.mac[1]), encrypt);
-+		ret = encrypt ||
-+		      !crypto_memneq(b.mac[0], b.mac[1], POLY1305_DIGEST_SIZE);
-+	}
-+
-+	memzero_explicit(chacha_state, sizeof(chacha_state));
-+	memzero_explicit(&b, sizeof(b));
-+
-+	return ret;
-+}
-+
-+bool chacha20poly1305_encrypt_sg_inplace(struct scatterlist *src, size_t src_len,
-+					 const u8 *ad, const size_t ad_len,
-+					 const u64 nonce,
-+					 const u8 key[CHACHA20POLY1305_KEY_SIZE])
-+{
-+	return chacha20poly1305_crypt_sg_inplace(src, src_len, ad, ad_len,
-+						 nonce, key, 1);
-+}
-+EXPORT_SYMBOL(chacha20poly1305_encrypt_sg_inplace);
-+
-+bool chacha20poly1305_decrypt_sg_inplace(struct scatterlist *src, size_t src_len,
-+					 const u8 *ad, const size_t ad_len,
-+					 const u64 nonce,
-+					 const u8 key[CHACHA20POLY1305_KEY_SIZE])
-+{
-+	if (unlikely(src_len < POLY1305_DIGEST_SIZE))
-+		return false;
-+
-+	return chacha20poly1305_crypt_sg_inplace(src,
-+						 src_len - POLY1305_DIGEST_SIZE,
-+						 ad, ad_len, nonce, key, 0);
-+}
-+EXPORT_SYMBOL(chacha20poly1305_decrypt_sg_inplace);
-+
- static int __init mod_init(void)
- {
- 	if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS) &&