mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Update 6.6 kernel
This commit is contained in:
parent
e0356e8da1
commit
5e05a624d1
271 changed files with 260 additions and 46224 deletions
|
@ -1,3 +0,0 @@
|
||||||
LINUX_VERSION-6.6 = .21
|
|
||||||
LINUX_KERNEL_HASH-6.6.21 = ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457
|
|
||||||
LINUX_KERNEL_HASH-6.6.12 = 1fd7ec8c3d9c4e4b3a41d11e2c6d151e5fbf875dd08b3577f73afd6ee6674605
|
|
|
@ -1,303 +0,0 @@
|
||||||
Package/ibt-firmware = $(call Package/firmware-default,Intel bluetooth firmware)
|
|
||||||
define Package/ibt-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/intel
|
|
||||||
$(CP) \
|
|
||||||
$(PKG_BUILD_DIR)/intel/*.bseq \
|
|
||||||
$(1)/lib/firmware/intel
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,ibt-firmware))
|
|
||||||
|
|
||||||
Package/iwl3945-firmware = $(call Package/firmware-default,Intel IWL3945 firmware)
|
|
||||||
define Package/iwl3945-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3945-2.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwl3945-firmware))
|
|
||||||
|
|
||||||
Package/iwl4965-firmware = $(call Package/firmware-default,Intel IWL4965 firmware)
|
|
||||||
define Package/iwl4965-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-4965-2.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwl4965-firmware))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl100 = $(call Package/firmware-default,Intel Centrino Wireless-N 100 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl100/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-100-5.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl100))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl1000 = $(call Package/firmware-default,Intel Centrino Wireless-N 1000 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl1000/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-1000-5.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl1000))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl105 = $(call Package/firmware-default,Intel Centrino Wireless-N 105 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl105/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-105-6.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl105))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl135 = $(call Package/firmware-default,Intel Centrino Wireless-N 135 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl135/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-135-6.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl135))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl2000 = $(call Package/firmware-default,Intel Centrino Wireless-N 2200 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl2000/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-2000-6.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl2000))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl2030 = $(call Package/firmware-default,Intel Centrino Wireless-N 2230 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl2030/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-2030-6.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl2030))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl3160 = $(call Package/firmware-default,Intel Wireless 3160 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl3160/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3160-17.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl3160))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl3168 = $(call Package/firmware-default,Intel Wireless 3168 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl3168/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3168-29.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl3168))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl5000 = $(call Package/firmware-default,Intel Wireless 5100AGN 5300AGN and 5350AGN firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl5000/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-5000-5.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl5000))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl5150 = $(call Package/firmware-default,Intel Wireless Wi-Fi 5150AGN firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl5150/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-5150-2.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl5150))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl6000g2 = $(call Package/firmware-default,Intel Centrino 6300 and 6200 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl6000g2/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6000-4.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl6000g2))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl6000g2a = $(call Package/firmware-default,Intel Centrino 6205 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl6000g2a/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6000g2a-6.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl6000g2a))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl6000g2b = $(call Package/firmware-default,Intel Centrino 6230 1030 130 and 6235 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl6000g2b/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6000g2b-6.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl6000g2b))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl6050 = $(call Package/firmware-default,Intel Centrino 6150 and 6250 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl6050/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6050-5.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl6050))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl7260 = $(call Package/firmware-default,Intel Wireless 7260 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl7260/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-7260-17.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl7260))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl7265 = $(call Package/firmware-default,Intel Wireless 7265 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl7265/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-7265-17.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl7265))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl7265d = $(call Package/firmware-default,Intel Wireless 7265D and 3165 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl7265d/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-7265D-29.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl7265d))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl8260c = $(call Package/firmware-default,Intel Wireless 8260 and 4165 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl8260c/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-8000C-36.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl8260c))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl8265 = $(call Package/firmware-default,Intel Wireless 8265 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl8265/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-8265-36.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl8265))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl9000 = $(call Package/firmware-default,Intel Wireless 9000 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl9000/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9000-pu-b0-jf-b0-46.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl9000))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-iwl9260 = $(call Package/firmware-default,Intel Wireless 9260 firmware)
|
|
||||||
define Package/iwlwifi-firmware-iwl9260/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9260-th-b0-jf-b0-46.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-iwl9260))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-ax200 = $(call Package/firmware-default,Intel AX200 firmware)
|
|
||||||
define Package/iwlwifi-firmware-ax200/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-cc-a0-66.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-ax200))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-ax201 = $(call Package/firmware-default,Intel AX201 firmware)
|
|
||||||
define Package/iwlwifi-firmware-ax201/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-so-a0-hr-b0-72.ucode $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-ax201))
|
|
||||||
|
|
||||||
Package/iwlwifi-firmware-ax210 = $(call Package/firmware-default,Intel AX210 firmware)
|
|
||||||
define Package/iwlwifi-firmware-ax210/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0-66.ucode $(1)/lib/firmware
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-ty-a0-gf-a0.pnvm $(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,iwlwifi-firmware-ax210))
|
|
||||||
|
|
||||||
Package/e100-firmware = $(call Package/firmware-default,Intel e100)
|
|
||||||
define Package/e100-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/e100
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/e100/d101m_ucode.bin $(1)/lib/firmware/e100/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/e100/d101s_ucode.bin $(1)/lib/firmware/e100/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/e100/d102e_ucode.bin $(1)/lib/firmware/e100/
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,e100-firmware))
|
|
||||||
|
|
||||||
Package/i915-firmware = $(call Package/firmware-default,Intel GPU firmware)
|
|
||||||
define Package/i915-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/i915
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_dmc_ver1_09.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_09.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_10.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_12.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_14.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_16.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_guc_62.0.3.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_guc_69.0.3.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_guc_70.1.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_guc_70.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adls_dmc_ver2_01.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_dmc_ver1_07.bin $(1)/lib/firmware/i915/
|
|
||||||
ln -s /lib/firmware/i915/bxt_dmc_ver1_07.bin $(1)/lib/firmware/i915/bxt_dmc_ver1.bin
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_guc_32.0.3.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_guc_33.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_guc_49.0.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_guc_62.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_guc_ver8_7.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_guc_ver9_29.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_huc_2.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_huc_ver01_07_1398.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_huc_ver01_8_2893.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/cml_guc_33.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/cml_guc_49.0.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/cml_guc_62.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/cml_huc_4.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/cnl_dmc_ver1_06.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/cnl_dmc_ver1_07.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/dg1_dmc_ver2_02.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/dg1_guc_49.0.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/dg1_guc_62.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/dg1_huc_7.7.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/dg1_huc_7.9.3.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_33.0.4.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_49.0.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_62.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_69.0.3.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_70.1.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_huc_9.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_dmc_ver1_04.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_32.0.3.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_33.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_49.0.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_62.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_70.1.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_huc_4.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_huc_ver03_01_2893.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_dmc_ver1_07.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_dmc_ver1_09.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_guc_32.0.3.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_guc_33.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_guc_49.0.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_guc_62.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_huc_9.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_huc_ver8_4_3238.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_dmc_ver1_01.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_dmc_ver1_04.bin $(1)/lib/firmware/i915/
|
|
||||||
ln -s /lib/firmware/i915/kbl_dmc_ver1_04.bin $(1)/lib/firmware/i915/kbl_dmc_ver1.bin
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_32.0.3.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_33.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_49.0.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_62.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_70.1.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_ver9_14.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_ver9_39.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_huc_4.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_huc_ver02_00_1810.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/rkl_dmc_ver2_02.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/rkl_dmc_ver2_03.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_dmc_ver1_23.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_dmc_ver1_26.bin $(1)/lib/firmware/i915/
|
|
||||||
ln -s /lib/firmware/i915/skl_dmc_ver1_26.bin $(1)/lib/firmware/i915/skl_dmc_ver1.bin
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_dmc_ver1_27.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_32.0.3.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_33.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_49.0.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_62.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_ver1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_ver4.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_ver6_1.bin $(1)/lib/firmware/i915/
|
|
||||||
ln -s /lib/firmware/i915/skl_guc_ver6_1.bin $(1)/lib/firmware/i915/skl_guc_ver6.bin
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_ver9_33.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_huc_2.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_huc_ver01_07_1398.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_dmc_ver2_04.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_dmc_ver2_06.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_dmc_ver2_08.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_dmc_ver2_12.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_35.2.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_49.0.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_62.0.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_70.1.1.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc_7.0.12.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc_7.0.3.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc_7.5.0.bin $(1)/lib/firmware/i915/
|
|
||||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc_7.9.3.bin $(1)/lib/firmware/i915/
|
|
||||||
endef
|
|
||||||
$(eval $(call BuildPackage,i915-firmware))
|
|
|
@ -1,58 +0,0 @@
|
||||||
#
|
|
||||||
# Copyright (C) 2014 OpenWrt.org
|
|
||||||
#
|
|
||||||
# This is free software, licensed under the GNU General Public License v2.
|
|
||||||
# See /LICENSE for more information.
|
|
||||||
#
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
include $(TOPDIR)/rules.mk
|
|
||||||
include $(INCLUDE_DIR)/kernel.mk
|
|
||||||
|
|
||||||
PKG_NAME:=cryptodev-linux
|
|
||||||
PKG_VERSION:=1.13
|
|
||||||
PKG_RELEASE:=1
|
|
||||||
|
|
||||||
PKG_SOURCE_URL:=https://codeload.github.com/$(PKG_NAME)/$(PKG_NAME)/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
|
||||||
PKG_HASH:=33b7915c46eb39a37110e88c681423c0dd0df25d784b6e1475ac3196367f0db5
|
|
||||||
PKG_LICENSE:=GPL-2.0
|
|
||||||
PKG_LICENSE_FILES:=COPYING
|
|
||||||
|
|
||||||
PKG_MAINTAINER:=Ansuel Smith <ansuelsmth@gmail.com>
|
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
|
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
|
||||||
|
|
||||||
define KernelPackage/cryptodev
|
|
||||||
SUBMENU:=Cryptographic API modules
|
|
||||||
TITLE:=Driver for cryptographic acceleration
|
|
||||||
URL:=http://cryptodev-linux.org/
|
|
||||||
VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
|
|
||||||
DEPENDS:=+kmod-crypto-authenc +kmod-crypto-hash
|
|
||||||
FILES:=$(PKG_BUILD_DIR)/cryptodev.$(LINUX_KMOD_SUFFIX)
|
|
||||||
AUTOLOAD:=$(call AutoLoad,50,cryptodev)
|
|
||||||
MODPARAMS.cryptodev:=cryptodev_verbosity=-1
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/cryptodev/description
|
|
||||||
This is a driver for that allows to use the Linux kernel supported
|
|
||||||
hardware ciphers by user-space applications.
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/Configure
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/Compile
|
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
|
||||||
$(KERNEL_MAKE_FLAGS) \
|
|
||||||
KERNEL_DIR="$(LINUX_DIR)"
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/InstallDev
|
|
||||||
$(INSTALL_DIR) $(STAGING_DIR)/usr/include/crypto
|
|
||||||
$(CP) $(PKG_BUILD_DIR)/crypto/cryptodev.h $(STAGING_DIR)/usr/include/crypto/
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,cryptodev))
|
|
|
@ -1,41 +0,0 @@
|
||||||
From 99ae2a39ddc3f89c66d9f09783b591c0f2dbf2e9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gaurav Jain <gaurav.jain@nxp.com>
|
|
||||||
Date: Wed, 28 Jun 2023 12:44:32 +0530
|
|
||||||
Subject: [PATCH] cryptodev_verbosity: Fix build for Linux 6.4
|
|
||||||
|
|
||||||
register_sysctl_table api is removed in kernel.
|
|
||||||
migrate to the new api register_sysctl.
|
|
||||||
|
|
||||||
child is also removed in linux 6.4 ctl_table struct.
|
|
||||||
|
|
||||||
Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
|
|
||||||
---
|
|
||||||
ioctl.c | 6 ++++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/ioctl.c b/ioctl.c
|
|
||||||
index 8f241b86..4262bbd5 100644
|
|
||||||
--- a/ioctl.c
|
|
||||||
+++ b/ioctl.c
|
|
||||||
@@ -1246,7 +1246,9 @@ static struct ctl_table verbosity_ctl_root[] = {
|
|
||||||
{
|
|
||||||
.procname = "ioctl",
|
|
||||||
.mode = 0555,
|
|
||||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0))
|
|
||||||
.child = verbosity_ctl_dir,
|
|
||||||
+#endif
|
|
||||||
},
|
|
||||||
{},
|
|
||||||
};
|
|
||||||
@@ -1267,7 +1269,11 @@ static int __init init_cryptodev(void)
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0))
|
|
||||||
verbosity_sysctl_header = register_sysctl_table(verbosity_ctl_root);
|
|
||||||
+#else
|
|
||||||
+ verbosity_sysctl_header = register_sysctl(verbosity_ctl_root->procname, verbosity_ctl_dir);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
pr_info(PFX "driver %s loaded.\n", VERSION);
|
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
From 592017c3a910a3905b1925aee88c4674e9a596b7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gaurav Jain <gaurav.jain@nxp.com>
|
|
||||||
Date: Tue, 30 May 2023 17:09:42 +0530
|
|
||||||
Subject: [PATCH] zero copy: Fix build for Linux 6.4
|
|
||||||
|
|
||||||
get_user_pages_remote api prototype is changed in kernel.
|
|
||||||
struct vm_area_struct **vmas argument is removed.
|
|
||||||
Migrate to the new API.
|
|
||||||
|
|
||||||
Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
|
|
||||||
---
|
|
||||||
zc.c | 6 +++++-
|
|
||||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/zc.c b/zc.c
|
|
||||||
index fdf7da17..6637945a 100644
|
|
||||||
--- a/zc.c
|
|
||||||
+++ b/zc.c
|
|
||||||
@@ -80,10 +80,14 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write,
|
|
||||||
ret = get_user_pages_remote(task, mm,
|
|
||||||
(unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
|
|
||||||
pg, NULL, NULL);
|
|
||||||
-#else
|
|
||||||
+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0))
|
|
||||||
ret = get_user_pages_remote(mm,
|
|
||||||
(unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
|
|
||||||
pg, NULL, NULL);
|
|
||||||
+#else
|
|
||||||
+ ret = get_user_pages_remote(mm,
|
|
||||||
+ (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
|
|
||||||
+ pg, NULL);
|
|
||||||
#endif
|
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
|
|
||||||
up_read(&mm->mmap_sem);
|
|
|
@ -1,60 +0,0 @@
|
||||||
From bb8bc7cf60d2c0b097c8b3b0e807f805b577a53f Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= <joanbrugueram@gmail.com>
|
|
||||||
Date: Mon, 3 Jul 2023 00:46:02 +0000
|
|
||||||
Subject: [PATCH] Move recent Linux version #ifdefs from v6.4 to v6.5
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
The latest commits, meant to fix the build on Linux 6.4, are actually
|
|
||||||
fixing the build for API changes introduced in the merge window of the
|
|
||||||
yet-unreleased Linux 6.5, and actually break the build for Linux 6.4.
|
|
||||||
|
|
||||||
In particular, the upstream commits introducing the API changes are the
|
|
||||||
following, which are *not* included in the Linux v6.4 tag:
|
|
||||||
* https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=19c4e618a1bc3d0cad1f04c857be8076cb05bbb2
|
|
||||||
* https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca5e863233e8f6acd1792fd85d6bc2729a1b2c10
|
|
||||||
|
|
||||||
Change to #ifdef's to v6.5, where they will most likely be included.
|
|
||||||
|
|
||||||
Signed-off-by: Joan Bruguera Micó <joanbrugueram@gmail.com>
|
|
||||||
---
|
|
||||||
ioctl.c | 4 ++--
|
|
||||||
zc.c | 2 +-
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/ioctl.c b/ioctl.c
|
|
||||||
index 4262bbd..e3eefe1 100644
|
|
||||||
--- a/ioctl.c
|
|
||||||
+++ b/ioctl.c
|
|
||||||
@@ -1246,7 +1246,7 @@ static struct ctl_table verbosity_ctl_root[] = {
|
|
||||||
{
|
|
||||||
.procname = "ioctl",
|
|
||||||
.mode = 0555,
|
|
||||||
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0))
|
|
||||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0))
|
|
||||||
.child = verbosity_ctl_dir,
|
|
||||||
#endif
|
|
||||||
},
|
|
||||||
@@ -1269,7 +1269,7 @@ static int __init init_cryptodev(void)
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0))
|
|
||||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0))
|
|
||||||
verbosity_sysctl_header = register_sysctl_table(verbosity_ctl_root);
|
|
||||||
#else
|
|
||||||
verbosity_sysctl_header = register_sysctl(verbosity_ctl_root->procname, verbosity_ctl_dir);
|
|
||||||
diff --git a/zc.c b/zc.c
|
|
||||||
index 6637945..00e00c1 100644
|
|
||||||
--- a/zc.c
|
|
||||||
+++ b/zc.c
|
|
||||||
@@ -80,7 +80,7 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write,
|
|
||||||
ret = get_user_pages_remote(task, mm,
|
|
||||||
(unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
|
|
||||||
pg, NULL, NULL);
|
|
||||||
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0))
|
|
||||||
+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0))
|
|
||||||
ret = get_user_pages_remote(mm,
|
|
||||||
(unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
|
|
||||||
pg, NULL, NULL);
|
|
|
@ -1,35 +0,0 @@
|
||||||
From 5e7121e45ff283d30097da381fd7e97c4bb61364 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= <joanbrugueram@gmail.com>
|
|
||||||
Date: Sun, 10 Dec 2023 13:57:55 +0000
|
|
||||||
Subject: [PATCH] Fix build for Linux 6.7-rc1
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Since Linux 6.7-rc1, no ahash algorithms set a nonzero alignmask,
|
|
||||||
and therefore `crypto_ahash_alignmask` has been removed.
|
|
||||||
|
|
||||||
See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0f8660c82b79af595b056f6b9f4f227edeb88574
|
|
||||||
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c626910f3f1bbce6ad18bc613d895d2a089ed95e
|
|
||||||
|
|
||||||
Signed-off-by: Joan Bruguera Micó <joanbrugueram@gmail.com>
|
|
||||||
---
|
|
||||||
cryptlib.c | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/cryptlib.c b/cryptlib.c
|
|
||||||
index 4d739e5..0e59d4c 100644
|
|
||||||
--- a/cryptlib.c
|
|
||||||
+++ b/cryptlib.c
|
|
||||||
@@ -381,7 +381,11 @@ int cryptodev_hash_init(struct hash_data *hdata, const char *alg_name,
|
|
||||||
}
|
|
||||||
|
|
||||||
hdata->digestsize = crypto_ahash_digestsize(hdata->async.s);
|
|
||||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 7, 0))
|
|
||||||
hdata->alignmask = crypto_ahash_alignmask(hdata->async.s);
|
|
||||||
+#else
|
|
||||||
+ hdata->alignmask = 0;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
init_completion(&hdata->async.result.completion);
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,721 +0,0 @@
|
||||||
#
|
|
||||||
# Copyright (C) 2006-2011 OpenWrt.org
|
|
||||||
#
|
|
||||||
# This is free software, licensed under the GNU General Public License v2.
|
|
||||||
# See /LICENSE for more information.
|
|
||||||
#
|
|
||||||
|
|
||||||
FS_MENU:=Filesystems
|
|
||||||
|
|
||||||
define KernelPackage/fs-9p
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=Plan 9 Resource Sharing Support
|
|
||||||
DEPENDS:=+kmod-9pnet +LINUX_6_1:kmod-fs-netfs
|
|
||||||
KCONFIG:=\
|
|
||||||
CONFIG_9P_FS \
|
|
||||||
CONFIG_9P_FS_POSIX_ACL=n \
|
|
||||||
CONFIG_9P_FS_SECURITY=n \
|
|
||||||
CONFIG_9P_FSCACHE=n
|
|
||||||
FILES:=$(LINUX_DIR)/fs/9p/9p.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,9p)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-9p/description
|
|
||||||
Kernel module for Plan 9 Resource Sharing Support support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-9p))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-afs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=Andrew FileSystem client
|
|
||||||
DEFAULT:=n
|
|
||||||
DEPENDS:=+kmod-rxrpc +kmod-dnsresolver +kmod-fs-fscache
|
|
||||||
KCONFIG:=\
|
|
||||||
CONFIG_AFS_FS=m \
|
|
||||||
CONFIG_AFS_DEBUG=n \
|
|
||||||
CONFIG_AFS_FSCACHE=y
|
|
||||||
FILES:=$(LINUX_DIR)/fs/afs/kafs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,kafs)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-afs/description
|
|
||||||
Kernel module for Andrew FileSystem client support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-afs))
|
|
||||||
|
|
||||||
define KernelPackage/fs-autofs4
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=AUTOFS4 filesystem support
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_AUTOFS4_FS \
|
|
||||||
CONFIG_AUTOFS_FS
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/fs/autofs/autofs4.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,autofs4)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-autofs4/description
|
|
||||||
Kernel module for AutoFS4 support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-autofs4))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-btrfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=BTRFS filesystem support
|
|
||||||
DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd
|
|
||||||
KCONFIG:=\
|
|
||||||
CONFIG_BTRFS_FS \
|
|
||||||
CONFIG_BTRFS_FS_CHECK_INTEGRITY=n
|
|
||||||
FILES:=\
|
|
||||||
$(LINUX_DIR)/fs/btrfs/btrfs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,btrfs,1)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-btrfs/description
|
|
||||||
Kernel module for BTRFS support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-btrfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-smbfs-common
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=SMBFS common dependencies support
|
|
||||||
HIDDEN:=1
|
|
||||||
KCONFIG:=\
|
|
||||||
CONFIG_SMBFS_COMMON@lt6.1 \
|
|
||||||
CONFIG_SMBFS@ge6.1
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko@lt6.1 \
|
|
||||||
$(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko@lt6.1 \
|
|
||||||
$(LINUX_DIR)/fs/smb/common/cifs_arc4.ko@ge6.1 \
|
|
||||||
$(LINUX_DIR)/fs/smb/common/cifs_md4.ko@ge6.1
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-smbfs-common/description
|
|
||||||
Kernel module dependency for CIFS or SMB_SERVER support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-smbfs-common))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-cifs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=CIFS support
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_CIFS \
|
|
||||||
CONFIG_CIFS_DFS_UPCALL=n \
|
|
||||||
CONFIG_CIFS_UPCALL=n
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/fs/cifs/cifs.ko@lt6.1 \
|
|
||||||
$(LINUX_DIR)/fs/smb/client/cifs.ko@ge6.1
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,cifs)
|
|
||||||
$(call AddDepends/nls)
|
|
||||||
DEPENDS+= \
|
|
||||||
+kmod-fs-smbfs-common \
|
|
||||||
+kmod-crypto-md5 \
|
|
||||||
+kmod-crypto-sha256 \
|
|
||||||
+kmod-crypto-sha512 \
|
|
||||||
+kmod-crypto-cmac \
|
|
||||||
+kmod-crypto-hmac \
|
|
||||||
+kmod-crypto-aead \
|
|
||||||
+kmod-crypto-ccm \
|
|
||||||
+kmod-crypto-ecb \
|
|
||||||
+kmod-crypto-des \
|
|
||||||
+kmod-asn1-decoder \
|
|
||||||
+kmod-oid-registry \
|
|
||||||
+kmod-dnsresolver
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-cifs/description
|
|
||||||
Kernel module for CIFS support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-cifs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-configfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=Configuration filesystem support
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_CONFIGFS_FS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/configfs/configfs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,configfs)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-configfs/description
|
|
||||||
Kernel module for configfs support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-configfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-cramfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=Compressed RAM/ROM filesystem support
|
|
||||||
DEPENDS:=+kmod-lib-zlib-inflate
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_CRAMFS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/cramfs/cramfs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,cramfs)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-cramfs/description
|
|
||||||
Kernel module for cramfs support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-cramfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-efivarfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=efivar filesystem support
|
|
||||||
KCONFIG:=CONFIG_EFIVAR_FS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/efivarfs/efivarfs.ko
|
|
||||||
DEPENDS:=@(x86_64||x86)
|
|
||||||
AUTOLOAD:=$(call Autoload,90,efivarfs)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-efivarfs/description
|
|
||||||
Kernel module to support efivarfs file system mountpoint.
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-efivarfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-exfat
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=exFAT filesystem support
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_EXFAT_FS \
|
|
||||||
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
|
|
||||||
FILES:= $(LINUX_DIR)/fs/exfat/exfat.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,exfat,1)
|
|
||||||
DEPENDS:=+kmod-nls-base
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-exfat/description
|
|
||||||
Kernel module for exFAT filesystem support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-exfat))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-exportfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=exportfs kernel server support
|
|
||||||
KCONFIG:=CONFIG_EXPORTFS
|
|
||||||
FILES=$(LINUX_DIR)/fs/exportfs/exportfs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,20,exportfs,1)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-exportfs/description
|
|
||||||
Kernel module for exportfs. Needed for some other modules.
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-exportfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-ext4
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=EXT4 filesystem support
|
|
||||||
DEPENDS := \
|
|
||||||
+kmod-lib-crc16 \
|
|
||||||
+kmod-crypto-hash \
|
|
||||||
+kmod-crypto-crc32c
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_EXT4_FS \
|
|
||||||
CONFIG_EXT4_ENCRYPTION=n \
|
|
||||||
CONFIG_JBD2
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/fs/ext4/ext4.ko \
|
|
||||||
$(LINUX_DIR)/fs/jbd2/jbd2.ko \
|
|
||||||
$(LINUX_DIR)/fs/mbcache.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,mbcache jbd2 ext4,1)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-ext4/description
|
|
||||||
Kernel module for EXT4 filesystem support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-ext4))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-f2fs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=F2FS filesystem support
|
|
||||||
DEPENDS:= +kmod-crypto-hash +kmod-crypto-crc32 +kmod-nls-base
|
|
||||||
KCONFIG:=CONFIG_F2FS_FS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/f2fs/f2fs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,f2fs,1)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-f2fs/description
|
|
||||||
Kernel module for F2FS filesystem support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-f2fs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-fscache
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=General filesystem local cache manager
|
|
||||||
DEPENDS:=+kmod-fs-netfs
|
|
||||||
KCONFIG:=\
|
|
||||||
CONFIG_FSCACHE \
|
|
||||||
CONFIG_FSCACHE_STATS=y \
|
|
||||||
CONFIG_FSCACHE_HISTOGRAM=n \
|
|
||||||
CONFIG_FSCACHE_DEBUG=n \
|
|
||||||
CONFIG_FSCACHE_OBJECT_LIST=n \
|
|
||||||
CONFIG_CACHEFILES \
|
|
||||||
CONFIG_CACHEFILES_DEBUG=n \
|
|
||||||
CONFIG_CACHEFILES_HISTOGRAM=n \
|
|
||||||
CONFIG_CACHEFILES_ERROR_INJECTION=n@ge5.17 \
|
|
||||||
CONFIG_CACHEFILES_ONDEMAND=n@ge5.19
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/fs/fscache/fscache.ko \
|
|
||||||
$(LINUX_DIR)/fs/cachefiles/cachefiles.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,29,fscache cachefiles)
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-fscache))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-hfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=HFS filesystem support
|
|
||||||
DEPENDS:=+kmod-cdrom
|
|
||||||
KCONFIG:=CONFIG_HFS_FS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/hfs/hfs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,hfs)
|
|
||||||
$(call AddDepends/nls)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-hfs/description
|
|
||||||
Kernel module for HFS filesystem support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-hfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-hfsplus
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=HFS+ filesystem support
|
|
||||||
DEPENDS:=+kmod-cdrom
|
|
||||||
KCONFIG:=CONFIG_HFSPLUS_FS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,hfsplus)
|
|
||||||
$(call AddDepends/nls,utf8)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-hfsplus/description
|
|
||||||
Kernel module for HFS+ filesystem support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-hfsplus))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-isofs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=ISO9660 filesystem support
|
|
||||||
DEPENDS:=+kmod-lib-zlib-inflate +kmod-cdrom
|
|
||||||
KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n
|
|
||||||
FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,isofs)
|
|
||||||
$(call AddDepends/nls)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-isofs/description
|
|
||||||
Kernel module for ISO9660 filesystem support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-isofs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-jfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=JFS filesystem support
|
|
||||||
KCONFIG:=CONFIG_JFS_FS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/jfs/jfs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,jfs,1)
|
|
||||||
$(call AddDepends/nls)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-jfs/description
|
|
||||||
Kernel module for JFS support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-jfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-ksmbd
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=SMB kernel server support
|
|
||||||
DEPENDS:= \
|
|
||||||
+kmod-nls-base \
|
|
||||||
+kmod-nls-utf8 \
|
|
||||||
+kmod-crypto-md4 \
|
|
||||||
+kmod-crypto-md5 \
|
|
||||||
+kmod-crypto-hmac \
|
|
||||||
+kmod-crypto-ecb \
|
|
||||||
+kmod-crypto-des \
|
|
||||||
+kmod-crypto-sha256 \
|
|
||||||
+kmod-crypto-cmac \
|
|
||||||
+kmod-crypto-sha512 \
|
|
||||||
+kmod-crypto-aead \
|
|
||||||
+kmod-crypto-ccm \
|
|
||||||
+kmod-crypto-gcm \
|
|
||||||
+kmod-asn1-decoder \
|
|
||||||
+kmod-oid-registry \
|
|
||||||
+kmod-fs-smbfs-common
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_SMB_SERVER \
|
|
||||||
CONFIG_SMB_SERVER_SMBDIRECT=n \
|
|
||||||
CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=n \
|
|
||||||
CONFIG_SMB_SERVER_KERBEROS5=n
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/fs/ksmbd/ksmbd.ko@lt6.1 \
|
|
||||||
$(LINUX_DIR)/fs/smb/server/ksmbd.ko@ge6.1
|
|
||||||
AUTOLOAD:=$(call AutoLoad,41,ksmbd)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-ksmbd/description
|
|
||||||
Kernel module for SMB kernel server support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-ksmbd))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-minix
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=Minix filesystem support
|
|
||||||
KCONFIG:=CONFIG_MINIX_FS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/minix/minix.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,minix)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-minix/description
|
|
||||||
Kernel module for Minix filesystem support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-minix))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-msdos
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=MSDOS filesystem support
|
|
||||||
DEPENDS:=+kmod-fs-vfat
|
|
||||||
KCONFIG:=CONFIG_MSDOS_FS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/fat/msdos.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,40,msdos)
|
|
||||||
$(call AddDepends/nls)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-msdos/description
|
|
||||||
Kernel module for MSDOS filesystem support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-msdos))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-netfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=Network Filesystems support
|
|
||||||
KCONFIG:= CONFIG_NETFS_SUPPORT
|
|
||||||
FILES:=$(LINUX_DIR)/fs/netfs/netfs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,28,netfs)
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-netfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-nfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=NFS filesystem client support
|
|
||||||
DEPENDS:=+kmod-fs-nfs-common +kmod-dnsresolver
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_NFS_FS \
|
|
||||||
CONFIG_NFS_USE_LEGACY_DNS=n \
|
|
||||||
CONFIG_NFS_USE_NEW_IDMAPPER=n
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/fs/nfs/nfs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,40,nfs)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-nfs/description
|
|
||||||
Kernel module for NFS client support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-nfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-nfs-common
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=Common NFS filesystem modules
|
|
||||||
DEPENDS:=+kmod-oid-registry
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_LOCKD \
|
|
||||||
CONFIG_SUNRPC \
|
|
||||||
CONFIG_GRACE_PERIOD \
|
|
||||||
CONFIG_NFS_V4=y \
|
|
||||||
CONFIG_NFS_V4_1=y \
|
|
||||||
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" \
|
|
||||||
CONFIG_NFS_V4_1_MIGRATION=n \
|
|
||||||
CONFIG_NFS_V4_2=y \
|
|
||||||
CONFIG_NFS_V4_2_READ_PLUS=n
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/fs/lockd/lockd.ko \
|
|
||||||
$(LINUX_DIR)/net/sunrpc/sunrpc.ko \
|
|
||||||
$(LINUX_DIR)/fs/nfs_common/grace.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd)
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-nfs-common))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-nfs-common-rpcsec
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=NFS Secure RPC
|
|
||||||
DEPENDS:= \
|
|
||||||
+kmod-fs-nfs-common \
|
|
||||||
+kmod-crypto-des \
|
|
||||||
+kmod-crypto-cbc \
|
|
||||||
+kmod-crypto-cts \
|
|
||||||
+kmod-crypto-md5 \
|
|
||||||
+kmod-crypto-sha1 \
|
|
||||||
+kmod-crypto-hmac \
|
|
||||||
+kmod-crypto-ecb \
|
|
||||||
+kmod-crypto-arc4
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_SUNRPC_GSS \
|
|
||||||
CONFIG_RPCSEC_GSS_KRB5
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.ko \
|
|
||||||
$(LINUX_DIR)/net/sunrpc/auth_gss/rpcsec_gss_krb5.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,31,auth_rpcgss rpcsec_gss_krb5)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-nfs-common-rpcsec/description
|
|
||||||
Kernel modules for NFS Secure RPC
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-nfs-common-rpcsec))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-nfs-v3
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=NFS3 filesystem client support
|
|
||||||
DEPENDS:=+kmod-fs-nfs
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/fs/nfs/nfsv3.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,41,nfsv3)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-nfs-v3/description
|
|
||||||
Kernel module for NFS v3 client support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-nfs-v3))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-nfs-v4
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=NFS4 filesystem client support
|
|
||||||
DEPENDS:=+kmod-fs-nfs
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_NFS_V4=y
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/fs/nfs/nfsv4.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,41,nfsv4)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-nfs-v4/description
|
|
||||||
Kernel module for NFS v4 client support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-nfs-v4))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-nfsd
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=NFS kernel server support
|
|
||||||
DEPENDS:=+kmod-fs-nfs-common +kmod-fs-exportfs +kmod-fs-nfs-common-rpcsec
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_NFSD \
|
|
||||||
CONFIG_NFSD_V4=y \
|
|
||||||
CONFIG_NFSD_V4_SECURITY_LABEL=n \
|
|
||||||
CONFIG_NFSD_BLOCKLAYOUT=n \
|
|
||||||
CONFIG_NFSD_SCSILAYOUT=n \
|
|
||||||
CONFIG_NFSD_FLEXFILELAYOUT=n \
|
|
||||||
CONFIG_NFSD_FAULT_INJECTION=n \
|
|
||||||
CONFIG_NFSD_V4_2_INTER_SSC=n
|
|
||||||
FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,40,nfsd)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-nfsd/description
|
|
||||||
Kernel module for NFS kernel server support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-nfsd))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-ntfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=NTFS filesystem read-only (old driver) support
|
|
||||||
KCONFIG:=CONFIG_NTFS_FS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,ntfs)
|
|
||||||
$(call AddDepends/nls)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-ntfs/description
|
|
||||||
Kernel module for limited NTFS filesystem support. Support for writing
|
|
||||||
is extremely limited and disabled as a result.
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-ntfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-ntfs3
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=NTFS filesystem read & write (new driver) support
|
|
||||||
KCONFIG:= CONFIG_NTFS3_FS CONFIG_NTFS3_FS_POSIX_ACL=y
|
|
||||||
FILES:=$(LINUX_DIR)/fs/ntfs3/ntfs3.ko
|
|
||||||
$(call AddDepends/nls)
|
|
||||||
AUTOLOAD:=$(call AutoLoad,80,ntfs3)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-ntfs3/description
|
|
||||||
Kernel module for fully functional NTFS filesystem support. It allows
|
|
||||||
reading as well as writing.
|
|
||||||
|
|
||||||
It supports NTFS versions up to 3.1.
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-ntfs3))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-reiserfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=ReiserFS filesystem support
|
|
||||||
KCONFIG:=CONFIG_REISERFS_FS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,reiserfs,1)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-reiserfs/description
|
|
||||||
Kernel module for ReiserFS support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-reiserfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-squashfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=SquashFS 4.0 filesystem support
|
|
||||||
KCONFIG:=CONFIG_SQUASHFS \
|
|
||||||
CONFIG_SQUASHFS_XZ=y
|
|
||||||
FILES:=$(LINUX_DIR)/fs/squashfs/squashfs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,squashfs,1)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-squashfs/description
|
|
||||||
Kernel module for SquashFS 4.0 support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-squashfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-udf
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=UDF filesystem support
|
|
||||||
KCONFIG:=CONFIG_UDF_FS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/udf/udf.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,udf)
|
|
||||||
DEPENDS:=+kmod-lib-crc-itu-t +kmod-cdrom
|
|
||||||
$(call AddDepends/nls)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-udf/description
|
|
||||||
Kernel module for UDF filesystem support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-udf))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-vfat
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=VFAT filesystem support
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_FAT_FS \
|
|
||||||
CONFIG_VFAT_FS
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/fs/fat/fat.ko \
|
|
||||||
$(LINUX_DIR)/fs/fat/vfat.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,fat vfat,1)
|
|
||||||
$(call AddDepends/nls,cp437 iso8859-1 utf8)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-vfat/description
|
|
||||||
Kernel module for VFAT filesystem support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-vfat))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fs-xfs
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=XFS filesystem support
|
|
||||||
KCONFIG:=CONFIG_XFS_FS
|
|
||||||
DEPENDS:= +kmod-fs-exportfs +kmod-lib-crc32c
|
|
||||||
FILES:=$(LINUX_DIR)/fs/xfs/xfs.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,xfs,1)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fs-xfs/description
|
|
||||||
Kernel module for XFS support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fs-xfs))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/fuse
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=FUSE (Filesystem in Userspace) support
|
|
||||||
KCONFIG:= CONFIG_FUSE_FS
|
|
||||||
FILES:=$(LINUX_DIR)/fs/fuse/fuse.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,80,fuse)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/fuse/description
|
|
||||||
Kernel module for userspace filesystem support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,fuse))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/pstore
|
|
||||||
SUBMENU:=$(FS_MENU)
|
|
||||||
TITLE:=Pstore file system
|
|
||||||
DEFAULT:=m if ALL_KMODS
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_PSTORE \
|
|
||||||
CONFIG_PSTORE_COMPRESS=y \
|
|
||||||
CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" \
|
|
||||||
CONFIG_PSTORE_DEFLATE_COMPRESS=y \
|
|
||||||
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
|
|
||||||
FILES:= $(LINUX_DIR)/fs/pstore/pstore.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,pstore,1)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/pstore/description
|
|
||||||
Kernel module for pstore filesystem support
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,pstore))
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,140 +0,0 @@
|
||||||
#
|
|
||||||
# Copyright (C) 2016 Yousong Zhou <yszhou4tech@gmail.com>
|
|
||||||
#
|
|
||||||
# This is free software, licensed under the GNU General Public License v2.
|
|
||||||
# See /LICENSE for more information.
|
|
||||||
#
|
|
||||||
define KernelPackage/irqbypass
|
|
||||||
SUBMENU:=Virtualization
|
|
||||||
TITLE:=IRQ offload/bypass manager
|
|
||||||
KCONFIG:=CONFIG_IRQ_BYPASS_MANAGER
|
|
||||||
HIDDEN:=1
|
|
||||||
FILES:= $(LINUX_DIR)/virt/lib/irqbypass.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,irqbypass.ko)
|
|
||||||
endef
|
|
||||||
$(eval $(call KernelPackage,irqbypass))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/kvm-x86
|
|
||||||
SUBMENU:=Virtualization
|
|
||||||
TITLE:=Kernel-based Virtual Machine (KVM) support
|
|
||||||
DEPENDS:=@TARGET_x86_generic||TARGET_x86_64 +kmod-irqbypass
|
|
||||||
KCONFIG:=\
|
|
||||||
CONFIG_KVM \
|
|
||||||
CONFIG_KVM_MMU_AUDIT=n \
|
|
||||||
CONFIG_VIRTUALIZATION=y
|
|
||||||
FILES:= $(LINUX_DIR)/arch/$(LINUX_KARCH)/kvm/kvm.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,kvm.ko)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/kvm-x86/description
|
|
||||||
Support hosting fully virtualized guest machines using hardware
|
|
||||||
virtualization extensions. You will need a fairly recent
|
|
||||||
processor equipped with virtualization extensions. You will also
|
|
||||||
need to select one or more of the processor modules.
|
|
||||||
|
|
||||||
This module provides access to the hardware capabilities through
|
|
||||||
a character device node named /dev/kvm.
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,kvm-x86))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/kvm-intel
|
|
||||||
SUBMENU:=Virtualization
|
|
||||||
TITLE:=KVM for Intel processors support
|
|
||||||
DEPENDS:=+kmod-kvm-x86
|
|
||||||
KCONFIG:=CONFIG_KVM_INTEL
|
|
||||||
FILES:= $(LINUX_DIR)/arch/$(LINUX_KARCH)/kvm/kvm-intel.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,kvm-intel.ko)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/kvm-intel/description
|
|
||||||
Provides support for KVM on Intel processors equipped with the VT
|
|
||||||
extensions.
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,kvm-intel))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/kvm-amd
|
|
||||||
SUBMENU:=Virtualization
|
|
||||||
TITLE:=KVM for AMD processors support
|
|
||||||
DEPENDS:=+kmod-kvm-x86
|
|
||||||
KCONFIG:=CONFIG_KVM_AMD
|
|
||||||
FILES:= $(LINUX_DIR)/arch/$(LINUX_KARCH)/kvm/kvm-amd.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,kvm-amd.ko)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/kvm-amd/description
|
|
||||||
Provides support for KVM on AMD processors equipped with the AMD-V
|
|
||||||
(SVM) extensions.
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,kvm-amd))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/vfio
|
|
||||||
SUBMENU:=Virtualization
|
|
||||||
TITLE:=VFIO Non-Privileged userspace driver framework
|
|
||||||
DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_VFIO \
|
|
||||||
CONFIG_VFIO_NOIOMMU=n \
|
|
||||||
CONFIG_VFIO_MDEV=n
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/drivers/vfio/vfio.ko \
|
|
||||||
$(LINUX_DIR)/drivers/vfio/vfio_iommu_type1.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,vfio vfio_iommu_type1)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/vfio/description
|
|
||||||
VFIO provides a framework for secure userspace device drivers.
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,vfio))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/vfio-pci
|
|
||||||
SUBMENU:=Virtualization
|
|
||||||
TITLE:=Generic VFIO support for any PCI device
|
|
||||||
DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 @PCI_SUPPORT +kmod-vfio +kmod-irqbypass
|
|
||||||
KCONFIG:= \
|
|
||||||
CONFIG_VFIO_PCI \
|
|
||||||
CONFIG_VFIO_PCI_IGD=n
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/drivers/vfio/pci/vfio-pci-core.ko \
|
|
||||||
$(LINUX_DIR)/drivers/vfio/pci/vfio-pci.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,vfio-pci)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/vfio-pci/description
|
|
||||||
Support for the generic PCI VFIO bus driver which can connect any PCI
|
|
||||||
device to the VFIO framework.
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,vfio-pci))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/vhost
|
|
||||||
SUBMENU:=Virtualization
|
|
||||||
TITLE:=Host kernel accelerator for virtio (base)
|
|
||||||
KCONFIG:=CONFIG_VHOST
|
|
||||||
FILES:=$(LINUX_DIR)/drivers/vhost/vhost.ko \
|
|
||||||
$(LINUX_DIR)/drivers/vhost/vhost_iotlb.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,vhost vhost_iotlb)
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,vhost))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/vhost-net
|
|
||||||
SUBMENU:=Virtualization
|
|
||||||
TITLE:=Host kernel accelerator for virtio-net
|
|
||||||
DEPENDS:=+kmod-tun +kmod-vhost
|
|
||||||
KCONFIG:=CONFIG_VHOST_NET
|
|
||||||
FILES:=$(LINUX_DIR)/drivers/vhost/vhost_net.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,vhost_net)
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,vhost-net))
|
|
|
@ -1,31 +0,0 @@
|
||||||
--- a/backport-include/net/genetlink.h 2023-10-19 17:24:48.721119999 +0200
|
|
||||||
+++ b/backport-include/net/genetlink.h 2023-10-19 17:35:11.810569190 +0200
|
|
||||||
@@ -3,6 +3,7 @@
|
|
||||||
#include_next <net/genetlink.h>
|
|
||||||
#include <linux/version.h>
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_IS_LESS(6,5,0)
|
|
||||||
static inline void __bp_genl_info_userhdr_set(struct genl_info *info,
|
|
||||||
void *userhdr)
|
|
||||||
{
|
|
||||||
@@ -13,6 +14,7 @@
|
|
||||||
{
|
|
||||||
return info->userhdr;
|
|
||||||
}
|
|
||||||
+#endif /* < 6.5.0 */
|
|
||||||
|
|
||||||
#if LINUX_VERSION_IS_LESS(4,12,0)
|
|
||||||
#define GENL_SET_ERR_MSG(info, msg) NL_SET_ERR_MSG(genl_info_extack(info), msg)
|
|
||||||
@@ -47,10 +47,12 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
/* this gets put in place of info->userhdr, since we use that above */
|
|
||||||
+#if LINUX_VERSION_IS_LESS(6,5,0)
|
|
||||||
static inline void *genl_info_userhdr(struct genl_info *info)
|
|
||||||
{
|
|
||||||
return (u8 *)info->genlhdr + GENL_HDRLEN;
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#if LINUX_VERSION_IS_LESS(4,10,0)
|
|
||||||
#define __genl_ro_after_init
|
|
|
@ -1,658 +0,0 @@
|
||||||
include $(TOPDIR)/rules.mk
|
|
||||||
|
|
||||||
PKG_NAME:=mt76
|
|
||||||
PKG_RELEASE=1
|
|
||||||
|
|
||||||
PKG_LICENSE:=GPLv2
|
|
||||||
PKG_LICENSE_FILES:=
|
|
||||||
|
|
||||||
PKG_SOURCE_URL:=https://github.com/openwrt/mt76
|
|
||||||
PKG_SOURCE_PROTO:=git
|
|
||||||
PKG_SOURCE_DATE:=2024-01-18
|
|
||||||
PKG_SOURCE_VERSION:=f77188160441d5f77f08dd517632ae3f60c653b0
|
|
||||||
PKG_MIRROR_HASH:=133a5e44624fe1933c893ee0b8ac75a847753f3490c26518c2ed9798f9ef53e0
|
|
||||||
|
|
||||||
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
|
||||||
PKG_USE_NINJA:=0
|
|
||||||
PKG_BUILD_PARALLEL:=1
|
|
||||||
|
|
||||||
PKG_CONFIG_DEPENDS += \
|
|
||||||
CONFIG_PACKAGE_kmod-mt76-usb \
|
|
||||||
CONFIG_PACKAGE_kmod-mt76x02-common \
|
|
||||||
CONFIG_PACKAGE_kmod-mt76x0-common \
|
|
||||||
CONFIG_PACKAGE_kmod-mt76x0u \
|
|
||||||
CONFIG_PACKAGE_kmod-mt76x2-common \
|
|
||||||
CONFIG_PACKAGE_kmod-mt76x2 \
|
|
||||||
CONFIG_PACKAGE_kmod-mt76x2u \
|
|
||||||
CONFIG_PACKAGE_kmod-mt7603 \
|
|
||||||
CONFIG_PACKAGE_CFG80211_TESTMODE
|
|
||||||
|
|
||||||
STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
|
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/kernel.mk
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
|
||||||
include $(INCLUDE_DIR)/cmake.mk
|
|
||||||
|
|
||||||
CMAKE_SOURCE_DIR:=$(PKG_BUILD_DIR)/tools
|
|
||||||
CMAKE_BINARY_DIR:=$(PKG_BUILD_DIR)/tools
|
|
||||||
|
|
||||||
define KernelPackage/mt76-default
|
|
||||||
SUBMENU:=Wireless Drivers
|
|
||||||
DEPENDS:= \
|
|
||||||
+kmod-mac80211 \
|
|
||||||
+@DRIVER_11AC_SUPPORT \
|
|
||||||
+@KERNEL_PAGE_POOL
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76
|
|
||||||
SUBMENU:=Wireless Drivers
|
|
||||||
TITLE:=MediaTek MT76x2/MT7603 wireless driver (metapackage)
|
|
||||||
DEPENDS:= \
|
|
||||||
+kmod-mt76-core +kmod-mt76x2 +kmod-mt7603
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76-core
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT76xx wireless driver
|
|
||||||
HIDDEN:=1
|
|
||||||
FILES:=\
|
|
||||||
$(PKG_BUILD_DIR)/mt76.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76-usb
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT76xx wireless driver USB support
|
|
||||||
DEPENDS += +kmod-usb-core +kmod-mt76-core
|
|
||||||
HIDDEN:=1
|
|
||||||
FILES:=\
|
|
||||||
$(PKG_BUILD_DIR)/mt76-usb.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76x02-usb
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT76x0/MT76x2 USB wireless driver common code
|
|
||||||
DEPENDS+=+kmod-mt76-usb +kmod-mt76x02-common
|
|
||||||
HIDDEN:=1
|
|
||||||
FILES:=$(PKG_BUILD_DIR)/mt76x02-usb.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76x02-common
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT76x0/MT76x2 wireless driver common code
|
|
||||||
DEPENDS+=+kmod-mt76-core
|
|
||||||
HIDDEN:=1
|
|
||||||
FILES:=$(PKG_BUILD_DIR)/mt76x02-lib.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76x0-common
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT76x0 wireless driver common code
|
|
||||||
DEPENDS+=+kmod-mt76x02-common
|
|
||||||
HIDDEN:=1
|
|
||||||
FILES:=$(PKG_BUILD_DIR)/mt76x0/mt76x0-common.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76x0e
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT76x0E wireless driver
|
|
||||||
DEPENDS+=@PCI_SUPPORT +kmod-mt76x0-common
|
|
||||||
FILES:=\
|
|
||||||
$(PKG_BUILD_DIR)/mt76x0/mt76x0e.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt76x0e)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76x0u
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT76x0U wireless driver
|
|
||||||
DEPENDS+=+kmod-mt76x0-common +kmod-mt76x02-usb
|
|
||||||
FILES:=\
|
|
||||||
$(PKG_BUILD_DIR)/mt76x0/mt76x0u.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt76x0u)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76x2-common
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT76x2 wireless driver common code
|
|
||||||
DEPENDS+=+kmod-mt76-core +kmod-mt76x02-common
|
|
||||||
HIDDEN:=1
|
|
||||||
FILES:=$(PKG_BUILD_DIR)/mt76x2/mt76x2-common.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76x2u
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT76x2U wireless driver
|
|
||||||
DEPENDS+=+kmod-mt76x2-common +kmod-mt76x02-usb
|
|
||||||
FILES:=\
|
|
||||||
$(PKG_BUILD_DIR)/mt76x2/mt76x2u.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt76x2u)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76x2
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT76x2 wireless driver
|
|
||||||
DEPENDS+=@PCI_SUPPORT +kmod-mt76x2-common
|
|
||||||
FILES:=\
|
|
||||||
$(PKG_BUILD_DIR)/mt76x2/mt76x2e.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt76x2e)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7603
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7603 wireless driver
|
|
||||||
DEPENDS+=@PCI_SUPPORT +kmod-mt76-core
|
|
||||||
FILES:=\
|
|
||||||
$(PKG_BUILD_DIR)/mt7603/mt7603e.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt7603e)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76-connac
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7615/MT79xx wireless driver common code
|
|
||||||
HIDDEN:=1
|
|
||||||
DEPENDS+=+kmod-mt76-core
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt76-connac-lib.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76-sdio
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7615/MT79xx SDIO driver common code
|
|
||||||
HIDDEN:=1
|
|
||||||
DEPENDS+=+kmod-mt76-core +kmod-mmc
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt76-sdio.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7615-common
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7615 wireless driver common code
|
|
||||||
HIDDEN:=1
|
|
||||||
DEPENDS+=@PCI_SUPPORT +kmod-mt76-core +kmod-mt76-connac +kmod-hwmon-core
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt7615/mt7615-common.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7615-firmware
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7615e firmware
|
|
||||||
DEPENDS+=+kmod-mt7615e
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7615e
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7615e wireless driver
|
|
||||||
DEPENDS+=@PCI_SUPPORT +kmod-mt7615-common
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt7615/mt7615e.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt7615e)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7622-firmware
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7622 firmware
|
|
||||||
DEPENDS+=+kmod-mt7615e
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7663-firmware-ap
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7663e firmware (optimized for AP)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7663-firmware-sta
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7663e firmware (client mode offload)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7663-usb-sdio
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7663 USB/SDIO shared code
|
|
||||||
DEPENDS+=+kmod-mt7615-common
|
|
||||||
HIDDEN:=1
|
|
||||||
FILES:= \
|
|
||||||
$(PKG_BUILD_DIR)/mt7615/mt7663-usb-sdio-common.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7663s
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7663s wireless driver
|
|
||||||
DEPENDS+=+kmod-mt76-sdio +kmod-mt7615-common +kmod-mt7663-usb-sdio
|
|
||||||
FILES:= \
|
|
||||||
$(PKG_BUILD_DIR)/mt7615/mt7663s.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt7663s)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7663u
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7663u wireless driver
|
|
||||||
DEPENDS+=+kmod-mt76-usb +kmod-mt7615-common +kmod-mt7663-usb-sdio
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt7615/mt7663u.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt7663u)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7915-firmware
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7915 firmware
|
|
||||||
DEPENDS+=+kmod-mt7915e
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7915e
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7915e wireless driver
|
|
||||||
DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt7915/mt7915e.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt7915e)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7916-firmware
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
DEPENDS+=+kmod-mt7915e
|
|
||||||
TITLE:=MediaTek MT7916 firmware
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7981-firmware
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
DEPENDS:=@TARGET_mediatek_filogic
|
|
||||||
TITLE:=MediaTek MT7981 firmware
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7986-firmware
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
DEPENDS:=@TARGET_mediatek_filogic
|
|
||||||
TITLE:=MediaTek MT7986 firmware
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7921-firmware
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7921 firmware
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7922-firmware
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7922 firmware
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt792x-common
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT792x wireless driver common code
|
|
||||||
HIDDEN:=1
|
|
||||||
DEPENDS+=+kmod-mt76-connac +@DRIVER_11AX_SUPPORT
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt792x-lib.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt792x-usb
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT792x wireless driver USB code
|
|
||||||
HIDDEN:=1
|
|
||||||
DEPENDS+=+kmod-mt792x-common +kmod-mt76-usb +@DRIVER_11AX_SUPPORT
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt792x-usb.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7921-common
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7921 wireless driver common code
|
|
||||||
HIDDEN:=1
|
|
||||||
DEPENDS+=+kmod-mt792x-common +kmod-mt7921-firmware +@DRIVER_11AX_SUPPORT +kmod-hwmon-core
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt7921/mt7921-common.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7921u
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7921U wireless driver
|
|
||||||
DEPENDS+=+kmod-mt792x-usb +kmod-mt7921-common
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt7921/mt7921u.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt7921u)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7921s
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7921S wireless driver
|
|
||||||
DEPENDS+=+kmod-mt76-sdio +kmod-mt7921-common
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt7921/mt7921s.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt7921s)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7921e
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7921e wireless driver
|
|
||||||
DEPENDS+=@PCI_SUPPORT +kmod-mt7921-common
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt7921/mt7921e.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt7921e)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7996e
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7996E wireless driver
|
|
||||||
DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt7996/mt7996e.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt7996e)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7925-common
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7925 wireless driver common code
|
|
||||||
HIDDEN:=1
|
|
||||||
DEPENDS+=+kmod-mt792x-common +@DRIVER_11AX_SUPPORT +kmod-hwmon-core
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt7925/mt7925-common.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7925u
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7925U wireless driver
|
|
||||||
DEPENDS+=+kmod-mt792x-usb +kmod-mt7925-common
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt7925/mt7925u.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt7921u)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7925e
|
|
||||||
$(KernelPackage/mt76-default)
|
|
||||||
TITLE:=MediaTek MT7925e wireless driver
|
|
||||||
DEPENDS+=@PCI_SUPPORT +kmod-mt7925-common
|
|
||||||
FILES:= $(PKG_BUILD_DIR)/mt7925/mt7925e.ko
|
|
||||||
AUTOLOAD:=$(call AutoProbe,mt7921e)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/mt76-test
|
|
||||||
SECTION:=devel
|
|
||||||
CATEGORY:=Development
|
|
||||||
TITLE:=mt76 testmode CLI
|
|
||||||
DEPENDS:=kmod-mt76-core +libnl-tiny
|
|
||||||
endef
|
|
||||||
|
|
||||||
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny
|
|
||||||
|
|
||||||
NOSTDINC_FLAGS := \
|
|
||||||
$(KERNEL_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
|
|
||||||
|
|
||||||
ifdef CONFIG_PACKAGE_CFG80211_TESTMODE
|
|
||||||
NOSTDINC_FLAGS += -DCONFIG_NL80211_TESTMODE
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_NL80211_TESTMODE=y
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt76-usb
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT76_USB=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt76x02-common
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT76x02_LIB=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt76x02-usb
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT76x02_USB=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt76x0-common
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT76x0_COMMON=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt76x0e
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT76x0E=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt76x0u
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT76x0U=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt76x2-common
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT76x2_COMMON=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt76x2
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT76x2E=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt76x2u
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT76x2U=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7603
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7603E=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt76-connac
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT76_CONNAC_LIB=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt76-sdio
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT76_SDIO=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7615-common
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7615_COMMON=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7615e
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7615E=m
|
|
||||||
ifdef CONFIG_TARGET_mediatek_mt7622
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7622_WMAC=y
|
|
||||||
NOSTDINC_FLAGS += -DCONFIG_MT7622_WMAC
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7663-usb-sdio
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7663_USB_SDIO_COMMON=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7663s
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7663S=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7663u
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7663U=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7915e
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7915E=m
|
|
||||||
ifdef CONFIG_TARGET_mediatek_filogic
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT798X_WMAC=y
|
|
||||||
NOSTDINC_FLAGS += -DCONFIG_MT798X_WMAC
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt792x-common
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT792x_LIB=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt792x-usb
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT792x_USB=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7921-common
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7921_COMMON=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7921u
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7921U=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7921s
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7921S=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7921e
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7921E=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7996e
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7996E=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7925-common
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7925_COMMON=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7925u
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7925U=m
|
|
||||||
endif
|
|
||||||
ifdef CONFIG_PACKAGE_kmod-mt7925e
|
|
||||||
PKG_MAKE_FLAGS += CONFIG_MT7925E=m
|
|
||||||
endif
|
|
||||||
|
|
||||||
define Build/Compile
|
|
||||||
+$(KERNEL_MAKE) $(PKG_JOBS) \
|
|
||||||
$(PKG_MAKE_FLAGS) \
|
|
||||||
M="$(PKG_BUILD_DIR)" \
|
|
||||||
NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
|
|
||||||
modules
|
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR)/tools
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Build/Install
|
|
||||||
:
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/kmod-mt76/install
|
|
||||||
true
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76x0-common/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
cp \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7610e.bin \
|
|
||||||
$(1)/lib/firmware/mediatek
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76x2-common/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
cp \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7662_rom_patch.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7662.bin \
|
|
||||||
$(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76x0u/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
ln -sf mt7610e.bin $(1)/lib/firmware/mediatek/mt7610u.bin
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt76x2u/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
ln -sf ../mt7662.bin $(1)/lib/firmware/mediatek/mt7662u.bin
|
|
||||||
ln -sf ../mt7662_rom_patch.bin $(1)/lib/firmware/mediatek/mt7662u_rom_patch.bin
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7603/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware
|
|
||||||
cp $(if $(CONFIG_TARGET_ramips_mt76x8), \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7628_e1.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7628_e2.bin \
|
|
||||||
,\
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7603_e1.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7603_e2.bin \
|
|
||||||
) \
|
|
||||||
$(1)/lib/firmware
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7615-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
cp \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7615_cr4.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7615_n9.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7615_rom_patch.bin \
|
|
||||||
$(1)/lib/firmware/mediatek
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7622-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
cp \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7622_n9.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7622_rom_patch.bin \
|
|
||||||
$(1)/lib/firmware/mediatek
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7663-firmware-ap/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
cp \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7663_n9_rebb.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7663pr2h_rebb.bin \
|
|
||||||
$(1)/lib/firmware/mediatek
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7663-firmware-sta/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
cp \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7663_n9_v3.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7663pr2h.bin \
|
|
||||||
$(1)/lib/firmware/mediatek
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7915-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
cp \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7915_wa.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7915_wm.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7915_rom_patch.bin \
|
|
||||||
$(1)/lib/firmware/mediatek
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7916-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
cp \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7916_wa.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7916_wm.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7916_rom_patch.bin \
|
|
||||||
$(1)/lib/firmware/mediatek
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7981-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
cp \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7981_wa.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7981_wm.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7981_rom_patch.bin \
|
|
||||||
$(1)/lib/firmware/mediatek
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7986-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
cp \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7986_wa.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7986_wm_mt7975.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7986_wm.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7986_rom_patch_mt7975.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/mt7986_rom_patch.bin \
|
|
||||||
$(1)/lib/firmware/mediatek
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7921-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
cp \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/WIFI_MT7961_patch_mcu_1_2_hdr.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/WIFI_RAM_CODE_MT7961_1.bin \
|
|
||||||
$(1)/lib/firmware/mediatek
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/mt7922-firmware/install
|
|
||||||
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
|
|
||||||
cp \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin \
|
|
||||||
$(PKG_BUILD_DIR)/firmware/WIFI_RAM_CODE_MT7922_1.bin \
|
|
||||||
$(1)/lib/firmware/mediatek
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/mt76-test/install
|
|
||||||
mkdir -p $(1)/usr/sbin
|
|
||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,mt76-core))
|
|
||||||
$(eval $(call KernelPackage,mt76-usb))
|
|
||||||
$(eval $(call KernelPackage,mt76x02-usb))
|
|
||||||
$(eval $(call KernelPackage,mt76x02-common))
|
|
||||||
$(eval $(call KernelPackage,mt76x0-common))
|
|
||||||
$(eval $(call KernelPackage,mt76x0e))
|
|
||||||
$(eval $(call KernelPackage,mt76x0u))
|
|
||||||
$(eval $(call KernelPackage,mt76x2-common))
|
|
||||||
$(eval $(call KernelPackage,mt76x2u))
|
|
||||||
$(eval $(call KernelPackage,mt76x2))
|
|
||||||
$(eval $(call KernelPackage,mt7603))
|
|
||||||
$(eval $(call KernelPackage,mt76-connac))
|
|
||||||
$(eval $(call KernelPackage,mt76-sdio))
|
|
||||||
$(eval $(call KernelPackage,mt7615-common))
|
|
||||||
$(eval $(call KernelPackage,mt7615-firmware))
|
|
||||||
$(eval $(call KernelPackage,mt7622-firmware))
|
|
||||||
$(eval $(call KernelPackage,mt7615e))
|
|
||||||
$(eval $(call KernelPackage,mt7663-firmware-ap))
|
|
||||||
$(eval $(call KernelPackage,mt7663-firmware-sta))
|
|
||||||
$(eval $(call KernelPackage,mt7663-usb-sdio))
|
|
||||||
$(eval $(call KernelPackage,mt7663u))
|
|
||||||
$(eval $(call KernelPackage,mt7663s))
|
|
||||||
$(eval $(call KernelPackage,mt7915-firmware))
|
|
||||||
$(eval $(call KernelPackage,mt7915e))
|
|
||||||
$(eval $(call KernelPackage,mt7916-firmware))
|
|
||||||
$(eval $(call KernelPackage,mt7981-firmware))
|
|
||||||
$(eval $(call KernelPackage,mt7986-firmware))
|
|
||||||
$(eval $(call KernelPackage,mt7921-firmware))
|
|
||||||
$(eval $(call KernelPackage,mt7922-firmware))
|
|
||||||
$(eval $(call KernelPackage,mt792x-common))
|
|
||||||
$(eval $(call KernelPackage,mt792x-usb))
|
|
||||||
$(eval $(call KernelPackage,mt7921-common))
|
|
||||||
$(eval $(call KernelPackage,mt7925-common))
|
|
||||||
$(eval $(call KernelPackage,mt7921u))
|
|
||||||
$(eval $(call KernelPackage,mt7921s))
|
|
||||||
$(eval $(call KernelPackage,mt7921e))
|
|
||||||
$(eval $(call KernelPackage,mt7925u))
|
|
||||||
$(eval $(call KernelPackage,mt7925e))
|
|
||||||
$(eval $(call KernelPackage,mt7996e))
|
|
||||||
$(eval $(call KernelPackage,mt76))
|
|
||||||
$(eval $(call BuildPackage,mt76-test))
|
|
|
@ -1,31 +0,0 @@
|
||||||
diff --git a/mac80211.c b/mac80211.c
|
|
||||||
index cc9e9ff1..9b29340d 100644
|
|
||||||
--- a/mac80211.c
|
|
||||||
+++ b/mac80211.c
|
|
||||||
@@ -4,7 +4,11 @@
|
|
||||||
*/
|
|
||||||
#include <linux/sched.h>
|
|
||||||
#include <linux/of.h>
|
|
||||||
+#if LINUX_VERSION_IS_LESS(6,6,0)
|
|
||||||
#include <net/page_pool.h>
|
|
||||||
+#else
|
|
||||||
+#include <net/page_pool/helpers.h>
|
|
||||||
+#endif
|
|
||||||
#include "mt76.h"
|
|
||||||
|
|
||||||
#define CHAN2G(_idx, _freq) { \
|
|
||||||
diff --git a/mt76.h b/mt76.h
|
|
||||||
index d2ead585..bb9002d8 100644
|
|
||||||
--- a/mt76.h
|
|
||||||
+++ b/mt76.h
|
|
||||||
@@ -15,6 +15,10 @@
|
|
||||||
#include <linux/average.h>
|
|
||||||
#include <linux/soc/mediatek/mtk_wed.h>
|
|
||||||
#include <net/mac80211.h>
|
|
||||||
+#if LINUX_VERSION_IS_GEQ(6,6,0)
|
|
||||||
+#include <net/page_pool/helpers.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "util.h"
|
|
||||||
#include "testmode.h"
|
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
#
|
|
||||||
# Copyright (C) 2008-2012 OpenWrt.org
|
|
||||||
#
|
|
||||||
# This is free software, licensed under the GNU General Public License v2.
|
|
||||||
# See /LICENSE for more information.
|
|
||||||
#
|
|
||||||
|
|
||||||
include $(TOPDIR)/rules.mk
|
|
||||||
include $(INCLUDE_DIR)/kernel.mk
|
|
||||||
|
|
||||||
PKG_NAME:=r2ec
|
|
||||||
PKG_RELEASE:=1
|
|
||||||
PKG_LICENSE:=GPL-2.0
|
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
|
||||||
|
|
||||||
define KernelPackage/r2ec
|
|
||||||
SUBMENU:=Other modules
|
|
||||||
TITLE:=STM32 R2EC (Router to Embedded board Communication) Driver
|
|
||||||
FILES:=$(PKG_BUILD_DIR)/r2ec.ko
|
|
||||||
AUTOLOAD:=$(call AutoLoad,30,r2ec,1)
|
|
||||||
# DEPENDS:=@TARGET_ipq40xx @LINUX_5_4
|
|
||||||
DEPENDS:=@TARGET_ipq40xx
|
|
||||||
KCONFIG:=
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKE_OPTS:= $(KERNEL_MAKE_FLAGS) M="$(PKG_BUILD_DIR)"
|
|
||||||
|
|
||||||
define Build/Compile
|
|
||||||
$(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) modules
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,r2ec))
|
|
|
@ -1 +0,0 @@
|
||||||
obj-m += r2ec.o
|
|
|
@ -1,60 +0,0 @@
|
||||||
#ifndef R2EC_IO_H
|
|
||||||
#define R2EC_IO_H
|
|
||||||
|
|
||||||
#define NO_OF_GPIOS 37
|
|
||||||
|
|
||||||
enum proto_version {
|
|
||||||
PROTO_VERSION_1 = 0x01,
|
|
||||||
PROTO_VERSION_2 = 0x02
|
|
||||||
};
|
|
||||||
|
|
||||||
enum cmd_type_id {
|
|
||||||
CMD_GPIO = 0x06,
|
|
||||||
CMD_PROTO = 0xFC,
|
|
||||||
CMD_FW = 0xFD,
|
|
||||||
CMD_BOOT = 0xFE
|
|
||||||
};
|
|
||||||
|
|
||||||
enum proto_id {
|
|
||||||
PROTO_GET_SUPPORTED = 0x03
|
|
||||||
};
|
|
||||||
|
|
||||||
enum boot_id {
|
|
||||||
BOOT_START_APP = 0x03,
|
|
||||||
BOOT_STATE = 0xFD,
|
|
||||||
BOOT_VERSION = 0xFE
|
|
||||||
};
|
|
||||||
|
|
||||||
enum state_id {
|
|
||||||
NO_IMAGE_FOUND = 0x17,
|
|
||||||
BOOT_STARTED = 0x18,
|
|
||||||
WATCHDOG_RESET = 0x1B,
|
|
||||||
APPLICATION_START_FAIL = 0x99,
|
|
||||||
HARD_FAULT_ERROR = 0x9A,
|
|
||||||
APP_STARTED = 0xFC,
|
|
||||||
NO_DATA_AVAILABLE = 0xFF
|
|
||||||
};
|
|
||||||
|
|
||||||
enum ack_id {
|
|
||||||
STATUS_ACK = 0x7D,
|
|
||||||
STATUS_NACK = 0x7E
|
|
||||||
};
|
|
||||||
|
|
||||||
enum gpio_state {
|
|
||||||
GPIO_STATE_HIGH = 0x1E,
|
|
||||||
GPIO_STATE_LOW = 0x9F
|
|
||||||
};
|
|
||||||
|
|
||||||
enum gpio_mode {
|
|
||||||
GPIO_VALUE_SET_LOW = 0x00,
|
|
||||||
GPIO_VALUE_SET_HIGH = 0x01,
|
|
||||||
GPIO_VALUE_GET = 0x02,
|
|
||||||
GPIO_MODE_SET_OUTPUT = 0x04,
|
|
||||||
GPIO_MODE_SET_INPUT = 0x05
|
|
||||||
};
|
|
||||||
|
|
||||||
enum fw_id {
|
|
||||||
FW_VERSION = 0x01
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // R2EC_IO_H
|
|
|
@ -1,752 +0,0 @@
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/gpio/driver.h>
|
|
||||||
#include <linux/interrupt.h>
|
|
||||||
#include <linux/i2c.h>
|
|
||||||
#include <linux/delay.h>
|
|
||||||
|
|
||||||
#include "io.h"
|
|
||||||
|
|
||||||
static const struct i2c_device_id r2ec_id[] = {
|
|
||||||
{ "stm32v1", NO_OF_GPIOS },
|
|
||||||
{ }
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(i2c, r2ec_id);
|
|
||||||
|
|
||||||
static const struct of_device_id r2ec_of_table[] = {
|
|
||||||
{ .compatible = "tlt,stm32v1" },
|
|
||||||
{ }
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(of, r2ec_of_table);
|
|
||||||
|
|
||||||
static uint8_t g_proto;
|
|
||||||
|
|
||||||
struct r2ec {
|
|
||||||
struct gpio_chip chip;
|
|
||||||
struct irq_chip irqchip;
|
|
||||||
struct i2c_client *client;
|
|
||||||
struct mutex i2c_lock;
|
|
||||||
struct mutex irq_lock;
|
|
||||||
int ic_ready;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct r2ec_platform_data {
|
|
||||||
unsigned gpio_base;
|
|
||||||
|
|
||||||
int (*setup)(struct i2c_client *client, int gpio, unsigned ngpio,
|
|
||||||
void *context);
|
|
||||||
|
|
||||||
int (*teardown)(struct i2c_client *client, int gpio, unsigned ngpio,
|
|
||||||
void *context);
|
|
||||||
|
|
||||||
void *context;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct i2c_request {
|
|
||||||
uint8_t version;
|
|
||||||
uint16_t length;
|
|
||||||
uint8_t command;
|
|
||||||
uint8_t data[1];
|
|
||||||
// uint8_t checksum; // invisible
|
|
||||||
} __attribute__((packed));
|
|
||||||
|
|
||||||
struct i2c_response {
|
|
||||||
uint8_t version;
|
|
||||||
uint8_t length;
|
|
||||||
uint8_t command;
|
|
||||||
uint8_t data[7];
|
|
||||||
uint8_t checksum;
|
|
||||||
} __attribute__((packed));
|
|
||||||
|
|
||||||
static uint8_t calc_crc8(const uint8_t *data, size_t len)
|
|
||||||
{
|
|
||||||
uint8_t crc = 0xFF;
|
|
||||||
int i = 0;
|
|
||||||
int j = 0;
|
|
||||||
|
|
||||||
for (j = 0; j < len; j++) {
|
|
||||||
crc ^= data[j];
|
|
||||||
|
|
||||||
for (i = 0; i < 8; i++) {
|
|
||||||
crc = (crc & 0x80) ? (crc ^ 0xD5) << 1 : crc << 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return crc;
|
|
||||||
}
|
|
||||||
|
|
||||||
// generate outcoming mesage checksum and write i2c data
|
|
||||||
static int stm32_write(struct i2c_client *client, uint8_t ver, uint8_t cmd, uint8_t *data, size_t len)
|
|
||||||
{
|
|
||||||
struct i2c_request *req = NULL;
|
|
||||||
const int tmp_len = sizeof(struct i2c_request) + 1;
|
|
||||||
uint8_t tmp[sizeof(struct i2c_request) + 1];
|
|
||||||
int err = 0;
|
|
||||||
|
|
||||||
if (!client) {
|
|
||||||
printk(KERN_ERR "R2EC I2C client is not ready!\n");
|
|
||||||
return -ENXIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
req = (struct i2c_request *)tmp;
|
|
||||||
req->version = ver;
|
|
||||||
req->length = 2 + len; // 2 + data_len
|
|
||||||
req->command = cmd;
|
|
||||||
|
|
||||||
memcpy(req->data, data, len);
|
|
||||||
|
|
||||||
req->data[len] = calc_crc8(tmp, tmp_len - 1);
|
|
||||||
|
|
||||||
if ((err = i2c_master_send(client, tmp, tmp_len)) < 0) {
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// attempt to read i2c data
|
|
||||||
static int stm32_read(struct i2c_client *client, uint8_t *data, size_t len)
|
|
||||||
{
|
|
||||||
char buffer[64] = { 0 };
|
|
||||||
uint8_t checksum;
|
|
||||||
int err;
|
|
||||||
unsigned i, cnt = 0;
|
|
||||||
|
|
||||||
if (!client) {
|
|
||||||
printk(KERN_ERR "R2EC I2C client is not ready!\n");
|
|
||||||
return -ENXIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
retry:
|
|
||||||
if ((err = i2c_master_recv(client, data, len)) < 0) {
|
|
||||||
if (err == -ETIMEDOUT && cnt < 10) {
|
|
||||||
cnt++;
|
|
||||||
msleep(10);
|
|
||||||
goto retry;
|
|
||||||
}
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (len == 1) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ignore checksum on partial i2c response
|
|
||||||
if (len == sizeof(struct i2c_response) - 1) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 0xFF - no data available
|
|
||||||
if (*(data + 3) == 0xFF) {
|
|
||||||
return -ENODATA;
|
|
||||||
}
|
|
||||||
|
|
||||||
// generate checksum and verify
|
|
||||||
checksum = calc_crc8(data, len - 1);
|
|
||||||
|
|
||||||
if (checksum != *(data + len - 1)) {
|
|
||||||
for (i = 0; i < len; i++) {
|
|
||||||
snprintf(buffer + strlen(buffer), sizeof(buffer),
|
|
||||||
"%02X ", *(data + i));
|
|
||||||
}
|
|
||||||
|
|
||||||
dev_err(&client->dev, "Checksum of incoming message "
|
|
||||||
"does not match!\n"
|
|
||||||
"Received: %s\n", buffer);
|
|
||||||
|
|
||||||
// for some reason checksum might appear as 1st byte in the
|
|
||||||
// data buffer, and actual checksum byte is zero
|
|
||||||
// apply quirk - discard first byte, skip checksum checking
|
|
||||||
if (!*(data + len - 1)) {
|
|
||||||
dev_err(&client->dev,
|
|
||||||
"Applying wrong-checksum quirk...\n");
|
|
||||||
memmove(data, data + 1, len - 1);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return -EBADE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// attempt to retrieve supported protocol version, then retrieve device state
|
|
||||||
// and boot into application state
|
|
||||||
// this is done without interrupt, so there should be delay after writing
|
|
||||||
// request and before reading response for protocol versions up until v2
|
|
||||||
static int stm32_prepare(struct r2ec *gpio, struct i2c_client *client)
|
|
||||||
{
|
|
||||||
struct i2c_response rsp;
|
|
||||||
uint8_t data[1], recv[1];
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
memset(&rsp, 0, sizeof(rsp));
|
|
||||||
|
|
||||||
data[0] = PROTO_GET_SUPPORTED;
|
|
||||||
|
|
||||||
if ((ret = stm32_write(client, 1, CMD_PROTO, data, 1))) {
|
|
||||||
dev_err(&client->dev,
|
|
||||||
"stm32_prepare: proto version write failed (%d)\n",
|
|
||||||
ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
// due compatibility reasons delay is needed between write/read
|
|
||||||
// operations
|
|
||||||
msleep(10);
|
|
||||||
|
|
||||||
if ((ret = stm32_read(client, (uint8_t *)&rsp, sizeof(rsp)))) {
|
|
||||||
dev_err(&client->dev,
|
|
||||||
"stm32_prepare: proto version read failed (%d)\n", ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
g_proto = rsp.data[1];
|
|
||||||
|
|
||||||
// fallback to version 1
|
|
||||||
if (g_proto != PROTO_VERSION_1 && g_proto != PROTO_VERSION_2) {
|
|
||||||
printk("STM32 fallback protocol: %u\n", g_proto);
|
|
||||||
g_proto = PROTO_VERSION_1;
|
|
||||||
}
|
|
||||||
|
|
||||||
printk("STM32 supported protocol: %u\n", g_proto);
|
|
||||||
|
|
||||||
data[0] = BOOT_STATE;
|
|
||||||
|
|
||||||
if ((ret = stm32_write(client, g_proto, CMD_BOOT, data, 1))) {
|
|
||||||
dev_err(&client->dev,
|
|
||||||
"stm32_prepare: boot state write failed (%d)\n", ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((ret = stm32_read(client, recv, 1))) {
|
|
||||||
dev_err(&client->dev,
|
|
||||||
"stm32_prepare: boot state read failed (%d)\n", ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
// device might be not ready aka in bootloader state
|
|
||||||
// we might need to ignore gpio_write status value
|
|
||||||
gpio->ic_ready = 0;
|
|
||||||
|
|
||||||
// handle the following possible states reported either from
|
|
||||||
// bootloader or system:
|
|
||||||
switch (recv[0]) {
|
|
||||||
case NO_IMAGE_FOUND:
|
|
||||||
case APP_STARTED:
|
|
||||||
// device is ready, no need to ignore gpio_write status value
|
|
||||||
// note: on no_image_found, user-space flasher will reflash
|
|
||||||
// firmware and device will be rebooted
|
|
||||||
gpio->ic_ready = 1;
|
|
||||||
return 0;
|
|
||||||
case BOOT_STARTED:
|
|
||||||
case WATCHDOG_RESET:
|
|
||||||
case APPLICATION_START_FAIL:
|
|
||||||
case HARD_FAULT_ERROR:
|
|
||||||
case NO_DATA_AVAILABLE:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
dev_err(&client->dev, "Device did not responded with correct "
|
|
||||||
"state! Actual response was 0x%02X. "
|
|
||||||
"Unable to get device state!\n", recv[0]);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
data[0] = BOOT_START_APP;
|
|
||||||
|
|
||||||
if ((ret = stm32_write(client, g_proto, CMD_BOOT, data, 1))) {
|
|
||||||
dev_err(&client->dev,
|
|
||||||
"stm32_prepare: boot start write failed (%d)\n", ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((ret = stm32_read(client, recv, 1))) {
|
|
||||||
dev_err(&client->dev,
|
|
||||||
"stm32_prepare: boot start read failed (%d)\n", ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (recv[0] != STATUS_ACK && recv[0] != NO_DATA_AVAILABLE) {
|
|
||||||
dev_err(&client->dev, "Device did not responded with ACK. "
|
|
||||||
"Actual response was 0x%02X. "
|
|
||||||
"Unable to set device state!\n", recv[0]);
|
|
||||||
return -EIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int stm32_gpio_write(struct r2ec *gpio, int pin, int val)
|
|
||||||
{
|
|
||||||
struct i2c_request *req;
|
|
||||||
size_t len = 2;
|
|
||||||
uint8_t tmp[sizeof(struct i2c_request) + 2];
|
|
||||||
//int err;
|
|
||||||
|
|
||||||
if (!gpio->client) {
|
|
||||||
printk(KERN_ERR "R2EC I2C client is not ready!\n");
|
|
||||||
return -ENXIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
req = (struct i2c_request *)tmp;
|
|
||||||
req->version = PROTO_VERSION_2;
|
|
||||||
req->length = 2 + len; // command + crc + data
|
|
||||||
req->command = CMD_GPIO;
|
|
||||||
req->data[0] = pin;
|
|
||||||
req->data[1] = val;
|
|
||||||
|
|
||||||
i2c_master_send(gpio->client, tmp, sizeof(tmp));
|
|
||||||
// if ((err = i2c_master_send(gpio->client, tmp, sizeof(tmp))) < 0) {
|
|
||||||
// if (err != -ENXIO) {
|
|
||||||
// return err;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// we need to ignore errors while device is not ready
|
|
||||||
// otherwise none of GPIOs/LEDs will be probed by the kernel
|
|
||||||
// if (!gpio->ic_ready) {
|
|
||||||
// err = 0;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// return err;
|
|
||||||
// }
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int stm32_gpio_read(struct r2ec *gpio, int pin, int val)
|
|
||||||
{
|
|
||||||
struct i2c_request *req;
|
|
||||||
size_t len = 2;
|
|
||||||
uint8_t tmp[sizeof(struct i2c_request) + 2];
|
|
||||||
uint8_t recv[1];
|
|
||||||
int err;
|
|
||||||
|
|
||||||
if (!gpio->client) {
|
|
||||||
printk(KERN_ERR "R2EC I2C client is not ready!\n");
|
|
||||||
return -ENXIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
req = (struct i2c_request *)tmp;
|
|
||||||
req->version = PROTO_VERSION_2;
|
|
||||||
req->length = 2 + len; // command + crc + data
|
|
||||||
req->command = CMD_GPIO;
|
|
||||||
req->data[0] = pin;
|
|
||||||
req->data[1] = val;
|
|
||||||
|
|
||||||
if ((err = i2c_master_send(gpio->client, tmp, sizeof(tmp))) < 0) {
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((err = i2c_master_recv(gpio->client, recv, sizeof(recv))) < 0) {
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (recv[0]) {
|
|
||||||
case GPIO_STATE_HIGH:
|
|
||||||
return 1;
|
|
||||||
case GPIO_STATE_LOW:
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return -EIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int r2ec_get(struct gpio_chip *chip, unsigned offset)
|
|
||||||
{
|
|
||||||
struct r2ec *gpio = gpiochip_get_data(chip);
|
|
||||||
int value;
|
|
||||||
|
|
||||||
mutex_lock(&gpio->i2c_lock);
|
|
||||||
value = stm32_gpio_read(gpio, offset, GPIO_VALUE_GET);
|
|
||||||
mutex_unlock(&gpio->i2c_lock);
|
|
||||||
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void r2ec_set(struct gpio_chip *chip, unsigned offset, int value)
|
|
||||||
{
|
|
||||||
struct r2ec *gpio = gpiochip_get_data(chip);
|
|
||||||
int val = value ? GPIO_VALUE_SET_HIGH : GPIO_VALUE_SET_LOW;
|
|
||||||
|
|
||||||
mutex_lock(&gpio->i2c_lock);
|
|
||||||
stm32_gpio_write(gpio, offset, val);
|
|
||||||
mutex_unlock(&gpio->i2c_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int r2ec_input(struct gpio_chip *chip, unsigned offset)
|
|
||||||
{
|
|
||||||
struct r2ec *gpio = gpiochip_get_data(chip);
|
|
||||||
int status;
|
|
||||||
|
|
||||||
mutex_lock(&gpio->i2c_lock);
|
|
||||||
status = stm32_gpio_write(gpio, offset, GPIO_MODE_SET_INPUT);
|
|
||||||
mutex_unlock(&gpio->i2c_lock);
|
|
||||||
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int r2ec_output(struct gpio_chip *chip, unsigned offset, int value)
|
|
||||||
{
|
|
||||||
struct r2ec *gpio = gpiochip_get_data(chip);
|
|
||||||
int status;
|
|
||||||
|
|
||||||
mutex_lock(&gpio->i2c_lock);
|
|
||||||
status = stm32_gpio_write(gpio, offset, GPIO_MODE_SET_OUTPUT);
|
|
||||||
mutex_unlock(&gpio->i2c_lock);
|
|
||||||
|
|
||||||
r2ec_set(chip, offset, value);
|
|
||||||
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void noop(struct irq_data *data) { }
|
|
||||||
|
|
||||||
static int noop_wake(struct irq_data *data, unsigned on)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static irqreturn_t r2ec_irq(int irq, void *data)
|
|
||||||
{
|
|
||||||
struct r2ec *gpio = data;
|
|
||||||
unsigned i;
|
|
||||||
|
|
||||||
for (i = 0; i < gpio->chip.ngpio; i++) {
|
|
||||||
handle_nested_irq(irq_find_mapping(gpio->chip.irq.domain, i));
|
|
||||||
}
|
|
||||||
|
|
||||||
return IRQ_HANDLED;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void r2ec_irq_bus_lock(struct irq_data *data)
|
|
||||||
{
|
|
||||||
struct r2ec *gpio = irq_data_get_irq_chip_data(data);
|
|
||||||
mutex_lock(&gpio->irq_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void r2ec_irq_bus_sync_unlock(struct irq_data *data)
|
|
||||||
{
|
|
||||||
struct r2ec *gpio = irq_data_get_irq_chip_data(data);
|
|
||||||
mutex_unlock(&gpio->irq_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int chip_label_match(struct gpio_chip *chip, void *data)
|
|
||||||
{
|
|
||||||
return !strcmp(chip->label, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int get_stm32_version(struct device *dev, uint8_t type, char *buffer)
|
|
||||||
{
|
|
||||||
struct gpio_chip *chip;
|
|
||||||
struct r2ec *gpio;
|
|
||||||
uint8_t recv[sizeof(struct i2c_response)];
|
|
||||||
uint8_t data[1];
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
struct pt_fw_get_ver {
|
|
||||||
unsigned char command_ex;
|
|
||||||
unsigned char major;
|
|
||||||
unsigned char middle;
|
|
||||||
unsigned char minor;
|
|
||||||
unsigned char rev;
|
|
||||||
} __attribute__((packed)) *res;
|
|
||||||
|
|
||||||
chip = gpiochip_find("stm32v1", chip_label_match);
|
|
||||||
if (!chip) {
|
|
||||||
printk(KERN_ERR "Unable to find R2EC gpio chip!\n");
|
|
||||||
return -ENXIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
gpio = gpiochip_get_data(chip);
|
|
||||||
|
|
||||||
if (!gpio->client) {
|
|
||||||
printk(KERN_ERR "R2EC I2C client is not ready!\n");
|
|
||||||
return -ENXIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
data[0] = (type == CMD_FW) ? FW_VERSION : BOOT_VERSION;
|
|
||||||
|
|
||||||
mutex_lock(&gpio->i2c_lock);
|
|
||||||
|
|
||||||
if ((ret = stm32_write(gpio->client, g_proto, type, data, 1))) {
|
|
||||||
printk("%s: firmware version write failed (%d)\n",
|
|
||||||
__func__, ret);
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
|
|
||||||
// prevent possible I2C bus lockup when master requests more than 1 byte
|
|
||||||
// and slave only sends a couple of bytes, but master is still waiting
|
|
||||||
// and SCL line is down; there is no recovery except power cycle
|
|
||||||
// first read 1 byte and compare with supported protocol versions
|
|
||||||
// if they match, then full messsage can be read, otherwise drop
|
|
||||||
// everything to not introduce bus lockup
|
|
||||||
if ((ret = stm32_read(gpio->client, data, 1))) {
|
|
||||||
printk("%s: firmware version read failed (%d)\n",
|
|
||||||
__func__, ret);
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (data[0] != PROTO_VERSION_1 && data[0] != PROTO_VERSION_2) {
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
|
|
||||||
recv[0] = data[0];
|
|
||||||
|
|
||||||
if ((ret = stm32_read(gpio->client, &recv[1], sizeof(recv) - 1))) {
|
|
||||||
printk("%s: firmware version read failed (%d)\n",
|
|
||||||
__func__, ret);
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
|
|
||||||
// device is ready now, running in application-mode
|
|
||||||
// this is called by autoflasher script first time
|
|
||||||
if (!gpio->ic_ready) {
|
|
||||||
gpio->ic_ready = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
res = (struct pt_fw_get_ver *)(&recv[3]);
|
|
||||||
|
|
||||||
sprintf(buffer, "%02d.%02d.%02d rev. %02d\n",
|
|
||||||
res->major, res->middle, res->minor, res->rev);
|
|
||||||
|
|
||||||
done:
|
|
||||||
mutex_unlock(&gpio->i2c_lock);
|
|
||||||
return strlen(buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
static ssize_t app_version_show(struct device *dev,
|
|
||||||
struct device_attribute *attr, char *buffer)
|
|
||||||
{
|
|
||||||
return get_stm32_version(dev, CMD_FW, buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
static ssize_t boot_version_show(struct device *dev,
|
|
||||||
struct device_attribute *attr, char *buffer)
|
|
||||||
{
|
|
||||||
return get_stm32_version(dev, CMD_BOOT, buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
static ssize_t reset_store(struct device *dev, struct device_attribute *attr,
|
|
||||||
const char *buff, size_t count)
|
|
||||||
{
|
|
||||||
struct gpio_chip *chip;
|
|
||||||
struct r2ec *gpio;
|
|
||||||
uint8_t data[1];
|
|
||||||
|
|
||||||
chip = gpiochip_find("stm32v1", chip_label_match);
|
|
||||||
if (!chip) {
|
|
||||||
printk(KERN_ERR "Unable to find R2EC gpio chip!\n");
|
|
||||||
return -ENXIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
gpio = gpiochip_get_data(chip);
|
|
||||||
|
|
||||||
if (!gpio->client) {
|
|
||||||
printk(KERN_ERR "R2EC I2C client is not ready!\n");
|
|
||||||
return -ENXIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
data[0] = BOOT_START_APP;
|
|
||||||
|
|
||||||
mutex_lock(&gpio->i2c_lock);
|
|
||||||
if (stm32_write(gpio->client, g_proto, CMD_BOOT, data, 1)) {
|
|
||||||
printk(KERN_ERR "Unable transmit R2EC data!\n");
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
|
|
||||||
done:
|
|
||||||
mutex_unlock(&gpio->i2c_lock);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct device_attribute g_r2ec_kobj_attr[] = {
|
|
||||||
__ATTR_RO(app_version),
|
|
||||||
__ATTR_RO(boot_version),
|
|
||||||
__ATTR_WO(reset)
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct attribute *g_r2ec_attrs[] = {
|
|
||||||
&g_r2ec_kobj_attr[0].attr,
|
|
||||||
&g_r2ec_kobj_attr[1].attr,
|
|
||||||
&g_r2ec_kobj_attr[2].attr,
|
|
||||||
NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct attribute_group g_r2ec_attr_group = { .attrs = g_r2ec_attrs };
|
|
||||||
static struct kobject *g_r2ec_kobj;
|
|
||||||
|
|
||||||
static int r2ec_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|
||||||
{
|
|
||||||
struct r2ec_platform_data *pdata = dev_get_platdata(&client->dev);
|
|
||||||
// dev_err(&client->dev,
|
|
||||||
// "r2ec_probe: dev_get_platdata(0x%x, %s): 0x%x\n",
|
|
||||||
// client->addr, client->name, pdata);
|
|
||||||
struct r2ec *gpio;
|
|
||||||
struct gpio_irq_chip *girq;
|
|
||||||
int status, i;
|
|
||||||
|
|
||||||
gpio = devm_kzalloc(&client->dev, sizeof(*gpio), GFP_KERNEL);
|
|
||||||
if (!gpio) {
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < 10; i++) {
|
|
||||||
if (!(status = stm32_prepare(gpio, client))) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
dev_err(&client->dev,
|
|
||||||
"Unable to initialize device, retrying...\n");
|
|
||||||
|
|
||||||
// give some time for next interation...
|
|
||||||
msleep(500);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (status) {
|
|
||||||
dev_err(&client->dev, "Unable to initialize device!\n");
|
|
||||||
devm_kfree(&client->dev, gpio);
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
mutex_init(&gpio->irq_lock);
|
|
||||||
mutex_init(&gpio->i2c_lock);
|
|
||||||
|
|
||||||
lockdep_set_subclass(&gpio->i2c_lock,
|
|
||||||
i2c_adapter_depth(client->adapter));
|
|
||||||
|
|
||||||
gpio->chip.base = pdata ? pdata->gpio_base : -1;
|
|
||||||
gpio->chip.can_sleep = true;
|
|
||||||
gpio->chip.parent = &client->dev;
|
|
||||||
gpio->chip.owner = THIS_MODULE;
|
|
||||||
gpio->chip.get = r2ec_get;
|
|
||||||
gpio->chip.set = r2ec_set;
|
|
||||||
gpio->chip.direction_input = r2ec_input;
|
|
||||||
gpio->chip.direction_output = r2ec_output;
|
|
||||||
gpio->chip.ngpio = id->driver_data;
|
|
||||||
gpio->chip.label = client->name;
|
|
||||||
gpio->client = client;
|
|
||||||
|
|
||||||
i2c_set_clientdata(client, gpio);
|
|
||||||
|
|
||||||
if (client->irq) {
|
|
||||||
gpio->irqchip.name = "r2ec";
|
|
||||||
gpio->irqchip.irq_enable = noop,
|
|
||||||
gpio->irqchip.irq_disable = noop,
|
|
||||||
gpio->irqchip.irq_ack = noop,
|
|
||||||
gpio->irqchip.irq_mask = noop,
|
|
||||||
gpio->irqchip.irq_unmask = noop,
|
|
||||||
gpio->irqchip.irq_set_wake = noop_wake,
|
|
||||||
gpio->irqchip.irq_bus_lock = r2ec_irq_bus_lock;
|
|
||||||
gpio->irqchip.irq_bus_sync_unlock = r2ec_irq_bus_sync_unlock;
|
|
||||||
|
|
||||||
girq = &gpio->chip.irq;
|
|
||||||
girq->chip = &gpio->irqchip;
|
|
||||||
/* This will let us handle the parent IRQ in the driver */
|
|
||||||
girq->parent_handler = NULL;
|
|
||||||
girq->num_parents = 0;
|
|
||||||
girq->parents = NULL;
|
|
||||||
girq->default_type = IRQ_TYPE_NONE;
|
|
||||||
girq->handler = handle_bad_irq;
|
|
||||||
girq->threaded = true;
|
|
||||||
|
|
||||||
status = devm_gpiochip_add_data(&client->dev, &gpio->chip, gpio);
|
|
||||||
|
|
||||||
if (status) {
|
|
||||||
dev_err(&client->dev, "cannot add irqchip\n");
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
status = devm_request_threaded_irq(&client->dev, client->irq,
|
|
||||||
NULL, r2ec_irq,
|
|
||||||
IRQF_ONESHOT |
|
|
||||||
IRQF_TRIGGER_FALLING |
|
|
||||||
IRQF_SHARED,
|
|
||||||
dev_name(&client->dev),
|
|
||||||
gpio);
|
|
||||||
if (status) {
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pdata && pdata->setup) {
|
|
||||||
status = pdata->setup(client, gpio->chip.base, gpio->chip.ngpio,
|
|
||||||
pdata->context);
|
|
||||||
|
|
||||||
if (status < 0) {
|
|
||||||
dev_warn(&client->dev, "setup --> %d\n", status);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dev_info(&client->dev, "probed\n");
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
fail:
|
|
||||||
devm_kfree(&client->dev, gpio);
|
|
||||||
dev_dbg(&client->dev, "probe error %d for %s\n", status, client->name);
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void r2ec_remove(struct i2c_client *client)
|
|
||||||
{
|
|
||||||
struct r2ec_platform_data *pdata = dev_get_platdata(&client->dev);
|
|
||||||
struct r2ec *gpio = i2c_get_clientdata(client);
|
|
||||||
int status = 0;
|
|
||||||
|
|
||||||
if (pdata && pdata->teardown) {
|
|
||||||
status = pdata->teardown(client, gpio->chip.base, gpio->chip.ngpio,
|
|
||||||
pdata->context);
|
|
||||||
|
|
||||||
if (status < 0) {
|
|
||||||
dev_err(&client->dev, "%s --> %d\n", "teardown", status);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct i2c_driver r2ec_driver = {
|
|
||||||
.driver = {
|
|
||||||
.name = "r2ec",
|
|
||||||
.of_match_table = of_match_ptr(r2ec_of_table),
|
|
||||||
},
|
|
||||||
.probe = r2ec_probe,
|
|
||||||
.remove = r2ec_remove,
|
|
||||||
.id_table = r2ec_id,
|
|
||||||
};
|
|
||||||
|
|
||||||
static int __init r2ec_init(void)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
ret = i2c_add_driver(&r2ec_driver);
|
|
||||||
if (ret) {
|
|
||||||
printk(KERN_ERR "Unable to initialize `r2ec` driver!\n");
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
g_r2ec_kobj = kobject_create_and_add("r2ec", NULL);
|
|
||||||
if (!g_r2ec_kobj) {
|
|
||||||
i2c_del_driver(&r2ec_driver);
|
|
||||||
printk(KERN_ERR "Unable to create `r2ec` kobject!\n");
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sysfs_create_group(g_r2ec_kobj, &g_r2ec_attr_group)) {
|
|
||||||
kobject_put(g_r2ec_kobj);
|
|
||||||
i2c_del_driver(&r2ec_driver);
|
|
||||||
printk(KERN_ERR "Unable to create `r2ec` sysfs group!\n");
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __exit r2ec_exit(void)
|
|
||||||
{
|
|
||||||
kobject_put(g_r2ec_kobj);
|
|
||||||
i2c_del_driver(&r2ec_driver);
|
|
||||||
}
|
|
||||||
|
|
||||||
module_init(r2ec_init);
|
|
||||||
module_exit(r2ec_exit);
|
|
||||||
|
|
||||||
MODULE_AUTHOR("Jokubas Maciulaitis <jokubas.maciulaitis@teltonika.lt>");
|
|
||||||
MODULE_DESCRIPTION("STM32F0 (R2EC) I2C GPIO Expander driver");
|
|
||||||
MODULE_LICENSE("GPL v2");
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,183 +0,0 @@
|
||||||
From e1fbfa4a995d42e02e22b0dff2f8b4fdee1504b3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Christian Marangi <ansuelsmth@gmail.com>
|
|
||||||
Date: Tue, 14 Nov 2023 15:08:42 +0100
|
|
||||||
Subject: [PATCH 2/3] net: phy: aquantia: move MMD_VEND define to header
|
|
||||||
|
|
||||||
Move MMD_VEND define to header to clean things up and in preparation for
|
|
||||||
firmware loading support that require some define placed in
|
|
||||||
aquantia_main.
|
|
||||||
|
|
||||||
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
|
||||||
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
||||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
---
|
|
||||||
drivers/net/phy/aquantia/aquantia.h | 69 +++++++++++++++++++++++
|
|
||||||
drivers/net/phy/aquantia/aquantia_hwmon.c | 14 -----
|
|
||||||
drivers/net/phy/aquantia/aquantia_main.c | 55 ------------------
|
|
||||||
3 files changed, 69 insertions(+), 69 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/net/phy/aquantia/aquantia.h
|
|
||||||
+++ b/drivers/net/phy/aquantia/aquantia.h
|
|
||||||
@@ -9,6 +9,75 @@
|
|
||||||
#include <linux/device.h>
|
|
||||||
#include <linux/phy.h>
|
|
||||||
|
|
||||||
+/* Vendor specific 1, MDIO_MMD_VEND1 */
|
|
||||||
+#define VEND1_GLOBAL_FW_ID 0x0020
|
|
||||||
+#define VEND1_GLOBAL_FW_ID_MAJOR GENMASK(15, 8)
|
|
||||||
+#define VEND1_GLOBAL_FW_ID_MINOR GENMASK(7, 0)
|
|
||||||
+
|
|
||||||
+/* The following registers all have similar layouts; first the registers... */
|
|
||||||
+#define VEND1_GLOBAL_CFG_10M 0x0310
|
|
||||||
+#define VEND1_GLOBAL_CFG_100M 0x031b
|
|
||||||
+#define VEND1_GLOBAL_CFG_1G 0x031c
|
|
||||||
+#define VEND1_GLOBAL_CFG_2_5G 0x031d
|
|
||||||
+#define VEND1_GLOBAL_CFG_5G 0x031e
|
|
||||||
+#define VEND1_GLOBAL_CFG_10G 0x031f
|
|
||||||
+/* ...and now the fields */
|
|
||||||
+#define VEND1_GLOBAL_CFG_RATE_ADAPT GENMASK(8, 7)
|
|
||||||
+#define VEND1_GLOBAL_CFG_RATE_ADAPT_NONE 0
|
|
||||||
+#define VEND1_GLOBAL_CFG_RATE_ADAPT_USX 1
|
|
||||||
+#define VEND1_GLOBAL_CFG_RATE_ADAPT_PAUSE 2
|
|
||||||
+
|
|
||||||
+/* Vendor specific 1, MDIO_MMD_VEND2 */
|
|
||||||
+#define VEND1_THERMAL_PROV_HIGH_TEMP_FAIL 0xc421
|
|
||||||
+#define VEND1_THERMAL_PROV_LOW_TEMP_FAIL 0xc422
|
|
||||||
+#define VEND1_THERMAL_PROV_HIGH_TEMP_WARN 0xc423
|
|
||||||
+#define VEND1_THERMAL_PROV_LOW_TEMP_WARN 0xc424
|
|
||||||
+#define VEND1_THERMAL_STAT1 0xc820
|
|
||||||
+#define VEND1_THERMAL_STAT2 0xc821
|
|
||||||
+#define VEND1_THERMAL_STAT2_VALID BIT(0)
|
|
||||||
+#define VEND1_GENERAL_STAT1 0xc830
|
|
||||||
+#define VEND1_GENERAL_STAT1_HIGH_TEMP_FAIL BIT(14)
|
|
||||||
+#define VEND1_GENERAL_STAT1_LOW_TEMP_FAIL BIT(13)
|
|
||||||
+#define VEND1_GENERAL_STAT1_HIGH_TEMP_WARN BIT(12)
|
|
||||||
+#define VEND1_GENERAL_STAT1_LOW_TEMP_WARN BIT(11)
|
|
||||||
+
|
|
||||||
+#define VEND1_GLOBAL_GEN_STAT2 0xc831
|
|
||||||
+#define VEND1_GLOBAL_GEN_STAT2_OP_IN_PROG BIT(15)
|
|
||||||
+
|
|
||||||
+#define VEND1_GLOBAL_RSVD_STAT1 0xc885
|
|
||||||
+#define VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID GENMASK(7, 4)
|
|
||||||
+#define VEND1_GLOBAL_RSVD_STAT1_PROV_ID GENMASK(3, 0)
|
|
||||||
+
|
|
||||||
+#define VEND1_GLOBAL_RSVD_STAT9 0xc88d
|
|
||||||
+#define VEND1_GLOBAL_RSVD_STAT9_MODE GENMASK(7, 0)
|
|
||||||
+#define VEND1_GLOBAL_RSVD_STAT9_1000BT2 0x23
|
|
||||||
+
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_STATUS 0xfc00
|
|
||||||
+#define VEND1_GLOBAL_INT_VEND_STATUS 0xfc01
|
|
||||||
+
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_MASK 0xff00
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_MASK_PMA1 BIT(15)
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_MASK_PMA2 BIT(14)
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_MASK_PCS1 BIT(13)
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_MASK_PCS2 BIT(12)
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_MASK_PCS3 BIT(11)
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_MASK_PHY_XS1 BIT(10)
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_MASK_PHY_XS2 BIT(9)
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_MASK_AN1 BIT(8)
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_MASK_AN2 BIT(7)
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_MASK_GBE BIT(6)
|
|
||||||
+#define VEND1_GLOBAL_INT_STD_MASK_ALL BIT(0)
|
|
||||||
+
|
|
||||||
+#define VEND1_GLOBAL_INT_VEND_MASK 0xff01
|
|
||||||
+#define VEND1_GLOBAL_INT_VEND_MASK_PMA BIT(15)
|
|
||||||
+#define VEND1_GLOBAL_INT_VEND_MASK_PCS BIT(14)
|
|
||||||
+#define VEND1_GLOBAL_INT_VEND_MASK_PHY_XS BIT(13)
|
|
||||||
+#define VEND1_GLOBAL_INT_VEND_MASK_AN BIT(12)
|
|
||||||
+#define VEND1_GLOBAL_INT_VEND_MASK_GBE BIT(11)
|
|
||||||
+#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL1 BIT(2)
|
|
||||||
+#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1)
|
|
||||||
+#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0)
|
|
||||||
+
|
|
||||||
#if IS_REACHABLE(CONFIG_HWMON)
|
|
||||||
int aqr_hwmon_probe(struct phy_device *phydev);
|
|
||||||
#else
|
|
||||||
--- a/drivers/net/phy/aquantia/aquantia_hwmon.c
|
|
||||||
+++ b/drivers/net/phy/aquantia/aquantia_hwmon.c
|
|
||||||
@@ -13,20 +13,6 @@
|
|
||||||
|
|
||||||
#include "aquantia.h"
|
|
||||||
|
|
||||||
-/* Vendor specific 1, MDIO_MMD_VEND2 */
|
|
||||||
-#define VEND1_THERMAL_PROV_HIGH_TEMP_FAIL 0xc421
|
|
||||||
-#define VEND1_THERMAL_PROV_LOW_TEMP_FAIL 0xc422
|
|
||||||
-#define VEND1_THERMAL_PROV_HIGH_TEMP_WARN 0xc423
|
|
||||||
-#define VEND1_THERMAL_PROV_LOW_TEMP_WARN 0xc424
|
|
||||||
-#define VEND1_THERMAL_STAT1 0xc820
|
|
||||||
-#define VEND1_THERMAL_STAT2 0xc821
|
|
||||||
-#define VEND1_THERMAL_STAT2_VALID BIT(0)
|
|
||||||
-#define VEND1_GENERAL_STAT1 0xc830
|
|
||||||
-#define VEND1_GENERAL_STAT1_HIGH_TEMP_FAIL BIT(14)
|
|
||||||
-#define VEND1_GENERAL_STAT1_LOW_TEMP_FAIL BIT(13)
|
|
||||||
-#define VEND1_GENERAL_STAT1_HIGH_TEMP_WARN BIT(12)
|
|
||||||
-#define VEND1_GENERAL_STAT1_LOW_TEMP_WARN BIT(11)
|
|
||||||
-
|
|
||||||
#if IS_REACHABLE(CONFIG_HWMON)
|
|
||||||
|
|
||||||
static umode_t aqr_hwmon_is_visible(const void *data,
|
|
||||||
--- a/drivers/net/phy/aquantia/aquantia_main.c
|
|
||||||
+++ b/drivers/net/phy/aquantia/aquantia_main.c
|
|
||||||
@@ -91,61 +91,6 @@
|
|
||||||
#define MDIO_C22EXT_STAT_SGMII_TX_FRAME_ALIGN_ERR 0xd31a
|
|
||||||
#define MDIO_C22EXT_STAT_SGMII_TX_RUNT_FRAMES 0xd31b
|
|
||||||
|
|
||||||
-/* Vendor specific 1, MDIO_MMD_VEND1 */
|
|
||||||
-#define VEND1_GLOBAL_FW_ID 0x0020
|
|
||||||
-#define VEND1_GLOBAL_FW_ID_MAJOR GENMASK(15, 8)
|
|
||||||
-#define VEND1_GLOBAL_FW_ID_MINOR GENMASK(7, 0)
|
|
||||||
-
|
|
||||||
-#define VEND1_GLOBAL_GEN_STAT2 0xc831
|
|
||||||
-#define VEND1_GLOBAL_GEN_STAT2_OP_IN_PROG BIT(15)
|
|
||||||
-
|
|
||||||
-/* The following registers all have similar layouts; first the registers... */
|
|
||||||
-#define VEND1_GLOBAL_CFG_10M 0x0310
|
|
||||||
-#define VEND1_GLOBAL_CFG_100M 0x031b
|
|
||||||
-#define VEND1_GLOBAL_CFG_1G 0x031c
|
|
||||||
-#define VEND1_GLOBAL_CFG_2_5G 0x031d
|
|
||||||
-#define VEND1_GLOBAL_CFG_5G 0x031e
|
|
||||||
-#define VEND1_GLOBAL_CFG_10G 0x031f
|
|
||||||
-/* ...and now the fields */
|
|
||||||
-#define VEND1_GLOBAL_CFG_RATE_ADAPT GENMASK(8, 7)
|
|
||||||
-#define VEND1_GLOBAL_CFG_RATE_ADAPT_NONE 0
|
|
||||||
-#define VEND1_GLOBAL_CFG_RATE_ADAPT_USX 1
|
|
||||||
-#define VEND1_GLOBAL_CFG_RATE_ADAPT_PAUSE 2
|
|
||||||
-
|
|
||||||
-#define VEND1_GLOBAL_RSVD_STAT1 0xc885
|
|
||||||
-#define VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID GENMASK(7, 4)
|
|
||||||
-#define VEND1_GLOBAL_RSVD_STAT1_PROV_ID GENMASK(3, 0)
|
|
||||||
-
|
|
||||||
-#define VEND1_GLOBAL_RSVD_STAT9 0xc88d
|
|
||||||
-#define VEND1_GLOBAL_RSVD_STAT9_MODE GENMASK(7, 0)
|
|
||||||
-#define VEND1_GLOBAL_RSVD_STAT9_1000BT2 0x23
|
|
||||||
-
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_STATUS 0xfc00
|
|
||||||
-#define VEND1_GLOBAL_INT_VEND_STATUS 0xfc01
|
|
||||||
-
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_MASK 0xff00
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_MASK_PMA1 BIT(15)
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_MASK_PMA2 BIT(14)
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_MASK_PCS1 BIT(13)
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_MASK_PCS2 BIT(12)
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_MASK_PCS3 BIT(11)
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_MASK_PHY_XS1 BIT(10)
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_MASK_PHY_XS2 BIT(9)
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_MASK_AN1 BIT(8)
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_MASK_AN2 BIT(7)
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_MASK_GBE BIT(6)
|
|
||||||
-#define VEND1_GLOBAL_INT_STD_MASK_ALL BIT(0)
|
|
||||||
-
|
|
||||||
-#define VEND1_GLOBAL_INT_VEND_MASK 0xff01
|
|
||||||
-#define VEND1_GLOBAL_INT_VEND_MASK_PMA BIT(15)
|
|
||||||
-#define VEND1_GLOBAL_INT_VEND_MASK_PCS BIT(14)
|
|
||||||
-#define VEND1_GLOBAL_INT_VEND_MASK_PHY_XS BIT(13)
|
|
||||||
-#define VEND1_GLOBAL_INT_VEND_MASK_AN BIT(12)
|
|
||||||
-#define VEND1_GLOBAL_INT_VEND_MASK_GBE BIT(11)
|
|
||||||
-#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL1 BIT(2)
|
|
||||||
-#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1)
|
|
||||||
-#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0)
|
|
||||||
-
|
|
||||||
/* Sleep and timeout for checking if the Processor-Intensive
|
|
||||||
* MDIO operation is finished
|
|
||||||
*/
|
|
|
@ -1,504 +0,0 @@
|
||||||
From e93984ebc1c82bd34f7a1b3391efaceee0a8ae96 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Robert Marko <robimarko@gmail.com>
|
|
||||||
Date: Tue, 14 Nov 2023 15:08:43 +0100
|
|
||||||
Subject: [PATCH 3/3] net: phy: aquantia: add firmware load support
|
|
||||||
|
|
||||||
Aquantia PHY-s require firmware to be loaded before they start operating.
|
|
||||||
It can be automatically loaded in case when there is a SPI-NOR connected
|
|
||||||
to Aquantia PHY-s or can be loaded from the host via MDIO.
|
|
||||||
|
|
||||||
This patch adds support for loading the firmware via MDIO as in most cases
|
|
||||||
there is no SPI-NOR being used to save on cost.
|
|
||||||
Firmware loading code itself is ported from mainline U-boot with cleanups.
|
|
||||||
|
|
||||||
The firmware has mixed values both in big and little endian.
|
|
||||||
PHY core itself is big-endian but it expects values to be in little-endian.
|
|
||||||
The firmware is little-endian but CRC-16 value for it is stored at the end
|
|
||||||
of firmware in big-endian.
|
|
||||||
|
|
||||||
It seems the PHY does the conversion internally from firmware that is
|
|
||||||
little-endian to the PHY that is big-endian on using the mailbox
|
|
||||||
but mailbox returns a big-endian CRC-16 to verify the written data
|
|
||||||
integrity.
|
|
||||||
|
|
||||||
Co-developed-by: Christian Marangi <ansuelsmth@gmail.com>
|
|
||||||
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
||||||
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
|
||||||
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
||||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
---
|
|
||||||
drivers/net/phy/aquantia/Kconfig | 1 +
|
|
||||||
drivers/net/phy/aquantia/Makefile | 2 +-
|
|
||||||
drivers/net/phy/aquantia/aquantia.h | 32 ++
|
|
||||||
drivers/net/phy/aquantia/aquantia_firmware.c | 370 +++++++++++++++++++
|
|
||||||
drivers/net/phy/aquantia/aquantia_main.c | 6 +
|
|
||||||
5 files changed, 410 insertions(+), 1 deletion(-)
|
|
||||||
create mode 100644 drivers/net/phy/aquantia/aquantia_firmware.c
|
|
||||||
|
|
||||||
--- a/drivers/net/phy/aquantia/Kconfig
|
|
||||||
+++ b/drivers/net/phy/aquantia/Kconfig
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
|
||||||
config AQUANTIA_PHY
|
|
||||||
tristate "Aquantia PHYs"
|
|
||||||
+ select CRC_CCITT
|
|
||||||
help
|
|
||||||
Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
|
|
||||||
--- a/drivers/net/phy/aquantia/Makefile
|
|
||||||
+++ b/drivers/net/phy/aquantia/Makefile
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
|
||||||
-aquantia-objs += aquantia_main.o
|
|
||||||
+aquantia-objs += aquantia_main.o aquantia_firmware.o
|
|
||||||
ifdef CONFIG_HWMON
|
|
||||||
aquantia-objs += aquantia_hwmon.o
|
|
||||||
endif
|
|
||||||
--- a/drivers/net/phy/aquantia/aquantia.h
|
|
||||||
+++ b/drivers/net/phy/aquantia/aquantia.h
|
|
||||||
@@ -10,10 +10,35 @@
|
|
||||||
#include <linux/phy.h>
|
|
||||||
|
|
||||||
/* Vendor specific 1, MDIO_MMD_VEND1 */
|
|
||||||
+#define VEND1_GLOBAL_SC 0x0
|
|
||||||
+#define VEND1_GLOBAL_SC_SOFT_RESET BIT(15)
|
|
||||||
+#define VEND1_GLOBAL_SC_LOW_POWER BIT(11)
|
|
||||||
+
|
|
||||||
#define VEND1_GLOBAL_FW_ID 0x0020
|
|
||||||
#define VEND1_GLOBAL_FW_ID_MAJOR GENMASK(15, 8)
|
|
||||||
#define VEND1_GLOBAL_FW_ID_MINOR GENMASK(7, 0)
|
|
||||||
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE1 0x0200
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE1_EXECUTE BIT(15)
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE1_WRITE BIT(14)
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE1_CRC_RESET BIT(12)
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE1_BUSY BIT(8)
|
|
||||||
+
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE2 0x0201
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE3 0x0202
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE3_MSW_ADDR_MASK GENMASK(15, 0)
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE3_MSW_ADDR(x) FIELD_PREP(VEND1_GLOBAL_MAILBOX_INTERFACE3_MSW_ADDR_MASK, (u16)((x) >> 16))
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE4 0x0203
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE4_LSW_ADDR_MASK GENMASK(15, 2)
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE4_LSW_ADDR(x) FIELD_PREP(VEND1_GLOBAL_MAILBOX_INTERFACE4_LSW_ADDR_MASK, (u16)(x))
|
|
||||||
+
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE5 0x0204
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE5_MSW_DATA_MASK GENMASK(15, 0)
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE5_MSW_DATA(x) FIELD_PREP(VEND1_GLOBAL_MAILBOX_INTERFACE5_MSW_DATA_MASK, (u16)((x) >> 16))
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE6 0x0205
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE6_LSW_DATA_MASK GENMASK(15, 0)
|
|
||||||
+#define VEND1_GLOBAL_MAILBOX_INTERFACE6_LSW_DATA(x) FIELD_PREP(VEND1_GLOBAL_MAILBOX_INTERFACE6_LSW_DATA_MASK, (u16)(x))
|
|
||||||
+
|
|
||||||
/* The following registers all have similar layouts; first the registers... */
|
|
||||||
#define VEND1_GLOBAL_CFG_10M 0x0310
|
|
||||||
#define VEND1_GLOBAL_CFG_100M 0x031b
|
|
||||||
@@ -28,6 +53,11 @@
|
|
||||||
#define VEND1_GLOBAL_CFG_RATE_ADAPT_PAUSE 2
|
|
||||||
|
|
||||||
/* Vendor specific 1, MDIO_MMD_VEND2 */
|
|
||||||
+#define VEND1_GLOBAL_CONTROL2 0xc001
|
|
||||||
+#define VEND1_GLOBAL_CONTROL2_UP_RUN_STALL_RST BIT(15)
|
|
||||||
+#define VEND1_GLOBAL_CONTROL2_UP_RUN_STALL_OVD BIT(6)
|
|
||||||
+#define VEND1_GLOBAL_CONTROL2_UP_RUN_STALL BIT(0)
|
|
||||||
+
|
|
||||||
#define VEND1_THERMAL_PROV_HIGH_TEMP_FAIL 0xc421
|
|
||||||
#define VEND1_THERMAL_PROV_LOW_TEMP_FAIL 0xc422
|
|
||||||
#define VEND1_THERMAL_PROV_HIGH_TEMP_WARN 0xc423
|
|
||||||
@@ -83,3 +113,5 @@ int aqr_hwmon_probe(struct phy_device *p
|
|
||||||
#else
|
|
||||||
static inline int aqr_hwmon_probe(struct phy_device *phydev) { return 0; }
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+int aqr_firmware_load(struct phy_device *phydev);
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/drivers/net/phy/aquantia/aquantia_firmware.c
|
|
||||||
@@ -0,0 +1,370 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0
|
|
||||||
+
|
|
||||||
+#include <linux/bitfield.h>
|
|
||||||
+#include <linux/of.h>
|
|
||||||
+#include <linux/firmware.h>
|
|
||||||
+#include <linux/crc-ccitt.h>
|
|
||||||
+#include <linux/nvmem-consumer.h>
|
|
||||||
+
|
|
||||||
+#include <asm/unaligned.h>
|
|
||||||
+
|
|
||||||
+#include "aquantia.h"
|
|
||||||
+
|
|
||||||
+#define UP_RESET_SLEEP 100
|
|
||||||
+
|
|
||||||
+/* addresses of memory segments in the phy */
|
|
||||||
+#define DRAM_BASE_ADDR 0x3FFE0000
|
|
||||||
+#define IRAM_BASE_ADDR 0x40000000
|
|
||||||
+
|
|
||||||
+/* firmware image format constants */
|
|
||||||
+#define VERSION_STRING_SIZE 0x40
|
|
||||||
+#define VERSION_STRING_OFFSET 0x0200
|
|
||||||
+/* primary offset is written at an offset from the start of the fw blob */
|
|
||||||
+#define PRIMARY_OFFSET_OFFSET 0x8
|
|
||||||
+/* primary offset needs to be then added to a base offset */
|
|
||||||
+#define PRIMARY_OFFSET_SHIFT 12
|
|
||||||
+#define PRIMARY_OFFSET(x) ((x) << PRIMARY_OFFSET_SHIFT)
|
|
||||||
+#define HEADER_OFFSET 0x300
|
|
||||||
+
|
|
||||||
+struct aqr_fw_header {
|
|
||||||
+ u32 padding;
|
|
||||||
+ u8 iram_offset[3];
|
|
||||||
+ u8 iram_size[3];
|
|
||||||
+ u8 dram_offset[3];
|
|
||||||
+ u8 dram_size[3];
|
|
||||||
+} __packed;
|
|
||||||
+
|
|
||||||
+enum aqr_fw_src {
|
|
||||||
+ AQR_FW_SRC_NVMEM = 0,
|
|
||||||
+ AQR_FW_SRC_FS,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static const char * const aqr_fw_src_string[] = {
|
|
||||||
+ [AQR_FW_SRC_NVMEM] = "NVMEM",
|
|
||||||
+ [AQR_FW_SRC_FS] = "FS",
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+/* AQR firmware doesn't have fixed offsets for iram and dram section
|
|
||||||
+ * but instead provide an header with the offset to use on reading
|
|
||||||
+ * and parsing the firmware.
|
|
||||||
+ *
|
|
||||||
+ * AQR firmware can't be trusted and each offset is validated to be
|
|
||||||
+ * not negative and be in the size of the firmware itself.
|
|
||||||
+ */
|
|
||||||
+static bool aqr_fw_validate_get(size_t size, size_t offset, size_t get_size)
|
|
||||||
+{
|
|
||||||
+ return offset + get_size <= size;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int aqr_fw_get_be16(const u8 *data, size_t offset, size_t size, u16 *value)
|
|
||||||
+{
|
|
||||||
+ if (!aqr_fw_validate_get(size, offset, sizeof(u16)))
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ *value = get_unaligned_be16(data + offset);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int aqr_fw_get_le16(const u8 *data, size_t offset, size_t size, u16 *value)
|
|
||||||
+{
|
|
||||||
+ if (!aqr_fw_validate_get(size, offset, sizeof(u16)))
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ *value = get_unaligned_le16(data + offset);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int aqr_fw_get_le24(const u8 *data, size_t offset, size_t size, u32 *value)
|
|
||||||
+{
|
|
||||||
+ if (!aqr_fw_validate_get(size, offset, sizeof(u8) * 3))
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ *value = get_unaligned_le24(data + offset);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* load data into the phy's memory */
|
|
||||||
+static int aqr_fw_load_memory(struct phy_device *phydev, u32 addr,
|
|
||||||
+ const u8 *data, size_t len)
|
|
||||||
+{
|
|
||||||
+ u16 crc = 0, up_crc;
|
|
||||||
+ size_t pos;
|
|
||||||
+
|
|
||||||
+ /* PHY expect addr in LE */
|
|
||||||
+ addr = (__force u32)cpu_to_le32(addr);
|
|
||||||
+
|
|
||||||
+ phy_write_mmd(phydev, MDIO_MMD_VEND1,
|
|
||||||
+ VEND1_GLOBAL_MAILBOX_INTERFACE1,
|
|
||||||
+ VEND1_GLOBAL_MAILBOX_INTERFACE1_CRC_RESET);
|
|
||||||
+ phy_write_mmd(phydev, MDIO_MMD_VEND1,
|
|
||||||
+ VEND1_GLOBAL_MAILBOX_INTERFACE3,
|
|
||||||
+ VEND1_GLOBAL_MAILBOX_INTERFACE3_MSW_ADDR(addr));
|
|
||||||
+ phy_write_mmd(phydev, MDIO_MMD_VEND1,
|
|
||||||
+ VEND1_GLOBAL_MAILBOX_INTERFACE4,
|
|
||||||
+ VEND1_GLOBAL_MAILBOX_INTERFACE4_LSW_ADDR(addr));
|
|
||||||
+
|
|
||||||
+ /* We assume and enforce the size to be word aligned.
|
|
||||||
+ * If a firmware that is not word aligned is found, please report upstream.
|
|
||||||
+ */
|
|
||||||
+ for (pos = 0; pos < len; pos += sizeof(u32)) {
|
|
||||||
+ u32 word;
|
|
||||||
+
|
|
||||||
+ /* FW data is always stored in little-endian */
|
|
||||||
+ word = get_unaligned((const u32 *)(data + pos));
|
|
||||||
+
|
|
||||||
+ phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_MAILBOX_INTERFACE5,
|
|
||||||
+ VEND1_GLOBAL_MAILBOX_INTERFACE5_MSW_DATA(word));
|
|
||||||
+ phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_MAILBOX_INTERFACE6,
|
|
||||||
+ VEND1_GLOBAL_MAILBOX_INTERFACE6_LSW_DATA(word));
|
|
||||||
+
|
|
||||||
+ phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_MAILBOX_INTERFACE1,
|
|
||||||
+ VEND1_GLOBAL_MAILBOX_INTERFACE1_EXECUTE |
|
|
||||||
+ VEND1_GLOBAL_MAILBOX_INTERFACE1_WRITE);
|
|
||||||
+
|
|
||||||
+ /* calculate CRC as we load data to the mailbox.
|
|
||||||
+ * We convert word to big-endian as PHY is BE and mailbox will
|
|
||||||
+ * return a BE CRC.
|
|
||||||
+ */
|
|
||||||
+ word = (__force u32)cpu_to_be32(word);
|
|
||||||
+ crc = crc_ccitt_false(crc, (u8 *)&word, sizeof(word));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ up_crc = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_MAILBOX_INTERFACE2);
|
|
||||||
+ if (crc != up_crc) {
|
|
||||||
+ phydev_err(phydev, "CRC mismatch: calculated 0x%04x PHY 0x%04x\n",
|
|
||||||
+ crc, up_crc);
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int aqr_fw_boot(struct phy_device *phydev, const u8 *data, size_t size,
|
|
||||||
+ enum aqr_fw_src fw_src)
|
|
||||||
+{
|
|
||||||
+ u16 calculated_crc, read_crc, read_primary_offset;
|
|
||||||
+ u32 iram_offset = 0, iram_size = 0;
|
|
||||||
+ u32 dram_offset = 0, dram_size = 0;
|
|
||||||
+ char version[VERSION_STRING_SIZE];
|
|
||||||
+ u32 primary_offset = 0;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ /* extract saved CRC at the end of the fw
|
|
||||||
+ * CRC is saved in big-endian as PHY is BE
|
|
||||||
+ */
|
|
||||||
+ ret = aqr_fw_get_be16(data, size - sizeof(u16), size, &read_crc);
|
|
||||||
+ if (ret) {
|
|
||||||
+ phydev_err(phydev, "bad firmware CRC in firmware\n");
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+ calculated_crc = crc_ccitt_false(0, data, size - sizeof(u16));
|
|
||||||
+ if (read_crc != calculated_crc) {
|
|
||||||
+ phydev_err(phydev, "bad firmware CRC: file 0x%04x calculated 0x%04x\n",
|
|
||||||
+ read_crc, calculated_crc);
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Get the primary offset to extract DRAM and IRAM sections. */
|
|
||||||
+ ret = aqr_fw_get_le16(data, PRIMARY_OFFSET_OFFSET, size, &read_primary_offset);
|
|
||||||
+ if (ret) {
|
|
||||||
+ phydev_err(phydev, "bad primary offset in firmware\n");
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+ primary_offset = PRIMARY_OFFSET(read_primary_offset);
|
|
||||||
+
|
|
||||||
+ /* Find the DRAM and IRAM sections within the firmware file.
|
|
||||||
+ * Make sure the fw_header is correctly in the firmware.
|
|
||||||
+ */
|
|
||||||
+ if (!aqr_fw_validate_get(size, primary_offset + HEADER_OFFSET,
|
|
||||||
+ sizeof(struct aqr_fw_header))) {
|
|
||||||
+ phydev_err(phydev, "bad fw_header in firmware\n");
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* offset are in LE and values needs to be converted to cpu endian */
|
|
||||||
+ ret = aqr_fw_get_le24(data, primary_offset + HEADER_OFFSET +
|
|
||||||
+ offsetof(struct aqr_fw_header, iram_offset),
|
|
||||||
+ size, &iram_offset);
|
|
||||||
+ if (ret) {
|
|
||||||
+ phydev_err(phydev, "bad iram offset in firmware\n");
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+ ret = aqr_fw_get_le24(data, primary_offset + HEADER_OFFSET +
|
|
||||||
+ offsetof(struct aqr_fw_header, iram_size),
|
|
||||||
+ size, &iram_size);
|
|
||||||
+ if (ret) {
|
|
||||||
+ phydev_err(phydev, "invalid iram size in firmware\n");
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+ ret = aqr_fw_get_le24(data, primary_offset + HEADER_OFFSET +
|
|
||||||
+ offsetof(struct aqr_fw_header, dram_offset),
|
|
||||||
+ size, &dram_offset);
|
|
||||||
+ if (ret) {
|
|
||||||
+ phydev_err(phydev, "bad dram offset in firmware\n");
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+ ret = aqr_fw_get_le24(data, primary_offset + HEADER_OFFSET +
|
|
||||||
+ offsetof(struct aqr_fw_header, dram_size),
|
|
||||||
+ size, &dram_size);
|
|
||||||
+ if (ret) {
|
|
||||||
+ phydev_err(phydev, "invalid dram size in firmware\n");
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Increment the offset with the primary offset.
|
|
||||||
+ * Validate iram/dram offset and size.
|
|
||||||
+ */
|
|
||||||
+ iram_offset += primary_offset;
|
|
||||||
+ if (iram_size % sizeof(u32)) {
|
|
||||||
+ phydev_err(phydev, "iram size if not aligned to word size. Please report this upstream!\n");
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+ if (!aqr_fw_validate_get(size, iram_offset, iram_size)) {
|
|
||||||
+ phydev_err(phydev, "invalid iram offset for iram size\n");
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ dram_offset += primary_offset;
|
|
||||||
+ if (dram_size % sizeof(u32)) {
|
|
||||||
+ phydev_err(phydev, "dram size if not aligned to word size. Please report this upstream!\n");
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+ if (!aqr_fw_validate_get(size, dram_offset, dram_size)) {
|
|
||||||
+ phydev_err(phydev, "invalid iram offset for iram size\n");
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ phydev_dbg(phydev, "primary %d IRAM offset=%d size=%d DRAM offset=%d size=%d\n",
|
|
||||||
+ primary_offset, iram_offset, iram_size, dram_offset, dram_size);
|
|
||||||
+
|
|
||||||
+ if (!aqr_fw_validate_get(size, dram_offset + VERSION_STRING_OFFSET,
|
|
||||||
+ VERSION_STRING_SIZE)) {
|
|
||||||
+ phydev_err(phydev, "invalid version in firmware\n");
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+ strscpy(version, (char *)data + dram_offset + VERSION_STRING_OFFSET,
|
|
||||||
+ VERSION_STRING_SIZE);
|
|
||||||
+ if (version[0] == '\0') {
|
|
||||||
+ phydev_err(phydev, "invalid version in firmware\n");
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+ phydev_info(phydev, "loading firmware version '%s' from '%s'\n", version,
|
|
||||||
+ aqr_fw_src_string[fw_src]);
|
|
||||||
+
|
|
||||||
+ /* stall the microcprocessor */
|
|
||||||
+ phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_CONTROL2,
|
|
||||||
+ VEND1_GLOBAL_CONTROL2_UP_RUN_STALL | VEND1_GLOBAL_CONTROL2_UP_RUN_STALL_OVD);
|
|
||||||
+
|
|
||||||
+ phydev_dbg(phydev, "loading DRAM 0x%08x from offset=%d size=%d\n",
|
|
||||||
+ DRAM_BASE_ADDR, dram_offset, dram_size);
|
|
||||||
+ ret = aqr_fw_load_memory(phydev, DRAM_BASE_ADDR, data + dram_offset,
|
|
||||||
+ dram_size);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+ phydev_dbg(phydev, "loading IRAM 0x%08x from offset=%d size=%d\n",
|
|
||||||
+ IRAM_BASE_ADDR, iram_offset, iram_size);
|
|
||||||
+ ret = aqr_fw_load_memory(phydev, IRAM_BASE_ADDR, data + iram_offset,
|
|
||||||
+ iram_size);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+ /* make sure soft reset and low power mode are clear */
|
|
||||||
+ phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_SC,
|
|
||||||
+ VEND1_GLOBAL_SC_SOFT_RESET | VEND1_GLOBAL_SC_LOW_POWER);
|
|
||||||
+
|
|
||||||
+ /* Release the microprocessor. UP_RESET must be held for 100 usec. */
|
|
||||||
+ phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_CONTROL2,
|
|
||||||
+ VEND1_GLOBAL_CONTROL2_UP_RUN_STALL |
|
|
||||||
+ VEND1_GLOBAL_CONTROL2_UP_RUN_STALL_OVD |
|
|
||||||
+ VEND1_GLOBAL_CONTROL2_UP_RUN_STALL_RST);
|
|
||||||
+ usleep_range(UP_RESET_SLEEP, UP_RESET_SLEEP * 2);
|
|
||||||
+
|
|
||||||
+ phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_CONTROL2,
|
|
||||||
+ VEND1_GLOBAL_CONTROL2_UP_RUN_STALL_OVD);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int aqr_firmware_load_nvmem(struct phy_device *phydev)
|
|
||||||
+{
|
|
||||||
+ struct nvmem_cell *cell;
|
|
||||||
+ size_t size;
|
|
||||||
+ u8 *buf;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ cell = nvmem_cell_get(&phydev->mdio.dev, "firmware");
|
|
||||||
+ if (IS_ERR(cell))
|
|
||||||
+ return PTR_ERR(cell);
|
|
||||||
+
|
|
||||||
+ buf = nvmem_cell_read(cell, &size);
|
|
||||||
+ if (IS_ERR(buf)) {
|
|
||||||
+ ret = PTR_ERR(buf);
|
|
||||||
+ goto exit;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ ret = aqr_fw_boot(phydev, buf, size, AQR_FW_SRC_NVMEM);
|
|
||||||
+ if (ret)
|
|
||||||
+ phydev_err(phydev, "firmware loading failed: %d\n", ret);
|
|
||||||
+
|
|
||||||
+ kfree(buf);
|
|
||||||
+exit:
|
|
||||||
+ nvmem_cell_put(cell);
|
|
||||||
+
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int aqr_firmware_load_fs(struct phy_device *phydev)
|
|
||||||
+{
|
|
||||||
+ struct device *dev = &phydev->mdio.dev;
|
|
||||||
+ const struct firmware *fw;
|
|
||||||
+ const char *fw_name;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ ret = of_property_read_string(dev->of_node, "firmware-name",
|
|
||||||
+ &fw_name);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+ ret = request_firmware(&fw, fw_name, dev);
|
|
||||||
+ if (ret) {
|
|
||||||
+ phydev_err(phydev, "failed to find FW file %s (%d)\n",
|
|
||||||
+ fw_name, ret);
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ ret = aqr_fw_boot(phydev, fw->data, fw->size, AQR_FW_SRC_FS);
|
|
||||||
+ if (ret)
|
|
||||||
+ phydev_err(phydev, "firmware loading failed: %d\n", ret);
|
|
||||||
+
|
|
||||||
+ release_firmware(fw);
|
|
||||||
+
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int aqr_firmware_load(struct phy_device *phydev)
|
|
||||||
+{
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ /* Check if the firmware is not already loaded by pooling
|
|
||||||
+ * the current version returned by the PHY. If 0 is returned,
|
|
||||||
+ * no firmware is loaded.
|
|
||||||
+ */
|
|
||||||
+ ret = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_FW_ID);
|
|
||||||
+ if (ret > 0)
|
|
||||||
+ goto exit;
|
|
||||||
+
|
|
||||||
+ ret = aqr_firmware_load_nvmem(phydev);
|
|
||||||
+ if (!ret)
|
|
||||||
+ goto exit;
|
|
||||||
+
|
|
||||||
+ ret = aqr_firmware_load_fs(phydev);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+exit:
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
--- a/drivers/net/phy/aquantia/aquantia_main.c
|
|
||||||
+++ b/drivers/net/phy/aquantia/aquantia_main.c
|
|
||||||
@@ -658,11 +658,17 @@ static int aqr107_resume(struct phy_devi
|
|
||||||
|
|
||||||
static int aqr107_probe(struct phy_device *phydev)
|
|
||||||
{
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
phydev->priv = devm_kzalloc(&phydev->mdio.dev,
|
|
||||||
sizeof(struct aqr107_priv), GFP_KERNEL);
|
|
||||||
if (!phydev->priv)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
+ ret = aqr_firmware_load(phydev);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
return aqr_hwmon_probe(phydev);
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,334 +0,0 @@
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Thu, 23 Mar 2023 10:24:11 +0100
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_eth_soc: improve keeping track of
|
|
||||||
offloaded flows
|
|
||||||
|
|
||||||
Unify tracking of L2 and L3 flows. Use the generic list field in struct
|
|
||||||
mtk_foe_entry for tracking L2 subflows. Preparation for improving
|
|
||||||
flow accounting support.
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
drivers/net/ethernet/mediatek/mtk_ppe.c | 162 ++++++++++++------------
|
|
||||||
drivers/net/ethernet/mediatek/mtk_ppe.h | 15 +--
|
|
||||||
2 files changed, 86 insertions(+), 91 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
||||||
@@ -477,42 +477,43 @@ int mtk_foe_entry_set_queue(struct mtk_e
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int
|
|
||||||
+mtk_flow_entry_match_len(struct mtk_eth *eth, struct mtk_foe_entry *entry)
|
|
||||||
+{
|
|
||||||
+ int type = mtk_get_ib1_pkt_type(eth, entry->ib1);
|
|
||||||
+
|
|
||||||
+ if (type > MTK_PPE_PKT_TYPE_IPV4_DSLITE)
|
|
||||||
+ return offsetof(struct mtk_foe_entry, ipv6._rsv);
|
|
||||||
+ else
|
|
||||||
+ return offsetof(struct mtk_foe_entry, ipv4.ib2);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static bool
|
|
||||||
mtk_flow_entry_match(struct mtk_eth *eth, struct mtk_flow_entry *entry,
|
|
||||||
- struct mtk_foe_entry *data)
|
|
||||||
+ struct mtk_foe_entry *data, int len)
|
|
||||||
{
|
|
||||||
- int type, len;
|
|
||||||
-
|
|
||||||
if ((data->ib1 ^ entry->data.ib1) & MTK_FOE_IB1_UDP)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
- type = mtk_get_ib1_pkt_type(eth, entry->data.ib1);
|
|
||||||
- if (type > MTK_PPE_PKT_TYPE_IPV4_DSLITE)
|
|
||||||
- len = offsetof(struct mtk_foe_entry, ipv6._rsv);
|
|
||||||
- else
|
|
||||||
- len = offsetof(struct mtk_foe_entry, ipv4.ib2);
|
|
||||||
-
|
|
||||||
return !memcmp(&entry->data.data, &data->data, len - 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
-__mtk_foe_entry_clear(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
|
|
||||||
+__mtk_foe_entry_clear(struct mtk_ppe *ppe, struct mtk_flow_entry *entry,
|
|
||||||
+ bool set_state)
|
|
||||||
{
|
|
||||||
- struct hlist_head *head;
|
|
||||||
struct hlist_node *tmp;
|
|
||||||
|
|
||||||
if (entry->type == MTK_FLOW_TYPE_L2) {
|
|
||||||
rhashtable_remove_fast(&ppe->l2_flows, &entry->l2_node,
|
|
||||||
mtk_flow_l2_ht_params);
|
|
||||||
|
|
||||||
- head = &entry->l2_flows;
|
|
||||||
- hlist_for_each_entry_safe(entry, tmp, head, l2_data.list)
|
|
||||||
- __mtk_foe_entry_clear(ppe, entry);
|
|
||||||
+ hlist_for_each_entry_safe(entry, tmp, &entry->l2_flows, l2_list)
|
|
||||||
+ __mtk_foe_entry_clear(ppe, entry, set_state);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- hlist_del_init(&entry->list);
|
|
||||||
- if (entry->hash != 0xffff) {
|
|
||||||
+ if (entry->hash != 0xffff && set_state) {
|
|
||||||
struct mtk_foe_entry *hwe = mtk_foe_get_entry(ppe, entry->hash);
|
|
||||||
|
|
||||||
hwe->ib1 &= ~MTK_FOE_IB1_STATE;
|
|
||||||
@@ -533,7 +534,8 @@ __mtk_foe_entry_clear(struct mtk_ppe *pp
|
|
||||||
if (entry->type != MTK_FLOW_TYPE_L2_SUBFLOW)
|
|
||||||
return;
|
|
||||||
|
|
||||||
- hlist_del_init(&entry->l2_data.list);
|
|
||||||
+ hlist_del_init(&entry->l2_list);
|
|
||||||
+ hlist_del_init(&entry->list);
|
|
||||||
kfree(entry);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -549,66 +551,55 @@ static int __mtk_foe_entry_idle_time(str
|
|
||||||
return now - timestamp;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static bool
|
|
||||||
+mtk_flow_entry_update(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
|
|
||||||
+{
|
|
||||||
+ struct mtk_foe_entry foe = {};
|
|
||||||
+ struct mtk_foe_entry *hwe;
|
|
||||||
+ u16 hash = entry->hash;
|
|
||||||
+ int len;
|
|
||||||
+
|
|
||||||
+ if (hash == 0xffff)
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
+ hwe = mtk_foe_get_entry(ppe, hash);
|
|
||||||
+ len = mtk_flow_entry_match_len(ppe->eth, &entry->data);
|
|
||||||
+ memcpy(&foe, hwe, len);
|
|
||||||
+
|
|
||||||
+ if (!mtk_flow_entry_match(ppe->eth, entry, &foe, len) ||
|
|
||||||
+ FIELD_GET(MTK_FOE_IB1_STATE, foe.ib1) != MTK_FOE_STATE_BIND)
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
+ entry->data.ib1 = foe.ib1;
|
|
||||||
+
|
|
||||||
+ return true;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
mtk_flow_entry_update_l2(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
|
|
||||||
{
|
|
||||||
u32 ib1_ts_mask = mtk_get_ib1_ts_mask(ppe->eth);
|
|
||||||
struct mtk_flow_entry *cur;
|
|
||||||
- struct mtk_foe_entry *hwe;
|
|
||||||
struct hlist_node *tmp;
|
|
||||||
int idle;
|
|
||||||
|
|
||||||
idle = __mtk_foe_entry_idle_time(ppe, entry->data.ib1);
|
|
||||||
- hlist_for_each_entry_safe(cur, tmp, &entry->l2_flows, l2_data.list) {
|
|
||||||
+ hlist_for_each_entry_safe(cur, tmp, &entry->l2_flows, l2_list) {
|
|
||||||
int cur_idle;
|
|
||||||
- u32 ib1;
|
|
||||||
-
|
|
||||||
- hwe = mtk_foe_get_entry(ppe, cur->hash);
|
|
||||||
- ib1 = READ_ONCE(hwe->ib1);
|
|
||||||
|
|
||||||
- if (FIELD_GET(MTK_FOE_IB1_STATE, ib1) != MTK_FOE_STATE_BIND) {
|
|
||||||
- cur->hash = 0xffff;
|
|
||||||
- __mtk_foe_entry_clear(ppe, cur);
|
|
||||||
+ if (!mtk_flow_entry_update(ppe, cur)) {
|
|
||||||
+ __mtk_foe_entry_clear(ppe, entry, false);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
- cur_idle = __mtk_foe_entry_idle_time(ppe, ib1);
|
|
||||||
+ cur_idle = __mtk_foe_entry_idle_time(ppe, cur->data.ib1);
|
|
||||||
if (cur_idle >= idle)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
idle = cur_idle;
|
|
||||||
entry->data.ib1 &= ~ib1_ts_mask;
|
|
||||||
- entry->data.ib1 |= hwe->ib1 & ib1_ts_mask;
|
|
||||||
- }
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-static void
|
|
||||||
-mtk_flow_entry_update(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
|
|
||||||
-{
|
|
||||||
- struct mtk_foe_entry foe = {};
|
|
||||||
- struct mtk_foe_entry *hwe;
|
|
||||||
-
|
|
||||||
- spin_lock_bh(&ppe_lock);
|
|
||||||
-
|
|
||||||
- if (entry->type == MTK_FLOW_TYPE_L2) {
|
|
||||||
- mtk_flow_entry_update_l2(ppe, entry);
|
|
||||||
- goto out;
|
|
||||||
+ entry->data.ib1 |= cur->data.ib1 & ib1_ts_mask;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
- if (entry->hash == 0xffff)
|
|
||||||
- goto out;
|
|
||||||
-
|
|
||||||
- hwe = mtk_foe_get_entry(ppe, entry->hash);
|
|
||||||
- memcpy(&foe, hwe, ppe->eth->soc->foe_entry_size);
|
|
||||||
- if (!mtk_flow_entry_match(ppe->eth, entry, &foe)) {
|
|
||||||
- entry->hash = 0xffff;
|
|
||||||
- goto out;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- entry->data.ib1 = foe.ib1;
|
|
||||||
-
|
|
||||||
-out:
|
|
||||||
- spin_unlock_bh(&ppe_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -651,7 +642,8 @@ __mtk_foe_entry_commit(struct mtk_ppe *p
|
|
||||||
void mtk_foe_entry_clear(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
|
|
||||||
{
|
|
||||||
spin_lock_bh(&ppe_lock);
|
|
||||||
- __mtk_foe_entry_clear(ppe, entry);
|
|
||||||
+ __mtk_foe_entry_clear(ppe, entry, true);
|
|
||||||
+ hlist_del_init(&entry->list);
|
|
||||||
spin_unlock_bh(&ppe_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -698,8 +690,8 @@ mtk_foe_entry_commit_subflow(struct mtk_
|
|
||||||
{
|
|
||||||
const struct mtk_soc_data *soc = ppe->eth->soc;
|
|
||||||
struct mtk_flow_entry *flow_info;
|
|
||||||
- struct mtk_foe_entry foe = {}, *hwe;
|
|
||||||
struct mtk_foe_mac_info *l2;
|
|
||||||
+ struct mtk_foe_entry *hwe;
|
|
||||||
u32 ib1_mask = mtk_get_ib1_pkt_type_mask(ppe->eth) | MTK_FOE_IB1_UDP;
|
|
||||||
int type;
|
|
||||||
|
|
||||||
@@ -707,30 +699,30 @@ mtk_foe_entry_commit_subflow(struct mtk_
|
|
||||||
if (!flow_info)
|
|
||||||
return;
|
|
||||||
|
|
||||||
- flow_info->l2_data.base_flow = entry;
|
|
||||||
flow_info->type = MTK_FLOW_TYPE_L2_SUBFLOW;
|
|
||||||
flow_info->hash = hash;
|
|
||||||
hlist_add_head(&flow_info->list,
|
|
||||||
&ppe->foe_flow[hash / soc->hash_offset]);
|
|
||||||
- hlist_add_head(&flow_info->l2_data.list, &entry->l2_flows);
|
|
||||||
+ hlist_add_head(&flow_info->l2_list, &entry->l2_flows);
|
|
||||||
|
|
||||||
hwe = mtk_foe_get_entry(ppe, hash);
|
|
||||||
- memcpy(&foe, hwe, soc->foe_entry_size);
|
|
||||||
- foe.ib1 &= ib1_mask;
|
|
||||||
- foe.ib1 |= entry->data.ib1 & ~ib1_mask;
|
|
||||||
+ memcpy(&flow_info->data, hwe, soc->foe_entry_size);
|
|
||||||
+ flow_info->data.ib1 &= ib1_mask;
|
|
||||||
+ flow_info->data.ib1 |= entry->data.ib1 & ~ib1_mask;
|
|
||||||
|
|
||||||
- l2 = mtk_foe_entry_l2(ppe->eth, &foe);
|
|
||||||
+ l2 = mtk_foe_entry_l2(ppe->eth, &flow_info->data);
|
|
||||||
memcpy(l2, &entry->data.bridge.l2, sizeof(*l2));
|
|
||||||
|
|
||||||
- type = mtk_get_ib1_pkt_type(ppe->eth, foe.ib1);
|
|
||||||
+ type = mtk_get_ib1_pkt_type(ppe->eth, flow_info->data.ib1);
|
|
||||||
if (type == MTK_PPE_PKT_TYPE_IPV4_HNAPT)
|
|
||||||
- memcpy(&foe.ipv4.new, &foe.ipv4.orig, sizeof(foe.ipv4.new));
|
|
||||||
+ memcpy(&flow_info->data.ipv4.new, &flow_info->data.ipv4.orig,
|
|
||||||
+ sizeof(flow_info->data.ipv4.new));
|
|
||||||
else if (type >= MTK_PPE_PKT_TYPE_IPV6_ROUTE_3T && l2->etype == ETH_P_IP)
|
|
||||||
l2->etype = ETH_P_IPV6;
|
|
||||||
|
|
||||||
- *mtk_foe_entry_ib2(ppe->eth, &foe) = entry->data.bridge.ib2;
|
|
||||||
+ *mtk_foe_entry_ib2(ppe->eth, &flow_info->data) = entry->data.bridge.ib2;
|
|
||||||
|
|
||||||
- __mtk_foe_entry_commit(ppe, &foe, hash);
|
|
||||||
+ __mtk_foe_entry_commit(ppe, &flow_info->data, hash);
|
|
||||||
}
|
|
||||||
|
|
||||||
void __mtk_ppe_check_skb(struct mtk_ppe *ppe, struct sk_buff *skb, u16 hash)
|
|
||||||
@@ -740,9 +732,11 @@ void __mtk_ppe_check_skb(struct mtk_ppe
|
|
||||||
struct mtk_foe_entry *hwe = mtk_foe_get_entry(ppe, hash);
|
|
||||||
struct mtk_flow_entry *entry;
|
|
||||||
struct mtk_foe_bridge key = {};
|
|
||||||
+ struct mtk_foe_entry foe = {};
|
|
||||||
struct hlist_node *n;
|
|
||||||
struct ethhdr *eh;
|
|
||||||
bool found = false;
|
|
||||||
+ int entry_len;
|
|
||||||
u8 *tag;
|
|
||||||
|
|
||||||
spin_lock_bh(&ppe_lock);
|
|
||||||
@@ -750,20 +744,14 @@ void __mtk_ppe_check_skb(struct mtk_ppe
|
|
||||||
if (FIELD_GET(MTK_FOE_IB1_STATE, hwe->ib1) == MTK_FOE_STATE_BIND)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
- hlist_for_each_entry_safe(entry, n, head, list) {
|
|
||||||
- if (entry->type == MTK_FLOW_TYPE_L2_SUBFLOW) {
|
|
||||||
- if (unlikely(FIELD_GET(MTK_FOE_IB1_STATE, hwe->ib1) ==
|
|
||||||
- MTK_FOE_STATE_BIND))
|
|
||||||
- continue;
|
|
||||||
-
|
|
||||||
- entry->hash = 0xffff;
|
|
||||||
- __mtk_foe_entry_clear(ppe, entry);
|
|
||||||
- continue;
|
|
||||||
- }
|
|
||||||
+ entry_len = mtk_flow_entry_match_len(ppe->eth, hwe);
|
|
||||||
+ memcpy(&foe, hwe, entry_len);
|
|
||||||
|
|
||||||
- if (found || !mtk_flow_entry_match(ppe->eth, entry, hwe)) {
|
|
||||||
+ hlist_for_each_entry_safe(entry, n, head, list) {
|
|
||||||
+ if (found ||
|
|
||||||
+ !mtk_flow_entry_match(ppe->eth, entry, &foe, entry_len)) {
|
|
||||||
if (entry->hash != 0xffff)
|
|
||||||
- entry->hash = 0xffff;
|
|
||||||
+ __mtk_foe_entry_clear(ppe, entry, false);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -814,9 +802,17 @@ out:
|
|
||||||
|
|
||||||
int mtk_foe_entry_idle_time(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
|
|
||||||
{
|
|
||||||
- mtk_flow_entry_update(ppe, entry);
|
|
||||||
+ int idle;
|
|
||||||
+
|
|
||||||
+ spin_lock_bh(&ppe_lock);
|
|
||||||
+ if (entry->type == MTK_FLOW_TYPE_L2)
|
|
||||||
+ mtk_flow_entry_update_l2(ppe, entry);
|
|
||||||
+ else
|
|
||||||
+ mtk_flow_entry_update(ppe, entry);
|
|
||||||
+ idle = __mtk_foe_entry_idle_time(ppe, entry->data.ib1);
|
|
||||||
+ spin_unlock_bh(&ppe_lock);
|
|
||||||
|
|
||||||
- return __mtk_foe_entry_idle_time(ppe, entry->data.ib1);
|
|
||||||
+ return idle;
|
|
||||||
}
|
|
||||||
|
|
||||||
int mtk_ppe_prepare_reset(struct mtk_ppe *ppe)
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_ppe.h
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.h
|
|
||||||
@@ -286,7 +286,12 @@ enum {
|
|
||||||
|
|
||||||
struct mtk_flow_entry {
|
|
||||||
union {
|
|
||||||
- struct hlist_node list;
|
|
||||||
+ /* regular flows + L2 subflows */
|
|
||||||
+ struct {
|
|
||||||
+ struct hlist_node list;
|
|
||||||
+ struct hlist_node l2_list;
|
|
||||||
+ };
|
|
||||||
+ /* L2 flows */
|
|
||||||
struct {
|
|
||||||
struct rhash_head l2_node;
|
|
||||||
struct hlist_head l2_flows;
|
|
||||||
@@ -296,13 +301,7 @@ struct mtk_flow_entry {
|
|
||||||
s8 wed_index;
|
|
||||||
u8 ppe_index;
|
|
||||||
u16 hash;
|
|
||||||
- union {
|
|
||||||
- struct mtk_foe_entry data;
|
|
||||||
- struct {
|
|
||||||
- struct mtk_flow_entry *base_flow;
|
|
||||||
- struct hlist_node list;
|
|
||||||
- } l2_data;
|
|
||||||
- };
|
|
||||||
+ struct mtk_foe_entry data;
|
|
||||||
struct rhash_head node;
|
|
||||||
unsigned long cookie;
|
|
||||||
};
|
|
|
@ -1,343 +0,0 @@
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Thu, 23 Mar 2023 11:05:22 +0100
|
|
||||||
Subject: [PATCH] net: ethernet: mediatek: fix ppe flow accounting for L2
|
|
||||||
flows
|
|
||||||
|
|
||||||
For L2 flows, the packet/byte counters should report the sum of the
|
|
||||||
counters of their subflows, both current and expired.
|
|
||||||
In order to make this work, change the way that accounting data is tracked.
|
|
||||||
Reset counters when a flow enters bind. Once it expires (or enters unbind),
|
|
||||||
store the last counter value in struct mtk_flow_entry.
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
||||||
@@ -80,9 +80,9 @@ static int mtk_ppe_mib_wait_busy(struct
|
|
||||||
int ret;
|
|
||||||
u32 val;
|
|
||||||
|
|
||||||
- ret = readl_poll_timeout(ppe->base + MTK_PPE_MIB_SER_CR, val,
|
|
||||||
- !(val & MTK_PPE_MIB_SER_CR_ST),
|
|
||||||
- 20, MTK_PPE_WAIT_TIMEOUT_US);
|
|
||||||
+ ret = readl_poll_timeout_atomic(ppe->base + MTK_PPE_MIB_SER_CR, val,
|
|
||||||
+ !(val & MTK_PPE_MIB_SER_CR_ST),
|
|
||||||
+ 20, MTK_PPE_WAIT_TIMEOUT_US);
|
|
||||||
|
|
||||||
if (ret)
|
|
||||||
dev_err(ppe->dev, "MIB table busy");
|
|
||||||
@@ -90,17 +90,31 @@ static int mtk_ppe_mib_wait_busy(struct
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int mtk_mib_entry_read(struct mtk_ppe *ppe, u16 index, u64 *bytes, u64 *packets)
|
|
||||||
+static inline struct mtk_foe_accounting *
|
|
||||||
+mtk_ppe_acct_data(struct mtk_ppe *ppe, u16 index)
|
|
||||||
+{
|
|
||||||
+ if (!ppe->acct_table)
|
|
||||||
+ return NULL;
|
|
||||||
+
|
|
||||||
+ return ppe->acct_table + index * sizeof(struct mtk_foe_accounting);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+struct mtk_foe_accounting *mtk_ppe_mib_entry_read(struct mtk_ppe *ppe, u16 index)
|
|
||||||
{
|
|
||||||
u32 val, cnt_r0, cnt_r1, cnt_r2;
|
|
||||||
+ struct mtk_foe_accounting *acct;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
val = FIELD_PREP(MTK_PPE_MIB_SER_CR_ADDR, index) | MTK_PPE_MIB_SER_CR_ST;
|
|
||||||
ppe_w32(ppe, MTK_PPE_MIB_SER_CR, val);
|
|
||||||
|
|
||||||
+ acct = mtk_ppe_acct_data(ppe, index);
|
|
||||||
+ if (!acct)
|
|
||||||
+ return NULL;
|
|
||||||
+
|
|
||||||
ret = mtk_ppe_mib_wait_busy(ppe);
|
|
||||||
if (ret)
|
|
||||||
- return ret;
|
|
||||||
+ return acct;
|
|
||||||
|
|
||||||
cnt_r0 = readl(ppe->base + MTK_PPE_MIB_SER_R0);
|
|
||||||
cnt_r1 = readl(ppe->base + MTK_PPE_MIB_SER_R1);
|
|
||||||
@@ -109,19 +123,19 @@ static int mtk_mib_entry_read(struct mtk
|
|
||||||
if (mtk_is_netsys_v3_or_greater(ppe->eth)) {
|
|
||||||
/* 64 bit for each counter */
|
|
||||||
u32 cnt_r3 = readl(ppe->base + MTK_PPE_MIB_SER_R3);
|
|
||||||
- *bytes = ((u64)cnt_r1 << 32) | cnt_r0;
|
|
||||||
- *packets = ((u64)cnt_r3 << 32) | cnt_r2;
|
|
||||||
+ acct->bytes += ((u64)cnt_r1 << 32) | cnt_r0;
|
|
||||||
+ acct->packets += ((u64)cnt_r3 << 32) | cnt_r2;
|
|
||||||
} else {
|
|
||||||
/* 48 bit byte counter, 40 bit packet counter */
|
|
||||||
u32 byte_cnt_low = FIELD_GET(MTK_PPE_MIB_SER_R0_BYTE_CNT_LOW, cnt_r0);
|
|
||||||
u32 byte_cnt_high = FIELD_GET(MTK_PPE_MIB_SER_R1_BYTE_CNT_HIGH, cnt_r1);
|
|
||||||
u32 pkt_cnt_low = FIELD_GET(MTK_PPE_MIB_SER_R1_PKT_CNT_LOW, cnt_r1);
|
|
||||||
u32 pkt_cnt_high = FIELD_GET(MTK_PPE_MIB_SER_R2_PKT_CNT_HIGH, cnt_r2);
|
|
||||||
- *bytes = ((u64)byte_cnt_high << 32) | byte_cnt_low;
|
|
||||||
- *packets = ((u64)pkt_cnt_high << 16) | pkt_cnt_low;
|
|
||||||
+ acct->bytes += ((u64)byte_cnt_high << 32) | byte_cnt_low;
|
|
||||||
+ acct->packets += ((u64)pkt_cnt_high << 16) | pkt_cnt_low;
|
|
||||||
}
|
|
||||||
|
|
||||||
- return 0;
|
|
||||||
+ return acct;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void mtk_ppe_cache_clear(struct mtk_ppe *ppe)
|
|
||||||
@@ -520,14 +534,6 @@ __mtk_foe_entry_clear(struct mtk_ppe *pp
|
|
||||||
hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_INVALID);
|
|
||||||
dma_wmb();
|
|
||||||
mtk_ppe_cache_clear(ppe);
|
|
||||||
-
|
|
||||||
- if (ppe->accounting) {
|
|
||||||
- struct mtk_foe_accounting *acct;
|
|
||||||
-
|
|
||||||
- acct = ppe->acct_table + entry->hash * sizeof(*acct);
|
|
||||||
- acct->packets = 0;
|
|
||||||
- acct->bytes = 0;
|
|
||||||
- }
|
|
||||||
}
|
|
||||||
entry->hash = 0xffff;
|
|
||||||
|
|
||||||
@@ -552,11 +558,14 @@ static int __mtk_foe_entry_idle_time(str
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool
|
|
||||||
-mtk_flow_entry_update(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
|
|
||||||
+mtk_flow_entry_update(struct mtk_ppe *ppe, struct mtk_flow_entry *entry,
|
|
||||||
+ u64 *packets, u64 *bytes)
|
|
||||||
{
|
|
||||||
+ struct mtk_foe_accounting *acct;
|
|
||||||
struct mtk_foe_entry foe = {};
|
|
||||||
struct mtk_foe_entry *hwe;
|
|
||||||
u16 hash = entry->hash;
|
|
||||||
+ bool ret = false;
|
|
||||||
int len;
|
|
||||||
|
|
||||||
if (hash == 0xffff)
|
|
||||||
@@ -567,18 +576,35 @@ mtk_flow_entry_update(struct mtk_ppe *pp
|
|
||||||
memcpy(&foe, hwe, len);
|
|
||||||
|
|
||||||
if (!mtk_flow_entry_match(ppe->eth, entry, &foe, len) ||
|
|
||||||
- FIELD_GET(MTK_FOE_IB1_STATE, foe.ib1) != MTK_FOE_STATE_BIND)
|
|
||||||
- return false;
|
|
||||||
+ FIELD_GET(MTK_FOE_IB1_STATE, foe.ib1) != MTK_FOE_STATE_BIND) {
|
|
||||||
+ acct = mtk_ppe_acct_data(ppe, hash);
|
|
||||||
+ if (acct) {
|
|
||||||
+ entry->prev_packets += acct->packets;
|
|
||||||
+ entry->prev_bytes += acct->bytes;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ goto out;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
entry->data.ib1 = foe.ib1;
|
|
||||||
+ acct = mtk_ppe_mib_entry_read(ppe, hash);
|
|
||||||
+ ret = true;
|
|
||||||
+
|
|
||||||
+out:
|
|
||||||
+ if (acct) {
|
|
||||||
+ *packets += acct->packets;
|
|
||||||
+ *bytes += acct->bytes;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- return true;
|
|
||||||
+ return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
mtk_flow_entry_update_l2(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
|
|
||||||
{
|
|
||||||
u32 ib1_ts_mask = mtk_get_ib1_ts_mask(ppe->eth);
|
|
||||||
+ u64 *packets = &entry->packets;
|
|
||||||
+ u64 *bytes = &entry->bytes;
|
|
||||||
struct mtk_flow_entry *cur;
|
|
||||||
struct hlist_node *tmp;
|
|
||||||
int idle;
|
|
||||||
@@ -587,7 +613,9 @@ mtk_flow_entry_update_l2(struct mtk_ppe
|
|
||||||
hlist_for_each_entry_safe(cur, tmp, &entry->l2_flows, l2_list) {
|
|
||||||
int cur_idle;
|
|
||||||
|
|
||||||
- if (!mtk_flow_entry_update(ppe, cur)) {
|
|
||||||
+ if (!mtk_flow_entry_update(ppe, cur, packets, bytes)) {
|
|
||||||
+ entry->prev_packets += cur->prev_packets;
|
|
||||||
+ entry->prev_bytes += cur->prev_bytes;
|
|
||||||
__mtk_foe_entry_clear(ppe, entry, false);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
@@ -602,10 +630,29 @@ mtk_flow_entry_update_l2(struct mtk_ppe
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+void mtk_foe_entry_get_stats(struct mtk_ppe *ppe, struct mtk_flow_entry *entry,
|
|
||||||
+ int *idle)
|
|
||||||
+{
|
|
||||||
+ entry->packets = entry->prev_packets;
|
|
||||||
+ entry->bytes = entry->prev_bytes;
|
|
||||||
+
|
|
||||||
+ spin_lock_bh(&ppe_lock);
|
|
||||||
+
|
|
||||||
+ if (entry->type == MTK_FLOW_TYPE_L2)
|
|
||||||
+ mtk_flow_entry_update_l2(ppe, entry);
|
|
||||||
+ else
|
|
||||||
+ mtk_flow_entry_update(ppe, entry, &entry->packets, &entry->bytes);
|
|
||||||
+
|
|
||||||
+ *idle = __mtk_foe_entry_idle_time(ppe, entry->data.ib1);
|
|
||||||
+
|
|
||||||
+ spin_unlock_bh(&ppe_lock);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
__mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_foe_entry *entry,
|
|
||||||
u16 hash)
|
|
||||||
{
|
|
||||||
+ struct mtk_foe_accounting *acct;
|
|
||||||
struct mtk_eth *eth = ppe->eth;
|
|
||||||
u16 timestamp = mtk_eth_timestamp(eth);
|
|
||||||
struct mtk_foe_entry *hwe;
|
|
||||||
@@ -636,6 +683,12 @@ __mtk_foe_entry_commit(struct mtk_ppe *p
|
|
||||||
|
|
||||||
dma_wmb();
|
|
||||||
|
|
||||||
+ acct = mtk_ppe_mib_entry_read(ppe, hash);
|
|
||||||
+ if (acct) {
|
|
||||||
+ acct->packets = 0;
|
|
||||||
+ acct->bytes = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
mtk_ppe_cache_clear(ppe);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -800,21 +853,6 @@ out:
|
|
||||||
spin_unlock_bh(&ppe_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
-int mtk_foe_entry_idle_time(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
|
|
||||||
-{
|
|
||||||
- int idle;
|
|
||||||
-
|
|
||||||
- spin_lock_bh(&ppe_lock);
|
|
||||||
- if (entry->type == MTK_FLOW_TYPE_L2)
|
|
||||||
- mtk_flow_entry_update_l2(ppe, entry);
|
|
||||||
- else
|
|
||||||
- mtk_flow_entry_update(ppe, entry);
|
|
||||||
- idle = __mtk_foe_entry_idle_time(ppe, entry->data.ib1);
|
|
||||||
- spin_unlock_bh(&ppe_lock);
|
|
||||||
-
|
|
||||||
- return idle;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
int mtk_ppe_prepare_reset(struct mtk_ppe *ppe)
|
|
||||||
{
|
|
||||||
if (!ppe)
|
|
||||||
@@ -842,32 +880,6 @@ int mtk_ppe_prepare_reset(struct mtk_ppe
|
|
||||||
return mtk_ppe_wait_busy(ppe);
|
|
||||||
}
|
|
||||||
|
|
||||||
-struct mtk_foe_accounting *mtk_foe_entry_get_mib(struct mtk_ppe *ppe, u32 index,
|
|
||||||
- struct mtk_foe_accounting *diff)
|
|
||||||
-{
|
|
||||||
- struct mtk_foe_accounting *acct;
|
|
||||||
- int size = sizeof(struct mtk_foe_accounting);
|
|
||||||
- u64 bytes, packets;
|
|
||||||
-
|
|
||||||
- if (!ppe->accounting)
|
|
||||||
- return NULL;
|
|
||||||
-
|
|
||||||
- if (mtk_mib_entry_read(ppe, index, &bytes, &packets))
|
|
||||||
- return NULL;
|
|
||||||
-
|
|
||||||
- acct = ppe->acct_table + index * size;
|
|
||||||
-
|
|
||||||
- acct->bytes += bytes;
|
|
||||||
- acct->packets += packets;
|
|
||||||
-
|
|
||||||
- if (diff) {
|
|
||||||
- diff->bytes = bytes;
|
|
||||||
- diff->packets = packets;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- return acct;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, int index)
|
|
||||||
{
|
|
||||||
bool accounting = eth->soc->has_accounting;
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_ppe.h
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.h
|
|
||||||
@@ -304,6 +304,8 @@ struct mtk_flow_entry {
|
|
||||||
struct mtk_foe_entry data;
|
|
||||||
struct rhash_head node;
|
|
||||||
unsigned long cookie;
|
|
||||||
+ u64 prev_packets, prev_bytes;
|
|
||||||
+ u64 packets, bytes;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct mtk_mib_entry {
|
|
||||||
@@ -348,6 +350,7 @@ void mtk_ppe_deinit(struct mtk_eth *eth)
|
|
||||||
void mtk_ppe_start(struct mtk_ppe *ppe);
|
|
||||||
int mtk_ppe_stop(struct mtk_ppe *ppe);
|
|
||||||
int mtk_ppe_prepare_reset(struct mtk_ppe *ppe);
|
|
||||||
+struct mtk_foe_accounting *mtk_ppe_mib_entry_read(struct mtk_ppe *ppe, u16 index);
|
|
||||||
|
|
||||||
void __mtk_ppe_check_skb(struct mtk_ppe *ppe, struct sk_buff *skb, u16 hash);
|
|
||||||
|
|
||||||
@@ -396,9 +399,8 @@ int mtk_foe_entry_set_queue(struct mtk_e
|
|
||||||
unsigned int queue);
|
|
||||||
int mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_flow_entry *entry);
|
|
||||||
void mtk_foe_entry_clear(struct mtk_ppe *ppe, struct mtk_flow_entry *entry);
|
|
||||||
-int mtk_foe_entry_idle_time(struct mtk_ppe *ppe, struct mtk_flow_entry *entry);
|
|
||||||
int mtk_ppe_debugfs_init(struct mtk_ppe *ppe, int index);
|
|
||||||
-struct mtk_foe_accounting *mtk_foe_entry_get_mib(struct mtk_ppe *ppe, u32 index,
|
|
||||||
- struct mtk_foe_accounting *diff);
|
|
||||||
+void mtk_foe_entry_get_stats(struct mtk_ppe *ppe, struct mtk_flow_entry *entry,
|
|
||||||
+ int *idle);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c
|
|
||||||
@@ -96,7 +96,7 @@ mtk_ppe_debugfs_foe_show(struct seq_file
|
|
||||||
if (bind && state != MTK_FOE_STATE_BIND)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
- acct = mtk_foe_entry_get_mib(ppe, i, NULL);
|
|
||||||
+ acct = mtk_ppe_mib_entry_read(ppe, i);
|
|
||||||
|
|
||||||
type = mtk_get_ib1_pkt_type(ppe->eth, entry->ib1);
|
|
||||||
seq_printf(m, "%05x %s %7s", i,
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
|
|
||||||
@@ -501,24 +501,21 @@ static int
|
|
||||||
mtk_flow_offload_stats(struct mtk_eth *eth, struct flow_cls_offload *f)
|
|
||||||
{
|
|
||||||
struct mtk_flow_entry *entry;
|
|
||||||
- struct mtk_foe_accounting diff;
|
|
||||||
- u32 idle;
|
|
||||||
+ u64 packets, bytes;
|
|
||||||
+ int idle;
|
|
||||||
|
|
||||||
entry = rhashtable_lookup(ð->flow_table, &f->cookie,
|
|
||||||
mtk_flow_ht_params);
|
|
||||||
if (!entry)
|
|
||||||
return -ENOENT;
|
|
||||||
|
|
||||||
- idle = mtk_foe_entry_idle_time(eth->ppe[entry->ppe_index], entry);
|
|
||||||
+ packets = entry->packets;
|
|
||||||
+ bytes = entry->bytes;
|
|
||||||
+ mtk_foe_entry_get_stats(eth->ppe[entry->ppe_index], entry, &idle);
|
|
||||||
+ f->stats.pkts += entry->packets - packets;
|
|
||||||
+ f->stats.bytes += entry->bytes - bytes;
|
|
||||||
f->stats.lastused = jiffies - idle * HZ;
|
|
||||||
|
|
||||||
- if (entry->hash != 0xFFFF &&
|
|
||||||
- mtk_foe_entry_get_mib(eth->ppe[entry->ppe_index], entry->hash,
|
|
||||||
- &diff)) {
|
|
||||||
- f->stats.pkts += diff.packets;
|
|
||||||
- f->stats.bytes += diff.bytes;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Tue, 12 Sep 2023 10:22:56 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_eth_soc: rely on mtk_pse_port definitions
|
|
||||||
in mtk_flow_set_output_device
|
|
||||||
|
|
||||||
Similar to ethernet ports, rely on mtk_pse_port definitions for
|
|
||||||
pse wdma ports as well.
|
|
||||||
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
||||||
Link: https://lore.kernel.org/r/b86bdb717e963e3246c1dec5f736c810703cf056.1694506814.git.lorenzo@kernel.org
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
|
|
||||||
@@ -196,10 +196,10 @@ mtk_flow_set_output_device(struct mtk_et
|
|
||||||
if (mtk_is_netsys_v2_or_greater(eth)) {
|
|
||||||
switch (info.wdma_idx) {
|
|
||||||
case 0:
|
|
||||||
- pse_port = 8;
|
|
||||||
+ pse_port = PSE_WDMA0_PORT;
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
- pse_port = 9;
|
|
||||||
+ pse_port = PSE_WDMA1_PORT;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return -EINVAL;
|
|
|
@ -1,26 +0,0 @@
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Tue, 12 Sep 2023 10:28:00 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: check update_wo_rx_stats in
|
|
||||||
mtk_wed_update_rx_stats()
|
|
||||||
|
|
||||||
Check if update_wo_rx_stats function pointer is properly set in
|
|
||||||
mtk_wed_update_rx_stats routine before accessing it.
|
|
||||||
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
||||||
Link: https://lore.kernel.org/r/b0d233386e059bccb59f18f69afb79a7806e5ded.1694507226.git.lorenzo@kernel.org
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
@@ -68,6 +68,9 @@ mtk_wed_update_rx_stats(struct mtk_wed_d
|
|
||||||
struct mtk_wed_wo_rx_stats *stats;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
+ if (!wed->wlan.update_wo_rx_stats)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
if (count * sizeof(*stats) > skb->len - sizeof(u32))
|
|
||||||
return;
|
|
||||||
|
|
|
@ -1,68 +0,0 @@
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Wed, 13 Sep 2023 20:42:47 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: do not assume offload callbacks are
|
|
||||||
always set
|
|
||||||
|
|
||||||
Check if wlan.offload_enable and wlan.offload_disable callbacks are set
|
|
||||||
in mtk_wed_flow_add/mtk_wed_flow_remove since mt7996 will not rely
|
|
||||||
on them.
|
|
||||||
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
||||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
@@ -1713,19 +1713,20 @@ mtk_wed_irq_set_mask(struct mtk_wed_devi
|
|
||||||
int mtk_wed_flow_add(int index)
|
|
||||||
{
|
|
||||||
struct mtk_wed_hw *hw = hw_list[index];
|
|
||||||
- int ret;
|
|
||||||
+ int ret = 0;
|
|
||||||
|
|
||||||
- if (!hw || !hw->wed_dev)
|
|
||||||
- return -ENODEV;
|
|
||||||
+ mutex_lock(&hw_lock);
|
|
||||||
|
|
||||||
- if (hw->num_flows) {
|
|
||||||
- hw->num_flows++;
|
|
||||||
- return 0;
|
|
||||||
+ if (!hw || !hw->wed_dev) {
|
|
||||||
+ ret = -ENODEV;
|
|
||||||
+ goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
- mutex_lock(&hw_lock);
|
|
||||||
- if (!hw->wed_dev) {
|
|
||||||
- ret = -ENODEV;
|
|
||||||
+ if (!hw->wed_dev->wlan.offload_enable)
|
|
||||||
+ goto out;
|
|
||||||
+
|
|
||||||
+ if (hw->num_flows) {
|
|
||||||
+ hw->num_flows++;
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1744,14 +1745,15 @@ void mtk_wed_flow_remove(int index)
|
|
||||||
{
|
|
||||||
struct mtk_wed_hw *hw = hw_list[index];
|
|
||||||
|
|
||||||
- if (!hw)
|
|
||||||
- return;
|
|
||||||
+ mutex_lock(&hw_lock);
|
|
||||||
|
|
||||||
- if (--hw->num_flows)
|
|
||||||
- return;
|
|
||||||
+ if (!hw || !hw->wed_dev)
|
|
||||||
+ goto out;
|
|
||||||
|
|
||||||
- mutex_lock(&hw_lock);
|
|
||||||
- if (!hw->wed_dev)
|
|
||||||
+ if (!hw->wed_dev->wlan.offload_disable)
|
|
||||||
+ goto out;
|
|
||||||
+
|
|
||||||
+ if (--hw->num_flows)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
hw->wed_dev->wlan.offload_disable(hw->wed_dev);
|
|
|
@ -1,232 +0,0 @@
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:05 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: introduce versioning utility routines
|
|
||||||
|
|
||||||
Similar to mtk_eth_soc, introduce the following wed versioning
|
|
||||||
utility routines:
|
|
||||||
- mtk_wed_is_v1
|
|
||||||
- mtk_wed_is_v2
|
|
||||||
|
|
||||||
This is a preliminary patch to introduce WED support for MT7988 SoC
|
|
||||||
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
@@ -278,7 +278,7 @@ mtk_wed_assign(struct mtk_wed_device *de
|
|
||||||
if (!hw->wed_dev)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
- if (hw->version == 1)
|
|
||||||
+ if (mtk_wed_is_v1(hw))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
/* MT7986 WED devices do not have any pcie slot restrictions */
|
|
||||||
@@ -359,7 +359,7 @@ mtk_wed_tx_buffer_alloc(struct mtk_wed_d
|
|
||||||
desc->buf0 = cpu_to_le32(buf_phys);
|
|
||||||
desc->buf1 = cpu_to_le32(buf_phys + txd_size);
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1)
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw))
|
|
||||||
ctrl = FIELD_PREP(MTK_WDMA_DESC_CTRL_LEN0, txd_size) |
|
|
||||||
FIELD_PREP(MTK_WDMA_DESC_CTRL_LEN1,
|
|
||||||
MTK_WED_BUF_SIZE - txd_size) |
|
|
||||||
@@ -498,7 +498,7 @@ mtk_wed_set_ext_int(struct mtk_wed_devic
|
|
||||||
{
|
|
||||||
u32 mask = MTK_WED_EXT_INT_STATUS_ERROR_MASK;
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1)
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw))
|
|
||||||
mask |= MTK_WED_EXT_INT_STATUS_TX_DRV_R_RESP_ERR;
|
|
||||||
else
|
|
||||||
mask |= MTK_WED_EXT_INT_STATUS_RX_FBUF_LO_TH |
|
|
||||||
@@ -577,7 +577,7 @@ mtk_wed_dma_disable(struct mtk_wed_devic
|
|
||||||
MTK_WDMA_GLO_CFG_RX_INFO1_PRERES |
|
|
||||||
MTK_WDMA_GLO_CFG_RX_INFO2_PRERES);
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1) {
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
regmap_write(dev->hw->mirror, dev->hw->index * 4, 0);
|
|
||||||
wdma_clr(dev, MTK_WDMA_GLO_CFG,
|
|
||||||
MTK_WDMA_GLO_CFG_RX_INFO3_PRERES);
|
|
||||||
@@ -606,7 +606,7 @@ mtk_wed_stop(struct mtk_wed_device *dev)
|
|
||||||
wdma_w32(dev, MTK_WDMA_INT_GRP2, 0);
|
|
||||||
wed_w32(dev, MTK_WED_WPDMA_INT_MASK, 0);
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1)
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw))
|
|
||||||
return;
|
|
||||||
|
|
||||||
wed_w32(dev, MTK_WED_EXT_INT_MASK1, 0);
|
|
||||||
@@ -625,7 +625,7 @@ mtk_wed_deinit(struct mtk_wed_device *de
|
|
||||||
MTK_WED_CTRL_WED_TX_BM_EN |
|
|
||||||
MTK_WED_CTRL_WED_TX_FREE_AGENT_EN);
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1)
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw))
|
|
||||||
return;
|
|
||||||
|
|
||||||
wed_clr(dev, MTK_WED_CTRL,
|
|
||||||
@@ -731,7 +731,7 @@ mtk_wed_bus_init(struct mtk_wed_device *
|
|
||||||
static void
|
|
||||||
mtk_wed_set_wpdma(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
- if (dev->hw->version == 1) {
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
wed_w32(dev, MTK_WED_WPDMA_CFG_BASE, dev->wlan.wpdma_phys);
|
|
||||||
} else {
|
|
||||||
mtk_wed_bus_init(dev);
|
|
||||||
@@ -762,7 +762,7 @@ mtk_wed_hw_init_early(struct mtk_wed_dev
|
|
||||||
MTK_WED_WDMA_GLO_CFG_IDLE_DMAD_SUPPLY;
|
|
||||||
wed_m32(dev, MTK_WED_WDMA_GLO_CFG, mask, set);
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1) {
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
u32 offset = dev->hw->index ? 0x04000400 : 0;
|
|
||||||
|
|
||||||
wdma_set(dev, MTK_WDMA_GLO_CFG,
|
|
||||||
@@ -935,7 +935,7 @@ mtk_wed_hw_init(struct mtk_wed_device *d
|
|
||||||
|
|
||||||
wed_w32(dev, MTK_WED_TX_BM_BUF_LEN, MTK_WED_PKT_SIZE);
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1) {
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
wed_w32(dev, MTK_WED_TX_BM_TKID,
|
|
||||||
FIELD_PREP(MTK_WED_TX_BM_TKID_START,
|
|
||||||
dev->wlan.token_start) |
|
|
||||||
@@ -968,7 +968,7 @@ mtk_wed_hw_init(struct mtk_wed_device *d
|
|
||||||
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_TX_BM);
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1) {
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
wed_set(dev, MTK_WED_CTRL,
|
|
||||||
MTK_WED_CTRL_WED_TX_BM_EN |
|
|
||||||
MTK_WED_CTRL_WED_TX_FREE_AGENT_EN);
|
|
||||||
@@ -1218,7 +1218,7 @@ mtk_wed_reset_dma(struct mtk_wed_device
|
|
||||||
}
|
|
||||||
|
|
||||||
dev->init_done = false;
|
|
||||||
- if (dev->hw->version == 1)
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!busy) {
|
|
||||||
@@ -1344,7 +1344,7 @@ mtk_wed_configure_irq(struct mtk_wed_dev
|
|
||||||
MTK_WED_CTRL_WED_TX_BM_EN |
|
|
||||||
MTK_WED_CTRL_WED_TX_FREE_AGENT_EN);
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1) {
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
wed_w32(dev, MTK_WED_PCIE_INT_TRIGGER,
|
|
||||||
MTK_WED_PCIE_INT_TRIGGER_STATUS);
|
|
||||||
|
|
||||||
@@ -1417,7 +1417,7 @@ mtk_wed_dma_enable(struct mtk_wed_device
|
|
||||||
MTK_WDMA_GLO_CFG_RX_INFO1_PRERES |
|
|
||||||
MTK_WDMA_GLO_CFG_RX_INFO2_PRERES);
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1) {
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
wdma_set(dev, MTK_WDMA_GLO_CFG,
|
|
||||||
MTK_WDMA_GLO_CFG_RX_INFO3_PRERES);
|
|
||||||
} else {
|
|
||||||
@@ -1466,7 +1466,7 @@ mtk_wed_start(struct mtk_wed_device *dev
|
|
||||||
|
|
||||||
mtk_wed_set_ext_int(dev, true);
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1) {
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
u32 val = dev->wlan.wpdma_phys | MTK_PCIE_MIRROR_MAP_EN |
|
|
||||||
FIELD_PREP(MTK_PCIE_MIRROR_MAP_WED_ID,
|
|
||||||
dev->hw->index);
|
|
||||||
@@ -1551,7 +1551,7 @@ mtk_wed_attach(struct mtk_wed_device *de
|
|
||||||
}
|
|
||||||
|
|
||||||
mtk_wed_hw_init_early(dev);
|
|
||||||
- if (hw->version == 1) {
|
|
||||||
+ if (mtk_wed_is_v1(hw)) {
|
|
||||||
regmap_update_bits(hw->hifsys, HIFSYS_DMA_AG_MAP,
|
|
||||||
BIT(hw->index), 0);
|
|
||||||
} else {
|
|
||||||
@@ -1619,7 +1619,7 @@ static int
|
|
||||||
mtk_wed_txfree_ring_setup(struct mtk_wed_device *dev, void __iomem *regs)
|
|
||||||
{
|
|
||||||
struct mtk_wed_ring *ring = &dev->txfree_ring;
|
|
||||||
- int i, index = dev->hw->version == 1;
|
|
||||||
+ int i, index = mtk_wed_is_v1(dev->hw);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* For txfree event handling, the same DMA ring is shared between WED
|
|
||||||
@@ -1677,7 +1677,7 @@ mtk_wed_irq_get(struct mtk_wed_device *d
|
|
||||||
{
|
|
||||||
u32 val, ext_mask = MTK_WED_EXT_INT_STATUS_ERROR_MASK;
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1)
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw))
|
|
||||||
ext_mask |= MTK_WED_EXT_INT_STATUS_TX_DRV_R_RESP_ERR;
|
|
||||||
else
|
|
||||||
ext_mask |= MTK_WED_EXT_INT_STATUS_RX_FBUF_LO_TH |
|
|
||||||
@@ -1844,7 +1844,7 @@ mtk_wed_setup_tc(struct mtk_wed_device *
|
|
||||||
{
|
|
||||||
struct mtk_wed_hw *hw = wed->hw;
|
|
||||||
|
|
||||||
- if (hw->version < 2)
|
|
||||||
+ if (mtk_wed_is_v1(hw))
|
|
||||||
return -EOPNOTSUPP;
|
|
||||||
|
|
||||||
switch (type) {
|
|
||||||
@@ -1918,9 +1918,9 @@ void mtk_wed_add_hw(struct device_node *
|
|
||||||
hw->wdma = wdma;
|
|
||||||
hw->index = index;
|
|
||||||
hw->irq = irq;
|
|
||||||
- hw->version = mtk_is_netsys_v1(eth) ? 1 : 2;
|
|
||||||
+ hw->version = eth->soc->version;
|
|
||||||
|
|
||||||
- if (hw->version == 1) {
|
|
||||||
+ if (mtk_wed_is_v1(hw)) {
|
|
||||||
hw->mirror = syscon_regmap_lookup_by_phandle(eth_np,
|
|
||||||
"mediatek,pcie-mirror");
|
|
||||||
hw->hifsys = syscon_regmap_lookup_by_phandle(eth_np,
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.h
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.h
|
|
||||||
@@ -40,6 +40,16 @@ struct mtk_wdma_info {
|
|
||||||
};
|
|
||||||
|
|
||||||
#ifdef CONFIG_NET_MEDIATEK_SOC_WED
|
|
||||||
+static inline bool mtk_wed_is_v1(struct mtk_wed_hw *hw)
|
|
||||||
+{
|
|
||||||
+ return hw->version == 1;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static inline bool mtk_wed_is_v2(struct mtk_wed_hw *hw)
|
|
||||||
+{
|
|
||||||
+ return hw->version == 2;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static inline void
|
|
||||||
wed_w32(struct mtk_wed_device *dev, u32 reg, u32 val)
|
|
||||||
{
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
|
|
||||||
@@ -261,7 +261,7 @@ void mtk_wed_hw_add_debugfs(struct mtk_w
|
|
||||||
debugfs_create_u32("regidx", 0600, dir, &hw->debugfs_reg);
|
|
||||||
debugfs_create_file_unsafe("regval", 0600, dir, hw, &fops_regval);
|
|
||||||
debugfs_create_file_unsafe("txinfo", 0400, dir, hw, &wed_txinfo_fops);
|
|
||||||
- if (hw->version != 1)
|
|
||||||
+ if (!mtk_wed_is_v1(hw))
|
|
||||||
debugfs_create_file_unsafe("rxinfo", 0400, dir, hw,
|
|
||||||
&wed_rxinfo_fops);
|
|
||||||
}
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
@@ -207,7 +207,7 @@ int mtk_wed_mcu_msg_update(struct mtk_we
|
|
||||||
{
|
|
||||||
struct mtk_wed_wo *wo = dev->hw->wed_wo;
|
|
||||||
|
|
||||||
- if (dev->hw->version == 1)
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (WARN_ON(!wo))
|
|
|
@ -1,234 +0,0 @@
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:06 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: do not configure rx offload if not
|
|
||||||
supported
|
|
||||||
|
|
||||||
Check if rx offload is supported running mtk_wed_get_rx_capa routine
|
|
||||||
before configuring it. This is a preliminary patch to introduce Wireless
|
|
||||||
Ethernet Dispatcher (WED) support for MT7988 SoC.
|
|
||||||
|
|
||||||
Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
@@ -606,7 +606,7 @@ mtk_wed_stop(struct mtk_wed_device *dev)
|
|
||||||
wdma_w32(dev, MTK_WDMA_INT_GRP2, 0);
|
|
||||||
wed_w32(dev, MTK_WED_WPDMA_INT_MASK, 0);
|
|
||||||
|
|
||||||
- if (mtk_wed_is_v1(dev->hw))
|
|
||||||
+ if (!mtk_wed_get_rx_capa(dev))
|
|
||||||
return;
|
|
||||||
|
|
||||||
wed_w32(dev, MTK_WED_EXT_INT_MASK1, 0);
|
|
||||||
@@ -733,16 +733,21 @@ mtk_wed_set_wpdma(struct mtk_wed_device
|
|
||||||
{
|
|
||||||
if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
wed_w32(dev, MTK_WED_WPDMA_CFG_BASE, dev->wlan.wpdma_phys);
|
|
||||||
- } else {
|
|
||||||
- mtk_wed_bus_init(dev);
|
|
||||||
-
|
|
||||||
- wed_w32(dev, MTK_WED_WPDMA_CFG_BASE, dev->wlan.wpdma_int);
|
|
||||||
- wed_w32(dev, MTK_WED_WPDMA_CFG_INT_MASK, dev->wlan.wpdma_mask);
|
|
||||||
- wed_w32(dev, MTK_WED_WPDMA_CFG_TX, dev->wlan.wpdma_tx);
|
|
||||||
- wed_w32(dev, MTK_WED_WPDMA_CFG_TX_FREE, dev->wlan.wpdma_txfree);
|
|
||||||
- wed_w32(dev, MTK_WED_WPDMA_RX_GLO_CFG, dev->wlan.wpdma_rx_glo);
|
|
||||||
- wed_w32(dev, MTK_WED_WPDMA_RX_RING, dev->wlan.wpdma_rx);
|
|
||||||
+ return;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ mtk_wed_bus_init(dev);
|
|
||||||
+
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_CFG_BASE, dev->wlan.wpdma_int);
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_CFG_INT_MASK, dev->wlan.wpdma_mask);
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_CFG_TX, dev->wlan.wpdma_tx);
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_CFG_TX_FREE, dev->wlan.wpdma_txfree);
|
|
||||||
+
|
|
||||||
+ if (!mtk_wed_get_rx_capa(dev))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_RX_GLO_CFG, dev->wlan.wpdma_rx_glo);
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_RX_RING, dev->wlan.wpdma_rx);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -974,15 +979,17 @@ mtk_wed_hw_init(struct mtk_wed_device *d
|
|
||||||
MTK_WED_CTRL_WED_TX_FREE_AGENT_EN);
|
|
||||||
} else {
|
|
||||||
wed_clr(dev, MTK_WED_TX_TKID_CTRL, MTK_WED_TX_TKID_CTRL_PAUSE);
|
|
||||||
- /* rx hw init */
|
|
||||||
- wed_w32(dev, MTK_WED_WPDMA_RX_D_RST_IDX,
|
|
||||||
- MTK_WED_WPDMA_RX_D_RST_CRX_IDX |
|
|
||||||
- MTK_WED_WPDMA_RX_D_RST_DRV_IDX);
|
|
||||||
- wed_w32(dev, MTK_WED_WPDMA_RX_D_RST_IDX, 0);
|
|
||||||
-
|
|
||||||
- mtk_wed_rx_buffer_hw_init(dev);
|
|
||||||
- mtk_wed_rro_hw_init(dev);
|
|
||||||
- mtk_wed_route_qm_hw_init(dev);
|
|
||||||
+ if (mtk_wed_get_rx_capa(dev)) {
|
|
||||||
+ /* rx hw init */
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_RX_D_RST_IDX,
|
|
||||||
+ MTK_WED_WPDMA_RX_D_RST_CRX_IDX |
|
|
||||||
+ MTK_WED_WPDMA_RX_D_RST_DRV_IDX);
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_RX_D_RST_IDX, 0);
|
|
||||||
+
|
|
||||||
+ mtk_wed_rx_buffer_hw_init(dev);
|
|
||||||
+ mtk_wed_rro_hw_init(dev);
|
|
||||||
+ mtk_wed_route_qm_hw_init(dev);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
wed_clr(dev, MTK_WED_TX_BM_CTRL, MTK_WED_TX_BM_CTRL_PAUSE);
|
|
||||||
@@ -1354,8 +1361,6 @@ mtk_wed_configure_irq(struct mtk_wed_dev
|
|
||||||
|
|
||||||
wed_clr(dev, MTK_WED_WDMA_INT_CTRL, wdma_mask);
|
|
||||||
} else {
|
|
||||||
- wdma_mask |= FIELD_PREP(MTK_WDMA_INT_MASK_TX_DONE,
|
|
||||||
- GENMASK(1, 0));
|
|
||||||
/* initail tx interrupt trigger */
|
|
||||||
wed_w32(dev, MTK_WED_WPDMA_INT_CTRL_TX,
|
|
||||||
MTK_WED_WPDMA_INT_CTRL_TX0_DONE_EN |
|
|
||||||
@@ -1374,15 +1379,20 @@ mtk_wed_configure_irq(struct mtk_wed_dev
|
|
||||||
FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_TX_FREE_DONE_TRIG,
|
|
||||||
dev->wlan.txfree_tbit));
|
|
||||||
|
|
||||||
- wed_w32(dev, MTK_WED_WPDMA_INT_CTRL_RX,
|
|
||||||
- MTK_WED_WPDMA_INT_CTRL_RX0_EN |
|
|
||||||
- MTK_WED_WPDMA_INT_CTRL_RX0_CLR |
|
|
||||||
- MTK_WED_WPDMA_INT_CTRL_RX1_EN |
|
|
||||||
- MTK_WED_WPDMA_INT_CTRL_RX1_CLR |
|
|
||||||
- FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_RX0_DONE_TRIG,
|
|
||||||
- dev->wlan.rx_tbit[0]) |
|
|
||||||
- FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_RX1_DONE_TRIG,
|
|
||||||
- dev->wlan.rx_tbit[1]));
|
|
||||||
+ if (mtk_wed_get_rx_capa(dev)) {
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_INT_CTRL_RX,
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RX0_EN |
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RX0_CLR |
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RX1_EN |
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RX1_CLR |
|
|
||||||
+ FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_RX0_DONE_TRIG,
|
|
||||||
+ dev->wlan.rx_tbit[0]) |
|
|
||||||
+ FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_RX1_DONE_TRIG,
|
|
||||||
+ dev->wlan.rx_tbit[1]));
|
|
||||||
+
|
|
||||||
+ wdma_mask |= FIELD_PREP(MTK_WDMA_INT_MASK_TX_DONE,
|
|
||||||
+ GENMASK(1, 0));
|
|
||||||
+ }
|
|
||||||
|
|
||||||
wed_w32(dev, MTK_WED_WDMA_INT_CLR, wdma_mask);
|
|
||||||
wed_set(dev, MTK_WED_WDMA_INT_CTRL,
|
|
||||||
@@ -1401,6 +1411,8 @@ mtk_wed_configure_irq(struct mtk_wed_dev
|
|
||||||
static void
|
|
||||||
mtk_wed_dma_enable(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
wed_set(dev, MTK_WED_WPDMA_INT_CTRL, MTK_WED_WPDMA_INT_CTRL_SUBRT_ADV);
|
|
||||||
|
|
||||||
wed_set(dev, MTK_WED_GLO_CFG,
|
|
||||||
@@ -1420,33 +1432,33 @@ mtk_wed_dma_enable(struct mtk_wed_device
|
|
||||||
if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
wdma_set(dev, MTK_WDMA_GLO_CFG,
|
|
||||||
MTK_WDMA_GLO_CFG_RX_INFO3_PRERES);
|
|
||||||
- } else {
|
|
||||||
- int i;
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- wed_set(dev, MTK_WED_WPDMA_CTRL,
|
|
||||||
- MTK_WED_WPDMA_CTRL_SDL1_FIXED);
|
|
||||||
+ wed_set(dev, MTK_WED_WPDMA_CTRL,
|
|
||||||
+ MTK_WED_WPDMA_CTRL_SDL1_FIXED);
|
|
||||||
+ wed_set(dev, MTK_WED_WPDMA_GLO_CFG,
|
|
||||||
+ MTK_WED_WPDMA_GLO_CFG_RX_DRV_R0_PKT_PROC |
|
|
||||||
+ MTK_WED_WPDMA_GLO_CFG_RX_DRV_R0_CRX_SYNC);
|
|
||||||
+ wed_clr(dev, MTK_WED_WPDMA_GLO_CFG,
|
|
||||||
+ MTK_WED_WPDMA_GLO_CFG_TX_TKID_KEEP |
|
|
||||||
+ MTK_WED_WPDMA_GLO_CFG_TX_DMAD_DW3_PREV);
|
|
||||||
|
|
||||||
- wed_set(dev, MTK_WED_WDMA_GLO_CFG,
|
|
||||||
- MTK_WED_WDMA_GLO_CFG_TX_DRV_EN |
|
|
||||||
- MTK_WED_WDMA_GLO_CFG_TX_DDONE_CHK);
|
|
||||||
+ if (!mtk_wed_get_rx_capa(dev))
|
|
||||||
+ return;
|
|
||||||
|
|
||||||
- wed_set(dev, MTK_WED_WPDMA_GLO_CFG,
|
|
||||||
- MTK_WED_WPDMA_GLO_CFG_RX_DRV_R0_PKT_PROC |
|
|
||||||
- MTK_WED_WPDMA_GLO_CFG_RX_DRV_R0_CRX_SYNC);
|
|
||||||
-
|
|
||||||
- wed_clr(dev, MTK_WED_WPDMA_GLO_CFG,
|
|
||||||
- MTK_WED_WPDMA_GLO_CFG_TX_TKID_KEEP |
|
|
||||||
- MTK_WED_WPDMA_GLO_CFG_TX_DMAD_DW3_PREV);
|
|
||||||
+ wed_set(dev, MTK_WED_WDMA_GLO_CFG,
|
|
||||||
+ MTK_WED_WDMA_GLO_CFG_TX_DRV_EN |
|
|
||||||
+ MTK_WED_WDMA_GLO_CFG_TX_DDONE_CHK);
|
|
||||||
|
|
||||||
- wed_set(dev, MTK_WED_WPDMA_RX_D_GLO_CFG,
|
|
||||||
- MTK_WED_WPDMA_RX_D_RX_DRV_EN |
|
|
||||||
- FIELD_PREP(MTK_WED_WPDMA_RX_D_RXD_READ_LEN, 0x18) |
|
|
||||||
- FIELD_PREP(MTK_WED_WPDMA_RX_D_INIT_PHASE_RXEN_SEL,
|
|
||||||
- 0x2));
|
|
||||||
+ wed_set(dev, MTK_WED_WPDMA_RX_D_GLO_CFG,
|
|
||||||
+ MTK_WED_WPDMA_RX_D_RX_DRV_EN |
|
|
||||||
+ FIELD_PREP(MTK_WED_WPDMA_RX_D_RXD_READ_LEN, 0x18) |
|
|
||||||
+ FIELD_PREP(MTK_WED_WPDMA_RX_D_INIT_PHASE_RXEN_SEL,
|
|
||||||
+ 0x2));
|
|
||||||
|
|
||||||
- for (i = 0; i < MTK_WED_RX_QUEUES; i++)
|
|
||||||
- mtk_wed_check_wfdma_rx_fill(dev, i);
|
|
||||||
- }
|
|
||||||
+ for (i = 0; i < MTK_WED_RX_QUEUES; i++)
|
|
||||||
+ mtk_wed_check_wfdma_rx_fill(dev, i);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -1473,7 +1485,7 @@ mtk_wed_start(struct mtk_wed_device *dev
|
|
||||||
|
|
||||||
val |= BIT(0) | (BIT(1) * !!dev->hw->index);
|
|
||||||
regmap_write(dev->hw->mirror, dev->hw->index * 4, val);
|
|
||||||
- } else {
|
|
||||||
+ } else if (mtk_wed_get_rx_capa(dev)) {
|
|
||||||
/* driver set mid ready and only once */
|
|
||||||
wed_w32(dev, MTK_WED_EXT_INT_MASK1,
|
|
||||||
MTK_WED_EXT_INT_STATUS_WPDMA_MID_RDY);
|
|
||||||
@@ -1485,7 +1497,6 @@ mtk_wed_start(struct mtk_wed_device *dev
|
|
||||||
|
|
||||||
if (mtk_wed_rro_cfg(dev))
|
|
||||||
return;
|
|
||||||
-
|
|
||||||
}
|
|
||||||
|
|
||||||
mtk_wed_set_512_support(dev, dev->wlan.wcid_512);
|
|
||||||
@@ -1551,13 +1562,14 @@ mtk_wed_attach(struct mtk_wed_device *de
|
|
||||||
}
|
|
||||||
|
|
||||||
mtk_wed_hw_init_early(dev);
|
|
||||||
- if (mtk_wed_is_v1(hw)) {
|
|
||||||
+ if (mtk_wed_is_v1(hw))
|
|
||||||
regmap_update_bits(hw->hifsys, HIFSYS_DMA_AG_MAP,
|
|
||||||
BIT(hw->index), 0);
|
|
||||||
- } else {
|
|
||||||
+ else
|
|
||||||
dev->rev_id = wed_r32(dev, MTK_WED_REV_ID);
|
|
||||||
+
|
|
||||||
+ if (mtk_wed_get_rx_capa(dev))
|
|
||||||
ret = mtk_wed_wo_init(hw);
|
|
||||||
- }
|
|
||||||
out:
|
|
||||||
if (ret) {
|
|
||||||
dev_err(dev->hw->dev, "failed to attach wed device\n");
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
@@ -207,7 +207,7 @@ int mtk_wed_mcu_msg_update(struct mtk_we
|
|
||||||
{
|
|
||||||
struct mtk_wed_wo *wo = dev->hw->wed_wo;
|
|
||||||
|
|
||||||
- if (mtk_wed_is_v1(dev->hw))
|
|
||||||
+ if (!mtk_wed_get_rx_capa(dev))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (WARN_ON(!wo))
|
|
|
@ -1,52 +0,0 @@
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:07 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: rename mtk_rxbm_desc in
|
|
||||||
mtk_wed_bm_desc
|
|
||||||
|
|
||||||
Rename mtk_rxbm_desc structure in mtk_wed_bm_desc since it will be used
|
|
||||||
even on tx side by MT7988 SoC.
|
|
||||||
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
@@ -422,7 +422,7 @@ free_pagelist:
|
|
||||||
static int
|
|
||||||
mtk_wed_rx_buffer_alloc(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
- struct mtk_rxbm_desc *desc;
|
|
||||||
+ struct mtk_wed_bm_desc *desc;
|
|
||||||
dma_addr_t desc_phys;
|
|
||||||
|
|
||||||
dev->rx_buf_ring.size = dev->wlan.rx_nbuf;
|
|
||||||
@@ -442,7 +442,7 @@ mtk_wed_rx_buffer_alloc(struct mtk_wed_d
|
|
||||||
static void
|
|
||||||
mtk_wed_free_rx_buffer(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
- struct mtk_rxbm_desc *desc = dev->rx_buf_ring.desc;
|
|
||||||
+ struct mtk_wed_bm_desc *desc = dev->rx_buf_ring.desc;
|
|
||||||
|
|
||||||
if (!desc)
|
|
||||||
return;
|
|
||||||
--- a/include/linux/soc/mediatek/mtk_wed.h
|
|
||||||
+++ b/include/linux/soc/mediatek/mtk_wed.h
|
|
||||||
@@ -45,7 +45,7 @@ enum mtk_wed_wo_cmd {
|
|
||||||
MTK_WED_WO_CMD_WED_END
|
|
||||||
};
|
|
||||||
|
|
||||||
-struct mtk_rxbm_desc {
|
|
||||||
+struct mtk_wed_bm_desc {
|
|
||||||
__le32 buf0;
|
|
||||||
__le32 token;
|
|
||||||
} __packed __aligned(4);
|
|
||||||
@@ -104,7 +104,7 @@ struct mtk_wed_device {
|
|
||||||
|
|
||||||
struct {
|
|
||||||
int size;
|
|
||||||
- struct mtk_rxbm_desc *desc;
|
|
||||||
+ struct mtk_wed_bm_desc *desc;
|
|
||||||
dma_addr_t desc_phys;
|
|
||||||
} rx_buf_ring;
|
|
||||||
|
|
|
@ -1,87 +0,0 @@
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:08 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: introduce mtk_wed_buf structure
|
|
||||||
|
|
||||||
Introduce mtk_wed_buf structure to store both virtual and physical
|
|
||||||
addresses allocated in mtk_wed_tx_buffer_alloc() routine. This is a
|
|
||||||
preliminary patch to add WED support for MT7988 SoC since it relies on a
|
|
||||||
different dma descriptor layout not storing page dma addresses.
|
|
||||||
|
|
||||||
Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
@@ -300,9 +300,9 @@ out:
|
|
||||||
static int
|
|
||||||
mtk_wed_tx_buffer_alloc(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
+ struct mtk_wed_buf *page_list;
|
|
||||||
struct mtk_wdma_desc *desc;
|
|
||||||
dma_addr_t desc_phys;
|
|
||||||
- void **page_list;
|
|
||||||
int token = dev->wlan.token_start;
|
|
||||||
int ring_size;
|
|
||||||
int n_pages;
|
|
||||||
@@ -343,7 +343,8 @@ mtk_wed_tx_buffer_alloc(struct mtk_wed_d
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
- page_list[page_idx++] = page;
|
|
||||||
+ page_list[page_idx].p = page;
|
|
||||||
+ page_list[page_idx++].phy_addr = page_phys;
|
|
||||||
dma_sync_single_for_cpu(dev->hw->dev, page_phys, PAGE_SIZE,
|
|
||||||
DMA_BIDIRECTIONAL);
|
|
||||||
|
|
||||||
@@ -387,8 +388,8 @@ mtk_wed_tx_buffer_alloc(struct mtk_wed_d
|
|
||||||
static void
|
|
||||||
mtk_wed_free_tx_buffer(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
+ struct mtk_wed_buf *page_list = dev->tx_buf_ring.pages;
|
|
||||||
struct mtk_wdma_desc *desc = dev->tx_buf_ring.desc;
|
|
||||||
- void **page_list = dev->tx_buf_ring.pages;
|
|
||||||
int page_idx;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
@@ -400,13 +401,12 @@ mtk_wed_free_tx_buffer(struct mtk_wed_de
|
|
||||||
|
|
||||||
for (i = 0, page_idx = 0; i < dev->tx_buf_ring.size;
|
|
||||||
i += MTK_WED_BUF_PER_PAGE) {
|
|
||||||
- void *page = page_list[page_idx++];
|
|
||||||
- dma_addr_t buf_addr;
|
|
||||||
+ dma_addr_t buf_addr = page_list[page_idx].phy_addr;
|
|
||||||
+ void *page = page_list[page_idx++].p;
|
|
||||||
|
|
||||||
if (!page)
|
|
||||||
break;
|
|
||||||
|
|
||||||
- buf_addr = le32_to_cpu(desc[i].buf0);
|
|
||||||
dma_unmap_page(dev->hw->dev, buf_addr, PAGE_SIZE,
|
|
||||||
DMA_BIDIRECTIONAL);
|
|
||||||
__free_page(page);
|
|
||||||
--- a/include/linux/soc/mediatek/mtk_wed.h
|
|
||||||
+++ b/include/linux/soc/mediatek/mtk_wed.h
|
|
||||||
@@ -76,6 +76,11 @@ struct mtk_wed_wo_rx_stats {
|
|
||||||
__le32 rx_drop_cnt;
|
|
||||||
};
|
|
||||||
|
|
||||||
+struct mtk_wed_buf {
|
|
||||||
+ void *p;
|
|
||||||
+ dma_addr_t phy_addr;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
struct mtk_wed_device {
|
|
||||||
#ifdef CONFIG_NET_MEDIATEK_SOC_WED
|
|
||||||
const struct mtk_wed_ops *ops;
|
|
||||||
@@ -97,7 +102,7 @@ struct mtk_wed_device {
|
|
||||||
|
|
||||||
struct {
|
|
||||||
int size;
|
|
||||||
- void **pages;
|
|
||||||
+ struct mtk_wed_buf *pages;
|
|
||||||
struct mtk_wdma_desc *desc;
|
|
||||||
dma_addr_t desc_phys;
|
|
||||||
} tx_buf_ring;
|
|
|
@ -1,88 +0,0 @@
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:09 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: move mem_region array out of
|
|
||||||
mtk_wed_mcu_load_firmware
|
|
||||||
|
|
||||||
Remove mtk_wed_wo_memory_region boot structure in mtk_wed_wo.
|
|
||||||
This is a preliminary patch to introduce WED support for MT7988 SoC.
|
|
||||||
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
@@ -16,14 +16,30 @@
|
|
||||||
#include "mtk_wed_wo.h"
|
|
||||||
#include "mtk_wed.h"
|
|
||||||
|
|
||||||
+static struct mtk_wed_wo_memory_region mem_region[] = {
|
|
||||||
+ [MTK_WED_WO_REGION_EMI] = {
|
|
||||||
+ .name = "wo-emi",
|
|
||||||
+ },
|
|
||||||
+ [MTK_WED_WO_REGION_ILM] = {
|
|
||||||
+ .name = "wo-ilm",
|
|
||||||
+ },
|
|
||||||
+ [MTK_WED_WO_REGION_DATA] = {
|
|
||||||
+ .name = "wo-data",
|
|
||||||
+ .shared = true,
|
|
||||||
+ },
|
|
||||||
+ [MTK_WED_WO_REGION_BOOT] = {
|
|
||||||
+ .name = "wo-boot",
|
|
||||||
+ },
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static u32 wo_r32(struct mtk_wed_wo *wo, u32 reg)
|
|
||||||
{
|
|
||||||
- return readl(wo->boot.addr + reg);
|
|
||||||
+ return readl(mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void wo_w32(struct mtk_wed_wo *wo, u32 reg, u32 val)
|
|
||||||
{
|
|
||||||
- writel(val, wo->boot.addr + reg);
|
|
||||||
+ writel(val, mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct sk_buff *
|
|
||||||
@@ -294,18 +310,6 @@ next:
|
|
||||||
static int
|
|
||||||
mtk_wed_mcu_load_firmware(struct mtk_wed_wo *wo)
|
|
||||||
{
|
|
||||||
- static struct mtk_wed_wo_memory_region mem_region[] = {
|
|
||||||
- [MTK_WED_WO_REGION_EMI] = {
|
|
||||||
- .name = "wo-emi",
|
|
||||||
- },
|
|
||||||
- [MTK_WED_WO_REGION_ILM] = {
|
|
||||||
- .name = "wo-ilm",
|
|
||||||
- },
|
|
||||||
- [MTK_WED_WO_REGION_DATA] = {
|
|
||||||
- .name = "wo-data",
|
|
||||||
- .shared = true,
|
|
||||||
- },
|
|
||||||
- };
|
|
||||||
const struct mtk_wed_fw_trailer *trailer;
|
|
||||||
const struct firmware *fw;
|
|
||||||
const char *fw_name;
|
|
||||||
@@ -319,11 +323,6 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
- wo->boot.name = "wo-boot";
|
|
||||||
- ret = mtk_wed_get_memory_region(wo, &wo->boot);
|
|
||||||
- if (ret)
|
|
||||||
- return ret;
|
|
||||||
-
|
|
||||||
/* set dummy cr */
|
|
||||||
wed_w32(wo->hw->wed_dev, MTK_WED_SCR0 + 4 * MTK_WED_DUMMY_CR_FWDL,
|
|
||||||
wo->hw->index + 1);
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_wo.h
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.h
|
|
||||||
@@ -228,7 +228,6 @@ struct mtk_wed_wo_queue {
|
|
||||||
|
|
||||||
struct mtk_wed_wo {
|
|
||||||
struct mtk_wed_hw *hw;
|
|
||||||
- struct mtk_wed_wo_memory_region boot;
|
|
||||||
|
|
||||||
struct mtk_wed_wo_queue q_tx;
|
|
||||||
struct mtk_wed_wo_queue q_rx;
|
|
|
@ -1,71 +0,0 @@
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:10 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: make memory region optional
|
|
||||||
|
|
||||||
Make mtk_wed_wo_memory_region optionals.
|
|
||||||
This is a preliminary patch to introduce Wireless Ethernet Dispatcher
|
|
||||||
support for MT7988 SoC since MT7988 WED fw image will have a different
|
|
||||||
layout.
|
|
||||||
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
@@ -234,19 +234,13 @@ int mtk_wed_mcu_msg_update(struct mtk_we
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
-mtk_wed_get_memory_region(struct mtk_wed_wo *wo,
|
|
||||||
+mtk_wed_get_memory_region(struct mtk_wed_hw *hw, int index,
|
|
||||||
struct mtk_wed_wo_memory_region *region)
|
|
||||||
{
|
|
||||||
struct reserved_mem *rmem;
|
|
||||||
struct device_node *np;
|
|
||||||
- int index;
|
|
||||||
|
|
||||||
- index = of_property_match_string(wo->hw->node, "memory-region-names",
|
|
||||||
- region->name);
|
|
||||||
- if (index < 0)
|
|
||||||
- return index;
|
|
||||||
-
|
|
||||||
- np = of_parse_phandle(wo->hw->node, "memory-region", index);
|
|
||||||
+ np = of_parse_phandle(hw->node, "memory-region", index);
|
|
||||||
if (!np)
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
@@ -258,7 +252,7 @@ mtk_wed_get_memory_region(struct mtk_wed
|
|
||||||
|
|
||||||
region->phy_addr = rmem->base;
|
|
||||||
region->size = rmem->size;
|
|
||||||
- region->addr = devm_ioremap(wo->hw->dev, region->phy_addr, region->size);
|
|
||||||
+ region->addr = devm_ioremap(hw->dev, region->phy_addr, region->size);
|
|
||||||
|
|
||||||
return !region->addr ? -EINVAL : 0;
|
|
||||||
}
|
|
||||||
@@ -271,6 +265,9 @@ mtk_wed_mcu_run_firmware(struct mtk_wed_
|
|
||||||
const struct mtk_wed_fw_trailer *trailer;
|
|
||||||
const struct mtk_wed_fw_region *fw_region;
|
|
||||||
|
|
||||||
+ if (!region->phy_addr || !region->size)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
trailer_ptr = fw->data + fw->size - sizeof(*trailer);
|
|
||||||
trailer = (const struct mtk_wed_fw_trailer *)trailer_ptr;
|
|
||||||
region_ptr = trailer_ptr - trailer->num_region * sizeof(*fw_region);
|
|
||||||
@@ -318,7 +315,13 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
|
||||||
|
|
||||||
/* load firmware region metadata */
|
|
||||||
for (i = 0; i < ARRAY_SIZE(mem_region); i++) {
|
|
||||||
- ret = mtk_wed_get_memory_region(wo, &mem_region[i]);
|
|
||||||
+ int index = of_property_match_string(wo->hw->node,
|
|
||||||
+ "memory-region-names",
|
|
||||||
+ mem_region[i].name);
|
|
||||||
+ if (index < 0)
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ ret = mtk_wed_get_memory_region(wo->hw, index, &mem_region[i]);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
}
|
|
|
@ -1,217 +0,0 @@
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:12 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: add mtk_wed_soc_data structure
|
|
||||||
|
|
||||||
Introduce mtk_wed_soc_data utility structure to contain per-SoC
|
|
||||||
definitions.
|
|
||||||
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
@@ -49,6 +49,26 @@ struct mtk_wed_flow_block_priv {
|
|
||||||
struct net_device *dev;
|
|
||||||
};
|
|
||||||
|
|
||||||
+static const struct mtk_wed_soc_data mt7622_data = {
|
|
||||||
+ .regmap = {
|
|
||||||
+ .tx_bm_tkid = 0x088,
|
|
||||||
+ .wpdma_rx_ring0 = 0x770,
|
|
||||||
+ .reset_idx_tx_mask = GENMASK(3, 0),
|
|
||||||
+ .reset_idx_rx_mask = GENMASK(17, 16),
|
|
||||||
+ },
|
|
||||||
+ .wdma_desc_size = sizeof(struct mtk_wdma_desc),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static const struct mtk_wed_soc_data mt7986_data = {
|
|
||||||
+ .regmap = {
|
|
||||||
+ .tx_bm_tkid = 0x0c8,
|
|
||||||
+ .wpdma_rx_ring0 = 0x770,
|
|
||||||
+ .reset_idx_tx_mask = GENMASK(1, 0),
|
|
||||||
+ .reset_idx_rx_mask = GENMASK(7, 6),
|
|
||||||
+ },
|
|
||||||
+ .wdma_desc_size = 2 * sizeof(struct mtk_wdma_desc),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
wed_m32(struct mtk_wed_device *dev, u32 reg, u32 mask, u32 val)
|
|
||||||
{
|
|
||||||
@@ -747,7 +767,7 @@ mtk_wed_set_wpdma(struct mtk_wed_device
|
|
||||||
return;
|
|
||||||
|
|
||||||
wed_w32(dev, MTK_WED_WPDMA_RX_GLO_CFG, dev->wlan.wpdma_rx_glo);
|
|
||||||
- wed_w32(dev, MTK_WED_WPDMA_RX_RING, dev->wlan.wpdma_rx);
|
|
||||||
+ wed_w32(dev, dev->hw->soc->regmap.wpdma_rx_ring0, dev->wlan.wpdma_rx);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -941,22 +961,10 @@ mtk_wed_hw_init(struct mtk_wed_device *d
|
|
||||||
wed_w32(dev, MTK_WED_TX_BM_BUF_LEN, MTK_WED_PKT_SIZE);
|
|
||||||
|
|
||||||
if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
- wed_w32(dev, MTK_WED_TX_BM_TKID,
|
|
||||||
- FIELD_PREP(MTK_WED_TX_BM_TKID_START,
|
|
||||||
- dev->wlan.token_start) |
|
|
||||||
- FIELD_PREP(MTK_WED_TX_BM_TKID_END,
|
|
||||||
- dev->wlan.token_start +
|
|
||||||
- dev->wlan.nbuf - 1));
|
|
||||||
wed_w32(dev, MTK_WED_TX_BM_DYN_THR,
|
|
||||||
FIELD_PREP(MTK_WED_TX_BM_DYN_THR_LO, 1) |
|
|
||||||
MTK_WED_TX_BM_DYN_THR_HI);
|
|
||||||
} else {
|
|
||||||
- wed_w32(dev, MTK_WED_TX_BM_TKID_V2,
|
|
||||||
- FIELD_PREP(MTK_WED_TX_BM_TKID_START,
|
|
||||||
- dev->wlan.token_start) |
|
|
||||||
- FIELD_PREP(MTK_WED_TX_BM_TKID_END,
|
|
||||||
- dev->wlan.token_start +
|
|
||||||
- dev->wlan.nbuf - 1));
|
|
||||||
wed_w32(dev, MTK_WED_TX_BM_DYN_THR,
|
|
||||||
FIELD_PREP(MTK_WED_TX_BM_DYN_THR_LO_V2, 0) |
|
|
||||||
MTK_WED_TX_BM_DYN_THR_HI_V2);
|
|
||||||
@@ -971,6 +979,11 @@ mtk_wed_hw_init(struct mtk_wed_device *d
|
|
||||||
MTK_WED_TX_TKID_DYN_THR_HI);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ wed_w32(dev, dev->hw->soc->regmap.tx_bm_tkid,
|
|
||||||
+ FIELD_PREP(MTK_WED_TX_BM_TKID_START, dev->wlan.token_start) |
|
|
||||||
+ FIELD_PREP(MTK_WED_TX_BM_TKID_END,
|
|
||||||
+ dev->wlan.token_start + dev->wlan.nbuf - 1));
|
|
||||||
+
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_TX_BM);
|
|
||||||
|
|
||||||
if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
@@ -1105,13 +1118,8 @@ mtk_wed_rx_reset(struct mtk_wed_device *
|
|
||||||
if (ret) {
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_WED_RX_DMA);
|
|
||||||
} else {
|
|
||||||
- struct mtk_eth *eth = dev->hw->eth;
|
|
||||||
-
|
|
||||||
- if (mtk_is_netsys_v2_or_greater(eth))
|
|
||||||
- wed_set(dev, MTK_WED_RESET_IDX,
|
|
||||||
- MTK_WED_RESET_IDX_RX_V2);
|
|
||||||
- else
|
|
||||||
- wed_set(dev, MTK_WED_RESET_IDX, MTK_WED_RESET_IDX_RX);
|
|
||||||
+ wed_set(dev, MTK_WED_RESET_IDX,
|
|
||||||
+ dev->hw->soc->regmap.reset_idx_rx_mask);
|
|
||||||
wed_w32(dev, MTK_WED_RESET_IDX, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1164,7 +1172,8 @@ mtk_wed_reset_dma(struct mtk_wed_device
|
|
||||||
if (busy) {
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_WED_TX_DMA);
|
|
||||||
} else {
|
|
||||||
- wed_w32(dev, MTK_WED_RESET_IDX, MTK_WED_RESET_IDX_TX);
|
|
||||||
+ wed_w32(dev, MTK_WED_RESET_IDX,
|
|
||||||
+ dev->hw->soc->regmap.reset_idx_tx_mask);
|
|
||||||
wed_w32(dev, MTK_WED_RESET_IDX, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1256,7 +1265,6 @@ static int
|
|
||||||
mtk_wed_wdma_rx_ring_setup(struct mtk_wed_device *dev, int idx, int size,
|
|
||||||
bool reset)
|
|
||||||
{
|
|
||||||
- u32 desc_size = sizeof(struct mtk_wdma_desc) * dev->hw->version;
|
|
||||||
struct mtk_wed_ring *wdma;
|
|
||||||
|
|
||||||
if (idx >= ARRAY_SIZE(dev->rx_wdma))
|
|
||||||
@@ -1264,7 +1272,7 @@ mtk_wed_wdma_rx_ring_setup(struct mtk_we
|
|
||||||
|
|
||||||
wdma = &dev->rx_wdma[idx];
|
|
||||||
if (!reset && mtk_wed_ring_alloc(dev, wdma, MTK_WED_WDMA_RING_SIZE,
|
|
||||||
- desc_size, true))
|
|
||||||
+ dev->hw->soc->wdma_desc_size, true))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
wdma_w32(dev, MTK_WDMA_RING_RX(idx) + MTK_WED_RING_OFS_BASE,
|
|
||||||
@@ -1285,7 +1293,6 @@ static int
|
|
||||||
mtk_wed_wdma_tx_ring_setup(struct mtk_wed_device *dev, int idx, int size,
|
|
||||||
bool reset)
|
|
||||||
{
|
|
||||||
- u32 desc_size = sizeof(struct mtk_wdma_desc) * dev->hw->version;
|
|
||||||
struct mtk_wed_ring *wdma;
|
|
||||||
|
|
||||||
if (idx >= ARRAY_SIZE(dev->tx_wdma))
|
|
||||||
@@ -1293,7 +1300,7 @@ mtk_wed_wdma_tx_ring_setup(struct mtk_we
|
|
||||||
|
|
||||||
wdma = &dev->tx_wdma[idx];
|
|
||||||
if (!reset && mtk_wed_ring_alloc(dev, wdma, MTK_WED_WDMA_RING_SIZE,
|
|
||||||
- desc_size, true))
|
|
||||||
+ dev->hw->soc->wdma_desc_size, true))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_BASE,
|
|
||||||
@@ -1932,7 +1939,12 @@ void mtk_wed_add_hw(struct device_node *
|
|
||||||
hw->irq = irq;
|
|
||||||
hw->version = eth->soc->version;
|
|
||||||
|
|
||||||
- if (mtk_wed_is_v1(hw)) {
|
|
||||||
+ switch (hw->version) {
|
|
||||||
+ case 2:
|
|
||||||
+ hw->soc = &mt7986_data;
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ case 1:
|
|
||||||
hw->mirror = syscon_regmap_lookup_by_phandle(eth_np,
|
|
||||||
"mediatek,pcie-mirror");
|
|
||||||
hw->hifsys = syscon_regmap_lookup_by_phandle(eth_np,
|
|
||||||
@@ -1946,6 +1958,8 @@ void mtk_wed_add_hw(struct device_node *
|
|
||||||
regmap_write(hw->mirror, 0, 0);
|
|
||||||
regmap_write(hw->mirror, 4, 0);
|
|
||||||
}
|
|
||||||
+ hw->soc = &mt7622_data;
|
|
||||||
+ break;
|
|
||||||
}
|
|
||||||
|
|
||||||
mtk_wed_hw_add_debugfs(hw);
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.h
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.h
|
|
||||||
@@ -12,7 +12,18 @@
|
|
||||||
struct mtk_eth;
|
|
||||||
struct mtk_wed_wo;
|
|
||||||
|
|
||||||
+struct mtk_wed_soc_data {
|
|
||||||
+ struct {
|
|
||||||
+ u32 tx_bm_tkid;
|
|
||||||
+ u32 wpdma_rx_ring0;
|
|
||||||
+ u32 reset_idx_tx_mask;
|
|
||||||
+ u32 reset_idx_rx_mask;
|
|
||||||
+ } regmap;
|
|
||||||
+ u32 wdma_desc_size;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
struct mtk_wed_hw {
|
|
||||||
+ const struct mtk_wed_soc_data *soc;
|
|
||||||
struct device_node *node;
|
|
||||||
struct mtk_eth *eth;
|
|
||||||
struct regmap *regs;
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_regs.h
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_regs.h
|
|
||||||
@@ -100,8 +100,6 @@ struct mtk_wdma_desc {
|
|
||||||
|
|
||||||
#define MTK_WED_TX_BM_BASE 0x084
|
|
||||||
|
|
||||||
-#define MTK_WED_TX_BM_TKID 0x088
|
|
||||||
-#define MTK_WED_TX_BM_TKID_V2 0x0c8
|
|
||||||
#define MTK_WED_TX_BM_TKID_START GENMASK(15, 0)
|
|
||||||
#define MTK_WED_TX_BM_TKID_END GENMASK(31, 16)
|
|
||||||
|
|
||||||
@@ -160,9 +158,6 @@ struct mtk_wdma_desc {
|
|
||||||
#define MTK_WED_GLO_CFG_RX_2B_OFFSET BIT(31)
|
|
||||||
|
|
||||||
#define MTK_WED_RESET_IDX 0x20c
|
|
||||||
-#define MTK_WED_RESET_IDX_TX GENMASK(3, 0)
|
|
||||||
-#define MTK_WED_RESET_IDX_RX GENMASK(17, 16)
|
|
||||||
-#define MTK_WED_RESET_IDX_RX_V2 GENMASK(7, 6)
|
|
||||||
#define MTK_WED_RESET_WPDMA_IDX_RX GENMASK(31, 30)
|
|
||||||
|
|
||||||
#define MTK_WED_TX_MIB(_n) (0x2a0 + (_n) * 4)
|
|
||||||
@@ -286,7 +281,6 @@ struct mtk_wdma_desc {
|
|
||||||
#define MTK_WED_WPDMA_RX_D_RST_DRV_IDX GENMASK(25, 24)
|
|
||||||
|
|
||||||
#define MTK_WED_WPDMA_RX_GLO_CFG 0x76c
|
|
||||||
-#define MTK_WED_WPDMA_RX_RING 0x770
|
|
||||||
|
|
||||||
#define MTK_WED_WPDMA_RX_D_MIB(_n) (0x774 + (_n) * 4)
|
|
||||||
#define MTK_WED_WPDMA_RX_D_PROCESSED_MIB(_n) (0x784 + (_n) * 4)
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,95 +0,0 @@
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:14 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: refactor mtk_wed_check_wfdma_rx_fill
|
|
||||||
routine
|
|
||||||
|
|
||||||
Refactor mtk_wed_check_wfdma_rx_fill() in order to be reused adding HW
|
|
||||||
receive offload support for MT7988 SoC.
|
|
||||||
|
|
||||||
Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
@@ -586,22 +586,15 @@ mtk_wed_set_512_support(struct mtk_wed_d
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-#define MTK_WFMDA_RX_DMA_EN BIT(2)
|
|
||||||
-static void
|
|
||||||
-mtk_wed_check_wfdma_rx_fill(struct mtk_wed_device *dev, int idx)
|
|
||||||
+static int
|
|
||||||
+mtk_wed_check_wfdma_rx_fill(struct mtk_wed_device *dev,
|
|
||||||
+ struct mtk_wed_ring *ring)
|
|
||||||
{
|
|
||||||
- u32 val;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
- if (!(dev->rx_ring[idx].flags & MTK_WED_RING_CONFIGURED))
|
|
||||||
- return; /* queue is not configured by mt76 */
|
|
||||||
-
|
|
||||||
for (i = 0; i < 3; i++) {
|
|
||||||
- u32 cur_idx;
|
|
||||||
+ u32 cur_idx = readl(ring->wpdma + MTK_WED_RING_OFS_CPU_IDX);
|
|
||||||
|
|
||||||
- cur_idx = wed_r32(dev,
|
|
||||||
- MTK_WED_WPDMA_RING_RX_DATA(idx) +
|
|
||||||
- MTK_WED_RING_OFS_CPU_IDX);
|
|
||||||
if (cur_idx == MTK_WED_RX_RING_SIZE - 1)
|
|
||||||
break;
|
|
||||||
|
|
||||||
@@ -610,12 +603,10 @@ mtk_wed_check_wfdma_rx_fill(struct mtk_w
|
|
||||||
|
|
||||||
if (i == 3) {
|
|
||||||
dev_err(dev->hw->dev, "rx dma enable failed\n");
|
|
||||||
- return;
|
|
||||||
+ return -ETIMEDOUT;
|
|
||||||
}
|
|
||||||
|
|
||||||
- val = wifi_r32(dev, dev->wlan.wpdma_rx_glo - dev->wlan.phy_base) |
|
|
||||||
- MTK_WFMDA_RX_DMA_EN;
|
|
||||||
- wifi_w32(dev, dev->wlan.wpdma_rx_glo - dev->wlan.phy_base, val);
|
|
||||||
+ return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -1546,6 +1537,7 @@ mtk_wed_configure_irq(struct mtk_wed_dev
|
|
||||||
wed_w32(dev, MTK_WED_INT_MASK, irq_mask);
|
|
||||||
}
|
|
||||||
|
|
||||||
+#define MTK_WFMDA_RX_DMA_EN BIT(2)
|
|
||||||
static void
|
|
||||||
mtk_wed_dma_enable(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
@@ -1633,8 +1625,26 @@ mtk_wed_dma_enable(struct mtk_wed_device
|
|
||||||
wdma_set(dev, MTK_WDMA_WRBK_TX_CFG, MTK_WDMA_WRBK_TX_CFG_WRBK_EN);
|
|
||||||
}
|
|
||||||
|
|
||||||
- for (i = 0; i < MTK_WED_RX_QUEUES; i++)
|
|
||||||
- mtk_wed_check_wfdma_rx_fill(dev, i);
|
|
||||||
+ for (i = 0; i < MTK_WED_RX_QUEUES; i++) {
|
|
||||||
+ struct mtk_wed_ring *ring = &dev->rx_ring[i];
|
|
||||||
+ u32 val;
|
|
||||||
+
|
|
||||||
+ if (!(ring->flags & MTK_WED_RING_CONFIGURED))
|
|
||||||
+ continue; /* queue is not configured by mt76 */
|
|
||||||
+
|
|
||||||
+ if (mtk_wed_check_wfdma_rx_fill(dev, ring)) {
|
|
||||||
+ dev_err(dev->hw->dev,
|
|
||||||
+ "rx_ring(%d) dma enable failed\n", i);
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ val = wifi_r32(dev,
|
|
||||||
+ dev->wlan.wpdma_rx_glo -
|
|
||||||
+ dev->wlan.phy_base) | MTK_WFMDA_RX_DMA_EN;
|
|
||||||
+ wifi_w32(dev,
|
|
||||||
+ dev->wlan.wpdma_rx_glo - dev->wlan.phy_base,
|
|
||||||
+ val);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
|
@ -1,465 +0,0 @@
|
||||||
From: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:15 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: introduce partial AMSDU offload
|
|
||||||
support for MT7988
|
|
||||||
|
|
||||||
Introduce partial AMSDU offload support for MT7988 SoC in order to merge
|
|
||||||
in hw packets belonging to the same AMSDU before passing them to the
|
|
||||||
WLAN nic.
|
|
||||||
|
|
||||||
Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
||||||
@@ -439,7 +439,8 @@ int mtk_foe_entry_set_pppoe(struct mtk_e
|
|
||||||
}
|
|
||||||
|
|
||||||
int mtk_foe_entry_set_wdma(struct mtk_eth *eth, struct mtk_foe_entry *entry,
|
|
||||||
- int wdma_idx, int txq, int bss, int wcid)
|
|
||||||
+ int wdma_idx, int txq, int bss, int wcid,
|
|
||||||
+ bool amsdu_en)
|
|
||||||
{
|
|
||||||
struct mtk_foe_mac_info *l2 = mtk_foe_entry_l2(eth, entry);
|
|
||||||
u32 *ib2 = mtk_foe_entry_ib2(eth, entry);
|
|
||||||
@@ -451,6 +452,7 @@ int mtk_foe_entry_set_wdma(struct mtk_et
|
|
||||||
MTK_FOE_IB2_WDMA_WINFO_V2;
|
|
||||||
l2->w3info = FIELD_PREP(MTK_FOE_WINFO_WCID_V3, wcid) |
|
|
||||||
FIELD_PREP(MTK_FOE_WINFO_BSS_V3, bss);
|
|
||||||
+ l2->amsdu = FIELD_PREP(MTK_FOE_WINFO_AMSDU_EN, amsdu_en);
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
*ib2 &= ~MTK_FOE_IB2_PORT_MG_V2;
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_ppe.h
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.h
|
|
||||||
@@ -88,13 +88,13 @@ enum {
|
|
||||||
#define MTK_FOE_WINFO_BSS_V3 GENMASK(23, 16)
|
|
||||||
#define MTK_FOE_WINFO_WCID_V3 GENMASK(15, 0)
|
|
||||||
|
|
||||||
-#define MTK_FOE_WINFO_PAO_USR_INFO GENMASK(15, 0)
|
|
||||||
-#define MTK_FOE_WINFO_PAO_TID GENMASK(19, 16)
|
|
||||||
-#define MTK_FOE_WINFO_PAO_IS_FIXEDRATE BIT(20)
|
|
||||||
-#define MTK_FOE_WINFO_PAO_IS_PRIOR BIT(21)
|
|
||||||
-#define MTK_FOE_WINFO_PAO_IS_SP BIT(22)
|
|
||||||
-#define MTK_FOE_WINFO_PAO_HF BIT(23)
|
|
||||||
-#define MTK_FOE_WINFO_PAO_AMSDU_EN BIT(24)
|
|
||||||
+#define MTK_FOE_WINFO_AMSDU_USR_INFO GENMASK(15, 0)
|
|
||||||
+#define MTK_FOE_WINFO_AMSDU_TID GENMASK(19, 16)
|
|
||||||
+#define MTK_FOE_WINFO_AMSDU_IS_FIXEDRATE BIT(20)
|
|
||||||
+#define MTK_FOE_WINFO_AMSDU_IS_PRIOR BIT(21)
|
|
||||||
+#define MTK_FOE_WINFO_AMSDU_IS_SP BIT(22)
|
|
||||||
+#define MTK_FOE_WINFO_AMSDU_HF BIT(23)
|
|
||||||
+#define MTK_FOE_WINFO_AMSDU_EN BIT(24)
|
|
||||||
|
|
||||||
enum {
|
|
||||||
MTK_FOE_STATE_INVALID,
|
|
||||||
@@ -123,7 +123,7 @@ struct mtk_foe_mac_info {
|
|
||||||
|
|
||||||
/* netsys_v3 */
|
|
||||||
u32 w3info;
|
|
||||||
- u32 wpao;
|
|
||||||
+ u32 amsdu;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* software-only entry type */
|
|
||||||
@@ -394,7 +394,8 @@ int mtk_foe_entry_set_vlan(struct mtk_et
|
|
||||||
int mtk_foe_entry_set_pppoe(struct mtk_eth *eth, struct mtk_foe_entry *entry,
|
|
||||||
int sid);
|
|
||||||
int mtk_foe_entry_set_wdma(struct mtk_eth *eth, struct mtk_foe_entry *entry,
|
|
||||||
- int wdma_idx, int txq, int bss, int wcid);
|
|
||||||
+ int wdma_idx, int txq, int bss, int wcid,
|
|
||||||
+ bool amsdu_en);
|
|
||||||
int mtk_foe_entry_set_queue(struct mtk_eth *eth, struct mtk_foe_entry *entry,
|
|
||||||
unsigned int queue);
|
|
||||||
int mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_flow_entry *entry);
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
|
|
||||||
@@ -111,6 +111,7 @@ mtk_flow_get_wdma_info(struct net_device
|
|
||||||
info->queue = path->mtk_wdma.queue;
|
|
||||||
info->bss = path->mtk_wdma.bss;
|
|
||||||
info->wcid = path->mtk_wdma.wcid;
|
|
||||||
+ info->amsdu = path->mtk_wdma.amsdu;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@@ -192,7 +193,7 @@ mtk_flow_set_output_device(struct mtk_et
|
|
||||||
|
|
||||||
if (mtk_flow_get_wdma_info(dev, dest_mac, &info) == 0) {
|
|
||||||
mtk_foe_entry_set_wdma(eth, foe, info.wdma_idx, info.queue,
|
|
||||||
- info.bss, info.wcid);
|
|
||||||
+ info.bss, info.wcid, info.amsdu);
|
|
||||||
if (mtk_is_netsys_v2_or_greater(eth)) {
|
|
||||||
switch (info.wdma_idx) {
|
|
||||||
case 0:
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
@@ -30,6 +30,8 @@
|
|
||||||
#define MTK_WED_RX_PAGE_BUF_PER_PAGE (PAGE_SIZE / 128)
|
|
||||||
#define MTK_WED_RX_RING_SIZE 1536
|
|
||||||
#define MTK_WED_RX_PG_BM_CNT 8192
|
|
||||||
+#define MTK_WED_AMSDU_BUF_SIZE (PAGE_SIZE << 4)
|
|
||||||
+#define MTK_WED_AMSDU_NPAGES 32
|
|
||||||
|
|
||||||
#define MTK_WED_TX_RING_SIZE 2048
|
|
||||||
#define MTK_WED_WDMA_RING_SIZE 1024
|
|
||||||
@@ -173,6 +175,23 @@ mtk_wdma_rx_reset(struct mtk_wed_device
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static u32
|
|
||||||
+mtk_wed_check_busy(struct mtk_wed_device *dev, u32 reg, u32 mask)
|
|
||||||
+{
|
|
||||||
+ return !!(wed_r32(dev, reg) & mask);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
+mtk_wed_poll_busy(struct mtk_wed_device *dev, u32 reg, u32 mask)
|
|
||||||
+{
|
|
||||||
+ int sleep = 15000;
|
|
||||||
+ int timeout = 100 * sleep;
|
|
||||||
+ u32 val;
|
|
||||||
+
|
|
||||||
+ return read_poll_timeout(mtk_wed_check_busy, val, !val, sleep,
|
|
||||||
+ timeout, false, dev, reg, mask);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
mtk_wdma_tx_reset(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
@@ -336,6 +355,118 @@ out:
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
+mtk_wed_amsdu_buffer_alloc(struct mtk_wed_device *dev)
|
|
||||||
+{
|
|
||||||
+ struct mtk_wed_hw *hw = dev->hw;
|
|
||||||
+ struct mtk_wed_amsdu *wed_amsdu;
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
+ if (!mtk_wed_is_v3_or_greater(hw))
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ wed_amsdu = devm_kcalloc(hw->dev, MTK_WED_AMSDU_NPAGES,
|
|
||||||
+ sizeof(*wed_amsdu), GFP_KERNEL);
|
|
||||||
+ if (!wed_amsdu)
|
|
||||||
+ return -ENOMEM;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < MTK_WED_AMSDU_NPAGES; i++) {
|
|
||||||
+ void *ptr;
|
|
||||||
+
|
|
||||||
+ /* each segment is 64K */
|
|
||||||
+ ptr = (void *)__get_free_pages(GFP_KERNEL | __GFP_NOWARN |
|
|
||||||
+ __GFP_ZERO | __GFP_COMP |
|
|
||||||
+ GFP_DMA32,
|
|
||||||
+ get_order(MTK_WED_AMSDU_BUF_SIZE));
|
|
||||||
+ if (!ptr)
|
|
||||||
+ goto error;
|
|
||||||
+
|
|
||||||
+ wed_amsdu[i].txd = ptr;
|
|
||||||
+ wed_amsdu[i].txd_phy = dma_map_single(hw->dev, ptr,
|
|
||||||
+ MTK_WED_AMSDU_BUF_SIZE,
|
|
||||||
+ DMA_TO_DEVICE);
|
|
||||||
+ if (dma_mapping_error(hw->dev, wed_amsdu[i].txd_phy))
|
|
||||||
+ goto error;
|
|
||||||
+ }
|
|
||||||
+ dev->hw->wed_amsdu = wed_amsdu;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+error:
|
|
||||||
+ for (i--; i >= 0; i--)
|
|
||||||
+ dma_unmap_single(hw->dev, wed_amsdu[i].txd_phy,
|
|
||||||
+ MTK_WED_AMSDU_BUF_SIZE, DMA_TO_DEVICE);
|
|
||||||
+ return -ENOMEM;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+mtk_wed_amsdu_free_buffer(struct mtk_wed_device *dev)
|
|
||||||
+{
|
|
||||||
+ struct mtk_wed_amsdu *wed_amsdu = dev->hw->wed_amsdu;
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
+ if (!wed_amsdu)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < MTK_WED_AMSDU_NPAGES; i++) {
|
|
||||||
+ dma_unmap_single(dev->hw->dev, wed_amsdu[i].txd_phy,
|
|
||||||
+ MTK_WED_AMSDU_BUF_SIZE, DMA_TO_DEVICE);
|
|
||||||
+ free_pages((unsigned long)wed_amsdu[i].txd,
|
|
||||||
+ get_order(MTK_WED_AMSDU_BUF_SIZE));
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
+mtk_wed_amsdu_init(struct mtk_wed_device *dev)
|
|
||||||
+{
|
|
||||||
+ struct mtk_wed_amsdu *wed_amsdu = dev->hw->wed_amsdu;
|
|
||||||
+ int i, ret;
|
|
||||||
+
|
|
||||||
+ if (!wed_amsdu)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < MTK_WED_AMSDU_NPAGES; i++)
|
|
||||||
+ wed_w32(dev, MTK_WED_AMSDU_HIFTXD_BASE_L(i),
|
|
||||||
+ wed_amsdu[i].txd_phy);
|
|
||||||
+
|
|
||||||
+ /* init all sta parameter */
|
|
||||||
+ wed_w32(dev, MTK_WED_AMSDU_STA_INFO_INIT, MTK_WED_AMSDU_STA_RMVL |
|
|
||||||
+ MTK_WED_AMSDU_STA_WTBL_HDRT_MODE |
|
|
||||||
+ FIELD_PREP(MTK_WED_AMSDU_STA_MAX_AMSDU_LEN,
|
|
||||||
+ dev->wlan.amsdu_max_len >> 8) |
|
|
||||||
+ FIELD_PREP(MTK_WED_AMSDU_STA_MAX_AMSDU_NUM,
|
|
||||||
+ dev->wlan.amsdu_max_subframes));
|
|
||||||
+
|
|
||||||
+ wed_w32(dev, MTK_WED_AMSDU_STA_INFO, MTK_WED_AMSDU_STA_INFO_DO_INIT);
|
|
||||||
+
|
|
||||||
+ ret = mtk_wed_poll_busy(dev, MTK_WED_AMSDU_STA_INFO,
|
|
||||||
+ MTK_WED_AMSDU_STA_INFO_DO_INIT);
|
|
||||||
+ if (ret) {
|
|
||||||
+ dev_err(dev->hw->dev, "amsdu initialization failed\n");
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* init partial amsdu offload txd src */
|
|
||||||
+ wed_set(dev, MTK_WED_AMSDU_HIFTXD_CFG,
|
|
||||||
+ FIELD_PREP(MTK_WED_AMSDU_HIFTXD_SRC, dev->hw->index));
|
|
||||||
+
|
|
||||||
+ /* init qmem */
|
|
||||||
+ wed_set(dev, MTK_WED_AMSDU_PSE, MTK_WED_AMSDU_PSE_RESET);
|
|
||||||
+ ret = mtk_wed_poll_busy(dev, MTK_WED_MON_AMSDU_QMEM_STS1, BIT(29));
|
|
||||||
+ if (ret) {
|
|
||||||
+ pr_info("%s: amsdu qmem initialization failed\n", __func__);
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* eagle E1 PCIE1 tx ring 22 flow control issue */
|
|
||||||
+ if (dev->wlan.id == 0x7991)
|
|
||||||
+ wed_clr(dev, MTK_WED_AMSDU_FIFO, MTK_WED_AMSDU_IS_PRIOR0_RING);
|
|
||||||
+
|
|
||||||
+ wed_set(dev, MTK_WED_CTRL, MTK_WED_CTRL_TX_AMSDU_EN);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
mtk_wed_tx_buffer_alloc(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
u32 desc_size = dev->hw->soc->tx_ring_desc_size;
|
|
||||||
@@ -709,6 +840,7 @@ __mtk_wed_detach(struct mtk_wed_device *
|
|
||||||
|
|
||||||
mtk_wdma_rx_reset(dev);
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_WED);
|
|
||||||
+ mtk_wed_amsdu_free_buffer(dev);
|
|
||||||
mtk_wed_free_tx_buffer(dev);
|
|
||||||
mtk_wed_free_tx_rings(dev);
|
|
||||||
|
|
||||||
@@ -1129,23 +1261,6 @@ mtk_wed_ring_reset(struct mtk_wed_ring *
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-static u32
|
|
||||||
-mtk_wed_check_busy(struct mtk_wed_device *dev, u32 reg, u32 mask)
|
|
||||||
-{
|
|
||||||
- return !!(wed_r32(dev, reg) & mask);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-static int
|
|
||||||
-mtk_wed_poll_busy(struct mtk_wed_device *dev, u32 reg, u32 mask)
|
|
||||||
-{
|
|
||||||
- int sleep = 15000;
|
|
||||||
- int timeout = 100 * sleep;
|
|
||||||
- u32 val;
|
|
||||||
-
|
|
||||||
- return read_poll_timeout(mtk_wed_check_busy, val, !val, sleep,
|
|
||||||
- timeout, false, dev, reg, mask);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
static int
|
|
||||||
mtk_wed_rx_reset(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
@@ -1692,6 +1807,7 @@ mtk_wed_start(struct mtk_wed_device *dev
|
|
||||||
}
|
|
||||||
|
|
||||||
mtk_wed_set_512_support(dev, dev->wlan.wcid_512);
|
|
||||||
+ mtk_wed_amsdu_init(dev);
|
|
||||||
|
|
||||||
mtk_wed_dma_enable(dev);
|
|
||||||
dev->running = true;
|
|
||||||
@@ -1748,6 +1864,10 @@ mtk_wed_attach(struct mtk_wed_device *de
|
|
||||||
if (ret)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
+ ret = mtk_wed_amsdu_buffer_alloc(dev);
|
|
||||||
+ if (ret)
|
|
||||||
+ goto out;
|
|
||||||
+
|
|
||||||
if (mtk_wed_get_rx_capa(dev)) {
|
|
||||||
ret = mtk_wed_rro_alloc(dev);
|
|
||||||
if (ret)
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.h
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.h
|
|
||||||
@@ -25,6 +25,11 @@ struct mtk_wed_soc_data {
|
|
||||||
u32 wdma_desc_size;
|
|
||||||
};
|
|
||||||
|
|
||||||
+struct mtk_wed_amsdu {
|
|
||||||
+ void *txd;
|
|
||||||
+ dma_addr_t txd_phy;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
struct mtk_wed_hw {
|
|
||||||
const struct mtk_wed_soc_data *soc;
|
|
||||||
struct device_node *node;
|
|
||||||
@@ -38,6 +43,7 @@ struct mtk_wed_hw {
|
|
||||||
struct dentry *debugfs_dir;
|
|
||||||
struct mtk_wed_device *wed_dev;
|
|
||||||
struct mtk_wed_wo *wed_wo;
|
|
||||||
+ struct mtk_wed_amsdu *wed_amsdu;
|
|
||||||
u32 pcie_base;
|
|
||||||
u32 debugfs_reg;
|
|
||||||
u32 num_flows;
|
|
||||||
@@ -52,6 +58,7 @@ struct mtk_wdma_info {
|
|
||||||
u8 queue;
|
|
||||||
u16 wcid;
|
|
||||||
u8 bss;
|
|
||||||
+ u8 amsdu;
|
|
||||||
};
|
|
||||||
|
|
||||||
#ifdef CONFIG_NET_MEDIATEK_SOC_WED
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_regs.h
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_regs.h
|
|
||||||
@@ -672,6 +672,82 @@ struct mtk_wdma_desc {
|
|
||||||
#define MTK_WED_WOCPU_VIEW_MIOD_BASE 0x8000
|
|
||||||
#define MTK_WED_PCIE_INT_MASK 0x0
|
|
||||||
|
|
||||||
+#define MTK_WED_AMSDU_FIFO 0x1800
|
|
||||||
+#define MTK_WED_AMSDU_IS_PRIOR0_RING BIT(10)
|
|
||||||
+
|
|
||||||
+#define MTK_WED_AMSDU_STA_INFO 0x01810
|
|
||||||
+#define MTK_WED_AMSDU_STA_INFO_DO_INIT BIT(0)
|
|
||||||
+#define MTK_WED_AMSDU_STA_INFO_SET_INIT BIT(1)
|
|
||||||
+
|
|
||||||
+#define MTK_WED_AMSDU_STA_INFO_INIT 0x01814
|
|
||||||
+#define MTK_WED_AMSDU_STA_WTBL_HDRT_MODE BIT(0)
|
|
||||||
+#define MTK_WED_AMSDU_STA_RMVL BIT(1)
|
|
||||||
+#define MTK_WED_AMSDU_STA_MAX_AMSDU_LEN GENMASK(7, 2)
|
|
||||||
+#define MTK_WED_AMSDU_STA_MAX_AMSDU_NUM GENMASK(11, 8)
|
|
||||||
+
|
|
||||||
+#define MTK_WED_AMSDU_HIFTXD_BASE_L(_n) (0x1980 + (_n) * 0x4)
|
|
||||||
+
|
|
||||||
+#define MTK_WED_AMSDU_PSE 0x1910
|
|
||||||
+#define MTK_WED_AMSDU_PSE_RESET BIT(16)
|
|
||||||
+
|
|
||||||
+#define MTK_WED_AMSDU_HIFTXD_CFG 0x1968
|
|
||||||
+#define MTK_WED_AMSDU_HIFTXD_SRC GENMASK(16, 15)
|
|
||||||
+
|
|
||||||
+#define MTK_WED_MON_AMSDU_FIFO_DMAD 0x1a34
|
|
||||||
+
|
|
||||||
+#define MTK_WED_MON_AMSDU_ENG_DMAD(_n) (0x1a80 + (_n) * 0x50)
|
|
||||||
+#define MTK_WED_MON_AMSDU_ENG_QFPL(_n) (0x1a84 + (_n) * 0x50)
|
|
||||||
+#define MTK_WED_MON_AMSDU_ENG_QENI(_n) (0x1a88 + (_n) * 0x50)
|
|
||||||
+#define MTK_WED_MON_AMSDU_ENG_QENO(_n) (0x1a8c + (_n) * 0x50)
|
|
||||||
+#define MTK_WED_MON_AMSDU_ENG_MERG(_n) (0x1a90 + (_n) * 0x50)
|
|
||||||
+
|
|
||||||
+#define MTK_WED_MON_AMSDU_ENG_CNT8(_n) (0x1a94 + (_n) * 0x50)
|
|
||||||
+#define MTK_WED_AMSDU_ENG_MAX_QGPP_CNT GENMASK(10, 0)
|
|
||||||
+#define MTK_WED_AMSDU_ENG_MAX_PL_CNT GENMASK(27, 16)
|
|
||||||
+
|
|
||||||
+#define MTK_WED_MON_AMSDU_ENG_CNT9(_n) (0x1a98 + (_n) * 0x50)
|
|
||||||
+#define MTK_WED_AMSDU_ENG_CUR_ENTRY GENMASK(10, 0)
|
|
||||||
+#define MTK_WED_AMSDU_ENG_MAX_BUF_MERGED GENMASK(20, 16)
|
|
||||||
+#define MTK_WED_AMSDU_ENG_MAX_MSDU_MERGED GENMASK(28, 24)
|
|
||||||
+
|
|
||||||
+#define MTK_WED_MON_AMSDU_QMEM_STS1 0x1e04
|
|
||||||
+
|
|
||||||
+#define MTK_WED_MON_AMSDU_QMEM_CNT(_n) (0x1e0c + (_n) * 0x4)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_FQ_CNT GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_SP_QCNT GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID0_QCNT GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID1_QCNT GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID2_QCNT GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID3_QCNT GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID4_QCNT GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID5_QCNT GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID6_QCNT GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID7_QCNT GENMASK(11, 0)
|
|
||||||
+
|
|
||||||
+#define MTK_WED_MON_AMSDU_QMEM_PTR(_n) (0x1e20 + (_n) * 0x4)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_FQ_HEAD GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_SP_QHEAD GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID0_QHEAD GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID1_QHEAD GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID2_QHEAD GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID3_QHEAD GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID4_QHEAD GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID5_QHEAD GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID6_QHEAD GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID7_QHEAD GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_FQ_TAIL GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_SP_QTAIL GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID0_QTAIL GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID1_QTAIL GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID2_QTAIL GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID3_QTAIL GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID4_QTAIL GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID5_QTAIL GENMASK(11, 0)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID6_QTAIL GENMASK(27, 16)
|
|
||||||
+#define MTK_WED_AMSDU_QMEM_TID7_QTAIL GENMASK(11, 0)
|
|
||||||
+
|
|
||||||
+#define MTK_WED_MON_AMSDU_HIFTXD_FETCH_MSDU(_n) (0x1ec4 + (_n) * 0x4)
|
|
||||||
+
|
|
||||||
#define MTK_WED_PCIE_BASE 0x11280000
|
|
||||||
#define MTK_WED_PCIE_BASE0 0x11300000
|
|
||||||
#define MTK_WED_PCIE_BASE1 0x11310000
|
|
||||||
--- a/include/linux/netdevice.h
|
|
||||||
+++ b/include/linux/netdevice.h
|
|
||||||
@@ -917,6 +917,7 @@ struct net_device_path {
|
|
||||||
u8 queue;
|
|
||||||
u16 wcid;
|
|
||||||
u8 bss;
|
|
||||||
+ u8 amsdu;
|
|
||||||
} mtk_wdma;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
--- a/include/linux/soc/mediatek/mtk_wed.h
|
|
||||||
+++ b/include/linux/soc/mediatek/mtk_wed.h
|
|
||||||
@@ -128,6 +128,7 @@ struct mtk_wed_device {
|
|
||||||
enum mtk_wed_bus_tye bus_type;
|
|
||||||
void __iomem *base;
|
|
||||||
u32 phy_base;
|
|
||||||
+ u32 id;
|
|
||||||
|
|
||||||
u32 wpdma_phys;
|
|
||||||
u32 wpdma_int;
|
|
||||||
@@ -146,10 +147,12 @@ struct mtk_wed_device {
|
|
||||||
unsigned int rx_nbuf;
|
|
||||||
unsigned int rx_npkt;
|
|
||||||
unsigned int rx_size;
|
|
||||||
+ unsigned int amsdu_max_len;
|
|
||||||
|
|
||||||
u8 tx_tbit[MTK_WED_TX_QUEUES];
|
|
||||||
u8 rx_tbit[MTK_WED_RX_QUEUES];
|
|
||||||
u8 txfree_tbit;
|
|
||||||
+ u8 amsdu_max_subframes;
|
|
||||||
|
|
||||||
u32 (*init_buf)(void *ptr, dma_addr_t phys, int token_id);
|
|
||||||
int (*offload_enable)(struct mtk_wed_device *wed);
|
|
||||||
@@ -223,6 +226,15 @@ static inline bool mtk_wed_get_rx_capa(s
|
|
||||||
#else
|
|
||||||
return false;
|
|
||||||
#endif
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static inline bool mtk_wed_is_amsdu_supported(struct mtk_wed_device *dev)
|
|
||||||
+{
|
|
||||||
+#ifdef CONFIG_NET_MEDIATEK_SOC_WED
|
|
||||||
+ return dev->version == 3;
|
|
||||||
+#else
|
|
||||||
+ return false;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_NET_MEDIATEK_SOC_WED
|
|
|
@ -1,483 +0,0 @@
|
||||||
From: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:16 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: introduce hw_rro support for MT7988
|
|
||||||
|
|
||||||
MT7988 SoC support 802.11 receive reordering offload in hw while
|
|
||||||
MT7986 SoC implements it through the firmware running on the mcu.
|
|
||||||
|
|
||||||
Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
@@ -27,7 +27,7 @@
|
|
||||||
#define MTK_WED_BUF_SIZE 2048
|
|
||||||
#define MTK_WED_PAGE_BUF_SIZE 128
|
|
||||||
#define MTK_WED_BUF_PER_PAGE (PAGE_SIZE / 2048)
|
|
||||||
-#define MTK_WED_RX_PAGE_BUF_PER_PAGE (PAGE_SIZE / 128)
|
|
||||||
+#define MTK_WED_RX_BUF_PER_PAGE (PAGE_SIZE / MTK_WED_PAGE_BUF_SIZE)
|
|
||||||
#define MTK_WED_RX_RING_SIZE 1536
|
|
||||||
#define MTK_WED_RX_PG_BM_CNT 8192
|
|
||||||
#define MTK_WED_AMSDU_BUF_SIZE (PAGE_SIZE << 4)
|
|
||||||
@@ -597,6 +597,68 @@ free_pagelist:
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
+mtk_wed_hwrro_buffer_alloc(struct mtk_wed_device *dev)
|
|
||||||
+{
|
|
||||||
+ int n_pages = MTK_WED_RX_PG_BM_CNT / MTK_WED_RX_BUF_PER_PAGE;
|
|
||||||
+ struct mtk_wed_buf *page_list;
|
|
||||||
+ struct mtk_wed_bm_desc *desc;
|
|
||||||
+ dma_addr_t desc_phys;
|
|
||||||
+ int i, page_idx = 0;
|
|
||||||
+
|
|
||||||
+ if (!dev->wlan.hw_rro)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ page_list = kcalloc(n_pages, sizeof(*page_list), GFP_KERNEL);
|
|
||||||
+ if (!page_list)
|
|
||||||
+ return -ENOMEM;
|
|
||||||
+
|
|
||||||
+ dev->hw_rro.size = dev->wlan.rx_nbuf & ~(MTK_WED_BUF_PER_PAGE - 1);
|
|
||||||
+ dev->hw_rro.pages = page_list;
|
|
||||||
+ desc = dma_alloc_coherent(dev->hw->dev,
|
|
||||||
+ dev->wlan.rx_nbuf * sizeof(*desc),
|
|
||||||
+ &desc_phys, GFP_KERNEL);
|
|
||||||
+ if (!desc)
|
|
||||||
+ return -ENOMEM;
|
|
||||||
+
|
|
||||||
+ dev->hw_rro.desc = desc;
|
|
||||||
+ dev->hw_rro.desc_phys = desc_phys;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < MTK_WED_RX_PG_BM_CNT; i += MTK_WED_RX_BUF_PER_PAGE) {
|
|
||||||
+ dma_addr_t page_phys, buf_phys;
|
|
||||||
+ struct page *page;
|
|
||||||
+ int s;
|
|
||||||
+
|
|
||||||
+ page = __dev_alloc_page(GFP_KERNEL);
|
|
||||||
+ if (!page)
|
|
||||||
+ return -ENOMEM;
|
|
||||||
+
|
|
||||||
+ page_phys = dma_map_page(dev->hw->dev, page, 0, PAGE_SIZE,
|
|
||||||
+ DMA_BIDIRECTIONAL);
|
|
||||||
+ if (dma_mapping_error(dev->hw->dev, page_phys)) {
|
|
||||||
+ __free_page(page);
|
|
||||||
+ return -ENOMEM;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ page_list[page_idx].p = page;
|
|
||||||
+ page_list[page_idx++].phy_addr = page_phys;
|
|
||||||
+ dma_sync_single_for_cpu(dev->hw->dev, page_phys, PAGE_SIZE,
|
|
||||||
+ DMA_BIDIRECTIONAL);
|
|
||||||
+
|
|
||||||
+ buf_phys = page_phys;
|
|
||||||
+ for (s = 0; s < MTK_WED_RX_BUF_PER_PAGE; s++) {
|
|
||||||
+ desc->buf0 = cpu_to_le32(buf_phys);
|
|
||||||
+ buf_phys += MTK_WED_PAGE_BUF_SIZE;
|
|
||||||
+ desc++;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ dma_sync_single_for_device(dev->hw->dev, page_phys, PAGE_SIZE,
|
|
||||||
+ DMA_BIDIRECTIONAL);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
mtk_wed_rx_buffer_alloc(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
struct mtk_wed_bm_desc *desc;
|
|
||||||
@@ -613,7 +675,42 @@ mtk_wed_rx_buffer_alloc(struct mtk_wed_d
|
|
||||||
dev->rx_buf_ring.desc_phys = desc_phys;
|
|
||||||
dev->wlan.init_rx_buf(dev, dev->wlan.rx_npkt);
|
|
||||||
|
|
||||||
- return 0;
|
|
||||||
+ return mtk_wed_hwrro_buffer_alloc(dev);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+mtk_wed_hwrro_free_buffer(struct mtk_wed_device *dev)
|
|
||||||
+{
|
|
||||||
+ struct mtk_wed_buf *page_list = dev->hw_rro.pages;
|
|
||||||
+ struct mtk_wed_bm_desc *desc = dev->hw_rro.desc;
|
|
||||||
+ int i, page_idx = 0;
|
|
||||||
+
|
|
||||||
+ if (!dev->wlan.hw_rro)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ if (!page_list)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ if (!desc)
|
|
||||||
+ goto free_pagelist;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < MTK_WED_RX_PG_BM_CNT; i += MTK_WED_RX_BUF_PER_PAGE) {
|
|
||||||
+ dma_addr_t buf_addr = page_list[page_idx].phy_addr;
|
|
||||||
+ void *page = page_list[page_idx++].p;
|
|
||||||
+
|
|
||||||
+ if (!page)
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
+ dma_unmap_page(dev->hw->dev, buf_addr, PAGE_SIZE,
|
|
||||||
+ DMA_BIDIRECTIONAL);
|
|
||||||
+ __free_page(page);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ dma_free_coherent(dev->hw->dev, dev->hw_rro.size * sizeof(*desc),
|
|
||||||
+ desc, dev->hw_rro.desc_phys);
|
|
||||||
+
|
|
||||||
+free_pagelist:
|
|
||||||
+ kfree(page_list);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -627,6 +724,28 @@ mtk_wed_free_rx_buffer(struct mtk_wed_de
|
|
||||||
dev->wlan.release_rx_buf(dev);
|
|
||||||
dma_free_coherent(dev->hw->dev, dev->rx_buf_ring.size * sizeof(*desc),
|
|
||||||
desc, dev->rx_buf_ring.desc_phys);
|
|
||||||
+
|
|
||||||
+ mtk_wed_hwrro_free_buffer(dev);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+mtk_wed_hwrro_init(struct mtk_wed_device *dev)
|
|
||||||
+{
|
|
||||||
+ if (!mtk_wed_get_rx_capa(dev) || !dev->wlan.hw_rro)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ wed_set(dev, MTK_WED_RRO_PG_BM_RX_DMAM,
|
|
||||||
+ FIELD_PREP(MTK_WED_RRO_PG_BM_RX_SDL0, 128));
|
|
||||||
+
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_PG_BM_BASE, dev->hw_rro.desc_phys);
|
|
||||||
+
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_PG_BM_INIT_PTR,
|
|
||||||
+ MTK_WED_RRO_PG_BM_INIT_SW_TAIL_IDX |
|
|
||||||
+ FIELD_PREP(MTK_WED_RRO_PG_BM_SW_TAIL_IDX,
|
|
||||||
+ MTK_WED_RX_PG_BM_CNT));
|
|
||||||
+
|
|
||||||
+ /* enable rx_page_bm to fetch dmad */
|
|
||||||
+ wed_set(dev, MTK_WED_CTRL, MTK_WED_CTRL_WED_RX_PG_BM_EN);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -640,6 +759,8 @@ mtk_wed_rx_buffer_hw_init(struct mtk_wed
|
|
||||||
wed_w32(dev, MTK_WED_RX_BM_DYN_ALLOC_TH,
|
|
||||||
FIELD_PREP(MTK_WED_RX_BM_DYN_ALLOC_TH_H, 0xffff));
|
|
||||||
wed_set(dev, MTK_WED_CTRL, MTK_WED_CTRL_WED_RX_BM_EN);
|
|
||||||
+
|
|
||||||
+ mtk_wed_hwrro_init(dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -935,6 +1056,8 @@ mtk_wed_bus_init(struct mtk_wed_device *
|
|
||||||
static void
|
|
||||||
mtk_wed_set_wpdma(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
if (mtk_wed_is_v1(dev->hw)) {
|
|
||||||
wed_w32(dev, MTK_WED_WPDMA_CFG_BASE, dev->wlan.wpdma_phys);
|
|
||||||
return;
|
|
||||||
@@ -952,6 +1075,15 @@ mtk_wed_set_wpdma(struct mtk_wed_device
|
|
||||||
|
|
||||||
wed_w32(dev, MTK_WED_WPDMA_RX_GLO_CFG, dev->wlan.wpdma_rx_glo);
|
|
||||||
wed_w32(dev, dev->hw->soc->regmap.wpdma_rx_ring0, dev->wlan.wpdma_rx);
|
|
||||||
+
|
|
||||||
+ if (!dev->wlan.hw_rro)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_RX_D_CFG(0), dev->wlan.wpdma_rx_rro[0]);
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_RX_D_CFG(1), dev->wlan.wpdma_rx_rro[1]);
|
|
||||||
+ for (i = 0; i < MTK_WED_RX_PAGE_QUEUES; i++)
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_MSDU_PG_RING_CFG(i),
|
|
||||||
+ dev->wlan.wpdma_rx_pg + i * 0x10);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -1763,6 +1895,165 @@ mtk_wed_dma_enable(struct mtk_wed_device
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
+mtk_wed_start_hw_rro(struct mtk_wed_device *dev, u32 irq_mask, bool reset)
|
|
||||||
+{
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_INT_MASK, irq_mask);
|
|
||||||
+ wed_w32(dev, MTK_WED_INT_MASK, irq_mask);
|
|
||||||
+
|
|
||||||
+ if (!mtk_wed_get_rx_capa(dev) || !dev->wlan.hw_rro)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ wed_set(dev, MTK_WED_RRO_RX_D_CFG(2), MTK_WED_RRO_MSDU_PG_DRV_CLR);
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_MSDU_PG_RING2_CFG,
|
|
||||||
+ MTK_WED_RRO_MSDU_PG_DRV_CLR);
|
|
||||||
+
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_INT_CTRL_RRO_RX,
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RRO_RX0_EN |
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RRO_RX0_CLR |
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RRO_RX1_EN |
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RRO_RX1_CLR |
|
|
||||||
+ FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_RRO_RX0_DONE_TRIG,
|
|
||||||
+ dev->wlan.rro_rx_tbit[0]) |
|
|
||||||
+ FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_RRO_RX1_DONE_TRIG,
|
|
||||||
+ dev->wlan.rro_rx_tbit[1]));
|
|
||||||
+
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_INT_CTRL_RRO_MSDU_PG,
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RRO_PG0_EN |
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RRO_PG0_CLR |
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RRO_PG1_EN |
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RRO_PG1_CLR |
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RRO_PG2_EN |
|
|
||||||
+ MTK_WED_WPDMA_INT_CTRL_RRO_PG2_CLR |
|
|
||||||
+ FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_RRO_PG0_DONE_TRIG,
|
|
||||||
+ dev->wlan.rx_pg_tbit[0]) |
|
|
||||||
+ FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_RRO_PG1_DONE_TRIG,
|
|
||||||
+ dev->wlan.rx_pg_tbit[1]) |
|
|
||||||
+ FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_RRO_PG2_DONE_TRIG,
|
|
||||||
+ dev->wlan.rx_pg_tbit[2]));
|
|
||||||
+
|
|
||||||
+ /* RRO_MSDU_PG_RING2_CFG1_FLD_DRV_EN should be enabled after
|
|
||||||
+ * WM FWDL completed, otherwise RRO_MSDU_PG ring may broken
|
|
||||||
+ */
|
|
||||||
+ wed_set(dev, MTK_WED_RRO_MSDU_PG_RING2_CFG,
|
|
||||||
+ MTK_WED_RRO_MSDU_PG_DRV_EN);
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < MTK_WED_RX_QUEUES; i++) {
|
|
||||||
+ struct mtk_wed_ring *ring = &dev->rx_rro_ring[i];
|
|
||||||
+
|
|
||||||
+ if (!(ring->flags & MTK_WED_RING_CONFIGURED))
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ if (mtk_wed_check_wfdma_rx_fill(dev, ring))
|
|
||||||
+ dev_err(dev->hw->dev,
|
|
||||||
+ "rx_rro_ring(%d) initialization failed\n", i);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < MTK_WED_RX_PAGE_QUEUES; i++) {
|
|
||||||
+ struct mtk_wed_ring *ring = &dev->rx_page_ring[i];
|
|
||||||
+
|
|
||||||
+ if (!(ring->flags & MTK_WED_RING_CONFIGURED))
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ if (mtk_wed_check_wfdma_rx_fill(dev, ring))
|
|
||||||
+ dev_err(dev->hw->dev,
|
|
||||||
+ "rx_page_ring(%d) initialization failed\n", i);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+mtk_wed_rro_rx_ring_setup(struct mtk_wed_device *dev, int idx,
|
|
||||||
+ void __iomem *regs)
|
|
||||||
+{
|
|
||||||
+ struct mtk_wed_ring *ring = &dev->rx_rro_ring[idx];
|
|
||||||
+
|
|
||||||
+ ring->wpdma = regs;
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_RX_D_RX(idx) + MTK_WED_RING_OFS_BASE,
|
|
||||||
+ readl(regs));
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_RX_D_RX(idx) + MTK_WED_RING_OFS_COUNT,
|
|
||||||
+ readl(regs + MTK_WED_RING_OFS_COUNT));
|
|
||||||
+ ring->flags |= MTK_WED_RING_CONFIGURED;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+mtk_wed_msdu_pg_rx_ring_setup(struct mtk_wed_device *dev, int idx, void __iomem *regs)
|
|
||||||
+{
|
|
||||||
+ struct mtk_wed_ring *ring = &dev->rx_page_ring[idx];
|
|
||||||
+
|
|
||||||
+ ring->wpdma = regs;
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_MSDU_PG_CTRL0(idx) + MTK_WED_RING_OFS_BASE,
|
|
||||||
+ readl(regs));
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_MSDU_PG_CTRL0(idx) + MTK_WED_RING_OFS_COUNT,
|
|
||||||
+ readl(regs + MTK_WED_RING_OFS_COUNT));
|
|
||||||
+ ring->flags |= MTK_WED_RING_CONFIGURED;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
+mtk_wed_ind_rx_ring_setup(struct mtk_wed_device *dev, void __iomem *regs)
|
|
||||||
+{
|
|
||||||
+ struct mtk_wed_ring *ring = &dev->ind_cmd_ring;
|
|
||||||
+ u32 val = readl(regs + MTK_WED_RING_OFS_COUNT);
|
|
||||||
+ int i, count = 0;
|
|
||||||
+
|
|
||||||
+ ring->wpdma = regs;
|
|
||||||
+ wed_w32(dev, MTK_WED_IND_CMD_RX_CTRL1 + MTK_WED_RING_OFS_BASE,
|
|
||||||
+ readl(regs) & 0xfffffff0);
|
|
||||||
+
|
|
||||||
+ wed_w32(dev, MTK_WED_IND_CMD_RX_CTRL1 + MTK_WED_RING_OFS_COUNT,
|
|
||||||
+ readl(regs + MTK_WED_RING_OFS_COUNT));
|
|
||||||
+
|
|
||||||
+ /* ack sn cr */
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_CFG0, dev->wlan.phy_base +
|
|
||||||
+ dev->wlan.ind_cmd.ack_sn_addr);
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_CFG1,
|
|
||||||
+ FIELD_PREP(MTK_WED_RRO_CFG1_MAX_WIN_SZ,
|
|
||||||
+ dev->wlan.ind_cmd.win_size) |
|
|
||||||
+ FIELD_PREP(MTK_WED_RRO_CFG1_PARTICL_SE_ID,
|
|
||||||
+ dev->wlan.ind_cmd.particular_sid));
|
|
||||||
+
|
|
||||||
+ /* particular session addr element */
|
|
||||||
+ wed_w32(dev, MTK_WED_ADDR_ELEM_CFG0,
|
|
||||||
+ dev->wlan.ind_cmd.particular_se_phys);
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < dev->wlan.ind_cmd.se_group_nums; i++) {
|
|
||||||
+ wed_w32(dev, MTK_WED_RADDR_ELEM_TBL_WDATA,
|
|
||||||
+ dev->wlan.ind_cmd.addr_elem_phys[i] >> 4);
|
|
||||||
+ wed_w32(dev, MTK_WED_ADDR_ELEM_TBL_CFG,
|
|
||||||
+ MTK_WED_ADDR_ELEM_TBL_WR | (i & 0x7f));
|
|
||||||
+
|
|
||||||
+ val = wed_r32(dev, MTK_WED_ADDR_ELEM_TBL_CFG);
|
|
||||||
+ while (!(val & MTK_WED_ADDR_ELEM_TBL_WR_RDY) && count++ < 100)
|
|
||||||
+ val = wed_r32(dev, MTK_WED_ADDR_ELEM_TBL_CFG);
|
|
||||||
+ if (count >= 100)
|
|
||||||
+ dev_err(dev->hw->dev,
|
|
||||||
+ "write ba session base failed\n");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* pn check init */
|
|
||||||
+ for (i = 0; i < dev->wlan.ind_cmd.particular_sid; i++) {
|
|
||||||
+ wed_w32(dev, MTK_WED_PN_CHECK_WDATA_M,
|
|
||||||
+ MTK_WED_PN_CHECK_IS_FIRST);
|
|
||||||
+
|
|
||||||
+ wed_w32(dev, MTK_WED_PN_CHECK_CFG, MTK_WED_PN_CHECK_WR |
|
|
||||||
+ FIELD_PREP(MTK_WED_PN_CHECK_SE_ID, i));
|
|
||||||
+
|
|
||||||
+ count = 0;
|
|
||||||
+ val = wed_r32(dev, MTK_WED_PN_CHECK_CFG);
|
|
||||||
+ while (!(val & MTK_WED_PN_CHECK_WR_RDY) && count++ < 100)
|
|
||||||
+ val = wed_r32(dev, MTK_WED_PN_CHECK_CFG);
|
|
||||||
+ if (count >= 100)
|
|
||||||
+ dev_err(dev->hw->dev,
|
|
||||||
+ "session(%d) initialization failed\n", i);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ wed_w32(dev, MTK_WED_RX_IND_CMD_CNT0, MTK_WED_RX_IND_CMD_DBG_CNT_EN);
|
|
||||||
+ wed_set(dev, MTK_WED_CTRL, MTK_WED_CTRL_WED_RX_IND_CMD_EN);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
mtk_wed_start(struct mtk_wed_device *dev, u32 irq_mask)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
@@ -2216,6 +2507,10 @@ void mtk_wed_add_hw(struct device_node *
|
|
||||||
.detach = mtk_wed_detach,
|
|
||||||
.ppe_check = mtk_wed_ppe_check,
|
|
||||||
.setup_tc = mtk_wed_setup_tc,
|
|
||||||
+ .start_hw_rro = mtk_wed_start_hw_rro,
|
|
||||||
+ .rro_rx_ring_setup = mtk_wed_rro_rx_ring_setup,
|
|
||||||
+ .msdu_pg_rx_ring_setup = mtk_wed_msdu_pg_rx_ring_setup,
|
|
||||||
+ .ind_rx_ring_setup = mtk_wed_ind_rx_ring_setup,
|
|
||||||
};
|
|
||||||
struct device_node *eth_np = eth->dev->of_node;
|
|
||||||
struct platform_device *pdev;
|
|
||||||
--- a/include/linux/soc/mediatek/mtk_wed.h
|
|
||||||
+++ b/include/linux/soc/mediatek/mtk_wed.h
|
|
||||||
@@ -10,6 +10,7 @@
|
|
||||||
|
|
||||||
#define MTK_WED_TX_QUEUES 2
|
|
||||||
#define MTK_WED_RX_QUEUES 2
|
|
||||||
+#define MTK_WED_RX_PAGE_QUEUES 3
|
|
||||||
|
|
||||||
#define WED_WO_STA_REC 0x6
|
|
||||||
|
|
||||||
@@ -99,6 +100,9 @@ struct mtk_wed_device {
|
|
||||||
struct mtk_wed_ring txfree_ring;
|
|
||||||
struct mtk_wed_ring tx_wdma[MTK_WED_TX_QUEUES];
|
|
||||||
struct mtk_wed_ring rx_wdma[MTK_WED_RX_QUEUES];
|
|
||||||
+ struct mtk_wed_ring rx_rro_ring[MTK_WED_RX_QUEUES];
|
|
||||||
+ struct mtk_wed_ring rx_page_ring[MTK_WED_RX_PAGE_QUEUES];
|
|
||||||
+ struct mtk_wed_ring ind_cmd_ring;
|
|
||||||
|
|
||||||
struct {
|
|
||||||
int size;
|
|
||||||
@@ -119,6 +123,13 @@ struct mtk_wed_device {
|
|
||||||
dma_addr_t fdbk_phys;
|
|
||||||
} rro;
|
|
||||||
|
|
||||||
+ struct {
|
|
||||||
+ int size;
|
|
||||||
+ struct mtk_wed_buf *pages;
|
|
||||||
+ struct mtk_wed_bm_desc *desc;
|
|
||||||
+ dma_addr_t desc_phys;
|
|
||||||
+ } hw_rro;
|
|
||||||
+
|
|
||||||
/* filled by driver: */
|
|
||||||
struct {
|
|
||||||
union {
|
|
||||||
@@ -137,6 +148,8 @@ struct mtk_wed_device {
|
|
||||||
u32 wpdma_txfree;
|
|
||||||
u32 wpdma_rx_glo;
|
|
||||||
u32 wpdma_rx;
|
|
||||||
+ u32 wpdma_rx_rro[MTK_WED_RX_QUEUES];
|
|
||||||
+ u32 wpdma_rx_pg;
|
|
||||||
|
|
||||||
bool wcid_512;
|
|
||||||
bool hw_rro;
|
|
||||||
@@ -151,9 +164,20 @@ struct mtk_wed_device {
|
|
||||||
|
|
||||||
u8 tx_tbit[MTK_WED_TX_QUEUES];
|
|
||||||
u8 rx_tbit[MTK_WED_RX_QUEUES];
|
|
||||||
+ u8 rro_rx_tbit[MTK_WED_RX_QUEUES];
|
|
||||||
+ u8 rx_pg_tbit[MTK_WED_RX_PAGE_QUEUES];
|
|
||||||
u8 txfree_tbit;
|
|
||||||
u8 amsdu_max_subframes;
|
|
||||||
|
|
||||||
+ struct {
|
|
||||||
+ u8 se_group_nums;
|
|
||||||
+ u16 win_size;
|
|
||||||
+ u16 particular_sid;
|
|
||||||
+ u32 ack_sn_addr;
|
|
||||||
+ dma_addr_t particular_se_phys;
|
|
||||||
+ dma_addr_t addr_elem_phys[1024];
|
|
||||||
+ } ind_cmd;
|
|
||||||
+
|
|
||||||
u32 (*init_buf)(void *ptr, dma_addr_t phys, int token_id);
|
|
||||||
int (*offload_enable)(struct mtk_wed_device *wed);
|
|
||||||
void (*offload_disable)(struct mtk_wed_device *wed);
|
|
||||||
@@ -192,6 +216,14 @@ struct mtk_wed_ops {
|
|
||||||
void (*irq_set_mask)(struct mtk_wed_device *dev, u32 mask);
|
|
||||||
int (*setup_tc)(struct mtk_wed_device *wed, struct net_device *dev,
|
|
||||||
enum tc_setup_type type, void *type_data);
|
|
||||||
+ void (*start_hw_rro)(struct mtk_wed_device *dev, u32 irq_mask,
|
|
||||||
+ bool reset);
|
|
||||||
+ void (*rro_rx_ring_setup)(struct mtk_wed_device *dev, int ring,
|
|
||||||
+ void __iomem *regs);
|
|
||||||
+ void (*msdu_pg_rx_ring_setup)(struct mtk_wed_device *dev, int ring,
|
|
||||||
+ void __iomem *regs);
|
|
||||||
+ int (*ind_rx_ring_setup)(struct mtk_wed_device *dev,
|
|
||||||
+ void __iomem *regs);
|
|
||||||
};
|
|
||||||
|
|
||||||
extern const struct mtk_wed_ops __rcu *mtk_soc_wed_ops;
|
|
||||||
@@ -263,6 +295,15 @@ static inline bool mtk_wed_is_amsdu_supp
|
|
||||||
#define mtk_wed_device_dma_reset(_dev) (_dev)->ops->reset_dma(_dev)
|
|
||||||
#define mtk_wed_device_setup_tc(_dev, _netdev, _type, _type_data) \
|
|
||||||
(_dev)->ops->setup_tc(_dev, _netdev, _type, _type_data)
|
|
||||||
+#define mtk_wed_device_start_hw_rro(_dev, _mask, _reset) \
|
|
||||||
+ (_dev)->ops->start_hw_rro(_dev, _mask, _reset)
|
|
||||||
+#define mtk_wed_device_rro_rx_ring_setup(_dev, _ring, _regs) \
|
|
||||||
+ (_dev)->ops->rro_rx_ring_setup(_dev, _ring, _regs)
|
|
||||||
+#define mtk_wed_device_msdu_pg_rx_ring_setup(_dev, _ring, _regs) \
|
|
||||||
+ (_dev)->ops->msdu_pg_rx_ring_setup(_dev, _ring, _regs)
|
|
||||||
+#define mtk_wed_device_ind_rx_ring_setup(_dev, _regs) \
|
|
||||||
+ (_dev)->ops->ind_rx_ring_setup(_dev, _regs)
|
|
||||||
+
|
|
||||||
#else
|
|
||||||
static inline bool mtk_wed_device_active(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
@@ -282,6 +323,10 @@ static inline bool mtk_wed_device_active
|
|
||||||
#define mtk_wed_device_stop(_dev) do {} while (0)
|
|
||||||
#define mtk_wed_device_dma_reset(_dev) do {} while (0)
|
|
||||||
#define mtk_wed_device_setup_tc(_dev, _netdev, _type, _type_data) -EOPNOTSUPP
|
|
||||||
+#define mtk_wed_device_start_hw_rro(_dev, _mask, _reset) do {} while (0)
|
|
||||||
+#define mtk_wed_device_rro_rx_ring_setup(_dev, _ring, _regs) -ENODEV
|
|
||||||
+#define mtk_wed_device_msdu_pg_rx_ring_setup(_dev, _ring, _regs) -ENODEV
|
|
||||||
+#define mtk_wed_device_ind_rx_ring_setup(_dev, _regs) -ENODEV
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,78 +0,0 @@
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:17 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: debugfs: move wed_v2 specific regs
|
|
||||||
out of regs array
|
|
||||||
|
|
||||||
Move specific WED2.0 debugfs entries out of regs array. This is a
|
|
||||||
preliminary patch to introduce WED 3.0 debugfs info.
|
|
||||||
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
|
|
||||||
@@ -151,7 +151,7 @@ DEFINE_SHOW_ATTRIBUTE(wed_txinfo);
|
|
||||||
static int
|
|
||||||
wed_rxinfo_show(struct seq_file *s, void *data)
|
|
||||||
{
|
|
||||||
- static const struct reg_dump regs[] = {
|
|
||||||
+ static const struct reg_dump regs_common[] = {
|
|
||||||
DUMP_STR("WPDMA RX"),
|
|
||||||
DUMP_WPDMA_RX_RING(0),
|
|
||||||
DUMP_WPDMA_RX_RING(1),
|
|
||||||
@@ -169,7 +169,7 @@ wed_rxinfo_show(struct seq_file *s, void
|
|
||||||
DUMP_WED_RING(WED_RING_RX_DATA(0)),
|
|
||||||
DUMP_WED_RING(WED_RING_RX_DATA(1)),
|
|
||||||
|
|
||||||
- DUMP_STR("WED RRO"),
|
|
||||||
+ DUMP_STR("WED WO RRO"),
|
|
||||||
DUMP_WED_RRO_RING(WED_RROQM_MIOD_CTRL0),
|
|
||||||
DUMP_WED(WED_RROQM_MID_MIB),
|
|
||||||
DUMP_WED(WED_RROQM_MOD_MIB),
|
|
||||||
@@ -180,17 +180,6 @@ wed_rxinfo_show(struct seq_file *s, void
|
|
||||||
DUMP_WED(WED_RROQM_FDBK_ANC_MIB),
|
|
||||||
DUMP_WED(WED_RROQM_FDBK_ANC2H_MIB),
|
|
||||||
|
|
||||||
- DUMP_STR("WED Route QM"),
|
|
||||||
- DUMP_WED(WED_RTQM_R2H_MIB(0)),
|
|
||||||
- DUMP_WED(WED_RTQM_R2Q_MIB(0)),
|
|
||||||
- DUMP_WED(WED_RTQM_Q2H_MIB(0)),
|
|
||||||
- DUMP_WED(WED_RTQM_R2H_MIB(1)),
|
|
||||||
- DUMP_WED(WED_RTQM_R2Q_MIB(1)),
|
|
||||||
- DUMP_WED(WED_RTQM_Q2H_MIB(1)),
|
|
||||||
- DUMP_WED(WED_RTQM_Q2N_MIB),
|
|
||||||
- DUMP_WED(WED_RTQM_Q2B_MIB),
|
|
||||||
- DUMP_WED(WED_RTQM_PFDBK_MIB),
|
|
||||||
-
|
|
||||||
DUMP_STR("WED WDMA TX"),
|
|
||||||
DUMP_WED(WED_WDMA_TX_MIB),
|
|
||||||
DUMP_WED_RING(WED_WDMA_RING_TX),
|
|
||||||
@@ -211,11 +200,25 @@ wed_rxinfo_show(struct seq_file *s, void
|
|
||||||
DUMP_WED(WED_RX_BM_INTF),
|
|
||||||
DUMP_WED(WED_RX_BM_ERR_STS),
|
|
||||||
};
|
|
||||||
+ static const struct reg_dump regs_wed_v2[] = {
|
|
||||||
+ DUMP_STR("WED Route QM"),
|
|
||||||
+ DUMP_WED(WED_RTQM_R2H_MIB(0)),
|
|
||||||
+ DUMP_WED(WED_RTQM_R2Q_MIB(0)),
|
|
||||||
+ DUMP_WED(WED_RTQM_Q2H_MIB(0)),
|
|
||||||
+ DUMP_WED(WED_RTQM_R2H_MIB(1)),
|
|
||||||
+ DUMP_WED(WED_RTQM_R2Q_MIB(1)),
|
|
||||||
+ DUMP_WED(WED_RTQM_Q2H_MIB(1)),
|
|
||||||
+ DUMP_WED(WED_RTQM_Q2N_MIB),
|
|
||||||
+ DUMP_WED(WED_RTQM_Q2B_MIB),
|
|
||||||
+ DUMP_WED(WED_RTQM_PFDBK_MIB),
|
|
||||||
+ };
|
|
||||||
struct mtk_wed_hw *hw = s->private;
|
|
||||||
struct mtk_wed_device *dev = hw->wed_dev;
|
|
||||||
|
|
||||||
- if (dev)
|
|
||||||
- dump_wed_regs(s, dev, regs, ARRAY_SIZE(regs));
|
|
||||||
+ if (dev) {
|
|
||||||
+ dump_wed_regs(s, dev, regs_common, ARRAY_SIZE(regs_common));
|
|
||||||
+ dump_wed_regs(s, dev, regs_wed_v2, ARRAY_SIZE(regs_wed_v2));
|
|
||||||
+ }
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
|
@ -1,432 +0,0 @@
|
||||||
From: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:18 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: debugfs: add WED 3.0 debugfs entries
|
|
||||||
|
|
||||||
Introduce WED3.0 debugfs entries useful for debugging.
|
|
||||||
|
|
||||||
Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
|
|
||||||
@@ -11,6 +11,7 @@ struct reg_dump {
|
|
||||||
u16 offset;
|
|
||||||
u8 type;
|
|
||||||
u8 base;
|
|
||||||
+ u32 mask;
|
|
||||||
};
|
|
||||||
|
|
||||||
enum {
|
|
||||||
@@ -25,6 +26,8 @@ enum {
|
|
||||||
|
|
||||||
#define DUMP_STR(_str) { _str, 0, DUMP_TYPE_STRING }
|
|
||||||
#define DUMP_REG(_reg, ...) { #_reg, MTK_##_reg, __VA_ARGS__ }
|
|
||||||
+#define DUMP_REG_MASK(_reg, _mask) \
|
|
||||||
+ { #_mask, MTK_##_reg, DUMP_TYPE_WED, 0, MTK_##_mask }
|
|
||||||
#define DUMP_RING(_prefix, _base, ...) \
|
|
||||||
{ _prefix " BASE", _base, __VA_ARGS__ }, \
|
|
||||||
{ _prefix " CNT", _base + 0x4, __VA_ARGS__ }, \
|
|
||||||
@@ -32,6 +35,7 @@ enum {
|
|
||||||
{ _prefix " DIDX", _base + 0xc, __VA_ARGS__ }
|
|
||||||
|
|
||||||
#define DUMP_WED(_reg) DUMP_REG(_reg, DUMP_TYPE_WED)
|
|
||||||
+#define DUMP_WED_MASK(_reg, _mask) DUMP_REG_MASK(_reg, _mask)
|
|
||||||
#define DUMP_WED_RING(_base) DUMP_RING(#_base, MTK_##_base, DUMP_TYPE_WED)
|
|
||||||
|
|
||||||
#define DUMP_WDMA(_reg) DUMP_REG(_reg, DUMP_TYPE_WDMA)
|
|
||||||
@@ -212,12 +216,58 @@ wed_rxinfo_show(struct seq_file *s, void
|
|
||||||
DUMP_WED(WED_RTQM_Q2B_MIB),
|
|
||||||
DUMP_WED(WED_RTQM_PFDBK_MIB),
|
|
||||||
};
|
|
||||||
+ static const struct reg_dump regs_wed_v3[] = {
|
|
||||||
+ DUMP_STR("WED RX RRO DATA"),
|
|
||||||
+ DUMP_WED_RING(WED_RRO_RX_D_RX(0)),
|
|
||||||
+ DUMP_WED_RING(WED_RRO_RX_D_RX(1)),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED RX MSDU PAGE"),
|
|
||||||
+ DUMP_WED_RING(WED_RRO_MSDU_PG_CTRL0(0)),
|
|
||||||
+ DUMP_WED_RING(WED_RRO_MSDU_PG_CTRL0(1)),
|
|
||||||
+ DUMP_WED_RING(WED_RRO_MSDU_PG_CTRL0(2)),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED RX IND CMD"),
|
|
||||||
+ DUMP_WED(WED_IND_CMD_RX_CTRL1),
|
|
||||||
+ DUMP_WED_MASK(WED_IND_CMD_RX_CTRL2, WED_IND_CMD_MAX_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_IND_CMD_RX_CTRL0, WED_IND_CMD_PROC_IDX),
|
|
||||||
+ DUMP_WED_MASK(RRO_IND_CMD_SIGNATURE, RRO_IND_CMD_DMA_IDX),
|
|
||||||
+ DUMP_WED_MASK(WED_IND_CMD_RX_CTRL0, WED_IND_CMD_MAGIC_CNT),
|
|
||||||
+ DUMP_WED_MASK(RRO_IND_CMD_SIGNATURE, RRO_IND_CMD_MAGIC_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_IND_CMD_RX_CTRL0,
|
|
||||||
+ WED_IND_CMD_PREFETCH_FREE_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_RRO_CFG1, WED_RRO_CFG1_PARTICL_SE_ID),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED ADDR ELEM"),
|
|
||||||
+ DUMP_WED(WED_ADDR_ELEM_CFG0),
|
|
||||||
+ DUMP_WED_MASK(WED_ADDR_ELEM_CFG1,
|
|
||||||
+ WED_ADDR_ELEM_PREFETCH_FREE_CNT),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED Route QM"),
|
|
||||||
+ DUMP_WED(WED_RTQM_ENQ_I2Q_DMAD_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_ENQ_I2N_DMAD_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_ENQ_I2Q_PKT_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_ENQ_I2N_PKT_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_ENQ_USED_ENTRY_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_ENQ_ERR_CNT),
|
|
||||||
+
|
|
||||||
+ DUMP_WED(WED_RTQM_DEQ_DMAD_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_DEQ_Q2I_DMAD_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_DEQ_PKT_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_DEQ_Q2I_PKT_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_DEQ_USED_PFDBK_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_DEQ_ERR_CNT),
|
|
||||||
+ };
|
|
||||||
struct mtk_wed_hw *hw = s->private;
|
|
||||||
struct mtk_wed_device *dev = hw->wed_dev;
|
|
||||||
|
|
||||||
if (dev) {
|
|
||||||
dump_wed_regs(s, dev, regs_common, ARRAY_SIZE(regs_common));
|
|
||||||
- dump_wed_regs(s, dev, regs_wed_v2, ARRAY_SIZE(regs_wed_v2));
|
|
||||||
+ if (mtk_wed_is_v2(hw))
|
|
||||||
+ dump_wed_regs(s, dev,
|
|
||||||
+ regs_wed_v2, ARRAY_SIZE(regs_wed_v2));
|
|
||||||
+ else
|
|
||||||
+ dump_wed_regs(s, dev,
|
|
||||||
+ regs_wed_v3, ARRAY_SIZE(regs_wed_v3));
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
@@ -225,6 +275,314 @@ wed_rxinfo_show(struct seq_file *s, void
|
|
||||||
DEFINE_SHOW_ATTRIBUTE(wed_rxinfo);
|
|
||||||
|
|
||||||
static int
|
|
||||||
+wed_amsdu_show(struct seq_file *s, void *data)
|
|
||||||
+{
|
|
||||||
+ static const struct reg_dump regs[] = {
|
|
||||||
+ DUMP_STR("WED AMDSU INFO"),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_FIFO_DMAD),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED AMDSU ENG0 INFO"),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_DMAD(0)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QFPL(0)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENI(0)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENO(0)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_MERG(0)),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(0),
|
|
||||||
+ WED_AMSDU_ENG_MAX_PL_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(0),
|
|
||||||
+ WED_AMSDU_ENG_MAX_QGPP_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(0),
|
|
||||||
+ WED_AMSDU_ENG_CUR_ENTRY),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(0),
|
|
||||||
+ WED_AMSDU_ENG_MAX_BUF_MERGED),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(0),
|
|
||||||
+ WED_AMSDU_ENG_MAX_MSDU_MERGED),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED AMDSU ENG1 INFO"),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_DMAD(1)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QFPL(1)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENI(1)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENO(1)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_MERG(1)),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(1),
|
|
||||||
+ WED_AMSDU_ENG_MAX_PL_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(1),
|
|
||||||
+ WED_AMSDU_ENG_MAX_QGPP_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(1),
|
|
||||||
+ WED_AMSDU_ENG_CUR_ENTRY),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(2),
|
|
||||||
+ WED_AMSDU_ENG_MAX_BUF_MERGED),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(2),
|
|
||||||
+ WED_AMSDU_ENG_MAX_MSDU_MERGED),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED AMDSU ENG2 INFO"),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_DMAD(2)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QFPL(2)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENI(2)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENO(2)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_MERG(2)),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(2),
|
|
||||||
+ WED_AMSDU_ENG_MAX_PL_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(2),
|
|
||||||
+ WED_AMSDU_ENG_MAX_QGPP_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(2),
|
|
||||||
+ WED_AMSDU_ENG_CUR_ENTRY),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(2),
|
|
||||||
+ WED_AMSDU_ENG_MAX_BUF_MERGED),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(2),
|
|
||||||
+ WED_AMSDU_ENG_MAX_MSDU_MERGED),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED AMDSU ENG3 INFO"),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_DMAD(3)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QFPL(3)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENI(3)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENO(3)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_MERG(3)),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(3),
|
|
||||||
+ WED_AMSDU_ENG_MAX_PL_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(3),
|
|
||||||
+ WED_AMSDU_ENG_MAX_QGPP_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(3),
|
|
||||||
+ WED_AMSDU_ENG_CUR_ENTRY),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(3),
|
|
||||||
+ WED_AMSDU_ENG_MAX_BUF_MERGED),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(3),
|
|
||||||
+ WED_AMSDU_ENG_MAX_MSDU_MERGED),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED AMDSU ENG4 INFO"),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_DMAD(4)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QFPL(4)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENI(4)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENO(4)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_MERG(4)),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(4),
|
|
||||||
+ WED_AMSDU_ENG_MAX_PL_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(4),
|
|
||||||
+ WED_AMSDU_ENG_MAX_QGPP_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(4),
|
|
||||||
+ WED_AMSDU_ENG_CUR_ENTRY),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(4),
|
|
||||||
+ WED_AMSDU_ENG_MAX_BUF_MERGED),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(4),
|
|
||||||
+ WED_AMSDU_ENG_MAX_MSDU_MERGED),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED AMDSU ENG5 INFO"),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_DMAD(5)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QFPL(5)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENI(5)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENO(5)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_MERG(5)),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(5),
|
|
||||||
+ WED_AMSDU_ENG_MAX_PL_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(5),
|
|
||||||
+ WED_AMSDU_ENG_MAX_QGPP_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(5),
|
|
||||||
+ WED_AMSDU_ENG_CUR_ENTRY),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(5),
|
|
||||||
+ WED_AMSDU_ENG_MAX_BUF_MERGED),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(5),
|
|
||||||
+ WED_AMSDU_ENG_MAX_MSDU_MERGED),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED AMDSU ENG6 INFO"),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_DMAD(6)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QFPL(6)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENI(6)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENO(6)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_MERG(6)),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(6),
|
|
||||||
+ WED_AMSDU_ENG_MAX_PL_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(6),
|
|
||||||
+ WED_AMSDU_ENG_MAX_QGPP_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(6),
|
|
||||||
+ WED_AMSDU_ENG_CUR_ENTRY),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(6),
|
|
||||||
+ WED_AMSDU_ENG_MAX_BUF_MERGED),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(6),
|
|
||||||
+ WED_AMSDU_ENG_MAX_MSDU_MERGED),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED AMDSU ENG7 INFO"),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_DMAD(7)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QFPL(7)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENI(7)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENO(7)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_MERG(7)),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(7),
|
|
||||||
+ WED_AMSDU_ENG_MAX_PL_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(7),
|
|
||||||
+ WED_AMSDU_ENG_MAX_QGPP_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(7),
|
|
||||||
+ WED_AMSDU_ENG_CUR_ENTRY),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(7),
|
|
||||||
+ WED_AMSDU_ENG_MAX_BUF_MERGED),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(4),
|
|
||||||
+ WED_AMSDU_ENG_MAX_MSDU_MERGED),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED AMDSU ENG8 INFO"),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_DMAD(8)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QFPL(8)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENI(8)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_QENO(8)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_ENG_MERG(8)),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(8),
|
|
||||||
+ WED_AMSDU_ENG_MAX_PL_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT8(8),
|
|
||||||
+ WED_AMSDU_ENG_MAX_QGPP_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(8),
|
|
||||||
+ WED_AMSDU_ENG_CUR_ENTRY),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(8),
|
|
||||||
+ WED_AMSDU_ENG_MAX_BUF_MERGED),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_ENG_CNT9(8),
|
|
||||||
+ WED_AMSDU_ENG_MAX_MSDU_MERGED),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED QMEM INFO"),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_CNT(0), WED_AMSDU_QMEM_FQ_CNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_CNT(0), WED_AMSDU_QMEM_SP_QCNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_CNT(1), WED_AMSDU_QMEM_TID0_QCNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_CNT(1), WED_AMSDU_QMEM_TID1_QCNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_CNT(2), WED_AMSDU_QMEM_TID2_QCNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_CNT(2), WED_AMSDU_QMEM_TID3_QCNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_CNT(3), WED_AMSDU_QMEM_TID4_QCNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_CNT(3), WED_AMSDU_QMEM_TID5_QCNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_CNT(4), WED_AMSDU_QMEM_TID6_QCNT),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_CNT(4), WED_AMSDU_QMEM_TID7_QCNT),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED QMEM HEAD INFO"),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(0), WED_AMSDU_QMEM_FQ_HEAD),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(0), WED_AMSDU_QMEM_SP_QHEAD),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(1), WED_AMSDU_QMEM_TID0_QHEAD),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(1), WED_AMSDU_QMEM_TID1_QHEAD),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(2), WED_AMSDU_QMEM_TID2_QHEAD),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(2), WED_AMSDU_QMEM_TID3_QHEAD),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(3), WED_AMSDU_QMEM_TID4_QHEAD),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(3), WED_AMSDU_QMEM_TID5_QHEAD),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(4), WED_AMSDU_QMEM_TID6_QHEAD),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(4), WED_AMSDU_QMEM_TID7_QHEAD),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED QMEM TAIL INFO"),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(5), WED_AMSDU_QMEM_FQ_TAIL),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(5), WED_AMSDU_QMEM_SP_QTAIL),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(6), WED_AMSDU_QMEM_TID0_QTAIL),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(6), WED_AMSDU_QMEM_TID1_QTAIL),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(7), WED_AMSDU_QMEM_TID2_QTAIL),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(7), WED_AMSDU_QMEM_TID3_QTAIL),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(8), WED_AMSDU_QMEM_TID4_QTAIL),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(8), WED_AMSDU_QMEM_TID5_QTAIL),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(9), WED_AMSDU_QMEM_TID6_QTAIL),
|
|
||||||
+ DUMP_WED_MASK(WED_MON_AMSDU_QMEM_PTR(9), WED_AMSDU_QMEM_TID7_QTAIL),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED HIFTXD MSDU INFO"),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(1)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(2)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(3)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(4)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(5)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(6)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(7)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(8)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(9)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(10)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(11)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(12)),
|
|
||||||
+ DUMP_WED(WED_MON_AMSDU_HIFTXD_FETCH_MSDU(13)),
|
|
||||||
+ };
|
|
||||||
+ struct mtk_wed_hw *hw = s->private;
|
|
||||||
+ struct mtk_wed_device *dev = hw->wed_dev;
|
|
||||||
+
|
|
||||||
+ if (dev)
|
|
||||||
+ dump_wed_regs(s, dev, regs, ARRAY_SIZE(regs));
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+DEFINE_SHOW_ATTRIBUTE(wed_amsdu);
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
+wed_rtqm_show(struct seq_file *s, void *data)
|
|
||||||
+{
|
|
||||||
+ static const struct reg_dump regs[] = {
|
|
||||||
+ DUMP_STR("WED Route QM IGRS0(N2H + Recycle)"),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS0_I2HW_DMAD_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS0_I2H_DMAD_CNT(0)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS0_I2H_DMAD_CNT(1)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS0_I2HW_PKT_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS0_I2H_PKT_CNT(0)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS0_I2H_PKT_CNT(0)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS0_FDROP_CNT),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED Route QM IGRS1(Legacy)"),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS1_I2HW_DMAD_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS1_I2H_DMAD_CNT(0)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS1_I2H_DMAD_CNT(1)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS1_I2HW_PKT_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS1_I2H_PKT_CNT(0)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS1_I2H_PKT_CNT(1)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS1_FDROP_CNT),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED Route QM IGRS2(RRO3.0)"),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS2_I2HW_DMAD_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS2_I2H_DMAD_CNT(0)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS2_I2H_DMAD_CNT(1)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS2_I2HW_PKT_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS2_I2H_PKT_CNT(0)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS2_I2H_PKT_CNT(1)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS2_FDROP_CNT),
|
|
||||||
+
|
|
||||||
+ DUMP_STR("WED Route QM IGRS3(DEBUG)"),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS2_I2HW_DMAD_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS3_I2H_DMAD_CNT(0)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS3_I2H_DMAD_CNT(1)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS3_I2HW_PKT_CNT),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS3_I2H_PKT_CNT(0)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS3_I2H_PKT_CNT(1)),
|
|
||||||
+ DUMP_WED(WED_RTQM_IGRS3_FDROP_CNT),
|
|
||||||
+ };
|
|
||||||
+ struct mtk_wed_hw *hw = s->private;
|
|
||||||
+ struct mtk_wed_device *dev = hw->wed_dev;
|
|
||||||
+
|
|
||||||
+ if (dev)
|
|
||||||
+ dump_wed_regs(s, dev, regs, ARRAY_SIZE(regs));
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+DEFINE_SHOW_ATTRIBUTE(wed_rtqm);
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
+wed_rro_show(struct seq_file *s, void *data)
|
|
||||||
+{
|
|
||||||
+ static const struct reg_dump regs[] = {
|
|
||||||
+ DUMP_STR("RRO/IND CMD CNT"),
|
|
||||||
+ DUMP_WED(WED_RX_IND_CMD_CNT(1)),
|
|
||||||
+ DUMP_WED(WED_RX_IND_CMD_CNT(2)),
|
|
||||||
+ DUMP_WED(WED_RX_IND_CMD_CNT(3)),
|
|
||||||
+ DUMP_WED(WED_RX_IND_CMD_CNT(4)),
|
|
||||||
+ DUMP_WED(WED_RX_IND_CMD_CNT(5)),
|
|
||||||
+ DUMP_WED(WED_RX_IND_CMD_CNT(6)),
|
|
||||||
+ DUMP_WED(WED_RX_IND_CMD_CNT(7)),
|
|
||||||
+ DUMP_WED(WED_RX_IND_CMD_CNT(8)),
|
|
||||||
+ DUMP_WED_MASK(WED_RX_IND_CMD_CNT(9),
|
|
||||||
+ WED_IND_CMD_MAGIC_CNT_FAIL_CNT),
|
|
||||||
+
|
|
||||||
+ DUMP_WED(WED_RX_ADDR_ELEM_CNT(0)),
|
|
||||||
+ DUMP_WED_MASK(WED_RX_ADDR_ELEM_CNT(1),
|
|
||||||
+ WED_ADDR_ELEM_SIG_FAIL_CNT),
|
|
||||||
+ DUMP_WED(WED_RX_MSDU_PG_CNT(1)),
|
|
||||||
+ DUMP_WED(WED_RX_MSDU_PG_CNT(2)),
|
|
||||||
+ DUMP_WED(WED_RX_MSDU_PG_CNT(3)),
|
|
||||||
+ DUMP_WED(WED_RX_MSDU_PG_CNT(4)),
|
|
||||||
+ DUMP_WED(WED_RX_MSDU_PG_CNT(5)),
|
|
||||||
+ DUMP_WED_MASK(WED_RX_PN_CHK_CNT,
|
|
||||||
+ WED_PN_CHK_FAIL_CNT),
|
|
||||||
+ };
|
|
||||||
+ struct mtk_wed_hw *hw = s->private;
|
|
||||||
+ struct mtk_wed_device *dev = hw->wed_dev;
|
|
||||||
+
|
|
||||||
+ if (dev)
|
|
||||||
+ dump_wed_regs(s, dev, regs, ARRAY_SIZE(regs));
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+DEFINE_SHOW_ATTRIBUTE(wed_rro);
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
mtk_wed_reg_set(void *data, u64 val)
|
|
||||||
{
|
|
||||||
struct mtk_wed_hw *hw = data;
|
|
||||||
@@ -264,7 +622,16 @@ void mtk_wed_hw_add_debugfs(struct mtk_w
|
|
||||||
debugfs_create_u32("regidx", 0600, dir, &hw->debugfs_reg);
|
|
||||||
debugfs_create_file_unsafe("regval", 0600, dir, hw, &fops_regval);
|
|
||||||
debugfs_create_file_unsafe("txinfo", 0400, dir, hw, &wed_txinfo_fops);
|
|
||||||
- if (!mtk_wed_is_v1(hw))
|
|
||||||
+ if (!mtk_wed_is_v1(hw)) {
|
|
||||||
debugfs_create_file_unsafe("rxinfo", 0400, dir, hw,
|
|
||||||
&wed_rxinfo_fops);
|
|
||||||
+ if (mtk_wed_is_v3_or_greater(hw)) {
|
|
||||||
+ debugfs_create_file_unsafe("amsdu", 0400, dir, hw,
|
|
||||||
+ &wed_amsdu_fops);
|
|
||||||
+ debugfs_create_file_unsafe("rtqm", 0400, dir, hw,
|
|
||||||
+ &wed_rtqm_fops);
|
|
||||||
+ debugfs_create_file_unsafe("rro", 0400, dir, hw,
|
|
||||||
+ &wed_rro_fops);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
}
|
|
|
@ -1,587 +0,0 @@
|
||||||
From: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Date: Mon, 18 Sep 2023 12:29:19 +0200
|
|
||||||
Subject: [PATCH] net: ethernet: mtk_wed: add wed 3.0 reset support
|
|
||||||
|
|
||||||
Introduce support for resetting Wireless Ethernet Dispatcher 3.0
|
|
||||||
available on MT988 SoC.
|
|
||||||
|
|
||||||
Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
||||||
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
|
||||||
@@ -149,6 +149,90 @@ mtk_wdma_read_reset(struct mtk_wed_devic
|
|
||||||
return wdma_r32(dev, MTK_WDMA_GLO_CFG);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void
|
|
||||||
+mtk_wdma_v3_rx_reset(struct mtk_wed_device *dev)
|
|
||||||
+{
|
|
||||||
+ u32 status;
|
|
||||||
+
|
|
||||||
+ if (!mtk_wed_is_v3_or_greater(dev->hw))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_PREF_TX_CFG, MTK_WDMA_PREF_TX_CFG_PREF_EN);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_PREF_RX_CFG, MTK_WDMA_PREF_RX_CFG_PREF_EN);
|
|
||||||
+
|
|
||||||
+ if (read_poll_timeout(wdma_r32, status,
|
|
||||||
+ !(status & MTK_WDMA_PREF_TX_CFG_PREF_BUSY),
|
|
||||||
+ 0, 10000, false, dev, MTK_WDMA_PREF_TX_CFG))
|
|
||||||
+ dev_err(dev->hw->dev, "rx reset failed\n");
|
|
||||||
+
|
|
||||||
+ if (read_poll_timeout(wdma_r32, status,
|
|
||||||
+ !(status & MTK_WDMA_PREF_RX_CFG_PREF_BUSY),
|
|
||||||
+ 0, 10000, false, dev, MTK_WDMA_PREF_RX_CFG))
|
|
||||||
+ dev_err(dev->hw->dev, "rx reset failed\n");
|
|
||||||
+
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_WRBK_TX_CFG, MTK_WDMA_WRBK_TX_CFG_WRBK_EN);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_WRBK_RX_CFG, MTK_WDMA_WRBK_RX_CFG_WRBK_EN);
|
|
||||||
+
|
|
||||||
+ if (read_poll_timeout(wdma_r32, status,
|
|
||||||
+ !(status & MTK_WDMA_WRBK_TX_CFG_WRBK_BUSY),
|
|
||||||
+ 0, 10000, false, dev, MTK_WDMA_WRBK_TX_CFG))
|
|
||||||
+ dev_err(dev->hw->dev, "rx reset failed\n");
|
|
||||||
+
|
|
||||||
+ if (read_poll_timeout(wdma_r32, status,
|
|
||||||
+ !(status & MTK_WDMA_WRBK_RX_CFG_WRBK_BUSY),
|
|
||||||
+ 0, 10000, false, dev, MTK_WDMA_WRBK_RX_CFG))
|
|
||||||
+ dev_err(dev->hw->dev, "rx reset failed\n");
|
|
||||||
+
|
|
||||||
+ /* prefetch FIFO */
|
|
||||||
+ wdma_w32(dev, MTK_WDMA_PREF_RX_FIFO_CFG,
|
|
||||||
+ MTK_WDMA_PREF_RX_FIFO_CFG_RING0_CLEAR |
|
|
||||||
+ MTK_WDMA_PREF_RX_FIFO_CFG_RING1_CLEAR);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_PREF_RX_FIFO_CFG,
|
|
||||||
+ MTK_WDMA_PREF_RX_FIFO_CFG_RING0_CLEAR |
|
|
||||||
+ MTK_WDMA_PREF_RX_FIFO_CFG_RING1_CLEAR);
|
|
||||||
+
|
|
||||||
+ /* core FIFO */
|
|
||||||
+ wdma_w32(dev, MTK_WDMA_XDMA_RX_FIFO_CFG,
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_PAR_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_CMD_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_DMAD_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_ARR_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_LEN_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_WID_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_BID_FIFO_CLEAR);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_XDMA_RX_FIFO_CFG,
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_PAR_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_CMD_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_DMAD_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_ARR_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_LEN_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_WID_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_RX_FIFO_CFG_RX_BID_FIFO_CLEAR);
|
|
||||||
+
|
|
||||||
+ /* writeback FIFO */
|
|
||||||
+ wdma_w32(dev, MTK_WDMA_WRBK_RX_FIFO_CFG(0),
|
|
||||||
+ MTK_WDMA_WRBK_RX_FIFO_CFG_RING_CLEAR);
|
|
||||||
+ wdma_w32(dev, MTK_WDMA_WRBK_RX_FIFO_CFG(1),
|
|
||||||
+ MTK_WDMA_WRBK_RX_FIFO_CFG_RING_CLEAR);
|
|
||||||
+
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_WRBK_RX_FIFO_CFG(0),
|
|
||||||
+ MTK_WDMA_WRBK_RX_FIFO_CFG_RING_CLEAR);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_WRBK_RX_FIFO_CFG(1),
|
|
||||||
+ MTK_WDMA_WRBK_RX_FIFO_CFG_RING_CLEAR);
|
|
||||||
+
|
|
||||||
+ /* prefetch ring status */
|
|
||||||
+ wdma_w32(dev, MTK_WDMA_PREF_SIDX_CFG,
|
|
||||||
+ MTK_WDMA_PREF_SIDX_CFG_RX_RING_CLEAR);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_PREF_SIDX_CFG,
|
|
||||||
+ MTK_WDMA_PREF_SIDX_CFG_RX_RING_CLEAR);
|
|
||||||
+
|
|
||||||
+ /* writeback ring status */
|
|
||||||
+ wdma_w32(dev, MTK_WDMA_WRBK_SIDX_CFG,
|
|
||||||
+ MTK_WDMA_WRBK_SIDX_CFG_RX_RING_CLEAR);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_WRBK_SIDX_CFG,
|
|
||||||
+ MTK_WDMA_WRBK_SIDX_CFG_RX_RING_CLEAR);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int
|
|
||||||
mtk_wdma_rx_reset(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
@@ -161,6 +245,7 @@ mtk_wdma_rx_reset(struct mtk_wed_device
|
|
||||||
if (ret)
|
|
||||||
dev_err(dev->hw->dev, "rx reset failed\n");
|
|
||||||
|
|
||||||
+ mtk_wdma_v3_rx_reset(dev);
|
|
||||||
wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_RX);
|
|
||||||
wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);
|
|
||||||
|
|
||||||
@@ -193,6 +278,84 @@ mtk_wed_poll_busy(struct mtk_wed_device
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
+mtk_wdma_v3_tx_reset(struct mtk_wed_device *dev)
|
|
||||||
+{
|
|
||||||
+ u32 status;
|
|
||||||
+
|
|
||||||
+ if (!mtk_wed_is_v3_or_greater(dev->hw))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_PREF_TX_CFG, MTK_WDMA_PREF_TX_CFG_PREF_EN);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_PREF_RX_CFG, MTK_WDMA_PREF_RX_CFG_PREF_EN);
|
|
||||||
+
|
|
||||||
+ if (read_poll_timeout(wdma_r32, status,
|
|
||||||
+ !(status & MTK_WDMA_PREF_TX_CFG_PREF_BUSY),
|
|
||||||
+ 0, 10000, false, dev, MTK_WDMA_PREF_TX_CFG))
|
|
||||||
+ dev_err(dev->hw->dev, "tx reset failed\n");
|
|
||||||
+
|
|
||||||
+ if (read_poll_timeout(wdma_r32, status,
|
|
||||||
+ !(status & MTK_WDMA_PREF_RX_CFG_PREF_BUSY),
|
|
||||||
+ 0, 10000, false, dev, MTK_WDMA_PREF_RX_CFG))
|
|
||||||
+ dev_err(dev->hw->dev, "tx reset failed\n");
|
|
||||||
+
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_WRBK_TX_CFG, MTK_WDMA_WRBK_TX_CFG_WRBK_EN);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_WRBK_RX_CFG, MTK_WDMA_WRBK_RX_CFG_WRBK_EN);
|
|
||||||
+
|
|
||||||
+ if (read_poll_timeout(wdma_r32, status,
|
|
||||||
+ !(status & MTK_WDMA_WRBK_TX_CFG_WRBK_BUSY),
|
|
||||||
+ 0, 10000, false, dev, MTK_WDMA_WRBK_TX_CFG))
|
|
||||||
+ dev_err(dev->hw->dev, "tx reset failed\n");
|
|
||||||
+
|
|
||||||
+ if (read_poll_timeout(wdma_r32, status,
|
|
||||||
+ !(status & MTK_WDMA_WRBK_RX_CFG_WRBK_BUSY),
|
|
||||||
+ 0, 10000, false, dev, MTK_WDMA_WRBK_RX_CFG))
|
|
||||||
+ dev_err(dev->hw->dev, "tx reset failed\n");
|
|
||||||
+
|
|
||||||
+ /* prefetch FIFO */
|
|
||||||
+ wdma_w32(dev, MTK_WDMA_PREF_TX_FIFO_CFG,
|
|
||||||
+ MTK_WDMA_PREF_TX_FIFO_CFG_RING0_CLEAR |
|
|
||||||
+ MTK_WDMA_PREF_TX_FIFO_CFG_RING1_CLEAR);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_PREF_TX_FIFO_CFG,
|
|
||||||
+ MTK_WDMA_PREF_TX_FIFO_CFG_RING0_CLEAR |
|
|
||||||
+ MTK_WDMA_PREF_TX_FIFO_CFG_RING1_CLEAR);
|
|
||||||
+
|
|
||||||
+ /* core FIFO */
|
|
||||||
+ wdma_w32(dev, MTK_WDMA_XDMA_TX_FIFO_CFG,
|
|
||||||
+ MTK_WDMA_XDMA_TX_FIFO_CFG_TX_PAR_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_TX_FIFO_CFG_TX_CMD_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_TX_FIFO_CFG_TX_DMAD_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_TX_FIFO_CFG_TX_ARR_FIFO_CLEAR);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_XDMA_TX_FIFO_CFG,
|
|
||||||
+ MTK_WDMA_XDMA_TX_FIFO_CFG_TX_PAR_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_TX_FIFO_CFG_TX_CMD_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_TX_FIFO_CFG_TX_DMAD_FIFO_CLEAR |
|
|
||||||
+ MTK_WDMA_XDMA_TX_FIFO_CFG_TX_ARR_FIFO_CLEAR);
|
|
||||||
+
|
|
||||||
+ /* writeback FIFO */
|
|
||||||
+ wdma_w32(dev, MTK_WDMA_WRBK_TX_FIFO_CFG(0),
|
|
||||||
+ MTK_WDMA_WRBK_TX_FIFO_CFG_RING_CLEAR);
|
|
||||||
+ wdma_w32(dev, MTK_WDMA_WRBK_TX_FIFO_CFG(1),
|
|
||||||
+ MTK_WDMA_WRBK_TX_FIFO_CFG_RING_CLEAR);
|
|
||||||
+
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_WRBK_TX_FIFO_CFG(0),
|
|
||||||
+ MTK_WDMA_WRBK_TX_FIFO_CFG_RING_CLEAR);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_WRBK_TX_FIFO_CFG(1),
|
|
||||||
+ MTK_WDMA_WRBK_TX_FIFO_CFG_RING_CLEAR);
|
|
||||||
+
|
|
||||||
+ /* prefetch ring status */
|
|
||||||
+ wdma_w32(dev, MTK_WDMA_PREF_SIDX_CFG,
|
|
||||||
+ MTK_WDMA_PREF_SIDX_CFG_TX_RING_CLEAR);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_PREF_SIDX_CFG,
|
|
||||||
+ MTK_WDMA_PREF_SIDX_CFG_TX_RING_CLEAR);
|
|
||||||
+
|
|
||||||
+ /* writeback ring status */
|
|
||||||
+ wdma_w32(dev, MTK_WDMA_WRBK_SIDX_CFG,
|
|
||||||
+ MTK_WDMA_WRBK_SIDX_CFG_TX_RING_CLEAR);
|
|
||||||
+ wdma_clr(dev, MTK_WDMA_WRBK_SIDX_CFG,
|
|
||||||
+ MTK_WDMA_WRBK_SIDX_CFG_TX_RING_CLEAR);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
mtk_wdma_tx_reset(struct mtk_wed_device *dev)
|
|
||||||
{
|
|
||||||
u32 status, mask = MTK_WDMA_GLO_CFG_TX_DMA_BUSY;
|
|
||||||
@@ -203,6 +366,7 @@ mtk_wdma_tx_reset(struct mtk_wed_device
|
|
||||||
!(status & mask), 0, 10000))
|
|
||||||
dev_err(dev->hw->dev, "tx reset failed\n");
|
|
||||||
|
|
||||||
+ mtk_wdma_v3_tx_reset(dev);
|
|
||||||
wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_TX);
|
|
||||||
wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);
|
|
||||||
|
|
||||||
@@ -1406,13 +1570,33 @@ mtk_wed_rx_reset(struct mtk_wed_device *
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
+ if (dev->wlan.hw_rro) {
|
|
||||||
+ wed_clr(dev, MTK_WED_CTRL, MTK_WED_CTRL_WED_RX_IND_CMD_EN);
|
|
||||||
+ mtk_wed_poll_busy(dev, MTK_WED_RRO_RX_HW_STS,
|
|
||||||
+ MTK_WED_RX_IND_CMD_BUSY);
|
|
||||||
+ mtk_wed_reset(dev, MTK_WED_RESET_RRO_RX_TO_PG);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
wed_clr(dev, MTK_WED_WPDMA_RX_D_GLO_CFG, MTK_WED_WPDMA_RX_D_RX_DRV_EN);
|
|
||||||
ret = mtk_wed_poll_busy(dev, MTK_WED_WPDMA_RX_D_GLO_CFG,
|
|
||||||
MTK_WED_WPDMA_RX_D_RX_DRV_BUSY);
|
|
||||||
+ if (!ret && mtk_wed_is_v3_or_greater(dev->hw))
|
|
||||||
+ ret = mtk_wed_poll_busy(dev, MTK_WED_WPDMA_RX_D_PREF_CFG,
|
|
||||||
+ MTK_WED_WPDMA_RX_D_PREF_BUSY);
|
|
||||||
if (ret) {
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_WPDMA_INT_AGENT);
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_WPDMA_RX_D_DRV);
|
|
||||||
} else {
|
|
||||||
+ if (mtk_wed_is_v3_or_greater(dev->hw)) {
|
|
||||||
+ /* 1.a. disable prefetch HW */
|
|
||||||
+ wed_clr(dev, MTK_WED_WPDMA_RX_D_PREF_CFG,
|
|
||||||
+ MTK_WED_WPDMA_RX_D_PREF_EN);
|
|
||||||
+ mtk_wed_poll_busy(dev, MTK_WED_WPDMA_RX_D_PREF_CFG,
|
|
||||||
+ MTK_WED_WPDMA_RX_D_PREF_BUSY);
|
|
||||||
+ wed_w32(dev, MTK_WED_WPDMA_RX_D_RST_IDX,
|
|
||||||
+ MTK_WED_WPDMA_RX_D_RST_DRV_IDX_ALL);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
wed_w32(dev, MTK_WED_WPDMA_RX_D_RST_IDX,
|
|
||||||
MTK_WED_WPDMA_RX_D_RST_CRX_IDX |
|
|
||||||
MTK_WED_WPDMA_RX_D_RST_DRV_IDX);
|
|
||||||
@@ -1440,23 +1624,52 @@ mtk_wed_rx_reset(struct mtk_wed_device *
|
|
||||||
wed_w32(dev, MTK_WED_RROQM_RST_IDX, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (dev->wlan.hw_rro) {
|
|
||||||
+ /* disable rro msdu page drv */
|
|
||||||
+ wed_clr(dev, MTK_WED_RRO_MSDU_PG_RING2_CFG,
|
|
||||||
+ MTK_WED_RRO_MSDU_PG_DRV_EN);
|
|
||||||
+
|
|
||||||
+ /* disable rro data drv */
|
|
||||||
+ wed_clr(dev, MTK_WED_RRO_RX_D_CFG(2), MTK_WED_RRO_RX_D_DRV_EN);
|
|
||||||
+
|
|
||||||
+ /* rro msdu page drv reset */
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_MSDU_PG_RING2_CFG,
|
|
||||||
+ MTK_WED_RRO_MSDU_PG_DRV_CLR);
|
|
||||||
+ mtk_wed_poll_busy(dev, MTK_WED_RRO_MSDU_PG_RING2_CFG,
|
|
||||||
+ MTK_WED_RRO_MSDU_PG_DRV_CLR);
|
|
||||||
+
|
|
||||||
+ /* rro data drv reset */
|
|
||||||
+ wed_w32(dev, MTK_WED_RRO_RX_D_CFG(2),
|
|
||||||
+ MTK_WED_RRO_RX_D_DRV_CLR);
|
|
||||||
+ mtk_wed_poll_busy(dev, MTK_WED_RRO_RX_D_CFG(2),
|
|
||||||
+ MTK_WED_RRO_RX_D_DRV_CLR);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* reset route qm */
|
|
||||||
wed_clr(dev, MTK_WED_CTRL, MTK_WED_CTRL_RX_ROUTE_QM_EN);
|
|
||||||
ret = mtk_wed_poll_busy(dev, MTK_WED_CTRL,
|
|
||||||
MTK_WED_CTRL_RX_ROUTE_QM_BUSY);
|
|
||||||
- if (ret)
|
|
||||||
+ if (ret) {
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_RX_ROUTE_QM);
|
|
||||||
- else
|
|
||||||
- wed_set(dev, MTK_WED_RTQM_GLO_CFG,
|
|
||||||
- MTK_WED_RTQM_Q_RST);
|
|
||||||
+ } else if (mtk_wed_is_v3_or_greater(dev->hw)) {
|
|
||||||
+ wed_set(dev, MTK_WED_RTQM_RST, BIT(0));
|
|
||||||
+ wed_clr(dev, MTK_WED_RTQM_RST, BIT(0));
|
|
||||||
+ mtk_wed_reset(dev, MTK_WED_RESET_RX_ROUTE_QM);
|
|
||||||
+ } else {
|
|
||||||
+ wed_set(dev, MTK_WED_RTQM_GLO_CFG, MTK_WED_RTQM_Q_RST);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/* reset tx wdma */
|
|
||||||
mtk_wdma_tx_reset(dev);
|
|
||||||
|
|
||||||
/* reset tx wdma drv */
|
|
||||||
wed_clr(dev, MTK_WED_WDMA_GLO_CFG, MTK_WED_WDMA_GLO_CFG_TX_DRV_EN);
|
|
||||||
- mtk_wed_poll_busy(dev, MTK_WED_CTRL,
|
|
||||||
- MTK_WED_CTRL_WDMA_INT_AGENT_BUSY);
|
|
||||||
+ if (mtk_wed_is_v3_or_greater(dev->hw))
|
|
||||||
+ mtk_wed_poll_busy(dev, MTK_WED_WPDMA_STATUS,
|
|
||||||
+ MTK_WED_WPDMA_STATUS_TX_DRV);
|
|
||||||
+ else
|
|
||||||
+ mtk_wed_poll_busy(dev, MTK_WED_CTRL,
|
|
||||||
+ MTK_WED_CTRL_WDMA_INT_AGENT_BUSY);
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_WDMA_TX_DRV);
|
|
||||||
|
|
||||||
/* reset wed rx dma */
|
|
||||||
@@ -1477,6 +1690,14 @@ mtk_wed_rx_reset(struct mtk_wed_device *
|
|
||||||
MTK_WED_CTRL_WED_RX_BM_BUSY);
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_RX_BM);
|
|
||||||
|
|
||||||
+ if (dev->wlan.hw_rro) {
|
|
||||||
+ wed_clr(dev, MTK_WED_CTRL, MTK_WED_CTRL_WED_RX_PG_BM_EN);
|
|
||||||
+ mtk_wed_poll_busy(dev, MTK_WED_CTRL,
|
|
||||||
+ MTK_WED_CTRL_WED_RX_PG_BM_BUSY);
|
|
||||||
+ wed_set(dev, MTK_WED_RESET, MTK_WED_RESET_RX_PG_BM);
|
|
||||||
+ wed_clr(dev, MTK_WED_RESET, MTK_WED_RESET_RX_PG_BM);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* wo change to enable state */
|
|
||||||
val = MTK_WED_WO_STATE_ENABLE;
|
|
||||||
ret = mtk_wed_mcu_send_msg(wo, MTK_WED_MODULE_ID_WO,
|
|
||||||
@@ -1494,6 +1715,7 @@ mtk_wed_rx_reset(struct mtk_wed_device *
|
|
||||||
false);
|
|
||||||
}
|
|
||||||
mtk_wed_free_rx_buffer(dev);
|
|
||||||
+ mtk_wed_hwrro_free_buffer(dev);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@@ -1527,15 +1749,41 @@ mtk_wed_reset_dma(struct mtk_wed_device
|
|
||||||
|
|
||||||
/* 2. reset WDMA rx DMA */
|
|
||||||
busy = !!mtk_wdma_rx_reset(dev);
|
|
||||||
- wed_clr(dev, MTK_WED_WDMA_GLO_CFG, MTK_WED_WDMA_GLO_CFG_RX_DRV_EN);
|
|
||||||
+ if (mtk_wed_is_v3_or_greater(dev->hw)) {
|
|
||||||
+ val = MTK_WED_WDMA_GLO_CFG_RX_DIS_FSM_AUTO_IDLE |
|
|
||||||
+ wed_r32(dev, MTK_WED_WDMA_GLO_CFG);
|
|
||||||
+ val &= ~MTK_WED_WDMA_GLO_CFG_RX_DRV_EN;
|
|
||||||
+ wed_w32(dev, MTK_WED_WDMA_GLO_CFG, val);
|
|
||||||
+ } else {
|
|
||||||
+ wed_clr(dev, MTK_WED_WDMA_GLO_CFG,
|
|
||||||
+ MTK_WED_WDMA_GLO_CFG_RX_DRV_EN);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (!busy)
|
|
||||||
busy = mtk_wed_poll_busy(dev, MTK_WED_WDMA_GLO_CFG,
|
|
||||||
MTK_WED_WDMA_GLO_CFG_RX_DRV_BUSY);
|
|
||||||
+ if (!busy && mtk_wed_is_v3_or_greater(dev->hw))
|
|
||||||
+ busy = mtk_wed_poll_busy(dev, MTK_WED_WDMA_RX_PREF_CFG,
|
|
||||||
+ MTK_WED_WDMA_RX_PREF_BUSY);
|
|
||||||
|
|
||||||
if (busy) {
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_WDMA_INT_AGENT);
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_WDMA_RX_DRV);
|
|
||||||
} else {
|
|
||||||
+ if (mtk_wed_is_v3_or_greater(dev->hw)) {
|
|
||||||
+ /* 1.a. disable prefetch HW */
|
|
||||||
+ wed_clr(dev, MTK_WED_WDMA_RX_PREF_CFG,
|
|
||||||
+ MTK_WED_WDMA_RX_PREF_EN);
|
|
||||||
+ mtk_wed_poll_busy(dev, MTK_WED_WDMA_RX_PREF_CFG,
|
|
||||||
+ MTK_WED_WDMA_RX_PREF_BUSY);
|
|
||||||
+ wed_clr(dev, MTK_WED_WDMA_RX_PREF_CFG,
|
|
||||||
+ MTK_WED_WDMA_RX_PREF_DDONE2_EN);
|
|
||||||
+
|
|
||||||
+ /* 2. Reset dma index */
|
|
||||||
+ wed_w32(dev, MTK_WED_WDMA_RESET_IDX,
|
|
||||||
+ MTK_WED_WDMA_RESET_IDX_RX_ALL);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
wed_w32(dev, MTK_WED_WDMA_RESET_IDX,
|
|
||||||
MTK_WED_WDMA_RESET_IDX_RX | MTK_WED_WDMA_RESET_IDX_DRV);
|
|
||||||
wed_w32(dev, MTK_WED_WDMA_RESET_IDX, 0);
|
|
||||||
@@ -1551,8 +1799,13 @@ mtk_wed_reset_dma(struct mtk_wed_device
|
|
||||||
wed_clr(dev, MTK_WED_CTRL, MTK_WED_CTRL_WED_TX_FREE_AGENT_EN);
|
|
||||||
|
|
||||||
for (i = 0; i < 100; i++) {
|
|
||||||
- val = wed_r32(dev, MTK_WED_TX_BM_INTF);
|
|
||||||
- if (FIELD_GET(MTK_WED_TX_BM_INTF_TKFIFO_FDEP, val) == 0x40)
|
|
||||||
+ if (mtk_wed_is_v1(dev->hw))
|
|
||||||
+ val = FIELD_GET(MTK_WED_TX_BM_INTF_TKFIFO_FDEP,
|
|
||||||
+ wed_r32(dev, MTK_WED_TX_BM_INTF));
|
|
||||||
+ else
|
|
||||||
+ val = FIELD_GET(MTK_WED_TX_TKID_INTF_TKFIFO_FDEP,
|
|
||||||
+ wed_r32(dev, MTK_WED_TX_TKID_INTF));
|
|
||||||
+ if (val == 0x40)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1574,6 +1827,8 @@ mtk_wed_reset_dma(struct mtk_wed_device
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_WPDMA_INT_AGENT);
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_WPDMA_TX_DRV);
|
|
||||||
mtk_wed_reset(dev, MTK_WED_RESET_WPDMA_RX_DRV);
|
|
||||||
+ if (mtk_wed_is_v3_or_greater(dev->hw))
|
|
||||||
+ wed_w32(dev, MTK_WED_RX1_CTRL2, 0);
|
|
||||||
} else {
|
|
||||||
wed_w32(dev, MTK_WED_WPDMA_RESET_IDX,
|
|
||||||
MTK_WED_WPDMA_RESET_IDX_TX |
|
|
||||||
@@ -1590,7 +1845,14 @@ mtk_wed_reset_dma(struct mtk_wed_device
|
|
||||||
wed_w32(dev, MTK_WED_RESET_IDX, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
- mtk_wed_rx_reset(dev);
|
|
||||||
+ if (mtk_wed_is_v3_or_greater(dev->hw)) {
|
|
||||||
+ /* reset amsdu engine */
|
|
||||||
+ wed_clr(dev, MTK_WED_CTRL, MTK_WED_CTRL_TX_AMSDU_EN);
|
|
||||||
+ mtk_wed_reset(dev, MTK_WED_RESET_TX_AMSDU);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (mtk_wed_get_rx_capa(dev))
|
|
||||||
+ mtk_wed_rx_reset(dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
@@ -1842,6 +2104,7 @@ mtk_wed_dma_enable(struct mtk_wed_device
|
|
||||||
MTK_WED_WPDMA_GLO_CFG_RX_DRV_UNS_VER_FORCE_4);
|
|
||||||
|
|
||||||
wdma_set(dev, MTK_WDMA_PREF_RX_CFG, MTK_WDMA_PREF_RX_CFG_PREF_EN);
|
|
||||||
+ wdma_set(dev, MTK_WDMA_WRBK_RX_CFG, MTK_WDMA_WRBK_RX_CFG_WRBK_EN);
|
|
||||||
}
|
|
||||||
|
|
||||||
wed_clr(dev, MTK_WED_WPDMA_GLO_CFG,
|
|
||||||
@@ -1905,6 +2168,12 @@ mtk_wed_start_hw_rro(struct mtk_wed_devi
|
|
||||||
if (!mtk_wed_get_rx_capa(dev) || !dev->wlan.hw_rro)
|
|
||||||
return;
|
|
||||||
|
|
||||||
+ if (reset) {
|
|
||||||
+ wed_set(dev, MTK_WED_RRO_MSDU_PG_RING2_CFG,
|
|
||||||
+ MTK_WED_RRO_MSDU_PG_DRV_EN);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
wed_set(dev, MTK_WED_RRO_RX_D_CFG(2), MTK_WED_RRO_MSDU_PG_DRV_CLR);
|
|
||||||
wed_w32(dev, MTK_WED_RRO_MSDU_PG_RING2_CFG,
|
|
||||||
MTK_WED_RRO_MSDU_PG_DRV_CLR);
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_regs.h
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_regs.h
|
|
||||||
@@ -28,6 +28,8 @@ struct mtk_wdma_desc {
|
|
||||||
#define MTK_WED_RESET 0x008
|
|
||||||
#define MTK_WED_RESET_TX_BM BIT(0)
|
|
||||||
#define MTK_WED_RESET_RX_BM BIT(1)
|
|
||||||
+#define MTK_WED_RESET_RX_PG_BM BIT(2)
|
|
||||||
+#define MTK_WED_RESET_RRO_RX_TO_PG BIT(3)
|
|
||||||
#define MTK_WED_RESET_TX_FREE_AGENT BIT(4)
|
|
||||||
#define MTK_WED_RESET_WPDMA_TX_DRV BIT(8)
|
|
||||||
#define MTK_WED_RESET_WPDMA_RX_DRV BIT(9)
|
|
||||||
@@ -106,6 +108,9 @@ struct mtk_wdma_desc {
|
|
||||||
#define MTK_WED_STATUS 0x060
|
|
||||||
#define MTK_WED_STATUS_TX GENMASK(15, 8)
|
|
||||||
|
|
||||||
+#define MTK_WED_WPDMA_STATUS 0x068
|
|
||||||
+#define MTK_WED_WPDMA_STATUS_TX_DRV GENMASK(15, 8)
|
|
||||||
+
|
|
||||||
#define MTK_WED_TX_BM_CTRL 0x080
|
|
||||||
#define MTK_WED_TX_BM_CTRL_VLD_GRP_NUM GENMASK(6, 0)
|
|
||||||
#define MTK_WED_TX_BM_CTRL_RSV_GRP_NUM GENMASK(22, 16)
|
|
||||||
@@ -140,6 +145,9 @@ struct mtk_wdma_desc {
|
|
||||||
#define MTK_WED_TX_TKID_CTRL_RSV_GRP_NUM GENMASK(22, 16)
|
|
||||||
#define MTK_WED_TX_TKID_CTRL_PAUSE BIT(28)
|
|
||||||
|
|
||||||
+#define MTK_WED_TX_TKID_INTF 0x0dc
|
|
||||||
+#define MTK_WED_TX_TKID_INTF_TKFIFO_FDEP GENMASK(25, 16)
|
|
||||||
+
|
|
||||||
#define MTK_WED_TX_TKID_CTRL_VLD_GRP_NUM_V3 GENMASK(7, 0)
|
|
||||||
#define MTK_WED_TX_TKID_CTRL_RSV_GRP_NUM_V3 GENMASK(23, 16)
|
|
||||||
|
|
||||||
@@ -190,6 +198,7 @@ struct mtk_wdma_desc {
|
|
||||||
#define MTK_WED_RING_RX_DATA(_n) (0x420 + (_n) * 0x10)
|
|
||||||
|
|
||||||
#define MTK_WED_SCR0 0x3c0
|
|
||||||
+#define MTK_WED_RX1_CTRL2 0x418
|
|
||||||
#define MTK_WED_WPDMA_INT_TRIGGER 0x504
|
|
||||||
#define MTK_WED_WPDMA_INT_TRIGGER_RX_DONE BIT(1)
|
|
||||||
#define MTK_WED_WPDMA_INT_TRIGGER_TX_DONE GENMASK(5, 4)
|
|
||||||
@@ -303,6 +312,7 @@ struct mtk_wdma_desc {
|
|
||||||
|
|
||||||
#define MTK_WED_WPDMA_RX_D_RST_IDX 0x760
|
|
||||||
#define MTK_WED_WPDMA_RX_D_RST_CRX_IDX GENMASK(17, 16)
|
|
||||||
+#define MTK_WED_WPDMA_RX_D_RST_DRV_IDX_ALL BIT(20)
|
|
||||||
#define MTK_WED_WPDMA_RX_D_RST_DRV_IDX GENMASK(25, 24)
|
|
||||||
|
|
||||||
#define MTK_WED_WPDMA_RX_GLO_CFG 0x76c
|
|
||||||
@@ -313,6 +323,7 @@ struct mtk_wdma_desc {
|
|
||||||
|
|
||||||
#define MTK_WED_WPDMA_RX_D_PREF_CFG 0x7b4
|
|
||||||
#define MTK_WED_WPDMA_RX_D_PREF_EN BIT(0)
|
|
||||||
+#define MTK_WED_WPDMA_RX_D_PREF_BUSY BIT(1)
|
|
||||||
#define MTK_WED_WPDMA_RX_D_PREF_BURST_SIZE GENMASK(12, 8)
|
|
||||||
#define MTK_WED_WPDMA_RX_D_PREF_LOW_THRES GENMASK(21, 16)
|
|
||||||
|
|
||||||
@@ -334,11 +345,13 @@ struct mtk_wdma_desc {
|
|
||||||
|
|
||||||
#define MTK_WED_WDMA_RX_PREF_CFG 0x950
|
|
||||||
#define MTK_WED_WDMA_RX_PREF_EN BIT(0)
|
|
||||||
+#define MTK_WED_WDMA_RX_PREF_BUSY BIT(1)
|
|
||||||
#define MTK_WED_WDMA_RX_PREF_BURST_SIZE GENMASK(12, 8)
|
|
||||||
#define MTK_WED_WDMA_RX_PREF_LOW_THRES GENMASK(21, 16)
|
|
||||||
#define MTK_WED_WDMA_RX_PREF_RX0_SIDX_CLR BIT(24)
|
|
||||||
#define MTK_WED_WDMA_RX_PREF_RX1_SIDX_CLR BIT(25)
|
|
||||||
#define MTK_WED_WDMA_RX_PREF_DDONE2_EN BIT(26)
|
|
||||||
+#define MTK_WED_WDMA_RX_PREF_DDONE2_BUSY BIT(27)
|
|
||||||
|
|
||||||
#define MTK_WED_WDMA_RX_PREF_FIFO_CFG 0x95C
|
|
||||||
#define MTK_WED_WDMA_RX_PREF_FIFO_RX0_CLR BIT(0)
|
|
||||||
@@ -367,6 +380,7 @@ struct mtk_wdma_desc {
|
|
||||||
|
|
||||||
#define MTK_WED_WDMA_RESET_IDX 0xa08
|
|
||||||
#define MTK_WED_WDMA_RESET_IDX_RX GENMASK(17, 16)
|
|
||||||
+#define MTK_WED_WDMA_RESET_IDX_RX_ALL BIT(20)
|
|
||||||
#define MTK_WED_WDMA_RESET_IDX_DRV GENMASK(25, 24)
|
|
||||||
|
|
||||||
#define MTK_WED_WDMA_INT_CLR 0xa24
|
|
||||||
@@ -437,21 +451,62 @@ struct mtk_wdma_desc {
|
|
||||||
#define MTK_WDMA_INT_MASK_RX_DELAY BIT(30)
|
|
||||||
#define MTK_WDMA_INT_MASK_RX_COHERENT BIT(31)
|
|
||||||
|
|
||||||
+#define MTK_WDMA_XDMA_TX_FIFO_CFG 0x238
|
|
||||||
+#define MTK_WDMA_XDMA_TX_FIFO_CFG_TX_PAR_FIFO_CLEAR BIT(0)
|
|
||||||
+#define MTK_WDMA_XDMA_TX_FIFO_CFG_TX_CMD_FIFO_CLEAR BIT(4)
|
|
||||||
+#define MTK_WDMA_XDMA_TX_FIFO_CFG_TX_DMAD_FIFO_CLEAR BIT(8)
|
|
||||||
+#define MTK_WDMA_XDMA_TX_FIFO_CFG_TX_ARR_FIFO_CLEAR BIT(12)
|
|
||||||
+
|
|
||||||
+#define MTK_WDMA_XDMA_RX_FIFO_CFG 0x23c
|
|
||||||
+#define MTK_WDMA_XDMA_RX_FIFO_CFG_RX_PAR_FIFO_CLEAR BIT(0)
|
|
||||||
+#define MTK_WDMA_XDMA_RX_FIFO_CFG_RX_CMD_FIFO_CLEAR BIT(4)
|
|
||||||
+#define MTK_WDMA_XDMA_RX_FIFO_CFG_RX_DMAD_FIFO_CLEAR BIT(8)
|
|
||||||
+#define MTK_WDMA_XDMA_RX_FIFO_CFG_RX_ARR_FIFO_CLEAR BIT(12)
|
|
||||||
+#define MTK_WDMA_XDMA_RX_FIFO_CFG_RX_LEN_FIFO_CLEAR BIT(15)
|
|
||||||
+#define MTK_WDMA_XDMA_RX_FIFO_CFG_RX_WID_FIFO_CLEAR BIT(18)
|
|
||||||
+#define MTK_WDMA_XDMA_RX_FIFO_CFG_RX_BID_FIFO_CLEAR BIT(21)
|
|
||||||
+
|
|
||||||
#define MTK_WDMA_INT_GRP1 0x250
|
|
||||||
#define MTK_WDMA_INT_GRP2 0x254
|
|
||||||
|
|
||||||
#define MTK_WDMA_PREF_TX_CFG 0x2d0
|
|
||||||
#define MTK_WDMA_PREF_TX_CFG_PREF_EN BIT(0)
|
|
||||||
+#define MTK_WDMA_PREF_TX_CFG_PREF_BUSY BIT(1)
|
|
||||||
|
|
||||||
#define MTK_WDMA_PREF_RX_CFG 0x2dc
|
|
||||||
#define MTK_WDMA_PREF_RX_CFG_PREF_EN BIT(0)
|
|
||||||
+#define MTK_WDMA_PREF_RX_CFG_PREF_BUSY BIT(1)
|
|
||||||
+
|
|
||||||
+#define MTK_WDMA_PREF_RX_FIFO_CFG 0x2e0
|
|
||||||
+#define MTK_WDMA_PREF_RX_FIFO_CFG_RING0_CLEAR BIT(0)
|
|
||||||
+#define MTK_WDMA_PREF_RX_FIFO_CFG_RING1_CLEAR BIT(16)
|
|
||||||
+
|
|
||||||
+#define MTK_WDMA_PREF_TX_FIFO_CFG 0x2d4
|
|
||||||
+#define MTK_WDMA_PREF_TX_FIFO_CFG_RING0_CLEAR BIT(0)
|
|
||||||
+#define MTK_WDMA_PREF_TX_FIFO_CFG_RING1_CLEAR BIT(16)
|
|
||||||
+
|
|
||||||
+#define MTK_WDMA_PREF_SIDX_CFG 0x2e4
|
|
||||||
+#define MTK_WDMA_PREF_SIDX_CFG_TX_RING_CLEAR GENMASK(3, 0)
|
|
||||||
+#define MTK_WDMA_PREF_SIDX_CFG_RX_RING_CLEAR GENMASK(5, 4)
|
|
||||||
|
|
||||||
#define MTK_WDMA_WRBK_TX_CFG 0x300
|
|
||||||
+#define MTK_WDMA_WRBK_TX_CFG_WRBK_BUSY BIT(0)
|
|
||||||
#define MTK_WDMA_WRBK_TX_CFG_WRBK_EN BIT(30)
|
|
||||||
|
|
||||||
+#define MTK_WDMA_WRBK_TX_FIFO_CFG(_n) (0x304 + (_n) * 0x4)
|
|
||||||
+#define MTK_WDMA_WRBK_TX_FIFO_CFG_RING_CLEAR BIT(0)
|
|
||||||
+
|
|
||||||
#define MTK_WDMA_WRBK_RX_CFG 0x344
|
|
||||||
+#define MTK_WDMA_WRBK_RX_CFG_WRBK_BUSY BIT(0)
|
|
||||||
#define MTK_WDMA_WRBK_RX_CFG_WRBK_EN BIT(30)
|
|
||||||
|
|
||||||
+#define MTK_WDMA_WRBK_RX_FIFO_CFG(_n) (0x348 + (_n) * 0x4)
|
|
||||||
+#define MTK_WDMA_WRBK_RX_FIFO_CFG_RING_CLEAR BIT(0)
|
|
||||||
+
|
|
||||||
+#define MTK_WDMA_WRBK_SIDX_CFG 0x388
|
|
||||||
+#define MTK_WDMA_WRBK_SIDX_CFG_TX_RING_CLEAR GENMASK(3, 0)
|
|
||||||
+#define MTK_WDMA_WRBK_SIDX_CFG_RX_RING_CLEAR GENMASK(5, 4)
|
|
||||||
+
|
|
||||||
#define MTK_PCIE_MIRROR_MAP(n) ((n) ? 0x4 : 0x0)
|
|
||||||
#define MTK_PCIE_MIRROR_MAP_EN BIT(0)
|
|
||||||
#define MTK_PCIE_MIRROR_MAP_WED_ID BIT(1)
|
|
||||||
@@ -465,6 +520,8 @@ struct mtk_wdma_desc {
|
|
||||||
#define MTK_WED_RTQM_Q_DBG_BYPASS BIT(5)
|
|
||||||
#define MTK_WED_RTQM_TXDMAD_FPORT GENMASK(23, 20)
|
|
||||||
|
|
||||||
+#define MTK_WED_RTQM_RST 0xb04
|
|
||||||
+
|
|
||||||
#define MTK_WED_RTQM_IGRS0_I2HW_DMAD_CNT 0xb1c
|
|
||||||
#define MTK_WED_RTQM_IGRS0_I2H_DMAD_CNT(_n) (0xb20 + (_n) * 0x4)
|
|
||||||
#define MTK_WED_RTQM_IGRS0_I2HW_PKT_CNT 0xb28
|
|
||||||
@@ -653,6 +710,9 @@ struct mtk_wdma_desc {
|
|
||||||
#define MTK_WED_WPDMA_INT_CTRL_RRO_PG2_CLR BIT(17)
|
|
||||||
#define MTK_WED_WPDMA_INT_CTRL_RRO_PG2_DONE_TRIG GENMASK(22, 18)
|
|
||||||
|
|
||||||
+#define MTK_WED_RRO_RX_HW_STS 0xf00
|
|
||||||
+#define MTK_WED_RX_IND_CMD_BUSY GENMASK(31, 0)
|
|
||||||
+
|
|
||||||
#define MTK_WED_RX_IND_CMD_CNT0 0xf20
|
|
||||||
#define MTK_WED_RX_IND_CMD_DBG_CNT_EN BIT(31)
|
|
||||||
|
|
|
@ -1,122 +0,0 @@
|
||||||
From 788d30daa8f97f06166b6a63f0e51f2a4c2f036a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hayes Wang <hayeswang@realtek.com>
|
|
||||||
Date: Tue, 26 Sep 2023 19:17:14 +0800
|
|
||||||
Subject: [PATCH] r8152: use napi_gro_frags
|
|
||||||
|
|
||||||
Use napi_gro_frags() for the skb of fragments when the work_done is less
|
|
||||||
than budget.
|
|
||||||
|
|
||||||
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
|
|
||||||
Link: https://lore.kernel.org/r/20230926111714.9448-434-nic_swsd@realtek.com
|
|
||||||
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
||||||
---
|
|
||||||
drivers/net/usb/r8152.c | 67 ++++++++++++++++++++++++++++++-----------
|
|
||||||
1 file changed, 50 insertions(+), 17 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/net/usb/r8152.c
|
|
||||||
+++ b/drivers/net/usb/r8152.c
|
|
||||||
@@ -2584,8 +2584,9 @@ static int rx_bottom(struct r8152 *tp, i
|
|
||||||
while (urb->actual_length > len_used) {
|
|
||||||
struct net_device *netdev = tp->netdev;
|
|
||||||
struct net_device_stats *stats = &netdev->stats;
|
|
||||||
- unsigned int pkt_len, rx_frag_head_sz;
|
|
||||||
+ unsigned int pkt_len, rx_frag_head_sz, len;
|
|
||||||
struct sk_buff *skb;
|
|
||||||
+ bool use_frags;
|
|
||||||
|
|
||||||
WARN_ON_ONCE(skb_queue_len(&tp->rx_queue) >= 1000);
|
|
||||||
|
|
||||||
@@ -2598,45 +2599,77 @@ static int rx_bottom(struct r8152 *tp, i
|
|
||||||
break;
|
|
||||||
|
|
||||||
pkt_len -= ETH_FCS_LEN;
|
|
||||||
+ len = pkt_len;
|
|
||||||
rx_data += sizeof(struct rx_desc);
|
|
||||||
|
|
||||||
- if (!agg_free || tp->rx_copybreak > pkt_len)
|
|
||||||
- rx_frag_head_sz = pkt_len;
|
|
||||||
+ if (!agg_free || tp->rx_copybreak > len)
|
|
||||||
+ use_frags = false;
|
|
||||||
else
|
|
||||||
- rx_frag_head_sz = tp->rx_copybreak;
|
|
||||||
+ use_frags = true;
|
|
||||||
+
|
|
||||||
+ if (use_frags) {
|
|
||||||
+ /* If the budget is exhausted, the packet
|
|
||||||
+ * would be queued in the driver. That is,
|
|
||||||
+ * napi_gro_frags() wouldn't be called, so
|
|
||||||
+ * we couldn't use napi_get_frags().
|
|
||||||
+ */
|
|
||||||
+ if (work_done >= budget) {
|
|
||||||
+ rx_frag_head_sz = tp->rx_copybreak;
|
|
||||||
+ skb = napi_alloc_skb(napi,
|
|
||||||
+ rx_frag_head_sz);
|
|
||||||
+ } else {
|
|
||||||
+ rx_frag_head_sz = 0;
|
|
||||||
+ skb = napi_get_frags(napi);
|
|
||||||
+ }
|
|
||||||
+ } else {
|
|
||||||
+ rx_frag_head_sz = 0;
|
|
||||||
+ skb = napi_alloc_skb(napi, len);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- skb = napi_alloc_skb(napi, rx_frag_head_sz);
|
|
||||||
if (!skb) {
|
|
||||||
stats->rx_dropped++;
|
|
||||||
goto find_next_rx;
|
|
||||||
}
|
|
||||||
|
|
||||||
skb->ip_summed = r8152_rx_csum(tp, rx_desc);
|
|
||||||
- memcpy(skb->data, rx_data, rx_frag_head_sz);
|
|
||||||
- skb_put(skb, rx_frag_head_sz);
|
|
||||||
- pkt_len -= rx_frag_head_sz;
|
|
||||||
- rx_data += rx_frag_head_sz;
|
|
||||||
- if (pkt_len) {
|
|
||||||
+ rtl_rx_vlan_tag(rx_desc, skb);
|
|
||||||
+
|
|
||||||
+ if (use_frags) {
|
|
||||||
+ if (rx_frag_head_sz) {
|
|
||||||
+ memcpy(skb->data, rx_data,
|
|
||||||
+ rx_frag_head_sz);
|
|
||||||
+ skb_put(skb, rx_frag_head_sz);
|
|
||||||
+ len -= rx_frag_head_sz;
|
|
||||||
+ rx_data += rx_frag_head_sz;
|
|
||||||
+ skb->protocol = eth_type_trans(skb,
|
|
||||||
+ netdev);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
skb_add_rx_frag(skb, 0, agg->page,
|
|
||||||
agg_offset(agg, rx_data),
|
|
||||||
- pkt_len,
|
|
||||||
- SKB_DATA_ALIGN(pkt_len));
|
|
||||||
+ len, SKB_DATA_ALIGN(len));
|
|
||||||
get_page(agg->page);
|
|
||||||
+ } else {
|
|
||||||
+ memcpy(skb->data, rx_data, len);
|
|
||||||
+ skb_put(skb, len);
|
|
||||||
+ skb->protocol = eth_type_trans(skb, netdev);
|
|
||||||
}
|
|
||||||
|
|
||||||
- skb->protocol = eth_type_trans(skb, netdev);
|
|
||||||
- rtl_rx_vlan_tag(rx_desc, skb);
|
|
||||||
if (work_done < budget) {
|
|
||||||
+ if (use_frags)
|
|
||||||
+ napi_gro_frags(napi);
|
|
||||||
+ else
|
|
||||||
+ napi_gro_receive(napi, skb);
|
|
||||||
+
|
|
||||||
work_done++;
|
|
||||||
stats->rx_packets++;
|
|
||||||
- stats->rx_bytes += skb->len;
|
|
||||||
- napi_gro_receive(napi, skb);
|
|
||||||
+ stats->rx_bytes += pkt_len;
|
|
||||||
} else {
|
|
||||||
__skb_queue_tail(&tp->rx_queue, skb);
|
|
||||||
}
|
|
||||||
|
|
||||||
find_next_rx:
|
|
||||||
- rx_data = rx_agg_align(rx_data + pkt_len + ETH_FCS_LEN);
|
|
||||||
+ rx_data = rx_agg_align(rx_data + len + ETH_FCS_LEN);
|
|
||||||
rx_desc = (struct rx_desc *)rx_data;
|
|
||||||
len_used = agg_offset(agg, rx_data);
|
|
||||||
len_used += sizeof(struct rx_desc);
|
|
|
@ -1,207 +0,0 @@
|
||||||
From a64c3c1357275b1fd61bc9734f638cdb5d8a8bbb Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
|
|
||||||
Date: Mon, 18 Sep 2023 18:11:02 +0200
|
|
||||||
Subject: [PATCH 4/6] leds: turris-omnia: Make set_brightness() more efficient
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Implement caching of the LED color and state values that are sent to MCU
|
|
||||||
in order to make the set_brightness() operation more efficient by
|
|
||||||
avoiding I2C transactions which are not needed.
|
|
||||||
|
|
||||||
On Turris Omnia's MCU, which acts as the RGB LED controller, each LED
|
|
||||||
has a RGB color, and a ON/OFF state, which are configurable via I2C
|
|
||||||
commands CMD_LED_COLOR and CMD_LED_STATE.
|
|
||||||
|
|
||||||
The CMD_LED_COLOR command sends 5 bytes and the CMD_LED_STATE command 2
|
|
||||||
bytes over the I2C bus, which operates at 100 kHz. With I2C overhead
|
|
||||||
this allows ~1670 color changing commands and ~3200 state changing
|
|
||||||
commands per second (or around 1000 color + state changes per second).
|
|
||||||
This may seem more than enough, but the issue is that the I2C bus is
|
|
||||||
shared with another peripheral, the MCU. The MCU exposes an interrupt
|
|
||||||
interface, and it can trigger hundreds of interrupts per second. Each
|
|
||||||
time, we need to read the interrupt state register over this I2C bus.
|
|
||||||
Whenever we are sending a LED color/state changing command, the
|
|
||||||
interrupt reading is waiting.
|
|
||||||
|
|
||||||
Currently, every time LED brightness or LED multi intensity is changed,
|
|
||||||
we send a CMD_LED_STATE command, and if the computed color (brightness
|
|
||||||
adjusted multi_intensity) is non-zero, we also send a CMD_LED_COLOR
|
|
||||||
command.
|
|
||||||
|
|
||||||
Consider for example the situation when we have a netdev trigger enabled
|
|
||||||
for a LED. The netdev trigger does not change the LED color, only the
|
|
||||||
brightness (either to 0 or to currently configured brightness), and so
|
|
||||||
there is no need to send the CMD_LED_COLOR command. But each change of
|
|
||||||
brightness to 0 sends one CMD_LED_STATE command, and each change of
|
|
||||||
brightness to max_brightness sends one CMD_LED_STATE command and one
|
|
||||||
CMD_LED_COLOR command:
|
|
||||||
set_brightness(0) -> CMD_LED_STATE
|
|
||||||
set_brightness(255) -> CMD_LED_STATE + CMD_LED_COLOR
|
|
||||||
(unnecessary)
|
|
||||||
|
|
||||||
We can avoid the unnecessary I2C transactions if we cache the values of
|
|
||||||
state and color that are sent to the controller. If the color does not
|
|
||||||
change from the one previously sent, there is no need to do the
|
|
||||||
CMD_LED_COLOR I2C transaction, and if the state does not change, there
|
|
||||||
is no need to do the CMD_LED_STATE transaction.
|
|
||||||
|
|
||||||
Because we need to make sure that our cached values are consistent with
|
|
||||||
the controller state, add explicit setting of the LED color to white at
|
|
||||||
probe time (this is the default setting when MCU resets, but does not
|
|
||||||
necessarily need to be the case, for example if U-Boot played with the
|
|
||||||
LED colors).
|
|
||||||
|
|
||||||
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
||||||
Link: https://lore.kernel.org/r/20230918161104.20860-3-kabel@kernel.org
|
|
||||||
Signed-off-by: Lee Jones <lee@kernel.org>
|
|
||||||
---
|
|
||||||
drivers/leds/leds-turris-omnia.c | 96 ++++++++++++++++++++++++++------
|
|
||||||
1 file changed, 78 insertions(+), 18 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/leds/leds-turris-omnia.c
|
|
||||||
+++ b/drivers/leds/leds-turris-omnia.c
|
|
||||||
@@ -30,6 +30,8 @@
|
|
||||||
struct omnia_led {
|
|
||||||
struct led_classdev_mc mc_cdev;
|
|
||||||
struct mc_subled subled_info[OMNIA_LED_NUM_CHANNELS];
|
|
||||||
+ u8 cached_channels[OMNIA_LED_NUM_CHANNELS];
|
|
||||||
+ bool on;
|
|
||||||
int reg;
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -72,36 +74,82 @@ static int omnia_cmd_read_u8(const struc
|
|
||||||
return -EIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int omnia_led_send_color_cmd(const struct i2c_client *client,
|
|
||||||
+ struct omnia_led *led)
|
|
||||||
+{
|
|
||||||
+ char cmd[5];
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ cmd[0] = CMD_LED_COLOR;
|
|
||||||
+ cmd[1] = led->reg;
|
|
||||||
+ cmd[2] = led->subled_info[0].brightness;
|
|
||||||
+ cmd[3] = led->subled_info[1].brightness;
|
|
||||||
+ cmd[4] = led->subled_info[2].brightness;
|
|
||||||
+
|
|
||||||
+ /* Send the color change command */
|
|
||||||
+ ret = i2c_master_send(client, cmd, 5);
|
|
||||||
+ if (ret < 0)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+ /* Cache the RGB channel brightnesses */
|
|
||||||
+ for (int i = 0; i < OMNIA_LED_NUM_CHANNELS; ++i)
|
|
||||||
+ led->cached_channels[i] = led->subled_info[i].brightness;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* Determine if the computed RGB channels are different from the cached ones */
|
|
||||||
+static bool omnia_led_channels_changed(struct omnia_led *led)
|
|
||||||
+{
|
|
||||||
+ for (int i = 0; i < OMNIA_LED_NUM_CHANNELS; ++i)
|
|
||||||
+ if (led->subled_info[i].brightness != led->cached_channels[i])
|
|
||||||
+ return true;
|
|
||||||
+
|
|
||||||
+ return false;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int omnia_led_brightness_set_blocking(struct led_classdev *cdev,
|
|
||||||
enum led_brightness brightness)
|
|
||||||
{
|
|
||||||
struct led_classdev_mc *mc_cdev = lcdev_to_mccdev(cdev);
|
|
||||||
struct omnia_leds *leds = dev_get_drvdata(cdev->dev->parent);
|
|
||||||
struct omnia_led *led = to_omnia_led(mc_cdev);
|
|
||||||
- u8 buf[5], state;
|
|
||||||
- int ret;
|
|
||||||
+ int err = 0;
|
|
||||||
|
|
||||||
mutex_lock(&leds->lock);
|
|
||||||
|
|
||||||
- led_mc_calc_color_components(&led->mc_cdev, brightness);
|
|
||||||
+ /*
|
|
||||||
+ * Only recalculate RGB brightnesses from intensities if brightness is
|
|
||||||
+ * non-zero. Otherwise we won't be using them and we can save ourselves
|
|
||||||
+ * some software divisions (Omnia's CPU does not implement the division
|
|
||||||
+ * instruction).
|
|
||||||
+ */
|
|
||||||
+ if (brightness) {
|
|
||||||
+ led_mc_calc_color_components(mc_cdev, brightness);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Send color command only if brightness is non-zero and the RGB
|
|
||||||
+ * channel brightnesses changed.
|
|
||||||
+ */
|
|
||||||
+ if (omnia_led_channels_changed(led))
|
|
||||||
+ err = omnia_led_send_color_cmd(leds->client, led);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- buf[0] = CMD_LED_COLOR;
|
|
||||||
- buf[1] = led->reg;
|
|
||||||
- buf[2] = mc_cdev->subled_info[0].brightness;
|
|
||||||
- buf[3] = mc_cdev->subled_info[1].brightness;
|
|
||||||
- buf[4] = mc_cdev->subled_info[2].brightness;
|
|
||||||
-
|
|
||||||
- state = CMD_LED_STATE_LED(led->reg);
|
|
||||||
- if (buf[2] || buf[3] || buf[4])
|
|
||||||
- state |= CMD_LED_STATE_ON;
|
|
||||||
-
|
|
||||||
- ret = omnia_cmd_write_u8(leds->client, CMD_LED_STATE, state);
|
|
||||||
- if (ret >= 0 && (state & CMD_LED_STATE_ON))
|
|
||||||
- ret = i2c_master_send(leds->client, buf, 5);
|
|
||||||
+ /* Send on/off state change only if (bool)brightness changed */
|
|
||||||
+ if (!err && !brightness != !led->on) {
|
|
||||||
+ u8 state = CMD_LED_STATE_LED(led->reg);
|
|
||||||
+
|
|
||||||
+ if (brightness)
|
|
||||||
+ state |= CMD_LED_STATE_ON;
|
|
||||||
+
|
|
||||||
+ err = omnia_cmd_write_u8(leds->client, CMD_LED_STATE, state);
|
|
||||||
+ if (!err)
|
|
||||||
+ led->on = !!brightness;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
mutex_unlock(&leds->lock);
|
|
||||||
|
|
||||||
- return ret;
|
|
||||||
+ return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int omnia_led_register(struct i2c_client *client, struct omnia_led *led,
|
|
||||||
@@ -129,11 +177,15 @@ static int omnia_led_register(struct i2c
|
|
||||||
}
|
|
||||||
|
|
||||||
led->subled_info[0].color_index = LED_COLOR_ID_RED;
|
|
||||||
- led->subled_info[0].channel = 0;
|
|
||||||
led->subled_info[1].color_index = LED_COLOR_ID_GREEN;
|
|
||||||
- led->subled_info[1].channel = 1;
|
|
||||||
led->subled_info[2].color_index = LED_COLOR_ID_BLUE;
|
|
||||||
- led->subled_info[2].channel = 2;
|
|
||||||
+
|
|
||||||
+ /* Initial color is white */
|
|
||||||
+ for (int i = 0; i < OMNIA_LED_NUM_CHANNELS; ++i) {
|
|
||||||
+ led->subled_info[i].intensity = 255;
|
|
||||||
+ led->subled_info[i].brightness = 255;
|
|
||||||
+ led->subled_info[i].channel = i;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
led->mc_cdev.subled_info = led->subled_info;
|
|
||||||
led->mc_cdev.num_colors = OMNIA_LED_NUM_CHANNELS;
|
|
||||||
@@ -162,6 +214,14 @@ static int omnia_led_register(struct i2c
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /* Set initial color and cache it */
|
|
||||||
+ ret = omnia_led_send_color_cmd(client, led);
|
|
||||||
+ if (ret < 0) {
|
|
||||||
+ dev_err(dev, "Cannot set LED %pOF initial color: %i\n", np,
|
|
||||||
+ ret);
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
ret = devm_led_classdev_multicolor_register_ext(dev, &led->mc_cdev,
|
|
||||||
&init_data);
|
|
||||||
if (ret < 0) {
|
|
|
@ -1,202 +0,0 @@
|
||||||
From e965e0f6de60874fc0a0caed9a9e0122999e0c7b Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
|
|
||||||
Date: Mon, 18 Sep 2023 18:11:03 +0200
|
|
||||||
Subject: [PATCH 5/6] leds: turris-omnia: Support HW controlled mode via
|
|
||||||
private trigger
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Add support for enabling MCU controlled mode of the Turris Omnia LEDs
|
|
||||||
via a LED private trigger called "omnia-mcu". Recall that private LED
|
|
||||||
triggers will only be listed in the sysfs trigger file for LEDs that
|
|
||||||
support them (currently there is no user of this mechanism).
|
|
||||||
|
|
||||||
When in MCU controlled mode, the user can still set LED color, but the
|
|
||||||
blinking is done by MCU, which does different things for different LEDs:
|
|
||||||
- WAN LED is blinked according to the LED[0] pin of the WAN PHY
|
|
||||||
- LAN LEDs are blinked according to the LED[0] output of the
|
|
||||||
corresponding port of the LAN switch
|
|
||||||
- PCIe LEDs are blinked according to the logical OR of the MiniPCIe port
|
|
||||||
LED pins
|
|
||||||
|
|
||||||
In the future I want to make the netdev trigger to transparently offload
|
|
||||||
the blinking to the HW if user sets compatible settings for the netdev
|
|
||||||
trigger (for LEDs associated with network devices).
|
|
||||||
There was some work on this already, and hopefully we will be able to
|
|
||||||
complete it sometime, but for now there are still multiple blockers for
|
|
||||||
this, and even if there weren't, we still would not be able to configure
|
|
||||||
HW controlled mode for the LEDs associated with MiniPCIe ports.
|
|
||||||
|
|
||||||
In the meantime let's support HW controlled mode via the private LED
|
|
||||||
trigger mechanism. If, in the future, we manage to complete the netdev
|
|
||||||
trigger offloading, we can still keep this private trigger for backwards
|
|
||||||
compatibility, if needed.
|
|
||||||
|
|
||||||
We also set "omnia-mcu" to cdev->default_trigger, so that the MCU keeps
|
|
||||||
control until the user first wants to take over it. If a different
|
|
||||||
default trigger is specified in device-tree via the
|
|
||||||
'linux,default-trigger' property, LED class will overwrite
|
|
||||||
cdev->default_trigger, and so the DT property will be respected.
|
|
||||||
|
|
||||||
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
||||||
Link: https://lore.kernel.org/r/20230918161104.20860-4-kabel@kernel.org
|
|
||||||
Signed-off-by: Lee Jones <lee@kernel.org>
|
|
||||||
---
|
|
||||||
drivers/leds/Kconfig | 1 +
|
|
||||||
drivers/leds/leds-turris-omnia.c | 98 +++++++++++++++++++++++++++++---
|
|
||||||
2 files changed, 91 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/leds/Kconfig
|
|
||||||
+++ b/drivers/leds/Kconfig
|
|
||||||
@@ -187,6 +187,7 @@ config LEDS_TURRIS_OMNIA
|
|
||||||
depends on I2C
|
|
||||||
depends on MACH_ARMADA_38X || COMPILE_TEST
|
|
||||||
depends on OF
|
|
||||||
+ select LEDS_TRIGGERS
|
|
||||||
help
|
|
||||||
This option enables basic support for the LEDs found on the front
|
|
||||||
side of CZ.NIC's Turris Omnia router. There are 12 RGB LEDs on the
|
|
||||||
--- a/drivers/leds/leds-turris-omnia.c
|
|
||||||
+++ b/drivers/leds/leds-turris-omnia.c
|
|
||||||
@@ -31,7 +31,7 @@ struct omnia_led {
|
|
||||||
struct led_classdev_mc mc_cdev;
|
|
||||||
struct mc_subled subled_info[OMNIA_LED_NUM_CHANNELS];
|
|
||||||
u8 cached_channels[OMNIA_LED_NUM_CHANNELS];
|
|
||||||
- bool on;
|
|
||||||
+ bool on, hwtrig;
|
|
||||||
int reg;
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -120,12 +120,14 @@ static int omnia_led_brightness_set_bloc
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Only recalculate RGB brightnesses from intensities if brightness is
|
|
||||||
- * non-zero. Otherwise we won't be using them and we can save ourselves
|
|
||||||
- * some software divisions (Omnia's CPU does not implement the division
|
|
||||||
- * instruction).
|
|
||||||
+ * non-zero (if it is zero and the LED is in HW blinking mode, we use
|
|
||||||
+ * max_brightness as brightness). Otherwise we won't be using them and
|
|
||||||
+ * we can save ourselves some software divisions (Omnia's CPU does not
|
|
||||||
+ * implement the division instruction).
|
|
||||||
*/
|
|
||||||
- if (brightness) {
|
|
||||||
- led_mc_calc_color_components(mc_cdev, brightness);
|
|
||||||
+ if (brightness || led->hwtrig) {
|
|
||||||
+ led_mc_calc_color_components(mc_cdev, brightness ?:
|
|
||||||
+ cdev->max_brightness);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Send color command only if brightness is non-zero and the RGB
|
|
||||||
@@ -135,8 +137,11 @@ static int omnia_led_brightness_set_bloc
|
|
||||||
err = omnia_led_send_color_cmd(leds->client, led);
|
|
||||||
}
|
|
||||||
|
|
||||||
- /* Send on/off state change only if (bool)brightness changed */
|
|
||||||
- if (!err && !brightness != !led->on) {
|
|
||||||
+ /*
|
|
||||||
+ * Send on/off state change only if (bool)brightness changed and the LED
|
|
||||||
+ * is not being blinked by HW.
|
|
||||||
+ */
|
|
||||||
+ if (!err && !led->hwtrig && !brightness != !led->on) {
|
|
||||||
u8 state = CMD_LED_STATE_LED(led->reg);
|
|
||||||
|
|
||||||
if (brightness)
|
|
||||||
@@ -152,6 +157,71 @@ static int omnia_led_brightness_set_bloc
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static struct led_hw_trigger_type omnia_hw_trigger_type;
|
|
||||||
+
|
|
||||||
+static int omnia_hwtrig_activate(struct led_classdev *cdev)
|
|
||||||
+{
|
|
||||||
+ struct led_classdev_mc *mc_cdev = lcdev_to_mccdev(cdev);
|
|
||||||
+ struct omnia_leds *leds = dev_get_drvdata(cdev->dev->parent);
|
|
||||||
+ struct omnia_led *led = to_omnia_led(mc_cdev);
|
|
||||||
+ int err = 0;
|
|
||||||
+
|
|
||||||
+ mutex_lock(&leds->lock);
|
|
||||||
+
|
|
||||||
+ if (!led->on) {
|
|
||||||
+ /*
|
|
||||||
+ * If the LED is off (brightness was set to 0), the last
|
|
||||||
+ * configured color was not necessarily sent to the MCU.
|
|
||||||
+ * Recompute with max_brightness and send if needed.
|
|
||||||
+ */
|
|
||||||
+ led_mc_calc_color_components(mc_cdev, cdev->max_brightness);
|
|
||||||
+
|
|
||||||
+ if (omnia_led_channels_changed(led))
|
|
||||||
+ err = omnia_led_send_color_cmd(leds->client, led);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (!err) {
|
|
||||||
+ /* Put the LED into MCU controlled mode */
|
|
||||||
+ err = omnia_cmd_write_u8(leds->client, CMD_LED_MODE,
|
|
||||||
+ CMD_LED_MODE_LED(led->reg));
|
|
||||||
+ if (!err)
|
|
||||||
+ led->hwtrig = true;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ mutex_unlock(&leds->lock);
|
|
||||||
+
|
|
||||||
+ return err;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void omnia_hwtrig_deactivate(struct led_classdev *cdev)
|
|
||||||
+{
|
|
||||||
+ struct omnia_leds *leds = dev_get_drvdata(cdev->dev->parent);
|
|
||||||
+ struct omnia_led *led = to_omnia_led(lcdev_to_mccdev(cdev));
|
|
||||||
+ int err;
|
|
||||||
+
|
|
||||||
+ mutex_lock(&leds->lock);
|
|
||||||
+
|
|
||||||
+ led->hwtrig = false;
|
|
||||||
+
|
|
||||||
+ /* Put the LED into software mode */
|
|
||||||
+ err = omnia_cmd_write_u8(leds->client, CMD_LED_MODE,
|
|
||||||
+ CMD_LED_MODE_LED(led->reg) |
|
|
||||||
+ CMD_LED_MODE_USER);
|
|
||||||
+
|
|
||||||
+ mutex_unlock(&leds->lock);
|
|
||||||
+
|
|
||||||
+ if (err < 0)
|
|
||||||
+ dev_err(cdev->dev, "Cannot put LED to software mode: %i\n",
|
|
||||||
+ err);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static struct led_trigger omnia_hw_trigger = {
|
|
||||||
+ .name = "omnia-mcu",
|
|
||||||
+ .activate = omnia_hwtrig_activate,
|
|
||||||
+ .deactivate = omnia_hwtrig_deactivate,
|
|
||||||
+ .trigger_type = &omnia_hw_trigger_type,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static int omnia_led_register(struct i2c_client *client, struct omnia_led *led,
|
|
||||||
struct device_node *np)
|
|
||||||
{
|
|
||||||
@@ -195,6 +265,12 @@ static int omnia_led_register(struct i2c
|
|
||||||
cdev = &led->mc_cdev.led_cdev;
|
|
||||||
cdev->max_brightness = 255;
|
|
||||||
cdev->brightness_set_blocking = omnia_led_brightness_set_blocking;
|
|
||||||
+ cdev->trigger_type = &omnia_hw_trigger_type;
|
|
||||||
+ /*
|
|
||||||
+ * Use the omnia-mcu trigger as the default trigger. It may be rewritten
|
|
||||||
+ * by LED class from the linux,default-trigger property.
|
|
||||||
+ */
|
|
||||||
+ cdev->default_trigger = omnia_hw_trigger.name;
|
|
||||||
|
|
||||||
/* put the LED into software mode */
|
|
||||||
ret = omnia_cmd_write_u8(client, CMD_LED_MODE,
|
|
||||||
@@ -308,6 +384,12 @@ static int omnia_leds_probe(struct i2c_c
|
|
||||||
|
|
||||||
mutex_init(&leds->lock);
|
|
||||||
|
|
||||||
+ ret = devm_led_trigger_register(dev, &omnia_hw_trigger);
|
|
||||||
+ if (ret < 0) {
|
|
||||||
+ dev_err(dev, "Cannot register private LED trigger: %d\n", ret);
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
led = &leds->leds[0];
|
|
||||||
for_each_available_child_of_node(np, child) {
|
|
||||||
ret = omnia_led_register(client, led, child);
|
|
|
@ -1,244 +0,0 @@
|
||||||
From 0efb3f9609d3de5a7d8c31e3835d7eb3e6adce79 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
|
|
||||||
Date: Mon, 18 Sep 2023 18:11:04 +0200
|
|
||||||
Subject: [PATCH 6/6] leds: turris-omnia: Add support for enabling/disabling HW
|
|
||||||
gamma correction
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
If the MCU on Turris Omnia is running newer firmware versions, the LED
|
|
||||||
controller supports RGB gamma correction (and enables it by default for
|
|
||||||
newer boards).
|
|
||||||
|
|
||||||
Determine whether the gamma correction setting feature is supported and
|
|
||||||
add the ability to set it via sysfs attribute file.
|
|
||||||
|
|
||||||
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
||||||
Link: https://lore.kernel.org/r/20230918161104.20860-5-kabel@kernel.org
|
|
||||||
Signed-off-by: Lee Jones <lee@kernel.org>
|
|
||||||
---
|
|
||||||
.../sysfs-class-led-driver-turris-omnia | 14 ++
|
|
||||||
drivers/leds/leds-turris-omnia.c | 137 +++++++++++++++---
|
|
||||||
2 files changed, 134 insertions(+), 17 deletions(-)
|
|
||||||
|
|
||||||
--- a/Documentation/ABI/testing/sysfs-class-led-driver-turris-omnia
|
|
||||||
+++ b/Documentation/ABI/testing/sysfs-class-led-driver-turris-omnia
|
|
||||||
@@ -12,3 +12,17 @@ Description: (RW) On the front panel of
|
|
||||||
able to change this setting from software.
|
|
||||||
|
|
||||||
Format: %i
|
|
||||||
+
|
|
||||||
+What: /sys/class/leds/<led>/device/gamma_correction
|
|
||||||
+Date: August 2023
|
|
||||||
+KernelVersion: 6.6
|
|
||||||
+Contact: Marek Behún <kabel@kernel.org>
|
|
||||||
+Description: (RW) Newer versions of the microcontroller firmware of the
|
|
||||||
+ Turris Omnia router support gamma correction for the RGB LEDs.
|
|
||||||
+ This feature can be enabled/disabled by writing to this file.
|
|
||||||
+
|
|
||||||
+ If the feature is not supported because the MCU firmware is too
|
|
||||||
+ old, the file always reads as 0, and writing to the file results
|
|
||||||
+ in the EOPNOTSUPP error.
|
|
||||||
+
|
|
||||||
+ Format: %i
|
|
||||||
--- a/drivers/leds/leds-turris-omnia.c
|
|
||||||
+++ b/drivers/leds/leds-turris-omnia.c
|
|
||||||
@@ -15,17 +15,30 @@
|
|
||||||
#define OMNIA_BOARD_LEDS 12
|
|
||||||
#define OMNIA_LED_NUM_CHANNELS 3
|
|
||||||
|
|
||||||
-#define CMD_LED_MODE 3
|
|
||||||
-#define CMD_LED_MODE_LED(l) ((l) & 0x0f)
|
|
||||||
-#define CMD_LED_MODE_USER 0x10
|
|
||||||
-
|
|
||||||
-#define CMD_LED_STATE 4
|
|
||||||
-#define CMD_LED_STATE_LED(l) ((l) & 0x0f)
|
|
||||||
-#define CMD_LED_STATE_ON 0x10
|
|
||||||
-
|
|
||||||
-#define CMD_LED_COLOR 5
|
|
||||||
-#define CMD_LED_SET_BRIGHTNESS 7
|
|
||||||
-#define CMD_LED_GET_BRIGHTNESS 8
|
|
||||||
+/* MCU controller commands at I2C address 0x2a */
|
|
||||||
+#define OMNIA_MCU_I2C_ADDR 0x2a
|
|
||||||
+
|
|
||||||
+#define CMD_GET_STATUS_WORD 0x01
|
|
||||||
+#define STS_FEATURES_SUPPORTED BIT(2)
|
|
||||||
+
|
|
||||||
+#define CMD_GET_FEATURES 0x10
|
|
||||||
+#define FEAT_LED_GAMMA_CORRECTION BIT(5)
|
|
||||||
+
|
|
||||||
+/* LED controller commands at I2C address 0x2b */
|
|
||||||
+#define CMD_LED_MODE 0x03
|
|
||||||
+#define CMD_LED_MODE_LED(l) ((l) & 0x0f)
|
|
||||||
+#define CMD_LED_MODE_USER 0x10
|
|
||||||
+
|
|
||||||
+#define CMD_LED_STATE 0x04
|
|
||||||
+#define CMD_LED_STATE_LED(l) ((l) & 0x0f)
|
|
||||||
+#define CMD_LED_STATE_ON 0x10
|
|
||||||
+
|
|
||||||
+#define CMD_LED_COLOR 0x05
|
|
||||||
+#define CMD_LED_SET_BRIGHTNESS 0x07
|
|
||||||
+#define CMD_LED_GET_BRIGHTNESS 0x08
|
|
||||||
+
|
|
||||||
+#define CMD_SET_GAMMA_CORRECTION 0x30
|
|
||||||
+#define CMD_GET_GAMMA_CORRECTION 0x31
|
|
||||||
|
|
||||||
struct omnia_led {
|
|
||||||
struct led_classdev_mc mc_cdev;
|
|
||||||
@@ -40,6 +53,7 @@ struct omnia_led {
|
|
||||||
struct omnia_leds {
|
|
||||||
struct i2c_client *client;
|
|
||||||
struct mutex lock;
|
|
||||||
+ bool has_gamma_correction;
|
|
||||||
struct omnia_led leds[];
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -50,30 +64,42 @@ static int omnia_cmd_write_u8(const stru
|
|
||||||
return i2c_master_send(client, buf, sizeof(buf));
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int omnia_cmd_read_u8(const struct i2c_client *client, u8 cmd)
|
|
||||||
+static int omnia_cmd_read_raw(struct i2c_adapter *adapter, u8 addr, u8 cmd,
|
|
||||||
+ void *reply, size_t len)
|
|
||||||
{
|
|
||||||
struct i2c_msg msgs[2];
|
|
||||||
- u8 reply;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
- msgs[0].addr = client->addr;
|
|
||||||
+ msgs[0].addr = addr;
|
|
||||||
msgs[0].flags = 0;
|
|
||||||
msgs[0].len = 1;
|
|
||||||
msgs[0].buf = &cmd;
|
|
||||||
- msgs[1].addr = client->addr;
|
|
||||||
+ msgs[1].addr = addr;
|
|
||||||
msgs[1].flags = I2C_M_RD;
|
|
||||||
- msgs[1].len = 1;
|
|
||||||
- msgs[1].buf = &reply;
|
|
||||||
+ msgs[1].len = len;
|
|
||||||
+ msgs[1].buf = reply;
|
|
||||||
|
|
||||||
- ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
|
|
||||||
+ ret = i2c_transfer(adapter, msgs, ARRAY_SIZE(msgs));
|
|
||||||
if (likely(ret == ARRAY_SIZE(msgs)))
|
|
||||||
- return reply;
|
|
||||||
+ return len;
|
|
||||||
else if (ret < 0)
|
|
||||||
return ret;
|
|
||||||
else
|
|
||||||
return -EIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int omnia_cmd_read_u8(const struct i2c_client *client, u8 cmd)
|
|
||||||
+{
|
|
||||||
+ u8 reply;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ ret = omnia_cmd_read_raw(client->adapter, client->addr, cmd, &reply, 1);
|
|
||||||
+ if (ret < 0)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+ return reply;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int omnia_led_send_color_cmd(const struct i2c_client *client,
|
|
||||||
struct omnia_led *led)
|
|
||||||
{
|
|
||||||
@@ -352,12 +378,74 @@ static ssize_t brightness_store(struct d
|
|
||||||
}
|
|
||||||
static DEVICE_ATTR_RW(brightness);
|
|
||||||
|
|
||||||
+static ssize_t gamma_correction_show(struct device *dev,
|
|
||||||
+ struct device_attribute *a, char *buf)
|
|
||||||
+{
|
|
||||||
+ struct i2c_client *client = to_i2c_client(dev);
|
|
||||||
+ struct omnia_leds *leds = i2c_get_clientdata(client);
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ if (leds->has_gamma_correction) {
|
|
||||||
+ ret = omnia_cmd_read_u8(client, CMD_GET_GAMMA_CORRECTION);
|
|
||||||
+ if (ret < 0)
|
|
||||||
+ return ret;
|
|
||||||
+ } else {
|
|
||||||
+ ret = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return sysfs_emit(buf, "%d\n", !!ret);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static ssize_t gamma_correction_store(struct device *dev,
|
|
||||||
+ struct device_attribute *a,
|
|
||||||
+ const char *buf, size_t count)
|
|
||||||
+{
|
|
||||||
+ struct i2c_client *client = to_i2c_client(dev);
|
|
||||||
+ struct omnia_leds *leds = i2c_get_clientdata(client);
|
|
||||||
+ bool val;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ if (!leds->has_gamma_correction)
|
|
||||||
+ return -EOPNOTSUPP;
|
|
||||||
+
|
|
||||||
+ if (kstrtobool(buf, &val) < 0)
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ ret = omnia_cmd_write_u8(client, CMD_SET_GAMMA_CORRECTION, val);
|
|
||||||
+
|
|
||||||
+ return ret < 0 ? ret : count;
|
|
||||||
+}
|
|
||||||
+static DEVICE_ATTR_RW(gamma_correction);
|
|
||||||
+
|
|
||||||
static struct attribute *omnia_led_controller_attrs[] = {
|
|
||||||
&dev_attr_brightness.attr,
|
|
||||||
+ &dev_attr_gamma_correction.attr,
|
|
||||||
NULL,
|
|
||||||
};
|
|
||||||
ATTRIBUTE_GROUPS(omnia_led_controller);
|
|
||||||
|
|
||||||
+static int omnia_mcu_get_features(const struct i2c_client *client)
|
|
||||||
+{
|
|
||||||
+ u16 reply;
|
|
||||||
+ int err;
|
|
||||||
+
|
|
||||||
+ err = omnia_cmd_read_raw(client->adapter, OMNIA_MCU_I2C_ADDR,
|
|
||||||
+ CMD_GET_STATUS_WORD, &reply, sizeof(reply));
|
|
||||||
+ if (err < 0)
|
|
||||||
+ return err;
|
|
||||||
+
|
|
||||||
+ /* Check whether MCU firmware supports the CMD_GET_FEAUTRES command */
|
|
||||||
+ if (!(le16_to_cpu(reply) & STS_FEATURES_SUPPORTED))
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ err = omnia_cmd_read_raw(client->adapter, OMNIA_MCU_I2C_ADDR,
|
|
||||||
+ CMD_GET_FEATURES, &reply, sizeof(reply));
|
|
||||||
+ if (err < 0)
|
|
||||||
+ return err;
|
|
||||||
+
|
|
||||||
+ return le16_to_cpu(reply);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int omnia_leds_probe(struct i2c_client *client)
|
|
||||||
{
|
|
||||||
struct device *dev = &client->dev;
|
|
||||||
@@ -382,6 +470,21 @@ static int omnia_leds_probe(struct i2c_c
|
|
||||||
leds->client = client;
|
|
||||||
i2c_set_clientdata(client, leds);
|
|
||||||
|
|
||||||
+ ret = omnia_mcu_get_features(client);
|
|
||||||
+ if (ret < 0) {
|
|
||||||
+ dev_err(dev, "Cannot determine MCU supported features: %d\n",
|
|
||||||
+ ret);
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ leds->has_gamma_correction = ret & FEAT_LED_GAMMA_CORRECTION;
|
|
||||||
+ if (!leds->has_gamma_correction) {
|
|
||||||
+ dev_info(dev,
|
|
||||||
+ "Your board's MCU firmware does not support the LED gamma correction feature.\n");
|
|
||||||
+ dev_info(dev,
|
|
||||||
+ "Consider upgrading MCU firmware with the omnia-mcutool utility.\n");
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
mutex_init(&leds->lock);
|
|
||||||
|
|
||||||
ret = devm_led_trigger_register(dev, &omnia_hw_trigger);
|
|
|
@ -1,167 +0,0 @@
|
||||||
From ffec49d391c5f0195360912b216aa24dbc9b53c8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
|
|
||||||
Date: Mon, 16 Oct 2023 16:15:38 +0200
|
|
||||||
Subject: [PATCH] leds: turris-omnia: Fix brightness setting and trigger
|
|
||||||
activating
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
I have improperly refactored commits
|
|
||||||
4d5ed2621c24 ("leds: turris-omnia: Make set_brightness() more efficient")
|
|
||||||
and
|
|
||||||
aaf38273cf76 ("leds: turris-omnia: Support HW controlled mode via private trigger")
|
|
||||||
after Lee requested a change in API semantics of the new functions I
|
|
||||||
introduced in commit
|
|
||||||
28350bc0ac77 ("leds: turris-omnia: Do not use SMBUS calls").
|
|
||||||
|
|
||||||
Before the change, the function omnia_cmd_write_u8() returned 0 on
|
|
||||||
success, and afterwards it returned a positive value (number of bytes
|
|
||||||
written). The latter version was applied, but the following commits did
|
|
||||||
not properly account for this change.
|
|
||||||
|
|
||||||
This results in non-functional LED's .brightness_set_blocking() and
|
|
||||||
trigger's .activate() methods.
|
|
||||||
|
|
||||||
The main reasoning behind the semantics change was that read/write
|
|
||||||
methods should return the number of read/written bytes on success.
|
|
||||||
It was pointed to me [1] that this is not always true (for example the
|
|
||||||
regmap API does not do so), and since the driver never uses this number
|
|
||||||
of read/written bytes information, I decided to fix this issue by
|
|
||||||
changing the functions to the original semantics (return 0 on success).
|
|
||||||
|
|
||||||
[1] https://lore.kernel.org/linux-gpio/ZQnn+Gi0xVlsGCYA@smile.fi.intel.com/
|
|
||||||
|
|
||||||
Fixes: 28350bc0ac77 ("leds: turris-omnia: Do not use SMBUS calls")
|
|
||||||
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
||||||
---
|
|
||||||
drivers/leds/leds-turris-omnia.c | 37 +++++++++++++++++---------------
|
|
||||||
1 file changed, 20 insertions(+), 17 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/leds/leds-turris-omnia.c
|
|
||||||
+++ b/drivers/leds/leds-turris-omnia.c
|
|
||||||
@@ -60,8 +60,11 @@ struct omnia_leds {
|
|
||||||
static int omnia_cmd_write_u8(const struct i2c_client *client, u8 cmd, u8 val)
|
|
||||||
{
|
|
||||||
u8 buf[2] = { cmd, val };
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ ret = i2c_master_send(client, buf, sizeof(buf));
|
|
||||||
|
|
||||||
- return i2c_master_send(client, buf, sizeof(buf));
|
|
||||||
+ return ret < 0 ? ret : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int omnia_cmd_read_raw(struct i2c_adapter *adapter, u8 addr, u8 cmd,
|
|
||||||
@@ -81,7 +84,7 @@ static int omnia_cmd_read_raw(struct i2c
|
|
||||||
|
|
||||||
ret = i2c_transfer(adapter, msgs, ARRAY_SIZE(msgs));
|
|
||||||
if (likely(ret == ARRAY_SIZE(msgs)))
|
|
||||||
- return len;
|
|
||||||
+ return 0;
|
|
||||||
else if (ret < 0)
|
|
||||||
return ret;
|
|
||||||
else
|
|
||||||
@@ -91,11 +94,11 @@ static int omnia_cmd_read_raw(struct i2c
|
|
||||||
static int omnia_cmd_read_u8(const struct i2c_client *client, u8 cmd)
|
|
||||||
{
|
|
||||||
u8 reply;
|
|
||||||
- int ret;
|
|
||||||
+ int err;
|
|
||||||
|
|
||||||
- ret = omnia_cmd_read_raw(client->adapter, client->addr, cmd, &reply, 1);
|
|
||||||
- if (ret < 0)
|
|
||||||
- return ret;
|
|
||||||
+ err = omnia_cmd_read_raw(client->adapter, client->addr, cmd, &reply, 1);
|
|
||||||
+ if (err)
|
|
||||||
+ return err;
|
|
||||||
|
|
||||||
return reply;
|
|
||||||
}
|
|
||||||
@@ -236,7 +239,7 @@ static void omnia_hwtrig_deactivate(stru
|
|
||||||
|
|
||||||
mutex_unlock(&leds->lock);
|
|
||||||
|
|
||||||
- if (err < 0)
|
|
||||||
+ if (err)
|
|
||||||
dev_err(cdev->dev, "Cannot put LED to software mode: %i\n",
|
|
||||||
err);
|
|
||||||
}
|
|
||||||
@@ -302,7 +305,7 @@ static int omnia_led_register(struct i2c
|
|
||||||
ret = omnia_cmd_write_u8(client, CMD_LED_MODE,
|
|
||||||
CMD_LED_MODE_LED(led->reg) |
|
|
||||||
CMD_LED_MODE_USER);
|
|
||||||
- if (ret < 0) {
|
|
||||||
+ if (ret) {
|
|
||||||
dev_err(dev, "Cannot set LED %pOF to software mode: %i\n", np,
|
|
||||||
ret);
|
|
||||||
return ret;
|
|
||||||
@@ -311,7 +314,7 @@ static int omnia_led_register(struct i2c
|
|
||||||
/* disable the LED */
|
|
||||||
ret = omnia_cmd_write_u8(client, CMD_LED_STATE,
|
|
||||||
CMD_LED_STATE_LED(led->reg));
|
|
||||||
- if (ret < 0) {
|
|
||||||
+ if (ret) {
|
|
||||||
dev_err(dev, "Cannot set LED %pOF brightness: %i\n", np, ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
@@ -364,7 +367,7 @@ static ssize_t brightness_store(struct d
|
|
||||||
{
|
|
||||||
struct i2c_client *client = to_i2c_client(dev);
|
|
||||||
unsigned long brightness;
|
|
||||||
- int ret;
|
|
||||||
+ int err;
|
|
||||||
|
|
||||||
if (kstrtoul(buf, 10, &brightness))
|
|
||||||
return -EINVAL;
|
|
||||||
@@ -372,9 +375,9 @@ static ssize_t brightness_store(struct d
|
|
||||||
if (brightness > 100)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
- ret = omnia_cmd_write_u8(client, CMD_LED_SET_BRIGHTNESS, brightness);
|
|
||||||
+ err = omnia_cmd_write_u8(client, CMD_LED_SET_BRIGHTNESS, brightness);
|
|
||||||
|
|
||||||
- return ret < 0 ? ret : count;
|
|
||||||
+ return err ?: count;
|
|
||||||
}
|
|
||||||
static DEVICE_ATTR_RW(brightness);
|
|
||||||
|
|
||||||
@@ -403,7 +406,7 @@ static ssize_t gamma_correction_store(st
|
|
||||||
struct i2c_client *client = to_i2c_client(dev);
|
|
||||||
struct omnia_leds *leds = i2c_get_clientdata(client);
|
|
||||||
bool val;
|
|
||||||
- int ret;
|
|
||||||
+ int err;
|
|
||||||
|
|
||||||
if (!leds->has_gamma_correction)
|
|
||||||
return -EOPNOTSUPP;
|
|
||||||
@@ -411,9 +414,9 @@ static ssize_t gamma_correction_store(st
|
|
||||||
if (kstrtobool(buf, &val) < 0)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
- ret = omnia_cmd_write_u8(client, CMD_SET_GAMMA_CORRECTION, val);
|
|
||||||
+ err = omnia_cmd_write_u8(client, CMD_SET_GAMMA_CORRECTION, val);
|
|
||||||
|
|
||||||
- return ret < 0 ? ret : count;
|
|
||||||
+ return err ?: count;
|
|
||||||
}
|
|
||||||
static DEVICE_ATTR_RW(gamma_correction);
|
|
||||||
|
|
||||||
@@ -431,7 +434,7 @@ static int omnia_mcu_get_features(const
|
|
||||||
|
|
||||||
err = omnia_cmd_read_raw(client->adapter, OMNIA_MCU_I2C_ADDR,
|
|
||||||
CMD_GET_STATUS_WORD, &reply, sizeof(reply));
|
|
||||||
- if (err < 0)
|
|
||||||
+ if (err)
|
|
||||||
return err;
|
|
||||||
|
|
||||||
/* Check whether MCU firmware supports the CMD_GET_FEAUTRES command */
|
|
||||||
@@ -440,7 +443,7 @@ static int omnia_mcu_get_features(const
|
|
||||||
|
|
||||||
err = omnia_cmd_read_raw(client->adapter, OMNIA_MCU_I2C_ADDR,
|
|
||||||
CMD_GET_FEATURES, &reply, sizeof(reply));
|
|
||||||
- if (err < 0)
|
|
||||||
+ if (err)
|
|
||||||
return err;
|
|
||||||
|
|
||||||
return le16_to_cpu(reply);
|
|
|
@ -1,37 +0,0 @@
|
||||||
From 16724d6ea40a2c9315f5a0d81005dfa4d7a6da24 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Luca Weiss <luca.weiss@fairphone.com>
|
|
||||||
Date: Fri, 20 Oct 2023 11:55:40 +0100
|
|
||||||
Subject: [PATCH] nvmem: qfprom: Mark core clk as optional
|
|
||||||
|
|
||||||
On some platforms like sc7280 on non-ChromeOS devices the core clock
|
|
||||||
cannot be touched by Linux so we cannot provide it. Mark it as optional
|
|
||||||
as accessing qfprom for reading works without it but we still prohibit
|
|
||||||
writing if we cannot provide the clock.
|
|
||||||
|
|
||||||
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
|
|
||||||
Reviewed-by: Douglas Anderson <dianders@chromium.org>
|
|
||||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
||||||
Link: https://lore.kernel.org/r/20231020105545.216052-2-srinivas.kandagatla@linaro.org
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/nvmem/qfprom.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/qfprom.c
|
|
||||||
+++ b/drivers/nvmem/qfprom.c
|
|
||||||
@@ -423,12 +423,12 @@ static int qfprom_probe(struct platform_
|
|
||||||
if (IS_ERR(priv->vcc))
|
|
||||||
return PTR_ERR(priv->vcc);
|
|
||||||
|
|
||||||
- priv->secclk = devm_clk_get(dev, "core");
|
|
||||||
+ priv->secclk = devm_clk_get_optional(dev, "core");
|
|
||||||
if (IS_ERR(priv->secclk))
|
|
||||||
return dev_err_probe(dev, PTR_ERR(priv->secclk), "Error getting clock\n");
|
|
||||||
|
|
||||||
- /* Only enable writing if we have SoC data. */
|
|
||||||
- if (priv->soc_data)
|
|
||||||
+ /* Only enable writing if we have SoC data and a valid clock */
|
|
||||||
+ if (priv->soc_data && priv->secclk)
|
|
||||||
econfig.reg_write = qfprom_reg_write;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,330 +0,0 @@
|
||||||
From 2cc3b37f5b6df8189d55d0e812d9658ce256dfec Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
||||||
Date: Fri, 20 Oct 2023 11:55:41 +0100
|
|
||||||
Subject: [PATCH] nvmem: add explicit config option to read old syntax fixed OF
|
|
||||||
cells
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Binding for fixed NVMEM cells defined directly as NVMEM device subnodes
|
|
||||||
has been deprecated. It has been replaced by the "fixed-layout" NVMEM
|
|
||||||
layout binding.
|
|
||||||
|
|
||||||
New syntax is meant to be clearer and should help avoiding imprecise
|
|
||||||
bindings.
|
|
||||||
|
|
||||||
NVMEM subsystem already supports the new binding. It should be a good
|
|
||||||
idea to limit support for old syntax to existing drivers that actually
|
|
||||||
support & use it (we can't break backward compatibility!). That way we
|
|
||||||
additionally encourage new bindings & drivers to ignore deprecated
|
|
||||||
binding.
|
|
||||||
|
|
||||||
It wasn't clear (to me) if rtc and w1 code actually uses old syntax
|
|
||||||
fixed cells. I enabled them to don't risk any breakage.
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
||||||
[for meson-{efuse,mx-efuse}.c]
|
|
||||||
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
|
||||||
[for mtk-efuse.c, nvmem/core.c, nvmem-provider.h]
|
|
||||||
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
|
||||||
[MT8192, MT8195 Chromebooks]
|
|
||||||
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
|
||||||
[for microchip-otpc.c]
|
|
||||||
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
|
|
||||||
[SAMA7G5-EK]
|
|
||||||
Tested-by: Claudiu Beznea <claudiu.beznea@microchip.com>
|
|
||||||
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
||||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
||||||
Link: https://lore.kernel.org/r/20231020105545.216052-3-srinivas.kandagatla@linaro.org
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/mtd/mtdcore.c | 2 ++
|
|
||||||
drivers/nvmem/apple-efuses.c | 1 +
|
|
||||||
drivers/nvmem/core.c | 8 +++++---
|
|
||||||
drivers/nvmem/imx-ocotp-scu.c | 1 +
|
|
||||||
drivers/nvmem/imx-ocotp.c | 1 +
|
|
||||||
drivers/nvmem/meson-efuse.c | 1 +
|
|
||||||
drivers/nvmem/meson-mx-efuse.c | 1 +
|
|
||||||
drivers/nvmem/microchip-otpc.c | 1 +
|
|
||||||
drivers/nvmem/mtk-efuse.c | 1 +
|
|
||||||
drivers/nvmem/qcom-spmi-sdam.c | 1 +
|
|
||||||
drivers/nvmem/qfprom.c | 1 +
|
|
||||||
drivers/nvmem/rave-sp-eeprom.c | 1 +
|
|
||||||
drivers/nvmem/rockchip-efuse.c | 1 +
|
|
||||||
drivers/nvmem/sc27xx-efuse.c | 1 +
|
|
||||||
drivers/nvmem/sec-qfprom.c | 1 +
|
|
||||||
drivers/nvmem/sprd-efuse.c | 1 +
|
|
||||||
drivers/nvmem/stm32-romem.c | 1 +
|
|
||||||
drivers/nvmem/sunplus-ocotp.c | 1 +
|
|
||||||
drivers/nvmem/sunxi_sid.c | 1 +
|
|
||||||
drivers/nvmem/uniphier-efuse.c | 1 +
|
|
||||||
drivers/nvmem/zynqmp_nvmem.c | 1 +
|
|
||||||
drivers/rtc/nvmem.c | 1 +
|
|
||||||
drivers/w1/slaves/w1_ds250x.c | 1 +
|
|
||||||
include/linux/nvmem-provider.h | 2 ++
|
|
||||||
24 files changed, 30 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/mtd/mtdcore.c
|
|
||||||
+++ b/drivers/mtd/mtdcore.c
|
|
||||||
@@ -552,6 +552,7 @@ static int mtd_nvmem_add(struct mtd_info
|
|
||||||
config.dev = &mtd->dev;
|
|
||||||
config.name = dev_name(&mtd->dev);
|
|
||||||
config.owner = THIS_MODULE;
|
|
||||||
+ config.add_legacy_fixed_of_cells = of_device_is_compatible(node, "nvmem-cells");
|
|
||||||
config.reg_read = mtd_nvmem_reg_read;
|
|
||||||
config.size = mtd->size;
|
|
||||||
config.word_size = 1;
|
|
||||||
@@ -898,6 +899,7 @@ static struct nvmem_device *mtd_otp_nvme
|
|
||||||
config.name = compatible;
|
|
||||||
config.id = NVMEM_DEVID_AUTO;
|
|
||||||
config.owner = THIS_MODULE;
|
|
||||||
+ config.add_legacy_fixed_of_cells = true;
|
|
||||||
config.type = NVMEM_TYPE_OTP;
|
|
||||||
config.root_only = true;
|
|
||||||
config.ignore_wp = true;
|
|
||||||
--- a/drivers/nvmem/apple-efuses.c
|
|
||||||
+++ b/drivers/nvmem/apple-efuses.c
|
|
||||||
@@ -36,6 +36,7 @@ static int apple_efuses_probe(struct pla
|
|
||||||
struct resource *res;
|
|
||||||
struct nvmem_config config = {
|
|
||||||
.dev = &pdev->dev,
|
|
||||||
+ .add_legacy_fixed_of_cells = true,
|
|
||||||
.read_only = true,
|
|
||||||
.reg_read = apple_efuses_read,
|
|
||||||
.stride = sizeof(u32),
|
|
||||||
--- a/drivers/nvmem/core.c
|
|
||||||
+++ b/drivers/nvmem/core.c
|
|
||||||
@@ -1003,9 +1003,11 @@ struct nvmem_device *nvmem_register(cons
|
|
||||||
if (rval)
|
|
||||||
goto err_remove_cells;
|
|
||||||
|
|
||||||
- rval = nvmem_add_cells_from_legacy_of(nvmem);
|
|
||||||
- if (rval)
|
|
||||||
- goto err_remove_cells;
|
|
||||||
+ if (config->add_legacy_fixed_of_cells) {
|
|
||||||
+ rval = nvmem_add_cells_from_legacy_of(nvmem);
|
|
||||||
+ if (rval)
|
|
||||||
+ goto err_remove_cells;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
rval = nvmem_add_cells_from_fixed_layout(nvmem);
|
|
||||||
if (rval)
|
|
||||||
--- a/drivers/nvmem/imx-ocotp-scu.c
|
|
||||||
+++ b/drivers/nvmem/imx-ocotp-scu.c
|
|
||||||
@@ -220,6 +220,7 @@ static int imx_scu_ocotp_write(void *con
|
|
||||||
|
|
||||||
static struct nvmem_config imx_scu_ocotp_nvmem_config = {
|
|
||||||
.name = "imx-scu-ocotp",
|
|
||||||
+ .add_legacy_fixed_of_cells = true,
|
|
||||||
.read_only = false,
|
|
||||||
.word_size = 4,
|
|
||||||
.stride = 1,
|
|
||||||
--- a/drivers/nvmem/imx-ocotp.c
|
|
||||||
+++ b/drivers/nvmem/imx-ocotp.c
|
|
||||||
@@ -615,6 +615,7 @@ static int imx_ocotp_probe(struct platfo
|
|
||||||
return PTR_ERR(priv->clk);
|
|
||||||
|
|
||||||
priv->params = of_device_get_match_data(&pdev->dev);
|
|
||||||
+ imx_ocotp_nvmem_config.add_legacy_fixed_of_cells = true;
|
|
||||||
imx_ocotp_nvmem_config.size = 4 * priv->params->nregs;
|
|
||||||
imx_ocotp_nvmem_config.dev = dev;
|
|
||||||
imx_ocotp_nvmem_config.priv = priv;
|
|
||||||
--- a/drivers/nvmem/meson-efuse.c
|
|
||||||
+++ b/drivers/nvmem/meson-efuse.c
|
|
||||||
@@ -93,6 +93,7 @@ static int meson_efuse_probe(struct plat
|
|
||||||
|
|
||||||
econfig->dev = dev;
|
|
||||||
econfig->name = dev_name(dev);
|
|
||||||
+ econfig->add_legacy_fixed_of_cells = true;
|
|
||||||
econfig->stride = 1;
|
|
||||||
econfig->word_size = 1;
|
|
||||||
econfig->reg_read = meson_efuse_read;
|
|
||||||
--- a/drivers/nvmem/meson-mx-efuse.c
|
|
||||||
+++ b/drivers/nvmem/meson-mx-efuse.c
|
|
||||||
@@ -210,6 +210,7 @@ static int meson_mx_efuse_probe(struct p
|
|
||||||
efuse->config.owner = THIS_MODULE;
|
|
||||||
efuse->config.dev = &pdev->dev;
|
|
||||||
efuse->config.priv = efuse;
|
|
||||||
+ efuse->config.add_legacy_fixed_of_cells = true;
|
|
||||||
efuse->config.stride = drvdata->word_size;
|
|
||||||
efuse->config.word_size = drvdata->word_size;
|
|
||||||
efuse->config.size = SZ_512;
|
|
||||||
--- a/drivers/nvmem/microchip-otpc.c
|
|
||||||
+++ b/drivers/nvmem/microchip-otpc.c
|
|
||||||
@@ -261,6 +261,7 @@ static int mchp_otpc_probe(struct platfo
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
mchp_nvmem_config.dev = otpc->dev;
|
|
||||||
+ mchp_nvmem_config.add_legacy_fixed_of_cells = true;
|
|
||||||
mchp_nvmem_config.size = size;
|
|
||||||
mchp_nvmem_config.priv = otpc;
|
|
||||||
nvmem = devm_nvmem_register(&pdev->dev, &mchp_nvmem_config);
|
|
||||||
--- a/drivers/nvmem/mtk-efuse.c
|
|
||||||
+++ b/drivers/nvmem/mtk-efuse.c
|
|
||||||
@@ -83,6 +83,7 @@ static int mtk_efuse_probe(struct platfo
|
|
||||||
return PTR_ERR(priv->base);
|
|
||||||
|
|
||||||
pdata = device_get_match_data(dev);
|
|
||||||
+ econfig.add_legacy_fixed_of_cells = true;
|
|
||||||
econfig.stride = 1;
|
|
||||||
econfig.word_size = 1;
|
|
||||||
econfig.reg_read = mtk_reg_read;
|
|
||||||
--- a/drivers/nvmem/qcom-spmi-sdam.c
|
|
||||||
+++ b/drivers/nvmem/qcom-spmi-sdam.c
|
|
||||||
@@ -142,6 +142,7 @@ static int sdam_probe(struct platform_de
|
|
||||||
sdam->sdam_config.name = "spmi_sdam";
|
|
||||||
sdam->sdam_config.id = NVMEM_DEVID_AUTO;
|
|
||||||
sdam->sdam_config.owner = THIS_MODULE;
|
|
||||||
+ sdam->sdam_config.add_legacy_fixed_of_cells = true;
|
|
||||||
sdam->sdam_config.stride = 1;
|
|
||||||
sdam->sdam_config.word_size = 1;
|
|
||||||
sdam->sdam_config.reg_read = sdam_read;
|
|
||||||
--- a/drivers/nvmem/qfprom.c
|
|
||||||
+++ b/drivers/nvmem/qfprom.c
|
|
||||||
@@ -357,6 +357,7 @@ static int qfprom_probe(struct platform_
|
|
||||||
{
|
|
||||||
struct nvmem_config econfig = {
|
|
||||||
.name = "qfprom",
|
|
||||||
+ .add_legacy_fixed_of_cells = true,
|
|
||||||
.stride = 1,
|
|
||||||
.word_size = 1,
|
|
||||||
.id = NVMEM_DEVID_AUTO,
|
|
||||||
--- a/drivers/nvmem/rave-sp-eeprom.c
|
|
||||||
+++ b/drivers/nvmem/rave-sp-eeprom.c
|
|
||||||
@@ -328,6 +328,7 @@ static int rave_sp_eeprom_probe(struct p
|
|
||||||
of_property_read_string(np, "zii,eeprom-name", &config.name);
|
|
||||||
config.priv = eeprom;
|
|
||||||
config.dev = dev;
|
|
||||||
+ config.add_legacy_fixed_of_cells = true;
|
|
||||||
config.size = size;
|
|
||||||
config.reg_read = rave_sp_eeprom_reg_read;
|
|
||||||
config.reg_write = rave_sp_eeprom_reg_write;
|
|
||||||
--- a/drivers/nvmem/rockchip-efuse.c
|
|
||||||
+++ b/drivers/nvmem/rockchip-efuse.c
|
|
||||||
@@ -205,6 +205,7 @@ static int rockchip_rk3399_efuse_read(vo
|
|
||||||
|
|
||||||
static struct nvmem_config econfig = {
|
|
||||||
.name = "rockchip-efuse",
|
|
||||||
+ .add_legacy_fixed_of_cells = true,
|
|
||||||
.stride = 1,
|
|
||||||
.word_size = 1,
|
|
||||||
.read_only = true,
|
|
||||||
--- a/drivers/nvmem/sc27xx-efuse.c
|
|
||||||
+++ b/drivers/nvmem/sc27xx-efuse.c
|
|
||||||
@@ -247,6 +247,7 @@ static int sc27xx_efuse_probe(struct pla
|
|
||||||
econfig.reg_read = sc27xx_efuse_read;
|
|
||||||
econfig.priv = efuse;
|
|
||||||
econfig.dev = &pdev->dev;
|
|
||||||
+ econfig.add_legacy_fixed_of_cells = true;
|
|
||||||
nvmem = devm_nvmem_register(&pdev->dev, &econfig);
|
|
||||||
if (IS_ERR(nvmem)) {
|
|
||||||
dev_err(&pdev->dev, "failed to register nvmem config\n");
|
|
||||||
--- a/drivers/nvmem/sec-qfprom.c
|
|
||||||
+++ b/drivers/nvmem/sec-qfprom.c
|
|
||||||
@@ -47,6 +47,7 @@ static int sec_qfprom_probe(struct platf
|
|
||||||
{
|
|
||||||
struct nvmem_config econfig = {
|
|
||||||
.name = "sec-qfprom",
|
|
||||||
+ .add_legacy_fixed_of_cells = true,
|
|
||||||
.stride = 1,
|
|
||||||
.word_size = 1,
|
|
||||||
.id = NVMEM_DEVID_AUTO,
|
|
||||||
--- a/drivers/nvmem/sprd-efuse.c
|
|
||||||
+++ b/drivers/nvmem/sprd-efuse.c
|
|
||||||
@@ -408,6 +408,7 @@ static int sprd_efuse_probe(struct platf
|
|
||||||
econfig.read_only = false;
|
|
||||||
econfig.name = "sprd-efuse";
|
|
||||||
econfig.size = efuse->data->blk_nums * SPRD_EFUSE_BLOCK_WIDTH;
|
|
||||||
+ econfig.add_legacy_fixed_of_cells = true;
|
|
||||||
econfig.reg_read = sprd_efuse_read;
|
|
||||||
econfig.reg_write = sprd_efuse_write;
|
|
||||||
econfig.priv = efuse;
|
|
||||||
--- a/drivers/nvmem/stm32-romem.c
|
|
||||||
+++ b/drivers/nvmem/stm32-romem.c
|
|
||||||
@@ -207,6 +207,7 @@ static int stm32_romem_probe(struct plat
|
|
||||||
priv->cfg.priv = priv;
|
|
||||||
priv->cfg.owner = THIS_MODULE;
|
|
||||||
priv->cfg.type = NVMEM_TYPE_OTP;
|
|
||||||
+ priv->cfg.add_legacy_fixed_of_cells = true;
|
|
||||||
|
|
||||||
priv->lower = 0;
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/sunplus-ocotp.c
|
|
||||||
+++ b/drivers/nvmem/sunplus-ocotp.c
|
|
||||||
@@ -145,6 +145,7 @@ disable_clk:
|
|
||||||
|
|
||||||
static struct nvmem_config sp_ocotp_nvmem_config = {
|
|
||||||
.name = "sp-ocotp",
|
|
||||||
+ .add_legacy_fixed_of_cells = true,
|
|
||||||
.read_only = true,
|
|
||||||
.word_size = 1,
|
|
||||||
.size = QAC628_OTP_SIZE,
|
|
||||||
--- a/drivers/nvmem/sunxi_sid.c
|
|
||||||
+++ b/drivers/nvmem/sunxi_sid.c
|
|
||||||
@@ -153,6 +153,7 @@ static int sunxi_sid_probe(struct platfo
|
|
||||||
nvmem_cfg->dev = dev;
|
|
||||||
nvmem_cfg->name = "sunxi-sid";
|
|
||||||
nvmem_cfg->type = NVMEM_TYPE_OTP;
|
|
||||||
+ nvmem_cfg->add_legacy_fixed_of_cells = true;
|
|
||||||
nvmem_cfg->read_only = true;
|
|
||||||
nvmem_cfg->size = cfg->size;
|
|
||||||
nvmem_cfg->word_size = 1;
|
|
||||||
--- a/drivers/nvmem/uniphier-efuse.c
|
|
||||||
+++ b/drivers/nvmem/uniphier-efuse.c
|
|
||||||
@@ -52,6 +52,7 @@ static int uniphier_efuse_probe(struct p
|
|
||||||
econfig.size = resource_size(res);
|
|
||||||
econfig.priv = priv;
|
|
||||||
econfig.dev = dev;
|
|
||||||
+ econfig.add_legacy_fixed_of_cells = true;
|
|
||||||
nvmem = devm_nvmem_register(dev, &econfig);
|
|
||||||
|
|
||||||
return PTR_ERR_OR_ZERO(nvmem);
|
|
||||||
--- a/drivers/nvmem/zynqmp_nvmem.c
|
|
||||||
+++ b/drivers/nvmem/zynqmp_nvmem.c
|
|
||||||
@@ -58,6 +58,7 @@ static int zynqmp_nvmem_probe(struct pla
|
|
||||||
|
|
||||||
priv->dev = dev;
|
|
||||||
econfig.dev = dev;
|
|
||||||
+ econfig.add_legacy_fixed_of_cells = true;
|
|
||||||
econfig.reg_read = zynqmp_nvmem_read;
|
|
||||||
econfig.priv = priv;
|
|
||||||
|
|
||||||
--- a/drivers/rtc/nvmem.c
|
|
||||||
+++ b/drivers/rtc/nvmem.c
|
|
||||||
@@ -21,6 +21,7 @@ int devm_rtc_nvmem_register(struct rtc_d
|
|
||||||
|
|
||||||
nvmem_config->dev = dev;
|
|
||||||
nvmem_config->owner = rtc->owner;
|
|
||||||
+ nvmem_config->add_legacy_fixed_of_cells = true;
|
|
||||||
nvmem = devm_nvmem_register(dev, nvmem_config);
|
|
||||||
if (IS_ERR(nvmem))
|
|
||||||
dev_err(dev, "failed to register nvmem device for RTC\n");
|
|
||||||
--- a/drivers/w1/slaves/w1_ds250x.c
|
|
||||||
+++ b/drivers/w1/slaves/w1_ds250x.c
|
|
||||||
@@ -168,6 +168,7 @@ static int w1_eprom_add_slave(struct w1_
|
|
||||||
struct nvmem_device *nvmem;
|
|
||||||
struct nvmem_config nvmem_cfg = {
|
|
||||||
.dev = &sl->dev,
|
|
||||||
+ .add_legacy_fixed_of_cells = true,
|
|
||||||
.reg_read = w1_nvmem_read,
|
|
||||||
.type = NVMEM_TYPE_OTP,
|
|
||||||
.read_only = true,
|
|
||||||
--- a/include/linux/nvmem-provider.h
|
|
||||||
+++ b/include/linux/nvmem-provider.h
|
|
||||||
@@ -82,6 +82,7 @@ struct nvmem_cell_info {
|
|
||||||
* @owner: Pointer to exporter module. Used for refcounting.
|
|
||||||
* @cells: Optional array of pre-defined NVMEM cells.
|
|
||||||
* @ncells: Number of elements in cells.
|
|
||||||
+ * @add_legacy_fixed_of_cells: Read fixed NVMEM cells from old OF syntax.
|
|
||||||
* @keepout: Optional array of keepout ranges (sorted ascending by start).
|
|
||||||
* @nkeepout: Number of elements in the keepout array.
|
|
||||||
* @type: Type of the nvmem storage
|
|
||||||
@@ -112,6 +113,7 @@ struct nvmem_config {
|
|
||||||
struct module *owner;
|
|
||||||
const struct nvmem_cell_info *cells;
|
|
||||||
int ncells;
|
|
||||||
+ bool add_legacy_fixed_of_cells;
|
|
||||||
const struct nvmem_keepout *keepout;
|
|
||||||
unsigned int nkeepout;
|
|
||||||
enum nvmem_type type;
|
|
|
@ -1,77 +0,0 @@
|
||||||
From 0720219f4d34a88a9badb4de70cfad7585687d48 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rob Herring <robh@kernel.org>
|
|
||||||
Date: Fri, 20 Oct 2023 11:55:45 +0100
|
|
||||||
Subject: [PATCH] nvmem: Use device_get_match_data()
|
|
||||||
|
|
||||||
Use preferred device_get_match_data() instead of of_match_device() to
|
|
||||||
get the driver match data. With this, adjust the includes to explicitly
|
|
||||||
include the correct headers.
|
|
||||||
|
|
||||||
Signed-off-by: Rob Herring <robh@kernel.org>
|
|
||||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
||||||
Link: https://lore.kernel.org/r/20231020105545.216052-7-srinivas.kandagatla@linaro.org
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/nvmem/mxs-ocotp.c | 10 ++++------
|
|
||||||
drivers/nvmem/stm32-romem.c | 7 ++++---
|
|
||||||
2 files changed, 8 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/mxs-ocotp.c
|
|
||||||
+++ b/drivers/nvmem/mxs-ocotp.c
|
|
||||||
@@ -13,8 +13,9 @@
|
|
||||||
#include <linux/io.h>
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/nvmem-provider.h>
|
|
||||||
-#include <linux/of_device.h>
|
|
||||||
+#include <linux/of.h>
|
|
||||||
#include <linux/platform_device.h>
|
|
||||||
+#include <linux/property.h>
|
|
||||||
#include <linux/slab.h>
|
|
||||||
#include <linux/stmp_device.h>
|
|
||||||
|
|
||||||
@@ -140,11 +141,10 @@ static int mxs_ocotp_probe(struct platfo
|
|
||||||
struct device *dev = &pdev->dev;
|
|
||||||
const struct mxs_data *data;
|
|
||||||
struct mxs_ocotp *otp;
|
|
||||||
- const struct of_device_id *match;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
- match = of_match_device(dev->driver->of_match_table, dev);
|
|
||||||
- if (!match || !match->data)
|
|
||||||
+ data = device_get_match_data(dev);
|
|
||||||
+ if (!data)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
otp = devm_kzalloc(dev, sizeof(*otp), GFP_KERNEL);
|
|
||||||
@@ -169,8 +169,6 @@ static int mxs_ocotp_probe(struct platfo
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
- data = match->data;
|
|
||||||
-
|
|
||||||
ocotp_config.size = data->size;
|
|
||||||
ocotp_config.priv = otp;
|
|
||||||
ocotp_config.dev = dev;
|
|
||||||
--- a/drivers/nvmem/stm32-romem.c
|
|
||||||
+++ b/drivers/nvmem/stm32-romem.c
|
|
||||||
@@ -10,7 +10,9 @@
|
|
||||||
#include <linux/io.h>
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/nvmem-provider.h>
|
|
||||||
-#include <linux/of_device.h>
|
|
||||||
+#include <linux/of.h>
|
|
||||||
+#include <linux/platform_device.h>
|
|
||||||
+#include <linux/property.h>
|
|
||||||
#include <linux/tee_drv.h>
|
|
||||||
|
|
||||||
#include "stm32-bsec-optee-ta.h"
|
|
||||||
@@ -211,8 +213,7 @@ static int stm32_romem_probe(struct plat
|
|
||||||
|
|
||||||
priv->lower = 0;
|
|
||||||
|
|
||||||
- cfg = (const struct stm32_romem_cfg *)
|
|
||||||
- of_match_device(dev->driver->of_match_table, dev)->data;
|
|
||||||
+ cfg = device_get_match_data(dev);
|
|
||||||
if (!cfg) {
|
|
||||||
priv->cfg.read_only = true;
|
|
||||||
priv->cfg.size = resource_size(res);
|
|
|
@ -1,77 +0,0 @@
|
||||||
From f4cf4e5db331a5ce69e3f0b21d322cac0f4e4b5d Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
||||||
Date: Mon, 23 Oct 2023 12:27:59 +0200
|
|
||||||
Subject: [PATCH] Revert "nvmem: add new config option"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
This reverts commit 517f14d9cf3533d5ab4fded195ab6f80a92e378f.
|
|
||||||
|
|
||||||
Config option "no_of_node" is no longer needed since adding a more
|
|
||||||
explicit and targeted option "add_legacy_fixed_of_cells".
|
|
||||||
|
|
||||||
That "no_of_node" config option was needed *earlier* to help mtd's case.
|
|
||||||
|
|
||||||
DT nodes of MTD partitions (that are also NVMEM devices) may contain
|
|
||||||
subnodes. Those SHOULD NOT be treated as NVMEM fixed cells.
|
|
||||||
|
|
||||||
To prevent NVMEM core code from parsing subnodes a "no_of_node" option
|
|
||||||
was added (and set to true in mtd) to make for_each_child_of_node() in
|
|
||||||
NVMEM a no-op. That was a bit hacky because it was messing with
|
|
||||||
"of_node" pointer to achieve some side-effect.
|
|
||||||
|
|
||||||
With the introduction of "add_legacy_fixed_of_cells" config option
|
|
||||||
things got more explicit. MTD subsystem simply tells NVMEM when to look
|
|
||||||
for fixed cells and there is no need to hack "of_node" pointer anymore.
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
||||||
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
||||||
Link: https://lore.kernel.org/r/20231023102759.31529-1-zajec5@gmail.com
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/mtd/mtdcore.c | 1 -
|
|
||||||
drivers/nvmem/core.c | 2 +-
|
|
||||||
include/linux/nvmem-provider.h | 2 --
|
|
||||||
3 files changed, 1 insertion(+), 4 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/mtd/mtdcore.c
|
|
||||||
+++ b/drivers/mtd/mtdcore.c
|
|
||||||
@@ -560,7 +560,6 @@ static int mtd_nvmem_add(struct mtd_info
|
|
||||||
config.read_only = true;
|
|
||||||
config.root_only = true;
|
|
||||||
config.ignore_wp = true;
|
|
||||||
- config.no_of_node = !of_device_is_compatible(node, "nvmem-cells");
|
|
||||||
config.priv = mtd;
|
|
||||||
|
|
||||||
mtd->nvmem = nvmem_register(&config);
|
|
||||||
--- a/drivers/nvmem/core.c
|
|
||||||
+++ b/drivers/nvmem/core.c
|
|
||||||
@@ -941,7 +941,7 @@ struct nvmem_device *nvmem_register(cons
|
|
||||||
nvmem->nkeepout = config->nkeepout;
|
|
||||||
if (config->of_node)
|
|
||||||
nvmem->dev.of_node = config->of_node;
|
|
||||||
- else if (!config->no_of_node)
|
|
||||||
+ else
|
|
||||||
nvmem->dev.of_node = config->dev->of_node;
|
|
||||||
|
|
||||||
switch (config->id) {
|
|
||||||
--- a/include/linux/nvmem-provider.h
|
|
||||||
+++ b/include/linux/nvmem-provider.h
|
|
||||||
@@ -89,7 +89,6 @@ struct nvmem_cell_info {
|
|
||||||
* @read_only: Device is read-only.
|
|
||||||
* @root_only: Device is accessibly to root only.
|
|
||||||
* @of_node: If given, this will be used instead of the parent's of_node.
|
|
||||||
- * @no_of_node: Device should not use the parent's of_node even if it's !NULL.
|
|
||||||
* @reg_read: Callback to read data.
|
|
||||||
* @reg_write: Callback to write data.
|
|
||||||
* @size: Device size.
|
|
||||||
@@ -122,7 +121,6 @@ struct nvmem_config {
|
|
||||||
bool ignore_wp;
|
|
||||||
struct nvmem_layout *layout;
|
|
||||||
struct device_node *of_node;
|
|
||||||
- bool no_of_node;
|
|
||||||
nvmem_reg_read_t reg_read;
|
|
||||||
nvmem_reg_write_t reg_write;
|
|
||||||
int size;
|
|
|
@ -1,140 +0,0 @@
|
||||||
From 7f38b70042fcaa49219045bd1a9a2836e27a58ac Mon Sep 17 00:00:00 2001
|
|
||||||
From: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Date: Fri, 15 Dec 2023 11:15:27 +0000
|
|
||||||
Subject: [PATCH] of: device: Export of_device_make_bus_id()
|
|
||||||
|
|
||||||
This helper is really handy to create unique device names based on their
|
|
||||||
device tree path, we may need it outside of the OF core (in the NVMEM
|
|
||||||
subsystem) so let's export it. As this helper has nothing patform
|
|
||||||
specific, let's move it to of/device.c instead of of/platform.c so we
|
|
||||||
can add its prototype to of_device.h.
|
|
||||||
|
|
||||||
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Acked-by: Rob Herring <robh@kernel.org>
|
|
||||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
||||||
Link: https://lore.kernel.org/r/20231215111536.316972-2-srinivas.kandagatla@linaro.org
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/of/device.c | 41 +++++++++++++++++++++++++++++++++++++++
|
|
||||||
drivers/of/platform.c | 40 --------------------------------------
|
|
||||||
include/linux/of_device.h | 6 ++++++
|
|
||||||
3 files changed, 47 insertions(+), 40 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/of/device.c
|
|
||||||
+++ b/drivers/of/device.c
|
|
||||||
@@ -304,3 +304,44 @@ int of_device_uevent_modalias(const stru
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(of_device_uevent_modalias);
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ * of_device_make_bus_id - Use the device node data to assign a unique name
|
|
||||||
+ * @dev: pointer to device structure that is linked to a device tree node
|
|
||||||
+ *
|
|
||||||
+ * This routine will first try using the translated bus address to
|
|
||||||
+ * derive a unique name. If it cannot, then it will prepend names from
|
|
||||||
+ * parent nodes until a unique name can be derived.
|
|
||||||
+ */
|
|
||||||
+void of_device_make_bus_id(struct device *dev)
|
|
||||||
+{
|
|
||||||
+ struct device_node *node = dev->of_node;
|
|
||||||
+ const __be32 *reg;
|
|
||||||
+ u64 addr;
|
|
||||||
+ u32 mask;
|
|
||||||
+
|
|
||||||
+ /* Construct the name, using parent nodes if necessary to ensure uniqueness */
|
|
||||||
+ while (node->parent) {
|
|
||||||
+ /*
|
|
||||||
+ * If the address can be translated, then that is as much
|
|
||||||
+ * uniqueness as we need. Make it the first component and return
|
|
||||||
+ */
|
|
||||||
+ reg = of_get_property(node, "reg", NULL);
|
|
||||||
+ if (reg && (addr = of_translate_address(node, reg)) != OF_BAD_ADDR) {
|
|
||||||
+ if (!of_property_read_u32(node, "mask", &mask))
|
|
||||||
+ dev_set_name(dev, dev_name(dev) ? "%llx.%x.%pOFn:%s" : "%llx.%x.%pOFn",
|
|
||||||
+ addr, ffs(mask) - 1, node, dev_name(dev));
|
|
||||||
+
|
|
||||||
+ else
|
|
||||||
+ dev_set_name(dev, dev_name(dev) ? "%llx.%pOFn:%s" : "%llx.%pOFn",
|
|
||||||
+ addr, node, dev_name(dev));
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* format arguments only used if dev_name() resolves to NULL */
|
|
||||||
+ dev_set_name(dev, dev_name(dev) ? "%s:%s" : "%s",
|
|
||||||
+ kbasename(node->full_name), dev_name(dev));
|
|
||||||
+ node = node->parent;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+EXPORT_SYMBOL_GPL(of_device_make_bus_id);
|
|
||||||
--- a/drivers/of/platform.c
|
|
||||||
+++ b/drivers/of/platform.c
|
|
||||||
@@ -98,46 +98,6 @@ static const struct of_device_id of_skip
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
- * of_device_make_bus_id - Use the device node data to assign a unique name
|
|
||||||
- * @dev: pointer to device structure that is linked to a device tree node
|
|
||||||
- *
|
|
||||||
- * This routine will first try using the translated bus address to
|
|
||||||
- * derive a unique name. If it cannot, then it will prepend names from
|
|
||||||
- * parent nodes until a unique name can be derived.
|
|
||||||
- */
|
|
||||||
-static void of_device_make_bus_id(struct device *dev)
|
|
||||||
-{
|
|
||||||
- struct device_node *node = dev->of_node;
|
|
||||||
- const __be32 *reg;
|
|
||||||
- u64 addr;
|
|
||||||
- u32 mask;
|
|
||||||
-
|
|
||||||
- /* Construct the name, using parent nodes if necessary to ensure uniqueness */
|
|
||||||
- while (node->parent) {
|
|
||||||
- /*
|
|
||||||
- * If the address can be translated, then that is as much
|
|
||||||
- * uniqueness as we need. Make it the first component and return
|
|
||||||
- */
|
|
||||||
- reg = of_get_property(node, "reg", NULL);
|
|
||||||
- if (reg && (addr = of_translate_address(node, reg)) != OF_BAD_ADDR) {
|
|
||||||
- if (!of_property_read_u32(node, "mask", &mask))
|
|
||||||
- dev_set_name(dev, dev_name(dev) ? "%llx.%x.%pOFn:%s" : "%llx.%x.%pOFn",
|
|
||||||
- addr, ffs(mask) - 1, node, dev_name(dev));
|
|
||||||
-
|
|
||||||
- else
|
|
||||||
- dev_set_name(dev, dev_name(dev) ? "%llx.%pOFn:%s" : "%llx.%pOFn",
|
|
||||||
- addr, node, dev_name(dev));
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- /* format arguments only used if dev_name() resolves to NULL */
|
|
||||||
- dev_set_name(dev, dev_name(dev) ? "%s:%s" : "%s",
|
|
||||||
- kbasename(node->full_name), dev_name(dev));
|
|
||||||
- node = node->parent;
|
|
||||||
- }
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-/**
|
|
||||||
* of_device_alloc - Allocate and initialize an of_device
|
|
||||||
* @np: device node to assign to device
|
|
||||||
* @bus_id: Name to assign to the device. May be null to use default name.
|
|
||||||
--- a/include/linux/of_device.h
|
|
||||||
+++ b/include/linux/of_device.h
|
|
||||||
@@ -40,6 +40,9 @@ static inline int of_dma_configure(struc
|
|
||||||
{
|
|
||||||
return of_dma_configure_id(dev, np, force_dma, NULL);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+void of_device_make_bus_id(struct device *dev);
|
|
||||||
+
|
|
||||||
#else /* CONFIG_OF */
|
|
||||||
|
|
||||||
static inline int of_driver_match_device(struct device *dev,
|
|
||||||
@@ -82,6 +85,9 @@ static inline int of_dma_configure(struc
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+static inline void of_device_make_bus_id(struct device *dev) {}
|
|
||||||
+
|
|
||||||
#endif /* CONFIG_OF */
|
|
||||||
|
|
||||||
#endif /* _LINUX_OF_DEVICE_H */
|
|
|
@ -1,95 +0,0 @@
|
||||||
From 4a1a40233b4a9fc159a5c7a27dc34c5c7bc5be55 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Date: Fri, 15 Dec 2023 11:15:28 +0000
|
|
||||||
Subject: [PATCH] nvmem: Move of_nvmem_layout_get_container() in another header
|
|
||||||
|
|
||||||
nvmem-consumer.h is included by consumer devices, extracting data from
|
|
||||||
NVMEM devices whereas nvmem-provider.h is included by devices providing
|
|
||||||
NVMEM content.
|
|
||||||
|
|
||||||
The only users of of_nvmem_layout_get_container() outside of the core
|
|
||||||
are layout drivers, so better move its prototype to nvmem-provider.h.
|
|
||||||
|
|
||||||
While we do so, we also move the kdoc associated with the function to
|
|
||||||
the header rather than the .c file.
|
|
||||||
|
|
||||||
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
||||||
Link: https://lore.kernel.org/r/20231215111536.316972-3-srinivas.kandagatla@linaro.org
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/nvmem/core.c | 8 --------
|
|
||||||
include/linux/nvmem-consumer.h | 7 -------
|
|
||||||
include/linux/nvmem-provider.h | 21 +++++++++++++++++++++
|
|
||||||
3 files changed, 21 insertions(+), 15 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/core.c
|
|
||||||
+++ b/drivers/nvmem/core.c
|
|
||||||
@@ -847,14 +847,6 @@ static int nvmem_add_cells_from_layout(s
|
|
||||||
}
|
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_OF)
|
|
||||||
-/**
|
|
||||||
- * of_nvmem_layout_get_container() - Get OF node to layout container.
|
|
||||||
- *
|
|
||||||
- * @nvmem: nvmem device.
|
|
||||||
- *
|
|
||||||
- * Return: a node pointer with refcount incremented or NULL if no
|
|
||||||
- * container exists. Use of_node_put() on it when done.
|
|
||||||
- */
|
|
||||||
struct device_node *of_nvmem_layout_get_container(struct nvmem_device *nvmem)
|
|
||||||
{
|
|
||||||
return of_get_child_by_name(nvmem->dev.of_node, "nvmem-layout");
|
|
||||||
--- a/include/linux/nvmem-consumer.h
|
|
||||||
+++ b/include/linux/nvmem-consumer.h
|
|
||||||
@@ -241,7 +241,6 @@ struct nvmem_cell *of_nvmem_cell_get(str
|
|
||||||
const char *id);
|
|
||||||
struct nvmem_device *of_nvmem_device_get(struct device_node *np,
|
|
||||||
const char *name);
|
|
||||||
-struct device_node *of_nvmem_layout_get_container(struct nvmem_device *nvmem);
|
|
||||||
#else
|
|
||||||
static inline struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,
|
|
||||||
const char *id)
|
|
||||||
@@ -254,12 +253,6 @@ static inline struct nvmem_device *of_nv
|
|
||||||
{
|
|
||||||
return ERR_PTR(-EOPNOTSUPP);
|
|
||||||
}
|
|
||||||
-
|
|
||||||
-static inline struct device_node *
|
|
||||||
-of_nvmem_layout_get_container(struct nvmem_device *nvmem)
|
|
||||||
-{
|
|
||||||
- return NULL;
|
|
||||||
-}
|
|
||||||
#endif /* CONFIG_NVMEM && CONFIG_OF */
|
|
||||||
|
|
||||||
#endif /* ifndef _LINUX_NVMEM_CONSUMER_H */
|
|
||||||
--- a/include/linux/nvmem-provider.h
|
|
||||||
+++ b/include/linux/nvmem-provider.h
|
|
||||||
@@ -244,6 +244,27 @@ nvmem_layout_get_match_data(struct nvmem
|
|
||||||
|
|
||||||
#endif /* CONFIG_NVMEM */
|
|
||||||
|
|
||||||
+#if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF)
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ * of_nvmem_layout_get_container() - Get OF node of layout container
|
|
||||||
+ *
|
|
||||||
+ * @nvmem: nvmem device
|
|
||||||
+ *
|
|
||||||
+ * Return: a node pointer with refcount incremented or NULL if no
|
|
||||||
+ * container exists. Use of_node_put() on it when done.
|
|
||||||
+ */
|
|
||||||
+struct device_node *of_nvmem_layout_get_container(struct nvmem_device *nvmem);
|
|
||||||
+
|
|
||||||
+#else /* CONFIG_NVMEM && CONFIG_OF */
|
|
||||||
+
|
|
||||||
+static inline struct device_node *of_nvmem_layout_get_container(struct nvmem_device *nvmem)
|
|
||||||
+{
|
|
||||||
+ return NULL;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#endif /* CONFIG_NVMEM && CONFIG_OF */
|
|
||||||
+
|
|
||||||
#define module_nvmem_layout_driver(__layout_driver) \
|
|
||||||
module_driver(__layout_driver, nvmem_layout_register, \
|
|
||||||
nvmem_layout_unregister)
|
|
|
@ -1,91 +0,0 @@
|
||||||
From ec9c08a1cb8dc5e8e003f95f5f62de41dde235bb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Date: Fri, 15 Dec 2023 11:15:29 +0000
|
|
||||||
Subject: [PATCH] nvmem: Create a header for internal sharing
|
|
||||||
|
|
||||||
Before adding all the NVMEM layout bus infrastructure to the core, let's
|
|
||||||
move the main nvmem_device structure in an internal header, only
|
|
||||||
available to the core. This way all the additional code can be added in
|
|
||||||
a dedicated file in order to keep the current core file tidy.
|
|
||||||
|
|
||||||
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
||||||
Link: https://lore.kernel.org/r/20231215111536.316972-4-srinivas.kandagatla@linaro.org
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/nvmem/core.c | 24 +-----------------------
|
|
||||||
drivers/nvmem/internals.h | 35 +++++++++++++++++++++++++++++++++++
|
|
||||||
2 files changed, 36 insertions(+), 23 deletions(-)
|
|
||||||
create mode 100644 drivers/nvmem/internals.h
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/core.c
|
|
||||||
+++ b/drivers/nvmem/core.c
|
|
||||||
@@ -19,29 +19,7 @@
|
|
||||||
#include <linux/of.h>
|
|
||||||
#include <linux/slab.h>
|
|
||||||
|
|
||||||
-struct nvmem_device {
|
|
||||||
- struct module *owner;
|
|
||||||
- struct device dev;
|
|
||||||
- int stride;
|
|
||||||
- int word_size;
|
|
||||||
- int id;
|
|
||||||
- struct kref refcnt;
|
|
||||||
- size_t size;
|
|
||||||
- bool read_only;
|
|
||||||
- bool root_only;
|
|
||||||
- int flags;
|
|
||||||
- enum nvmem_type type;
|
|
||||||
- struct bin_attribute eeprom;
|
|
||||||
- struct device *base_dev;
|
|
||||||
- struct list_head cells;
|
|
||||||
- const struct nvmem_keepout *keepout;
|
|
||||||
- unsigned int nkeepout;
|
|
||||||
- nvmem_reg_read_t reg_read;
|
|
||||||
- nvmem_reg_write_t reg_write;
|
|
||||||
- struct gpio_desc *wp_gpio;
|
|
||||||
- struct nvmem_layout *layout;
|
|
||||||
- void *priv;
|
|
||||||
-};
|
|
||||||
+#include "internals.h"
|
|
||||||
|
|
||||||
#define to_nvmem_device(d) container_of(d, struct nvmem_device, dev)
|
|
||||||
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/drivers/nvmem/internals.h
|
|
||||||
@@ -0,0 +1,35 @@
|
|
||||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
|
||||||
+
|
|
||||||
+#ifndef _LINUX_NVMEM_INTERNALS_H
|
|
||||||
+#define _LINUX_NVMEM_INTERNALS_H
|
|
||||||
+
|
|
||||||
+#include <linux/device.h>
|
|
||||||
+#include <linux/nvmem-consumer.h>
|
|
||||||
+#include <linux/nvmem-provider.h>
|
|
||||||
+
|
|
||||||
+struct nvmem_device {
|
|
||||||
+ struct module *owner;
|
|
||||||
+ struct device dev;
|
|
||||||
+ struct list_head node;
|
|
||||||
+ int stride;
|
|
||||||
+ int word_size;
|
|
||||||
+ int id;
|
|
||||||
+ struct kref refcnt;
|
|
||||||
+ size_t size;
|
|
||||||
+ bool read_only;
|
|
||||||
+ bool root_only;
|
|
||||||
+ int flags;
|
|
||||||
+ enum nvmem_type type;
|
|
||||||
+ struct bin_attribute eeprom;
|
|
||||||
+ struct device *base_dev;
|
|
||||||
+ struct list_head cells;
|
|
||||||
+ const struct nvmem_keepout *keepout;
|
|
||||||
+ unsigned int nkeepout;
|
|
||||||
+ nvmem_reg_read_t reg_read;
|
|
||||||
+ nvmem_reg_write_t reg_write;
|
|
||||||
+ struct gpio_desc *wp_gpio;
|
|
||||||
+ struct nvmem_layout *layout;
|
|
||||||
+ void *priv;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+#endif /* ifndef _LINUX_NVMEM_INTERNALS_H */
|
|
|
@ -1,79 +0,0 @@
|
||||||
From 1b7c298a4ecbc28cc6ee94005734bff55eb83d22 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Date: Fri, 15 Dec 2023 11:15:30 +0000
|
|
||||||
Subject: [PATCH] nvmem: Simplify the ->add_cells() hook
|
|
||||||
|
|
||||||
The layout entry is not used and will anyway be made useless by the new
|
|
||||||
layout bus infrastructure coming next, so drop it. While at it, clarify
|
|
||||||
the kdoc entry.
|
|
||||||
|
|
||||||
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
||||||
Link: https://lore.kernel.org/r/20231215111536.316972-5-srinivas.kandagatla@linaro.org
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/nvmem/core.c | 2 +-
|
|
||||||
drivers/nvmem/layouts/onie-tlv.c | 3 +--
|
|
||||||
drivers/nvmem/layouts/sl28vpd.c | 3 +--
|
|
||||||
include/linux/nvmem-provider.h | 8 +++-----
|
|
||||||
4 files changed, 6 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/core.c
|
|
||||||
+++ b/drivers/nvmem/core.c
|
|
||||||
@@ -816,7 +816,7 @@ static int nvmem_add_cells_from_layout(s
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
if (layout && layout->add_cells) {
|
|
||||||
- ret = layout->add_cells(&nvmem->dev, nvmem, layout);
|
|
||||||
+ ret = layout->add_cells(&nvmem->dev, nvmem);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
--- a/drivers/nvmem/layouts/onie-tlv.c
|
|
||||||
+++ b/drivers/nvmem/layouts/onie-tlv.c
|
|
||||||
@@ -182,8 +182,7 @@ static bool onie_tlv_crc_is_valid(struct
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int onie_tlv_parse_table(struct device *dev, struct nvmem_device *nvmem,
|
|
||||||
- struct nvmem_layout *layout)
|
|
||||||
+static int onie_tlv_parse_table(struct device *dev, struct nvmem_device *nvmem)
|
|
||||||
{
|
|
||||||
struct onie_tlv_hdr hdr;
|
|
||||||
size_t table_len, data_len, hdr_len;
|
|
||||||
--- a/drivers/nvmem/layouts/sl28vpd.c
|
|
||||||
+++ b/drivers/nvmem/layouts/sl28vpd.c
|
|
||||||
@@ -80,8 +80,7 @@ static int sl28vpd_v1_check_crc(struct d
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int sl28vpd_add_cells(struct device *dev, struct nvmem_device *nvmem,
|
|
||||||
- struct nvmem_layout *layout)
|
|
||||||
+static int sl28vpd_add_cells(struct device *dev, struct nvmem_device *nvmem)
|
|
||||||
{
|
|
||||||
const struct nvmem_cell_info *pinfo;
|
|
||||||
struct nvmem_cell_info info = {0};
|
|
||||||
--- a/include/linux/nvmem-provider.h
|
|
||||||
+++ b/include/linux/nvmem-provider.h
|
|
||||||
@@ -156,9 +156,8 @@ struct nvmem_cell_table {
|
|
||||||
*
|
|
||||||
* @name: Layout name.
|
|
||||||
* @of_match_table: Open firmware match table.
|
|
||||||
- * @add_cells: Will be called if a nvmem device is found which
|
|
||||||
- * has this layout. The function will add layout
|
|
||||||
- * specific cells with nvmem_add_one_cell().
|
|
||||||
+ * @add_cells: Called to populate the layout using
|
|
||||||
+ * nvmem_add_one_cell().
|
|
||||||
* @fixup_cell_info: Will be called before a cell is added. Can be
|
|
||||||
* used to modify the nvmem_cell_info.
|
|
||||||
* @owner: Pointer to struct module.
|
|
||||||
@@ -172,8 +171,7 @@ struct nvmem_cell_table {
|
|
||||||
struct nvmem_layout {
|
|
||||||
const char *name;
|
|
||||||
const struct of_device_id *of_match_table;
|
|
||||||
- int (*add_cells)(struct device *dev, struct nvmem_device *nvmem,
|
|
||||||
- struct nvmem_layout *layout);
|
|
||||||
+ int (*add_cells)(struct device *dev, struct nvmem_device *nvmem);
|
|
||||||
void (*fixup_cell_info)(struct nvmem_device *nvmem,
|
|
||||||
struct nvmem_layout *layout,
|
|
||||||
struct nvmem_cell_info *cell);
|
|
|
@ -1,169 +0,0 @@
|
||||||
From 1172460e716784ac7e1049a537bdca8edbf97360 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Date: Fri, 15 Dec 2023 11:15:31 +0000
|
|
||||||
Subject: [PATCH] nvmem: Move and rename ->fixup_cell_info()
|
|
||||||
|
|
||||||
This hook is meant to be used by any provider and instantiating a layout
|
|
||||||
just for this is useless. Let's instead move this hook to the nvmem
|
|
||||||
device and add it to the config structure to be easily shared by the
|
|
||||||
providers.
|
|
||||||
|
|
||||||
While at moving this hook, rename it ->fixup_dt_cell_info() to clarify
|
|
||||||
its main intended purpose.
|
|
||||||
|
|
||||||
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
||||||
Link: https://lore.kernel.org/r/20231215111536.316972-6-srinivas.kandagatla@linaro.org
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/nvmem/core.c | 6 +++---
|
|
||||||
drivers/nvmem/imx-ocotp.c | 11 +++--------
|
|
||||||
drivers/nvmem/internals.h | 2 ++
|
|
||||||
drivers/nvmem/mtk-efuse.c | 11 +++--------
|
|
||||||
include/linux/nvmem-provider.h | 9 ++++-----
|
|
||||||
5 files changed, 15 insertions(+), 24 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/core.c
|
|
||||||
+++ b/drivers/nvmem/core.c
|
|
||||||
@@ -675,7 +675,6 @@ static int nvmem_validate_keepouts(struc
|
|
||||||
|
|
||||||
static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np)
|
|
||||||
{
|
|
||||||
- struct nvmem_layout *layout = nvmem->layout;
|
|
||||||
struct device *dev = &nvmem->dev;
|
|
||||||
struct device_node *child;
|
|
||||||
const __be32 *addr;
|
|
||||||
@@ -705,8 +704,8 @@ static int nvmem_add_cells_from_dt(struc
|
|
||||||
|
|
||||||
info.np = of_node_get(child);
|
|
||||||
|
|
||||||
- if (layout && layout->fixup_cell_info)
|
|
||||||
- layout->fixup_cell_info(nvmem, layout, &info);
|
|
||||||
+ if (nvmem->fixup_dt_cell_info)
|
|
||||||
+ nvmem->fixup_dt_cell_info(nvmem, &info);
|
|
||||||
|
|
||||||
ret = nvmem_add_one_cell(nvmem, &info);
|
|
||||||
kfree(info.name);
|
|
||||||
@@ -895,6 +894,7 @@ struct nvmem_device *nvmem_register(cons
|
|
||||||
|
|
||||||
kref_init(&nvmem->refcnt);
|
|
||||||
INIT_LIST_HEAD(&nvmem->cells);
|
|
||||||
+ nvmem->fixup_dt_cell_info = config->fixup_dt_cell_info;
|
|
||||||
|
|
||||||
nvmem->owner = config->owner;
|
|
||||||
if (!nvmem->owner && config->dev->driver)
|
|
||||||
--- a/drivers/nvmem/imx-ocotp.c
|
|
||||||
+++ b/drivers/nvmem/imx-ocotp.c
|
|
||||||
@@ -583,17 +583,12 @@ static const struct of_device_id imx_oco
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(of, imx_ocotp_dt_ids);
|
|
||||||
|
|
||||||
-static void imx_ocotp_fixup_cell_info(struct nvmem_device *nvmem,
|
|
||||||
- struct nvmem_layout *layout,
|
|
||||||
- struct nvmem_cell_info *cell)
|
|
||||||
+static void imx_ocotp_fixup_dt_cell_info(struct nvmem_device *nvmem,
|
|
||||||
+ struct nvmem_cell_info *cell)
|
|
||||||
{
|
|
||||||
cell->read_post_process = imx_ocotp_cell_pp;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static struct nvmem_layout imx_ocotp_layout = {
|
|
||||||
- .fixup_cell_info = imx_ocotp_fixup_cell_info,
|
|
||||||
-};
|
|
||||||
-
|
|
||||||
static int imx_ocotp_probe(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct device *dev = &pdev->dev;
|
|
||||||
@@ -619,7 +614,7 @@ static int imx_ocotp_probe(struct platfo
|
|
||||||
imx_ocotp_nvmem_config.size = 4 * priv->params->nregs;
|
|
||||||
imx_ocotp_nvmem_config.dev = dev;
|
|
||||||
imx_ocotp_nvmem_config.priv = priv;
|
|
||||||
- imx_ocotp_nvmem_config.layout = &imx_ocotp_layout;
|
|
||||||
+ imx_ocotp_nvmem_config.fixup_dt_cell_info = &imx_ocotp_fixup_dt_cell_info;
|
|
||||||
|
|
||||||
priv->config = &imx_ocotp_nvmem_config;
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/internals.h
|
|
||||||
+++ b/drivers/nvmem/internals.h
|
|
||||||
@@ -23,6 +23,8 @@ struct nvmem_device {
|
|
||||||
struct bin_attribute eeprom;
|
|
||||||
struct device *base_dev;
|
|
||||||
struct list_head cells;
|
|
||||||
+ void (*fixup_dt_cell_info)(struct nvmem_device *nvmem,
|
|
||||||
+ struct nvmem_cell_info *cell);
|
|
||||||
const struct nvmem_keepout *keepout;
|
|
||||||
unsigned int nkeepout;
|
|
||||||
nvmem_reg_read_t reg_read;
|
|
||||||
--- a/drivers/nvmem/mtk-efuse.c
|
|
||||||
+++ b/drivers/nvmem/mtk-efuse.c
|
|
||||||
@@ -45,9 +45,8 @@ static int mtk_efuse_gpu_speedbin_pp(voi
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void mtk_efuse_fixup_cell_info(struct nvmem_device *nvmem,
|
|
||||||
- struct nvmem_layout *layout,
|
|
||||||
- struct nvmem_cell_info *cell)
|
|
||||||
+static void mtk_efuse_fixup_dt_cell_info(struct nvmem_device *nvmem,
|
|
||||||
+ struct nvmem_cell_info *cell)
|
|
||||||
{
|
|
||||||
size_t sz = strlen(cell->name);
|
|
||||||
|
|
||||||
@@ -61,10 +60,6 @@ static void mtk_efuse_fixup_cell_info(st
|
|
||||||
cell->read_post_process = mtk_efuse_gpu_speedbin_pp;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static struct nvmem_layout mtk_efuse_layout = {
|
|
||||||
- .fixup_cell_info = mtk_efuse_fixup_cell_info,
|
|
||||||
-};
|
|
||||||
-
|
|
||||||
static int mtk_efuse_probe(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct device *dev = &pdev->dev;
|
|
||||||
@@ -91,7 +86,7 @@ static int mtk_efuse_probe(struct platfo
|
|
||||||
econfig.priv = priv;
|
|
||||||
econfig.dev = dev;
|
|
||||||
if (pdata->uses_post_processing)
|
|
||||||
- econfig.layout = &mtk_efuse_layout;
|
|
||||||
+ econfig.fixup_dt_cell_info = &mtk_efuse_fixup_dt_cell_info;
|
|
||||||
nvmem = devm_nvmem_register(dev, &econfig);
|
|
||||||
|
|
||||||
return PTR_ERR_OR_ZERO(nvmem);
|
|
||||||
--- a/include/linux/nvmem-provider.h
|
|
||||||
+++ b/include/linux/nvmem-provider.h
|
|
||||||
@@ -83,6 +83,8 @@ struct nvmem_cell_info {
|
|
||||||
* @cells: Optional array of pre-defined NVMEM cells.
|
|
||||||
* @ncells: Number of elements in cells.
|
|
||||||
* @add_legacy_fixed_of_cells: Read fixed NVMEM cells from old OF syntax.
|
|
||||||
+ * @fixup_dt_cell_info: Will be called before a cell is added. Can be
|
|
||||||
+ * used to modify the nvmem_cell_info.
|
|
||||||
* @keepout: Optional array of keepout ranges (sorted ascending by start).
|
|
||||||
* @nkeepout: Number of elements in the keepout array.
|
|
||||||
* @type: Type of the nvmem storage
|
|
||||||
@@ -113,6 +115,8 @@ struct nvmem_config {
|
|
||||||
const struct nvmem_cell_info *cells;
|
|
||||||
int ncells;
|
|
||||||
bool add_legacy_fixed_of_cells;
|
|
||||||
+ void (*fixup_dt_cell_info)(struct nvmem_device *nvmem,
|
|
||||||
+ struct nvmem_cell_info *cell);
|
|
||||||
const struct nvmem_keepout *keepout;
|
|
||||||
unsigned int nkeepout;
|
|
||||||
enum nvmem_type type;
|
|
||||||
@@ -158,8 +162,6 @@ struct nvmem_cell_table {
|
|
||||||
* @of_match_table: Open firmware match table.
|
|
||||||
* @add_cells: Called to populate the layout using
|
|
||||||
* nvmem_add_one_cell().
|
|
||||||
- * @fixup_cell_info: Will be called before a cell is added. Can be
|
|
||||||
- * used to modify the nvmem_cell_info.
|
|
||||||
* @owner: Pointer to struct module.
|
|
||||||
* @node: List node.
|
|
||||||
*
|
|
||||||
@@ -172,9 +174,6 @@ struct nvmem_layout {
|
|
||||||
const char *name;
|
|
||||||
const struct of_device_id *of_match_table;
|
|
||||||
int (*add_cells)(struct device *dev, struct nvmem_device *nvmem);
|
|
||||||
- void (*fixup_cell_info)(struct nvmem_device *nvmem,
|
|
||||||
- struct nvmem_layout *layout,
|
|
||||||
- struct nvmem_cell_info *cell);
|
|
||||||
|
|
||||||
/* private */
|
|
||||||
struct module *owner;
|
|
|
@ -1,763 +0,0 @@
|
||||||
From fc29fd821d9ac2ae3d32a722fac39ce874efb883 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Date: Fri, 15 Dec 2023 11:15:32 +0000
|
|
||||||
Subject: [PATCH] nvmem: core: Rework layouts to become regular devices
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Current layout support was initially written without modules support in
|
|
||||||
mind. When the requirement for module support rose, the existing base
|
|
||||||
was improved to adopt modularization support, but kind of a design flaw
|
|
||||||
was introduced. With the existing implementation, when a storage device
|
|
||||||
registers into NVMEM, the core tries to hook a layout (if any) and
|
|
||||||
populates its cells immediately. This means, if the hardware description
|
|
||||||
expects a layout to be hooked up, but no driver was provided for that,
|
|
||||||
the storage medium will fail to probe and try later from
|
|
||||||
scratch. Even if we consider that the hardware description shall be
|
|
||||||
correct, we could still probe the storage device (especially if it
|
|
||||||
contains the rootfs).
|
|
||||||
|
|
||||||
One way to overcome this situation is to consider the layouts as
|
|
||||||
devices, and leverage the native notifier mechanism. When a new NVMEM
|
|
||||||
device is registered, we can populate its nvmem-layout child, if any,
|
|
||||||
and wait for the matching to be done in order to get the cells (the
|
|
||||||
waiting can be easily done with the NVMEM notifiers). If the layout
|
|
||||||
driver is compiled as a module, it should automatically be loaded. This
|
|
||||||
way, there is no strong order to enforce, any NVMEM device creation
|
|
||||||
or NVMEM layout driver insertion will be observed as a new event which
|
|
||||||
may lead to the creation of additional cells, without disturbing the
|
|
||||||
probes with costly (and sometimes endless) deferrals.
|
|
||||||
|
|
||||||
In order to achieve that goal we create a new bus for the nvmem-layouts
|
|
||||||
with minimal logic to match nvmem-layout devices with nvmem-layout
|
|
||||||
drivers. All this infrastructure code is created in the layouts.c file.
|
|
||||||
|
|
||||||
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Tested-by: Rafał Miłecki <rafal@milecki.pl>
|
|
||||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
||||||
Link: https://lore.kernel.org/r/20231215111536.316972-7-srinivas.kandagatla@linaro.org
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/nvmem/Kconfig | 1 +
|
|
||||||
drivers/nvmem/Makefile | 2 +
|
|
||||||
drivers/nvmem/core.c | 170 ++++++++++----------------
|
|
||||||
drivers/nvmem/internals.h | 21 ++++
|
|
||||||
drivers/nvmem/layouts.c | 201 +++++++++++++++++++++++++++++++
|
|
||||||
drivers/nvmem/layouts/Kconfig | 8 ++
|
|
||||||
drivers/nvmem/layouts/onie-tlv.c | 24 +++-
|
|
||||||
drivers/nvmem/layouts/sl28vpd.c | 24 +++-
|
|
||||||
include/linux/nvmem-provider.h | 38 +++---
|
|
||||||
9 files changed, 354 insertions(+), 135 deletions(-)
|
|
||||||
create mode 100644 drivers/nvmem/layouts.c
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/Kconfig
|
|
||||||
+++ b/drivers/nvmem/Kconfig
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
|
||||||
menuconfig NVMEM
|
|
||||||
bool "NVMEM Support"
|
|
||||||
+ imply NVMEM_LAYOUTS
|
|
||||||
help
|
|
||||||
Support for NVMEM(Non Volatile Memory) devices like EEPROM, EFUSES...
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/Makefile
|
|
||||||
+++ b/drivers/nvmem/Makefile
|
|
||||||
@@ -5,6 +5,8 @@
|
|
||||||
|
|
||||||
obj-$(CONFIG_NVMEM) += nvmem_core.o
|
|
||||||
nvmem_core-y := core.o
|
|
||||||
+obj-$(CONFIG_NVMEM_LAYOUTS) += nvmem_layouts.o
|
|
||||||
+nvmem_layouts-y := layouts.o
|
|
||||||
obj-y += layouts/
|
|
||||||
|
|
||||||
# Devices
|
|
||||||
--- a/drivers/nvmem/core.c
|
|
||||||
+++ b/drivers/nvmem/core.c
|
|
||||||
@@ -55,9 +55,6 @@ static LIST_HEAD(nvmem_lookup_list);
|
|
||||||
|
|
||||||
static BLOCKING_NOTIFIER_HEAD(nvmem_notifier);
|
|
||||||
|
|
||||||
-static DEFINE_SPINLOCK(nvmem_layout_lock);
|
|
||||||
-static LIST_HEAD(nvmem_layouts);
|
|
||||||
-
|
|
||||||
static int __nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset,
|
|
||||||
void *val, size_t bytes)
|
|
||||||
{
|
|
||||||
@@ -740,97 +737,22 @@ static int nvmem_add_cells_from_fixed_la
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
-int __nvmem_layout_register(struct nvmem_layout *layout, struct module *owner)
|
|
||||||
+int nvmem_layout_register(struct nvmem_layout *layout)
|
|
||||||
{
|
|
||||||
- layout->owner = owner;
|
|
||||||
-
|
|
||||||
- spin_lock(&nvmem_layout_lock);
|
|
||||||
- list_add(&layout->node, &nvmem_layouts);
|
|
||||||
- spin_unlock(&nvmem_layout_lock);
|
|
||||||
-
|
|
||||||
- blocking_notifier_call_chain(&nvmem_notifier, NVMEM_LAYOUT_ADD, layout);
|
|
||||||
+ if (!layout->add_cells)
|
|
||||||
+ return -EINVAL;
|
|
||||||
|
|
||||||
- return 0;
|
|
||||||
+ /* Populate the cells */
|
|
||||||
+ return layout->add_cells(&layout->nvmem->dev, layout->nvmem);
|
|
||||||
}
|
|
||||||
-EXPORT_SYMBOL_GPL(__nvmem_layout_register);
|
|
||||||
+EXPORT_SYMBOL_GPL(nvmem_layout_register);
|
|
||||||
|
|
||||||
void nvmem_layout_unregister(struct nvmem_layout *layout)
|
|
||||||
{
|
|
||||||
- blocking_notifier_call_chain(&nvmem_notifier, NVMEM_LAYOUT_REMOVE, layout);
|
|
||||||
-
|
|
||||||
- spin_lock(&nvmem_layout_lock);
|
|
||||||
- list_del(&layout->node);
|
|
||||||
- spin_unlock(&nvmem_layout_lock);
|
|
||||||
+ /* Keep the API even with an empty stub in case we need it later */
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(nvmem_layout_unregister);
|
|
||||||
|
|
||||||
-static struct nvmem_layout *nvmem_layout_get(struct nvmem_device *nvmem)
|
|
||||||
-{
|
|
||||||
- struct device_node *layout_np;
|
|
||||||
- struct nvmem_layout *l, *layout = ERR_PTR(-EPROBE_DEFER);
|
|
||||||
-
|
|
||||||
- layout_np = of_nvmem_layout_get_container(nvmem);
|
|
||||||
- if (!layout_np)
|
|
||||||
- return NULL;
|
|
||||||
-
|
|
||||||
- /* Fixed layouts don't have a matching driver */
|
|
||||||
- if (of_device_is_compatible(layout_np, "fixed-layout")) {
|
|
||||||
- of_node_put(layout_np);
|
|
||||||
- return NULL;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * In case the nvmem device was built-in while the layout was built as a
|
|
||||||
- * module, we shall manually request the layout driver loading otherwise
|
|
||||||
- * we'll never have any match.
|
|
||||||
- */
|
|
||||||
- of_request_module(layout_np);
|
|
||||||
-
|
|
||||||
- spin_lock(&nvmem_layout_lock);
|
|
||||||
-
|
|
||||||
- list_for_each_entry(l, &nvmem_layouts, node) {
|
|
||||||
- if (of_match_node(l->of_match_table, layout_np)) {
|
|
||||||
- if (try_module_get(l->owner))
|
|
||||||
- layout = l;
|
|
||||||
-
|
|
||||||
- break;
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- spin_unlock(&nvmem_layout_lock);
|
|
||||||
- of_node_put(layout_np);
|
|
||||||
-
|
|
||||||
- return layout;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-static void nvmem_layout_put(struct nvmem_layout *layout)
|
|
||||||
-{
|
|
||||||
- if (layout)
|
|
||||||
- module_put(layout->owner);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-static int nvmem_add_cells_from_layout(struct nvmem_device *nvmem)
|
|
||||||
-{
|
|
||||||
- struct nvmem_layout *layout = nvmem->layout;
|
|
||||||
- int ret;
|
|
||||||
-
|
|
||||||
- if (layout && layout->add_cells) {
|
|
||||||
- ret = layout->add_cells(&nvmem->dev, nvmem);
|
|
||||||
- if (ret)
|
|
||||||
- return ret;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- return 0;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-#if IS_ENABLED(CONFIG_OF)
|
|
||||||
-struct device_node *of_nvmem_layout_get_container(struct nvmem_device *nvmem)
|
|
||||||
-{
|
|
||||||
- return of_get_child_by_name(nvmem->dev.of_node, "nvmem-layout");
|
|
||||||
-}
|
|
||||||
-EXPORT_SYMBOL_GPL(of_nvmem_layout_get_container);
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem,
|
|
||||||
struct nvmem_layout *layout)
|
|
||||||
{
|
|
||||||
@@ -838,7 +760,7 @@ const void *nvmem_layout_get_match_data(
|
|
||||||
const struct of_device_id *match;
|
|
||||||
|
|
||||||
layout_np = of_nvmem_layout_get_container(nvmem);
|
|
||||||
- match = of_match_node(layout->of_match_table, layout_np);
|
|
||||||
+ match = of_match_node(layout->dev.driver->of_match_table, layout_np);
|
|
||||||
|
|
||||||
return match ? match->data : NULL;
|
|
||||||
}
|
|
||||||
@@ -950,19 +872,6 @@ struct nvmem_device *nvmem_register(cons
|
|
||||||
goto err_put_device;
|
|
||||||
}
|
|
||||||
|
|
||||||
- /*
|
|
||||||
- * If the driver supplied a layout by config->layout, the module
|
|
||||||
- * pointer will be NULL and nvmem_layout_put() will be a noop.
|
|
||||||
- */
|
|
||||||
- nvmem->layout = config->layout ?: nvmem_layout_get(nvmem);
|
|
||||||
- if (IS_ERR(nvmem->layout)) {
|
|
||||||
- rval = PTR_ERR(nvmem->layout);
|
|
||||||
- nvmem->layout = NULL;
|
|
||||||
-
|
|
||||||
- if (rval == -EPROBE_DEFER)
|
|
||||||
- goto err_teardown_compat;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
if (config->cells) {
|
|
||||||
rval = nvmem_add_cells(nvmem, config->cells, config->ncells);
|
|
||||||
if (rval)
|
|
||||||
@@ -983,24 +892,24 @@ struct nvmem_device *nvmem_register(cons
|
|
||||||
if (rval)
|
|
||||||
goto err_remove_cells;
|
|
||||||
|
|
||||||
- rval = nvmem_add_cells_from_layout(nvmem);
|
|
||||||
- if (rval)
|
|
||||||
- goto err_remove_cells;
|
|
||||||
-
|
|
||||||
dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);
|
|
||||||
|
|
||||||
rval = device_add(&nvmem->dev);
|
|
||||||
if (rval)
|
|
||||||
goto err_remove_cells;
|
|
||||||
|
|
||||||
+ rval = nvmem_populate_layout(nvmem);
|
|
||||||
+ if (rval)
|
|
||||||
+ goto err_remove_dev;
|
|
||||||
+
|
|
||||||
blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem);
|
|
||||||
|
|
||||||
return nvmem;
|
|
||||||
|
|
||||||
+err_remove_dev:
|
|
||||||
+ device_del(&nvmem->dev);
|
|
||||||
err_remove_cells:
|
|
||||||
nvmem_device_remove_all_cells(nvmem);
|
|
||||||
- nvmem_layout_put(nvmem->layout);
|
|
||||||
-err_teardown_compat:
|
|
||||||
if (config->compat)
|
|
||||||
nvmem_sysfs_remove_compat(nvmem, config);
|
|
||||||
err_put_device:
|
|
||||||
@@ -1022,7 +931,7 @@ static void nvmem_device_release(struct
|
|
||||||
device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom);
|
|
||||||
|
|
||||||
nvmem_device_remove_all_cells(nvmem);
|
|
||||||
- nvmem_layout_put(nvmem->layout);
|
|
||||||
+ nvmem_destroy_layout(nvmem);
|
|
||||||
device_unregister(&nvmem->dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1324,6 +1233,12 @@ nvmem_cell_get_from_lookup(struct device
|
|
||||||
return cell;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void nvmem_layout_module_put(struct nvmem_device *nvmem)
|
|
||||||
+{
|
|
||||||
+ if (nvmem->layout && nvmem->layout->dev.driver)
|
|
||||||
+ module_put(nvmem->layout->dev.driver->owner);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
#if IS_ENABLED(CONFIG_OF)
|
|
||||||
static struct nvmem_cell_entry *
|
|
||||||
nvmem_find_cell_entry_by_node(struct nvmem_device *nvmem, struct device_node *np)
|
|
||||||
@@ -1342,6 +1257,18 @@ nvmem_find_cell_entry_by_node(struct nvm
|
|
||||||
return cell;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int nvmem_layout_module_get_optional(struct nvmem_device *nvmem)
|
|
||||||
+{
|
|
||||||
+ if (!nvmem->layout)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ if (!nvmem->layout->dev.driver ||
|
|
||||||
+ !try_module_get(nvmem->layout->dev.driver->owner))
|
|
||||||
+ return -EPROBE_DEFER;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* of_nvmem_cell_get() - Get a nvmem cell from given device node and cell id
|
|
||||||
*
|
|
||||||
@@ -1404,16 +1331,29 @@ struct nvmem_cell *of_nvmem_cell_get(str
|
|
||||||
return ERR_CAST(nvmem);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ ret = nvmem_layout_module_get_optional(nvmem);
|
|
||||||
+ if (ret) {
|
|
||||||
+ of_node_put(cell_np);
|
|
||||||
+ __nvmem_device_put(nvmem);
|
|
||||||
+ return ERR_PTR(ret);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
cell_entry = nvmem_find_cell_entry_by_node(nvmem, cell_np);
|
|
||||||
of_node_put(cell_np);
|
|
||||||
if (!cell_entry) {
|
|
||||||
__nvmem_device_put(nvmem);
|
|
||||||
- return ERR_PTR(-ENOENT);
|
|
||||||
+ nvmem_layout_module_put(nvmem);
|
|
||||||
+ if (nvmem->layout)
|
|
||||||
+ return ERR_PTR(-EPROBE_DEFER);
|
|
||||||
+ else
|
|
||||||
+ return ERR_PTR(-ENOENT);
|
|
||||||
}
|
|
||||||
|
|
||||||
cell = nvmem_create_cell(cell_entry, id, cell_index);
|
|
||||||
- if (IS_ERR(cell))
|
|
||||||
+ if (IS_ERR(cell)) {
|
|
||||||
__nvmem_device_put(nvmem);
|
|
||||||
+ nvmem_layout_module_put(nvmem);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
return cell;
|
|
||||||
}
|
|
||||||
@@ -1527,6 +1467,7 @@ void nvmem_cell_put(struct nvmem_cell *c
|
|
||||||
|
|
||||||
kfree(cell);
|
|
||||||
__nvmem_device_put(nvmem);
|
|
||||||
+ nvmem_layout_module_put(nvmem);
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(nvmem_cell_put);
|
|
||||||
|
|
||||||
@@ -2104,11 +2045,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_name);
|
|
||||||
|
|
||||||
static int __init nvmem_init(void)
|
|
||||||
{
|
|
||||||
- return bus_register(&nvmem_bus_type);
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ ret = bus_register(&nvmem_bus_type);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+ ret = nvmem_layout_bus_register();
|
|
||||||
+ if (ret)
|
|
||||||
+ bus_unregister(&nvmem_bus_type);
|
|
||||||
+
|
|
||||||
+ return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __exit nvmem_exit(void)
|
|
||||||
{
|
|
||||||
+ nvmem_layout_bus_unregister();
|
|
||||||
bus_unregister(&nvmem_bus_type);
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/internals.h
|
|
||||||
+++ b/drivers/nvmem/internals.h
|
|
||||||
@@ -34,4 +34,25 @@ struct nvmem_device {
|
|
||||||
void *priv;
|
|
||||||
};
|
|
||||||
|
|
||||||
+#if IS_ENABLED(CONFIG_OF)
|
|
||||||
+int nvmem_layout_bus_register(void);
|
|
||||||
+void nvmem_layout_bus_unregister(void);
|
|
||||||
+int nvmem_populate_layout(struct nvmem_device *nvmem);
|
|
||||||
+void nvmem_destroy_layout(struct nvmem_device *nvmem);
|
|
||||||
+#else /* CONFIG_OF */
|
|
||||||
+static inline int nvmem_layout_bus_register(void)
|
|
||||||
+{
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static inline void nvmem_layout_bus_unregister(void) {}
|
|
||||||
+
|
|
||||||
+static inline int nvmem_populate_layout(struct nvmem_device *nvmem)
|
|
||||||
+{
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static inline void nvmem_destroy_layout(struct nvmem_device *nvmem) { }
|
|
||||||
+#endif /* CONFIG_OF */
|
|
||||||
+
|
|
||||||
#endif /* ifndef _LINUX_NVMEM_INTERNALS_H */
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/drivers/nvmem/layouts.c
|
|
||||||
@@ -0,0 +1,201 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0
|
|
||||||
+/*
|
|
||||||
+ * NVMEM layout bus handling
|
|
||||||
+ *
|
|
||||||
+ * Copyright (C) 2023 Bootlin
|
|
||||||
+ * Author: Miquel Raynal <miquel.raynal@bootlin.com
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include <linux/device.h>
|
|
||||||
+#include <linux/dma-mapping.h>
|
|
||||||
+#include <linux/nvmem-consumer.h>
|
|
||||||
+#include <linux/nvmem-provider.h>
|
|
||||||
+#include <linux/of.h>
|
|
||||||
+#include <linux/of_device.h>
|
|
||||||
+#include <linux/of_irq.h>
|
|
||||||
+
|
|
||||||
+#include "internals.h"
|
|
||||||
+
|
|
||||||
+#define to_nvmem_layout_driver(drv) \
|
|
||||||
+ (container_of((drv), struct nvmem_layout_driver, driver))
|
|
||||||
+#define to_nvmem_layout_device(_dev) \
|
|
||||||
+ container_of((_dev), struct nvmem_layout, dev)
|
|
||||||
+
|
|
||||||
+static int nvmem_layout_bus_match(struct device *dev, struct device_driver *drv)
|
|
||||||
+{
|
|
||||||
+ return of_driver_match_device(dev, drv);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int nvmem_layout_bus_probe(struct device *dev)
|
|
||||||
+{
|
|
||||||
+ struct nvmem_layout_driver *drv = to_nvmem_layout_driver(dev->driver);
|
|
||||||
+ struct nvmem_layout *layout = to_nvmem_layout_device(dev);
|
|
||||||
+
|
|
||||||
+ if (!drv->probe || !drv->remove)
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ return drv->probe(layout);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void nvmem_layout_bus_remove(struct device *dev)
|
|
||||||
+{
|
|
||||||
+ struct nvmem_layout_driver *drv = to_nvmem_layout_driver(dev->driver);
|
|
||||||
+ struct nvmem_layout *layout = to_nvmem_layout_device(dev);
|
|
||||||
+
|
|
||||||
+ return drv->remove(layout);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static struct bus_type nvmem_layout_bus_type = {
|
|
||||||
+ .name = "nvmem-layout",
|
|
||||||
+ .match = nvmem_layout_bus_match,
|
|
||||||
+ .probe = nvmem_layout_bus_probe,
|
|
||||||
+ .remove = nvmem_layout_bus_remove,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+int nvmem_layout_driver_register(struct nvmem_layout_driver *drv)
|
|
||||||
+{
|
|
||||||
+ drv->driver.bus = &nvmem_layout_bus_type;
|
|
||||||
+
|
|
||||||
+ return driver_register(&drv->driver);
|
|
||||||
+}
|
|
||||||
+EXPORT_SYMBOL_GPL(nvmem_layout_driver_register);
|
|
||||||
+
|
|
||||||
+void nvmem_layout_driver_unregister(struct nvmem_layout_driver *drv)
|
|
||||||
+{
|
|
||||||
+ driver_unregister(&drv->driver);
|
|
||||||
+}
|
|
||||||
+EXPORT_SYMBOL_GPL(nvmem_layout_driver_unregister);
|
|
||||||
+
|
|
||||||
+static void nvmem_layout_release_device(struct device *dev)
|
|
||||||
+{
|
|
||||||
+ struct nvmem_layout *layout = to_nvmem_layout_device(dev);
|
|
||||||
+
|
|
||||||
+ of_node_put(layout->dev.of_node);
|
|
||||||
+ kfree(layout);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int nvmem_layout_create_device(struct nvmem_device *nvmem,
|
|
||||||
+ struct device_node *np)
|
|
||||||
+{
|
|
||||||
+ struct nvmem_layout *layout;
|
|
||||||
+ struct device *dev;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ layout = kzalloc(sizeof(*layout), GFP_KERNEL);
|
|
||||||
+ if (!layout)
|
|
||||||
+ return -ENOMEM;
|
|
||||||
+
|
|
||||||
+ /* Create a bidirectional link */
|
|
||||||
+ layout->nvmem = nvmem;
|
|
||||||
+ nvmem->layout = layout;
|
|
||||||
+
|
|
||||||
+ /* Device model registration */
|
|
||||||
+ dev = &layout->dev;
|
|
||||||
+ device_initialize(dev);
|
|
||||||
+ dev->parent = &nvmem->dev;
|
|
||||||
+ dev->bus = &nvmem_layout_bus_type;
|
|
||||||
+ dev->release = nvmem_layout_release_device;
|
|
||||||
+ dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
|
||||||
+ dev->dma_mask = &dev->coherent_dma_mask;
|
|
||||||
+ device_set_node(dev, of_fwnode_handle(of_node_get(np)));
|
|
||||||
+ of_device_make_bus_id(dev);
|
|
||||||
+ of_msi_configure(dev, dev->of_node);
|
|
||||||
+
|
|
||||||
+ ret = device_add(dev);
|
|
||||||
+ if (ret) {
|
|
||||||
+ put_device(dev);
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static const struct of_device_id of_nvmem_layout_skip_table[] = {
|
|
||||||
+ { .compatible = "fixed-layout", },
|
|
||||||
+ {}
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static int nvmem_layout_bus_populate(struct nvmem_device *nvmem,
|
|
||||||
+ struct device_node *layout_dn)
|
|
||||||
+{
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ /* Make sure it has a compatible property */
|
|
||||||
+ if (!of_get_property(layout_dn, "compatible", NULL)) {
|
|
||||||
+ pr_debug("%s() - skipping %pOF, no compatible prop\n",
|
|
||||||
+ __func__, layout_dn);
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Fixed layouts are parsed manually somewhere else for now */
|
|
||||||
+ if (of_match_node(of_nvmem_layout_skip_table, layout_dn)) {
|
|
||||||
+ pr_debug("%s() - skipping %pOF node\n", __func__, layout_dn);
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (of_node_check_flag(layout_dn, OF_POPULATED_BUS)) {
|
|
||||||
+ pr_debug("%s() - skipping %pOF, already populated\n",
|
|
||||||
+ __func__, layout_dn);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* NVMEM layout buses expect only a single device representing the layout */
|
|
||||||
+ ret = nvmem_layout_create_device(nvmem, layout_dn);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+ of_node_set_flag(layout_dn, OF_POPULATED_BUS);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+struct device_node *of_nvmem_layout_get_container(struct nvmem_device *nvmem)
|
|
||||||
+{
|
|
||||||
+ return of_get_child_by_name(nvmem->dev.of_node, "nvmem-layout");
|
|
||||||
+}
|
|
||||||
+EXPORT_SYMBOL_GPL(of_nvmem_layout_get_container);
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Returns the number of devices populated, 0 if the operation was not relevant
|
|
||||||
+ * for this nvmem device, an error code otherwise.
|
|
||||||
+ */
|
|
||||||
+int nvmem_populate_layout(struct nvmem_device *nvmem)
|
|
||||||
+{
|
|
||||||
+ struct device_node *layout_dn;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ layout_dn = of_nvmem_layout_get_container(nvmem);
|
|
||||||
+ if (!layout_dn)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ /* Populate the layout device */
|
|
||||||
+ device_links_supplier_sync_state_pause();
|
|
||||||
+ ret = nvmem_layout_bus_populate(nvmem, layout_dn);
|
|
||||||
+ device_links_supplier_sync_state_resume();
|
|
||||||
+
|
|
||||||
+ of_node_put(layout_dn);
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void nvmem_destroy_layout(struct nvmem_device *nvmem)
|
|
||||||
+{
|
|
||||||
+ struct device *dev;
|
|
||||||
+
|
|
||||||
+ if (!nvmem->layout)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ dev = &nvmem->layout->dev;
|
|
||||||
+ of_node_clear_flag(dev->of_node, OF_POPULATED_BUS);
|
|
||||||
+ device_unregister(dev);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+int nvmem_layout_bus_register(void)
|
|
||||||
+{
|
|
||||||
+ return bus_register(&nvmem_layout_bus_type);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void nvmem_layout_bus_unregister(void)
|
|
||||||
+{
|
|
||||||
+ bus_unregister(&nvmem_layout_bus_type);
|
|
||||||
+}
|
|
||||||
--- a/drivers/nvmem/layouts/Kconfig
|
|
||||||
+++ b/drivers/nvmem/layouts/Kconfig
|
|
||||||
@@ -1,5 +1,11 @@
|
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
|
||||||
|
|
||||||
+config NVMEM_LAYOUTS
|
|
||||||
+ bool
|
|
||||||
+ depends on OF
|
|
||||||
+
|
|
||||||
+if NVMEM_LAYOUTS
|
|
||||||
+
|
|
||||||
menu "Layout Types"
|
|
||||||
|
|
||||||
config NVMEM_LAYOUT_SL28_VPD
|
|
||||||
@@ -21,3 +27,5 @@ config NVMEM_LAYOUT_ONIE_TLV
|
|
||||||
If unsure, say N.
|
|
||||||
|
|
||||||
endmenu
|
|
||||||
+
|
|
||||||
+endif
|
|
||||||
--- a/drivers/nvmem/layouts/onie-tlv.c
|
|
||||||
+++ b/drivers/nvmem/layouts/onie-tlv.c
|
|
||||||
@@ -225,16 +225,32 @@ static int onie_tlv_parse_table(struct d
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int onie_tlv_probe(struct nvmem_layout *layout)
|
|
||||||
+{
|
|
||||||
+ layout->add_cells = onie_tlv_parse_table;
|
|
||||||
+
|
|
||||||
+ return nvmem_layout_register(layout);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void onie_tlv_remove(struct nvmem_layout *layout)
|
|
||||||
+{
|
|
||||||
+ nvmem_layout_unregister(layout);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static const struct of_device_id onie_tlv_of_match_table[] = {
|
|
||||||
{ .compatible = "onie,tlv-layout", },
|
|
||||||
{},
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(of, onie_tlv_of_match_table);
|
|
||||||
|
|
||||||
-static struct nvmem_layout onie_tlv_layout = {
|
|
||||||
- .name = "ONIE tlv layout",
|
|
||||||
- .of_match_table = onie_tlv_of_match_table,
|
|
||||||
- .add_cells = onie_tlv_parse_table,
|
|
||||||
+static struct nvmem_layout_driver onie_tlv_layout = {
|
|
||||||
+ .driver = {
|
|
||||||
+ .owner = THIS_MODULE,
|
|
||||||
+ .name = "onie-tlv-layout",
|
|
||||||
+ .of_match_table = onie_tlv_of_match_table,
|
|
||||||
+ },
|
|
||||||
+ .probe = onie_tlv_probe,
|
|
||||||
+ .remove = onie_tlv_remove,
|
|
||||||
};
|
|
||||||
module_nvmem_layout_driver(onie_tlv_layout);
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/layouts/sl28vpd.c
|
|
||||||
+++ b/drivers/nvmem/layouts/sl28vpd.c
|
|
||||||
@@ -134,16 +134,32 @@ static int sl28vpd_add_cells(struct devi
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int sl28vpd_probe(struct nvmem_layout *layout)
|
|
||||||
+{
|
|
||||||
+ layout->add_cells = sl28vpd_add_cells;
|
|
||||||
+
|
|
||||||
+ return nvmem_layout_register(layout);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void sl28vpd_remove(struct nvmem_layout *layout)
|
|
||||||
+{
|
|
||||||
+ nvmem_layout_unregister(layout);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static const struct of_device_id sl28vpd_of_match_table[] = {
|
|
||||||
{ .compatible = "kontron,sl28-vpd" },
|
|
||||||
{},
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(of, sl28vpd_of_match_table);
|
|
||||||
|
|
||||||
-static struct nvmem_layout sl28vpd_layout = {
|
|
||||||
- .name = "sl28-vpd",
|
|
||||||
- .of_match_table = sl28vpd_of_match_table,
|
|
||||||
- .add_cells = sl28vpd_add_cells,
|
|
||||||
+static struct nvmem_layout_driver sl28vpd_layout = {
|
|
||||||
+ .driver = {
|
|
||||||
+ .owner = THIS_MODULE,
|
|
||||||
+ .name = "kontron-sl28vpd-layout",
|
|
||||||
+ .of_match_table = sl28vpd_of_match_table,
|
|
||||||
+ },
|
|
||||||
+ .probe = sl28vpd_probe,
|
|
||||||
+ .remove = sl28vpd_remove,
|
|
||||||
};
|
|
||||||
module_nvmem_layout_driver(sl28vpd_layout);
|
|
||||||
|
|
||||||
--- a/include/linux/nvmem-provider.h
|
|
||||||
+++ b/include/linux/nvmem-provider.h
|
|
||||||
@@ -9,6 +9,7 @@
|
|
||||||
#ifndef _LINUX_NVMEM_PROVIDER_H
|
|
||||||
#define _LINUX_NVMEM_PROVIDER_H
|
|
||||||
|
|
||||||
+#include <linux/device.h>
|
|
||||||
#include <linux/device/driver.h>
|
|
||||||
#include <linux/err.h>
|
|
||||||
#include <linux/errno.h>
|
|
||||||
@@ -158,12 +159,11 @@ struct nvmem_cell_table {
|
|
||||||
/**
|
|
||||||
* struct nvmem_layout - NVMEM layout definitions
|
|
||||||
*
|
|
||||||
- * @name: Layout name.
|
|
||||||
- * @of_match_table: Open firmware match table.
|
|
||||||
- * @add_cells: Called to populate the layout using
|
|
||||||
- * nvmem_add_one_cell().
|
|
||||||
- * @owner: Pointer to struct module.
|
|
||||||
- * @node: List node.
|
|
||||||
+ * @dev: Device-model layout device.
|
|
||||||
+ * @nvmem: The underlying NVMEM device
|
|
||||||
+ * @add_cells: Will be called if a nvmem device is found which
|
|
||||||
+ * has this layout. The function will add layout
|
|
||||||
+ * specific cells with nvmem_add_one_cell().
|
|
||||||
*
|
|
||||||
* A nvmem device can hold a well defined structure which can just be
|
|
||||||
* evaluated during runtime. For example a TLV list, or a list of "name=val"
|
|
||||||
@@ -171,13 +171,15 @@ struct nvmem_cell_table {
|
|
||||||
* cells.
|
|
||||||
*/
|
|
||||||
struct nvmem_layout {
|
|
||||||
- const char *name;
|
|
||||||
- const struct of_device_id *of_match_table;
|
|
||||||
+ struct device dev;
|
|
||||||
+ struct nvmem_device *nvmem;
|
|
||||||
int (*add_cells)(struct device *dev, struct nvmem_device *nvmem);
|
|
||||||
+};
|
|
||||||
|
|
||||||
- /* private */
|
|
||||||
- struct module *owner;
|
|
||||||
- struct list_head node;
|
|
||||||
+struct nvmem_layout_driver {
|
|
||||||
+ struct device_driver driver;
|
|
||||||
+ int (*probe)(struct nvmem_layout *layout);
|
|
||||||
+ void (*remove)(struct nvmem_layout *layout);
|
|
||||||
};
|
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_NVMEM)
|
|
||||||
@@ -194,11 +196,15 @@ void nvmem_del_cell_table(struct nvmem_c
|
|
||||||
int nvmem_add_one_cell(struct nvmem_device *nvmem,
|
|
||||||
const struct nvmem_cell_info *info);
|
|
||||||
|
|
||||||
-int __nvmem_layout_register(struct nvmem_layout *layout, struct module *owner);
|
|
||||||
-#define nvmem_layout_register(layout) \
|
|
||||||
- __nvmem_layout_register(layout, THIS_MODULE)
|
|
||||||
+int nvmem_layout_register(struct nvmem_layout *layout);
|
|
||||||
void nvmem_layout_unregister(struct nvmem_layout *layout);
|
|
||||||
|
|
||||||
+int nvmem_layout_driver_register(struct nvmem_layout_driver *drv);
|
|
||||||
+void nvmem_layout_driver_unregister(struct nvmem_layout_driver *drv);
|
|
||||||
+#define module_nvmem_layout_driver(__nvmem_layout_driver) \
|
|
||||||
+ module_driver(__nvmem_layout_driver, nvmem_layout_driver_register, \
|
|
||||||
+ nvmem_layout_driver_unregister)
|
|
||||||
+
|
|
||||||
const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem,
|
|
||||||
struct nvmem_layout *layout);
|
|
||||||
|
|
||||||
@@ -262,8 +268,4 @@ static inline struct device_node *of_nvm
|
|
||||||
|
|
||||||
#endif /* CONFIG_NVMEM && CONFIG_OF */
|
|
||||||
|
|
||||||
-#define module_nvmem_layout_driver(__layout_driver) \
|
|
||||||
- module_driver(__layout_driver, nvmem_layout_register, \
|
|
||||||
- nvmem_layout_unregister)
|
|
||||||
-
|
|
||||||
#endif /* ifndef _LINUX_NVMEM_PROVIDER_H */
|
|
|
@ -1,240 +0,0 @@
|
||||||
From 0331c611949fffdf486652450901a4dc52bc5cca Mon Sep 17 00:00:00 2001
|
|
||||||
From: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Date: Fri, 15 Dec 2023 11:15:34 +0000
|
|
||||||
Subject: [PATCH] nvmem: core: Expose cells through sysfs
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
The binary content of nvmem devices is available to the user so in the
|
|
||||||
easiest cases, finding the content of a cell is rather easy as it is
|
|
||||||
just a matter of looking at a known and fixed offset. However, nvmem
|
|
||||||
layouts have been recently introduced to cope with more advanced
|
|
||||||
situations, where the offset and size of the cells is not known in
|
|
||||||
advance or is dynamic. When using layouts, more advanced parsers are
|
|
||||||
used by the kernel in order to give direct access to the content of each
|
|
||||||
cell, regardless of its position/size in the underlying
|
|
||||||
device. Unfortunately, these information are not accessible by users,
|
|
||||||
unless by fully re-implementing the parser logic in userland.
|
|
||||||
|
|
||||||
Let's expose the cells and their content through sysfs to avoid these
|
|
||||||
situations. Of course the relevant NVMEM sysfs Kconfig option must be
|
|
||||||
enabled for this support to be available.
|
|
||||||
|
|
||||||
Not all nvmem devices expose cells. Indeed, the .bin_attrs attribute
|
|
||||||
group member will be filled at runtime only when relevant and will
|
|
||||||
remain empty otherwise. In this case, as the cells attribute group will
|
|
||||||
be empty, it will not lead to any additional folder/file creation.
|
|
||||||
|
|
||||||
Exposed cells are read-only. There is, in practice, everything in the
|
|
||||||
core to support a write path, but as I don't see any need for that, I
|
|
||||||
prefer to keep the interface simple (and probably safer). The interface
|
|
||||||
is documented as being in the "testing" state which means we can later
|
|
||||||
add a write attribute if though relevant.
|
|
||||||
|
|
||||||
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
||||||
Tested-by: Rafał Miłecki <rafal@milecki.pl>
|
|
||||||
Tested-by: Chen-Yu Tsai <wenst@chromium.org>
|
|
||||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
||||||
Link: https://lore.kernel.org/r/20231215111536.316972-9-srinivas.kandagatla@linaro.org
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/nvmem/core.c | 135 +++++++++++++++++++++++++++++++++++++-
|
|
||||||
drivers/nvmem/internals.h | 1 +
|
|
||||||
2 files changed, 135 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/core.c
|
|
||||||
+++ b/drivers/nvmem/core.c
|
|
||||||
@@ -299,6 +299,43 @@ static umode_t nvmem_bin_attr_is_visible
|
|
||||||
return nvmem_bin_attr_get_umode(nvmem);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static struct nvmem_cell *nvmem_create_cell(struct nvmem_cell_entry *entry,
|
|
||||||
+ const char *id, int index);
|
|
||||||
+
|
|
||||||
+static ssize_t nvmem_cell_attr_read(struct file *filp, struct kobject *kobj,
|
|
||||||
+ struct bin_attribute *attr, char *buf,
|
|
||||||
+ loff_t pos, size_t count)
|
|
||||||
+{
|
|
||||||
+ struct nvmem_cell_entry *entry;
|
|
||||||
+ struct nvmem_cell *cell = NULL;
|
|
||||||
+ size_t cell_sz, read_len;
|
|
||||||
+ void *content;
|
|
||||||
+
|
|
||||||
+ entry = attr->private;
|
|
||||||
+ cell = nvmem_create_cell(entry, entry->name, 0);
|
|
||||||
+ if (IS_ERR(cell))
|
|
||||||
+ return PTR_ERR(cell);
|
|
||||||
+
|
|
||||||
+ if (!cell)
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ content = nvmem_cell_read(cell, &cell_sz);
|
|
||||||
+ if (IS_ERR(content)) {
|
|
||||||
+ read_len = PTR_ERR(content);
|
|
||||||
+ goto destroy_cell;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ read_len = min_t(unsigned int, cell_sz - pos, count);
|
|
||||||
+ memcpy(buf, content + pos, read_len);
|
|
||||||
+ kfree(content);
|
|
||||||
+
|
|
||||||
+destroy_cell:
|
|
||||||
+ kfree_const(cell->id);
|
|
||||||
+ kfree(cell);
|
|
||||||
+
|
|
||||||
+ return read_len;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* default read/write permissions */
|
|
||||||
static struct bin_attribute bin_attr_rw_nvmem = {
|
|
||||||
.attr = {
|
|
||||||
@@ -320,11 +357,21 @@ static const struct attribute_group nvme
|
|
||||||
.is_bin_visible = nvmem_bin_attr_is_visible,
|
|
||||||
};
|
|
||||||
|
|
||||||
+/* Cell attributes will be dynamically allocated */
|
|
||||||
+static struct attribute_group nvmem_cells_group = {
|
|
||||||
+ .name = "cells",
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static const struct attribute_group *nvmem_dev_groups[] = {
|
|
||||||
&nvmem_bin_group,
|
|
||||||
NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
+static const struct attribute_group *nvmem_cells_groups[] = {
|
|
||||||
+ &nvmem_cells_group,
|
|
||||||
+ NULL,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static struct bin_attribute bin_attr_nvmem_eeprom_compat = {
|
|
||||||
.attr = {
|
|
||||||
.name = "eeprom",
|
|
||||||
@@ -380,6 +427,68 @@ static void nvmem_sysfs_remove_compat(st
|
|
||||||
device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int nvmem_populate_sysfs_cells(struct nvmem_device *nvmem)
|
|
||||||
+{
|
|
||||||
+ struct bin_attribute **cells_attrs, *attrs;
|
|
||||||
+ struct nvmem_cell_entry *entry;
|
|
||||||
+ unsigned int ncells = 0, i = 0;
|
|
||||||
+ int ret = 0;
|
|
||||||
+
|
|
||||||
+ mutex_lock(&nvmem_mutex);
|
|
||||||
+
|
|
||||||
+ if (list_empty(&nvmem->cells) || nvmem->sysfs_cells_populated) {
|
|
||||||
+ nvmem_cells_group.bin_attrs = NULL;
|
|
||||||
+ goto unlock_mutex;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Allocate an array of attributes with a sentinel */
|
|
||||||
+ ncells = list_count_nodes(&nvmem->cells);
|
|
||||||
+ cells_attrs = devm_kcalloc(&nvmem->dev, ncells + 1,
|
|
||||||
+ sizeof(struct bin_attribute *), GFP_KERNEL);
|
|
||||||
+ if (!cells_attrs) {
|
|
||||||
+ ret = -ENOMEM;
|
|
||||||
+ goto unlock_mutex;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ attrs = devm_kcalloc(&nvmem->dev, ncells, sizeof(struct bin_attribute), GFP_KERNEL);
|
|
||||||
+ if (!attrs) {
|
|
||||||
+ ret = -ENOMEM;
|
|
||||||
+ goto unlock_mutex;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Initialize each attribute to take the name and size of the cell */
|
|
||||||
+ list_for_each_entry(entry, &nvmem->cells, node) {
|
|
||||||
+ sysfs_bin_attr_init(&attrs[i]);
|
|
||||||
+ attrs[i].attr.name = devm_kasprintf(&nvmem->dev, GFP_KERNEL,
|
|
||||||
+ "%s@%x", entry->name,
|
|
||||||
+ entry->offset);
|
|
||||||
+ attrs[i].attr.mode = 0444;
|
|
||||||
+ attrs[i].size = entry->bytes;
|
|
||||||
+ attrs[i].read = &nvmem_cell_attr_read;
|
|
||||||
+ attrs[i].private = entry;
|
|
||||||
+ if (!attrs[i].attr.name) {
|
|
||||||
+ ret = -ENOMEM;
|
|
||||||
+ goto unlock_mutex;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ cells_attrs[i] = &attrs[i];
|
|
||||||
+ i++;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ nvmem_cells_group.bin_attrs = cells_attrs;
|
|
||||||
+
|
|
||||||
+ ret = devm_device_add_groups(&nvmem->dev, nvmem_cells_groups);
|
|
||||||
+ if (ret)
|
|
||||||
+ goto unlock_mutex;
|
|
||||||
+
|
|
||||||
+ nvmem->sysfs_cells_populated = true;
|
|
||||||
+
|
|
||||||
+unlock_mutex:
|
|
||||||
+ mutex_unlock(&nvmem_mutex);
|
|
||||||
+
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
#else /* CONFIG_NVMEM_SYSFS */
|
|
||||||
|
|
||||||
static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,
|
|
||||||
@@ -739,11 +848,25 @@ static int nvmem_add_cells_from_fixed_la
|
|
||||||
|
|
||||||
int nvmem_layout_register(struct nvmem_layout *layout)
|
|
||||||
{
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
if (!layout->add_cells)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
/* Populate the cells */
|
|
||||||
- return layout->add_cells(&layout->nvmem->dev, layout->nvmem);
|
|
||||||
+ ret = layout->add_cells(&layout->nvmem->dev, layout->nvmem);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+#ifdef CONFIG_NVMEM_SYSFS
|
|
||||||
+ ret = nvmem_populate_sysfs_cells(layout->nvmem);
|
|
||||||
+ if (ret) {
|
|
||||||
+ nvmem_device_remove_all_cells(layout->nvmem);
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(nvmem_layout_register);
|
|
||||||
|
|
||||||
@@ -902,10 +1025,20 @@ struct nvmem_device *nvmem_register(cons
|
|
||||||
if (rval)
|
|
||||||
goto err_remove_dev;
|
|
||||||
|
|
||||||
+#ifdef CONFIG_NVMEM_SYSFS
|
|
||||||
+ rval = nvmem_populate_sysfs_cells(nvmem);
|
|
||||||
+ if (rval)
|
|
||||||
+ goto err_destroy_layout;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem);
|
|
||||||
|
|
||||||
return nvmem;
|
|
||||||
|
|
||||||
+#ifdef CONFIG_NVMEM_SYSFS
|
|
||||||
+err_destroy_layout:
|
|
||||||
+ nvmem_destroy_layout(nvmem);
|
|
||||||
+#endif
|
|
||||||
err_remove_dev:
|
|
||||||
device_del(&nvmem->dev);
|
|
||||||
err_remove_cells:
|
|
||||||
--- a/drivers/nvmem/internals.h
|
|
||||||
+++ b/drivers/nvmem/internals.h
|
|
||||||
@@ -32,6 +32,7 @@ struct nvmem_device {
|
|
||||||
struct gpio_desc *wp_gpio;
|
|
||||||
struct nvmem_layout *layout;
|
|
||||||
void *priv;
|
|
||||||
+ bool sysfs_cells_populated;
|
|
||||||
};
|
|
||||||
|
|
||||||
#if IS_ENABLED(CONFIG_OF)
|
|
|
@ -1,65 +0,0 @@
|
||||||
From f0ac5b23039610619ca4a4805528553ecb6bc815 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Patrick Delaunay <patrick.delaunay@foss.st.com>
|
|
||||||
Date: Fri, 15 Dec 2023 11:15:36 +0000
|
|
||||||
Subject: [PATCH] nvmem: stm32: add support for STM32MP25 BSEC to control OTP
|
|
||||||
data
|
|
||||||
|
|
||||||
On STM32MP25, OTP area may be read/written by using BSEC (boot, security
|
|
||||||
and OTP control). The BSEC internal peripheral is only managed by the
|
|
||||||
secure world.
|
|
||||||
|
|
||||||
The 12 Kbits of OTP (effective) are organized into the following regions:
|
|
||||||
- lower OTP (OTP0 to OTP127) = 4096 lower OTP bits,
|
|
||||||
bitwise (1-bit) programmable
|
|
||||||
- mid OTP (OTP128 to OTP255) = 4096 middle OTP bits,
|
|
||||||
bulk (32-bit) programmable
|
|
||||||
- upper OTP (OTP256 to OTP383) = 4096 upper OTP bits,
|
|
||||||
bulk (32-bit) programmable,
|
|
||||||
only accessible when BSEC is in closed state.
|
|
||||||
|
|
||||||
As HWKEY and ECIES key are only accessible by ROM code;
|
|
||||||
only 368 OTP words are managed in this driver (OTP0 to OTP267).
|
|
||||||
|
|
||||||
This patch adds the STM32MP25 configuration for reading and writing
|
|
||||||
the OTP data using the OP-TEE BSEC TA services.
|
|
||||||
|
|
||||||
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
|
|
||||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
||||||
Link: https://lore.kernel.org/r/20231215111536.316972-11-srinivas.kandagatla@linaro.org
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/nvmem/stm32-romem.c | 16 ++++++++++++++++
|
|
||||||
1 file changed, 16 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/nvmem/stm32-romem.c
|
|
||||||
+++ b/drivers/nvmem/stm32-romem.c
|
|
||||||
@@ -269,6 +269,19 @@ static const struct stm32_romem_cfg stm3
|
|
||||||
.ta = true,
|
|
||||||
};
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * STM32MP25 BSEC OTP: 3 regions of 32-bits data words
|
|
||||||
+ * lower OTP (OTP0 to OTP127), bitwise (1-bit) programmable
|
|
||||||
+ * mid OTP (OTP128 to OTP255), bulk (32-bit) programmable
|
|
||||||
+ * upper OTP (OTP256 to OTP383), bulk (32-bit) programmable
|
|
||||||
+ * but no access to HWKEY and ECIES key: limited at OTP367
|
|
||||||
+ */
|
|
||||||
+static const struct stm32_romem_cfg stm32mp25_bsec_cfg = {
|
|
||||||
+ .size = 368 * 4,
|
|
||||||
+ .lower = 127,
|
|
||||||
+ .ta = true,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static const struct of_device_id stm32_romem_of_match[] __maybe_unused = {
|
|
||||||
{ .compatible = "st,stm32f4-otp", }, {
|
|
||||||
.compatible = "st,stm32mp15-bsec",
|
|
||||||
@@ -276,6 +289,9 @@ static const struct of_device_id stm32_r
|
|
||||||
}, {
|
|
||||||
.compatible = "st,stm32mp13-bsec",
|
|
||||||
.data = (void *)&stm32mp13_bsec_cfg,
|
|
||||||
+ }, {
|
|
||||||
+ .compatible = "st,stm32mp25-bsec",
|
|
||||||
+ .data = (void *)&stm32mp25_bsec_cfg,
|
|
||||||
},
|
|
||||||
{ /* sentinel */ },
|
|
||||||
};
|
|
|
@ -1,93 +0,0 @@
|
||||||
From edd25a77e69b7c546c28077e5dffe72c54c0afe8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
Date: Thu, 21 Sep 2023 22:18:12 +0200
|
|
||||||
Subject: [PATCH 2/4] rtc: rtc7301: Support byte-addressed IO
|
|
||||||
|
|
||||||
The old RTC7301 driver in OpenWrt used byte access, but the
|
|
||||||
current mainline Linux driver uses 32bit word access.
|
|
||||||
|
|
||||||
Make this configurable using device properties using the
|
|
||||||
standard property "reg-io-width" in e.g. device tree.
|
|
||||||
|
|
||||||
This is needed for the USRobotics USR8200 which has the
|
|
||||||
chip connected using byte accesses.
|
|
||||||
|
|
||||||
Debugging and testing by Howard Harte.
|
|
||||||
|
|
||||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
---
|
|
||||||
drivers/rtc/rtc-r7301.c | 35 +++++++++++++++++++++++++++++++++--
|
|
||||||
1 file changed, 33 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/rtc/rtc-r7301.c
|
|
||||||
+++ b/drivers/rtc/rtc-r7301.c
|
|
||||||
@@ -14,6 +14,7 @@
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/mod_devicetable.h>
|
|
||||||
#include <linux/delay.h>
|
|
||||||
+#include <linux/property.h>
|
|
||||||
#include <linux/regmap.h>
|
|
||||||
#include <linux/platform_device.h>
|
|
||||||
#include <linux/rtc.h>
|
|
||||||
@@ -55,12 +56,23 @@ struct rtc7301_priv {
|
|
||||||
u8 bank;
|
|
||||||
};
|
|
||||||
|
|
||||||
-static const struct regmap_config rtc7301_regmap_config = {
|
|
||||||
+/*
|
|
||||||
+ * When the device is memory-mapped, some platforms pack the registers into
|
|
||||||
+ * 32-bit access using the lower 8 bits at each 4-byte stride, while others
|
|
||||||
+ * expose them as simply consecutive bytes.
|
|
||||||
+ */
|
|
||||||
+static const struct regmap_config rtc7301_regmap_32_config = {
|
|
||||||
.reg_bits = 32,
|
|
||||||
.val_bits = 8,
|
|
||||||
.reg_stride = 4,
|
|
||||||
};
|
|
||||||
|
|
||||||
+static const struct regmap_config rtc7301_regmap_8_config = {
|
|
||||||
+ .reg_bits = 8,
|
|
||||||
+ .val_bits = 8,
|
|
||||||
+ .reg_stride = 1,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static u8 rtc7301_read(struct rtc7301_priv *priv, unsigned int reg)
|
|
||||||
{
|
|
||||||
int reg_stride = regmap_get_reg_stride(priv->regmap);
|
|
||||||
@@ -356,7 +368,9 @@ static int __init rtc7301_rtc_probe(stru
|
|
||||||
void __iomem *regs;
|
|
||||||
struct rtc7301_priv *priv;
|
|
||||||
struct rtc_device *rtc;
|
|
||||||
+ static const struct regmap_config *mapconf;
|
|
||||||
int ret;
|
|
||||||
+ u32 val;
|
|
||||||
|
|
||||||
priv = devm_kzalloc(&dev->dev, sizeof(*priv), GFP_KERNEL);
|
|
||||||
if (!priv)
|
|
||||||
@@ -366,8 +380,25 @@ static int __init rtc7301_rtc_probe(stru
|
|
||||||
if (IS_ERR(regs))
|
|
||||||
return PTR_ERR(regs);
|
|
||||||
|
|
||||||
+ ret = device_property_read_u32(&dev->dev, "reg-io-width", &val);
|
|
||||||
+ if (ret)
|
|
||||||
+ /* Default to 32bit accesses */
|
|
||||||
+ val = 4;
|
|
||||||
+
|
|
||||||
+ switch (val) {
|
|
||||||
+ case 1:
|
|
||||||
+ mapconf = &rtc7301_regmap_8_config;
|
|
||||||
+ break;
|
|
||||||
+ case 4:
|
|
||||||
+ mapconf = &rtc7301_regmap_32_config;
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ dev_err(&dev->dev, "invalid reg-io-width %d\n", val);
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
priv->regmap = devm_regmap_init_mmio(&dev->dev, regs,
|
|
||||||
- &rtc7301_regmap_config);
|
|
||||||
+ mapconf);
|
|
||||||
if (IS_ERR(priv->regmap))
|
|
||||||
return PTR_ERR(priv->regmap);
|
|
||||||
|
|
|
@ -1,82 +0,0 @@
|
||||||
From 49e5663b505070424e18099841943f34342aa405 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
Date: Sun, 24 Sep 2023 01:09:01 +0200
|
|
||||||
Subject: [PATCH] net: phy: amd: Support the Altima AMI101L
|
|
||||||
|
|
||||||
The Altima AC101L is obviously compatible with the AMD PHY,
|
|
||||||
as seen by reading the datasheet.
|
|
||||||
|
|
||||||
Datasheet: https://docs.broadcom.com/doc/AC101L-DS05-405-RDS.pdf
|
|
||||||
|
|
||||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
---
|
|
||||||
drivers/net/phy/Kconfig | 4 ++--
|
|
||||||
drivers/net/phy/amd.c | 33 +++++++++++++++++++++++----------
|
|
||||||
2 files changed, 25 insertions(+), 12 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/net/phy/Kconfig
|
|
||||||
+++ b/drivers/net/phy/Kconfig
|
|
||||||
@@ -69,9 +69,9 @@ config SFP
|
|
||||||
comment "MII PHY device drivers"
|
|
||||||
|
|
||||||
config AMD_PHY
|
|
||||||
- tristate "AMD PHYs"
|
|
||||||
+ tristate "AMD and Altima PHYs"
|
|
||||||
help
|
|
||||||
- Currently supports the am79c874
|
|
||||||
+ Currently supports the AMD am79c874 and Altima AC101L.
|
|
||||||
|
|
||||||
config MESON_GXL_PHY
|
|
||||||
tristate "Amlogic Meson GXL Internal PHY"
|
|
||||||
--- a/drivers/net/phy/amd.c
|
|
||||||
+++ b/drivers/net/phy/amd.c
|
|
||||||
@@ -13,6 +13,7 @@
|
|
||||||
#include <linux/mii.h>
|
|
||||||
#include <linux/phy.h>
|
|
||||||
|
|
||||||
+#define PHY_ID_AC101L 0x00225520
|
|
||||||
#define PHY_ID_AM79C874 0x0022561b
|
|
||||||
|
|
||||||
#define MII_AM79C_IR 17 /* Interrupt Status/Control Register */
|
|
||||||
@@ -87,19 +88,31 @@ static irqreturn_t am79c_handle_interrup
|
|
||||||
return IRQ_HANDLED;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static struct phy_driver am79c_driver[] = { {
|
|
||||||
- .phy_id = PHY_ID_AM79C874,
|
|
||||||
- .name = "AM79C874",
|
|
||||||
- .phy_id_mask = 0xfffffff0,
|
|
||||||
- /* PHY_BASIC_FEATURES */
|
|
||||||
- .config_init = am79c_config_init,
|
|
||||||
- .config_intr = am79c_config_intr,
|
|
||||||
- .handle_interrupt = am79c_handle_interrupt,
|
|
||||||
-} };
|
|
||||||
+static struct phy_driver am79c_drivers[] = {
|
|
||||||
+ {
|
|
||||||
+ .phy_id = PHY_ID_AM79C874,
|
|
||||||
+ .name = "AM79C874",
|
|
||||||
+ .phy_id_mask = 0xfffffff0,
|
|
||||||
+ /* PHY_BASIC_FEATURES */
|
|
||||||
+ .config_init = am79c_config_init,
|
|
||||||
+ .config_intr = am79c_config_intr,
|
|
||||||
+ .handle_interrupt = am79c_handle_interrupt,
|
|
||||||
+ },
|
|
||||||
+ {
|
|
||||||
+ .phy_id = PHY_ID_AC101L,
|
|
||||||
+ .name = "AC101L",
|
|
||||||
+ .phy_id_mask = 0xfffffff0,
|
|
||||||
+ /* PHY_BASIC_FEATURES */
|
|
||||||
+ .config_init = am79c_config_init,
|
|
||||||
+ .config_intr = am79c_config_intr,
|
|
||||||
+ .handle_interrupt = am79c_handle_interrupt,
|
|
||||||
+ },
|
|
||||||
+};
|
|
||||||
|
|
||||||
-module_phy_driver(am79c_driver);
|
|
||||||
+module_phy_driver(am79c_drivers);
|
|
||||||
|
|
||||||
static struct mdio_device_id __maybe_unused amd_tbl[] = {
|
|
||||||
+ { PHY_ID_AC101L, 0xfffffff0 },
|
|
||||||
{ PHY_ID_AM79C874, 0xfffffff0 },
|
|
||||||
{ }
|
|
||||||
};
|
|
|
@ -1,29 +0,0 @@
|
||||||
From a067943129b4ec6b835e02cfd5fbef01093c1471 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ondrej Jirman <megi@xff.cz>
|
|
||||||
Date: Sun, 8 Oct 2023 16:40:13 +0200
|
|
||||||
Subject: [PATCH] leds: core: Add more colors from DT bindings to led_colors
|
|
||||||
|
|
||||||
The colors are already part of DT bindings. Make sure the kernel is
|
|
||||||
able to convert them to strings.
|
|
||||||
|
|
||||||
Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
|
||||||
Link: https://lore.kernel.org/r/20231008144014.1180334-1-megi@xff.cz
|
|
||||||
Signed-off-by: Lee Jones <lee@kernel.org>
|
|
||||||
---
|
|
||||||
drivers/leds/led-core.c | 5 +++++
|
|
||||||
1 file changed, 5 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/leds/led-core.c
|
|
||||||
+++ b/drivers/leds/led-core.c
|
|
||||||
@@ -36,6 +36,11 @@ const char * const led_colors[LED_COLOR_
|
|
||||||
[LED_COLOR_ID_IR] = "ir",
|
|
||||||
[LED_COLOR_ID_MULTI] = "multicolor",
|
|
||||||
[LED_COLOR_ID_RGB] = "rgb",
|
|
||||||
+ [LED_COLOR_ID_PURPLE] = "purple",
|
|
||||||
+ [LED_COLOR_ID_ORANGE] = "orange",
|
|
||||||
+ [LED_COLOR_ID_PINK] = "pink",
|
|
||||||
+ [LED_COLOR_ID_CYAN] = "cyan",
|
|
||||||
+ [LED_COLOR_ID_LIME] = "lime",
|
|
||||||
};
|
|
||||||
EXPORT_SYMBOL_GPL(led_colors);
|
|
||||||
|
|
|
@ -8150,3 +8150,12 @@ CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
|
||||||
# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
|
# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
|
||||||
CONFIG_PROBE_EVENTS_BTF_ARGS=y
|
CONFIG_PROBE_EVENTS_BTF_ARGS=y
|
||||||
# CONFIG_ARM64_ERRATUM_3117295 is not set
|
# CONFIG_ARM64_ERRATUM_3117295 is not set
|
||||||
|
# CONFIG_MITIGATION_RFDS is not set
|
||||||
|
# CONFIG_UIMAGE_FIT_BLK is not set
|
||||||
|
# CONFIG_AIR_EN8811H_PHY is not set
|
||||||
|
# CONFIG_QCA83XX_PHY is not set
|
||||||
|
# CONFIG_QCA808X_PHY is not set
|
||||||
|
# CONFIG_CAN_F81604 is not set
|
||||||
|
# CONFIG_PCS_MTK_USXGMII is not set
|
||||||
|
# CONFIG_USB_CDNS3_PCI_WRAP is not set
|
||||||
|
# CONFIG_USB_CDNSP_PCI is not set
|
||||||
|
|
|
@ -1,571 +0,0 @@
|
||||||
/*
|
|
||||||
* swconfig_led.c: LED trigger support for the switch configuration API
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef CONFIG_SWCONFIG_LEDS
|
|
||||||
|
|
||||||
#include <linux/leds.h>
|
|
||||||
#include <linux/ctype.h>
|
|
||||||
#include <linux/device.h>
|
|
||||||
#include <linux/workqueue.h>
|
|
||||||
|
|
||||||
#define SWCONFIG_LED_TIMER_INTERVAL (HZ / 10)
|
|
||||||
#define SWCONFIG_LED_NUM_PORTS 32
|
|
||||||
|
|
||||||
#define SWCONFIG_LED_PORT_SPEED_NA 0x01 /* unknown speed */
|
|
||||||
#define SWCONFIG_LED_PORT_SPEED_10 0x02 /* 10 Mbps */
|
|
||||||
#define SWCONFIG_LED_PORT_SPEED_100 0x04 /* 100 Mbps */
|
|
||||||
#define SWCONFIG_LED_PORT_SPEED_1000 0x08 /* 1000 Mbps */
|
|
||||||
#define SWCONFIG_LED_PORT_SPEED_ALL (SWCONFIG_LED_PORT_SPEED_NA | \
|
|
||||||
SWCONFIG_LED_PORT_SPEED_10 | \
|
|
||||||
SWCONFIG_LED_PORT_SPEED_100 | \
|
|
||||||
SWCONFIG_LED_PORT_SPEED_1000)
|
|
||||||
|
|
||||||
#define SWCONFIG_LED_MODE_LINK 0x01
|
|
||||||
#define SWCONFIG_LED_MODE_TX 0x02
|
|
||||||
#define SWCONFIG_LED_MODE_RX 0x04
|
|
||||||
#define SWCONFIG_LED_MODE_TXRX (SWCONFIG_LED_MODE_TX | \
|
|
||||||
SWCONFIG_LED_MODE_RX)
|
|
||||||
#define SWCONFIG_LED_MODE_ALL (SWCONFIG_LED_MODE_LINK | \
|
|
||||||
SWCONFIG_LED_MODE_TX | \
|
|
||||||
SWCONFIG_LED_MODE_RX)
|
|
||||||
|
|
||||||
struct switch_led_trigger {
|
|
||||||
struct led_trigger trig;
|
|
||||||
struct switch_dev *swdev;
|
|
||||||
|
|
||||||
struct delayed_work sw_led_work;
|
|
||||||
u32 port_mask;
|
|
||||||
u32 port_link;
|
|
||||||
unsigned long long port_tx_traffic[SWCONFIG_LED_NUM_PORTS];
|
|
||||||
unsigned long long port_rx_traffic[SWCONFIG_LED_NUM_PORTS];
|
|
||||||
u8 link_speed[SWCONFIG_LED_NUM_PORTS];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct swconfig_trig_data {
|
|
||||||
struct led_classdev *led_cdev;
|
|
||||||
struct switch_dev *swdev;
|
|
||||||
|
|
||||||
rwlock_t lock;
|
|
||||||
u32 port_mask;
|
|
||||||
|
|
||||||
bool prev_link;
|
|
||||||
unsigned long prev_traffic;
|
|
||||||
enum led_brightness prev_brightness;
|
|
||||||
u8 mode;
|
|
||||||
u8 speed_mask;
|
|
||||||
};
|
|
||||||
|
|
||||||
static void
|
|
||||||
swconfig_trig_set_brightness(struct swconfig_trig_data *trig_data,
|
|
||||||
enum led_brightness brightness)
|
|
||||||
{
|
|
||||||
led_set_brightness(trig_data->led_cdev, brightness);
|
|
||||||
trig_data->prev_brightness = brightness;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
swconfig_trig_update_port_mask(struct led_trigger *trigger)
|
|
||||||
{
|
|
||||||
struct list_head *entry;
|
|
||||||
struct switch_led_trigger *sw_trig;
|
|
||||||
u32 port_mask;
|
|
||||||
|
|
||||||
if (!trigger)
|
|
||||||
return;
|
|
||||||
|
|
||||||
sw_trig = (void *) trigger;
|
|
||||||
|
|
||||||
port_mask = 0;
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
|
|
||||||
spin_lock(&trigger->leddev_list_lock);
|
|
||||||
#else
|
|
||||||
read_lock(&trigger->leddev_list_lock);
|
|
||||||
#endif
|
|
||||||
list_for_each(entry, &trigger->led_cdevs) {
|
|
||||||
struct led_classdev *led_cdev;
|
|
||||||
struct swconfig_trig_data *trig_data;
|
|
||||||
|
|
||||||
led_cdev = list_entry(entry, struct led_classdev, trig_list);
|
|
||||||
trig_data = led_cdev->trigger_data;
|
|
||||||
if (trig_data) {
|
|
||||||
read_lock(&trig_data->lock);
|
|
||||||
port_mask |= trig_data->port_mask;
|
|
||||||
read_unlock(&trig_data->lock);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
|
|
||||||
spin_unlock(&trigger->leddev_list_lock);
|
|
||||||
#else
|
|
||||||
read_unlock(&trigger->leddev_list_lock);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
sw_trig->port_mask = port_mask;
|
|
||||||
|
|
||||||
if (port_mask)
|
|
||||||
schedule_delayed_work(&sw_trig->sw_led_work,
|
|
||||||
SWCONFIG_LED_TIMER_INTERVAL);
|
|
||||||
else
|
|
||||||
cancel_delayed_work_sync(&sw_trig->sw_led_work);
|
|
||||||
}
|
|
||||||
|
|
||||||
static ssize_t
|
|
||||||
swconfig_trig_port_mask_store(struct device *dev, struct device_attribute *attr,
|
|
||||||
const char *buf, size_t size)
|
|
||||||
{
|
|
||||||
struct led_classdev *led_cdev = dev_get_drvdata(dev);
|
|
||||||
struct swconfig_trig_data *trig_data = led_cdev->trigger_data;
|
|
||||||
unsigned long port_mask;
|
|
||||||
int ret;
|
|
||||||
bool changed;
|
|
||||||
|
|
||||||
ret = kstrtoul(buf, 0, &port_mask);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
write_lock(&trig_data->lock);
|
|
||||||
changed = (trig_data->port_mask != port_mask);
|
|
||||||
trig_data->port_mask = port_mask;
|
|
||||||
write_unlock(&trig_data->lock);
|
|
||||||
|
|
||||||
if (changed) {
|
|
||||||
if (port_mask == 0)
|
|
||||||
swconfig_trig_set_brightness(trig_data, LED_OFF);
|
|
||||||
|
|
||||||
swconfig_trig_update_port_mask(led_cdev->trigger);
|
|
||||||
}
|
|
||||||
|
|
||||||
return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
static ssize_t
|
|
||||||
swconfig_trig_port_mask_show(struct device *dev, struct device_attribute *attr,
|
|
||||||
char *buf)
|
|
||||||
{
|
|
||||||
struct led_classdev *led_cdev = dev_get_drvdata(dev);
|
|
||||||
struct swconfig_trig_data *trig_data = led_cdev->trigger_data;
|
|
||||||
u32 port_mask;
|
|
||||||
|
|
||||||
read_lock(&trig_data->lock);
|
|
||||||
port_mask = trig_data->port_mask;
|
|
||||||
read_unlock(&trig_data->lock);
|
|
||||||
|
|
||||||
sprintf(buf, "%#x\n", port_mask);
|
|
||||||
|
|
||||||
return strlen(buf) + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static DEVICE_ATTR(port_mask, 0644, swconfig_trig_port_mask_show,
|
|
||||||
swconfig_trig_port_mask_store);
|
|
||||||
|
|
||||||
/* speed_mask file handler - display value */
|
|
||||||
static ssize_t swconfig_trig_speed_mask_show(struct device *dev,
|
|
||||||
struct device_attribute *attr,
|
|
||||||
char *buf)
|
|
||||||
{
|
|
||||||
struct led_classdev *led_cdev = dev_get_drvdata(dev);
|
|
||||||
struct swconfig_trig_data *trig_data = led_cdev->trigger_data;
|
|
||||||
u8 speed_mask;
|
|
||||||
|
|
||||||
read_lock(&trig_data->lock);
|
|
||||||
speed_mask = trig_data->speed_mask;
|
|
||||||
read_unlock(&trig_data->lock);
|
|
||||||
|
|
||||||
sprintf(buf, "%#x\n", speed_mask);
|
|
||||||
|
|
||||||
return strlen(buf) + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* speed_mask file handler - store value */
|
|
||||||
static ssize_t swconfig_trig_speed_mask_store(struct device *dev,
|
|
||||||
struct device_attribute *attr,
|
|
||||||
const char *buf, size_t size)
|
|
||||||
{
|
|
||||||
struct led_classdev *led_cdev = dev_get_drvdata(dev);
|
|
||||||
struct swconfig_trig_data *trig_data = led_cdev->trigger_data;
|
|
||||||
u8 speed_mask;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
ret = kstrtou8(buf, 0, &speed_mask);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
write_lock(&trig_data->lock);
|
|
||||||
trig_data->speed_mask = speed_mask & SWCONFIG_LED_PORT_SPEED_ALL;
|
|
||||||
write_unlock(&trig_data->lock);
|
|
||||||
|
|
||||||
return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* speed_mask special file */
|
|
||||||
static DEVICE_ATTR(speed_mask, 0644, swconfig_trig_speed_mask_show,
|
|
||||||
swconfig_trig_speed_mask_store);
|
|
||||||
|
|
||||||
static ssize_t swconfig_trig_mode_show(struct device *dev,
|
|
||||||
struct device_attribute *attr, char *buf)
|
|
||||||
{
|
|
||||||
struct led_classdev *led_cdev = dev_get_drvdata(dev);
|
|
||||||
struct swconfig_trig_data *trig_data = led_cdev->trigger_data;
|
|
||||||
u8 mode;
|
|
||||||
|
|
||||||
read_lock(&trig_data->lock);
|
|
||||||
mode = trig_data->mode;
|
|
||||||
read_unlock(&trig_data->lock);
|
|
||||||
|
|
||||||
if (mode == 0) {
|
|
||||||
strcpy(buf, "none\n");
|
|
||||||
} else {
|
|
||||||
if (mode & SWCONFIG_LED_MODE_LINK)
|
|
||||||
strcat(buf, "link ");
|
|
||||||
if (mode & SWCONFIG_LED_MODE_TX)
|
|
||||||
strcat(buf, "tx ");
|
|
||||||
if (mode & SWCONFIG_LED_MODE_RX)
|
|
||||||
strcat(buf, "rx ");
|
|
||||||
strcat(buf, "\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
return strlen(buf)+1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static ssize_t swconfig_trig_mode_store(struct device *dev,
|
|
||||||
struct device_attribute *attr, const char *buf, size_t size)
|
|
||||||
{
|
|
||||||
struct led_classdev *led_cdev = dev_get_drvdata(dev);
|
|
||||||
struct swconfig_trig_data *trig_data = led_cdev->trigger_data;
|
|
||||||
char copybuf[128];
|
|
||||||
int new_mode = -1;
|
|
||||||
char *p, *token;
|
|
||||||
|
|
||||||
/* take a copy since we don't want to trash the inbound buffer when using strsep */
|
|
||||||
strncpy(copybuf, buf, sizeof(copybuf));
|
|
||||||
copybuf[sizeof(copybuf) - 1] = 0;
|
|
||||||
p = copybuf;
|
|
||||||
|
|
||||||
while ((token = strsep(&p, " \t\n")) != NULL) {
|
|
||||||
if (!*token)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (new_mode < 0)
|
|
||||||
new_mode = 0;
|
|
||||||
|
|
||||||
if (!strcmp(token, "none"))
|
|
||||||
new_mode = 0;
|
|
||||||
else if (!strcmp(token, "tx"))
|
|
||||||
new_mode |= SWCONFIG_LED_MODE_TX;
|
|
||||||
else if (!strcmp(token, "rx"))
|
|
||||||
new_mode |= SWCONFIG_LED_MODE_RX;
|
|
||||||
else if (!strcmp(token, "link"))
|
|
||||||
new_mode |= SWCONFIG_LED_MODE_LINK;
|
|
||||||
else
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (new_mode < 0)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
write_lock(&trig_data->lock);
|
|
||||||
trig_data->mode = (u8)new_mode;
|
|
||||||
write_unlock(&trig_data->lock);
|
|
||||||
|
|
||||||
return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* mode special file */
|
|
||||||
static DEVICE_ATTR(mode, 0644, swconfig_trig_mode_show,
|
|
||||||
swconfig_trig_mode_store);
|
|
||||||
|
|
||||||
static int
|
|
||||||
swconfig_trig_activate(struct led_classdev *led_cdev)
|
|
||||||
{
|
|
||||||
struct switch_led_trigger *sw_trig;
|
|
||||||
struct swconfig_trig_data *trig_data;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
trig_data = kzalloc(sizeof(struct swconfig_trig_data), GFP_KERNEL);
|
|
||||||
if (!trig_data)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
sw_trig = (void *) led_cdev->trigger;
|
|
||||||
|
|
||||||
rwlock_init(&trig_data->lock);
|
|
||||||
trig_data->led_cdev = led_cdev;
|
|
||||||
trig_data->swdev = sw_trig->swdev;
|
|
||||||
trig_data->speed_mask = SWCONFIG_LED_PORT_SPEED_ALL;
|
|
||||||
trig_data->mode = SWCONFIG_LED_MODE_ALL;
|
|
||||||
led_cdev->trigger_data = trig_data;
|
|
||||||
|
|
||||||
err = device_create_file(led_cdev->dev, &dev_attr_port_mask);
|
|
||||||
if (err)
|
|
||||||
goto err_free;
|
|
||||||
|
|
||||||
err = device_create_file(led_cdev->dev, &dev_attr_speed_mask);
|
|
||||||
if (err)
|
|
||||||
goto err_dev_free;
|
|
||||||
|
|
||||||
err = device_create_file(led_cdev->dev, &dev_attr_mode);
|
|
||||||
if (err)
|
|
||||||
goto err_mode_free;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
err_mode_free:
|
|
||||||
device_remove_file(led_cdev->dev, &dev_attr_speed_mask);
|
|
||||||
|
|
||||||
err_dev_free:
|
|
||||||
device_remove_file(led_cdev->dev, &dev_attr_port_mask);
|
|
||||||
|
|
||||||
err_free:
|
|
||||||
led_cdev->trigger_data = NULL;
|
|
||||||
kfree(trig_data);
|
|
||||||
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
swconfig_trig_deactivate(struct led_classdev *led_cdev)
|
|
||||||
{
|
|
||||||
struct swconfig_trig_data *trig_data;
|
|
||||||
|
|
||||||
swconfig_trig_update_port_mask(led_cdev->trigger);
|
|
||||||
|
|
||||||
trig_data = (void *) led_cdev->trigger_data;
|
|
||||||
if (trig_data) {
|
|
||||||
device_remove_file(led_cdev->dev, &dev_attr_port_mask);
|
|
||||||
device_remove_file(led_cdev->dev, &dev_attr_speed_mask);
|
|
||||||
device_remove_file(led_cdev->dev, &dev_attr_mode);
|
|
||||||
kfree(trig_data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* link off -> led off (can't be any other reason to turn it on)
|
|
||||||
* link on:
|
|
||||||
* mode link: led on by default only if speed matches, else off
|
|
||||||
* mode txrx: blink only if speed matches, else off
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
swconfig_trig_led_event(struct switch_led_trigger *sw_trig,
|
|
||||||
struct led_classdev *led_cdev)
|
|
||||||
{
|
|
||||||
struct swconfig_trig_data *trig_data;
|
|
||||||
u32 port_mask;
|
|
||||||
bool link;
|
|
||||||
u8 speed_mask, mode;
|
|
||||||
enum led_brightness led_base, led_blink;
|
|
||||||
|
|
||||||
trig_data = led_cdev->trigger_data;
|
|
||||||
if (!trig_data)
|
|
||||||
return;
|
|
||||||
|
|
||||||
read_lock(&trig_data->lock);
|
|
||||||
port_mask = trig_data->port_mask;
|
|
||||||
speed_mask = trig_data->speed_mask;
|
|
||||||
mode = trig_data->mode;
|
|
||||||
read_unlock(&trig_data->lock);
|
|
||||||
|
|
||||||
link = !!(sw_trig->port_link & port_mask);
|
|
||||||
if (!link) {
|
|
||||||
if (trig_data->prev_brightness != LED_OFF)
|
|
||||||
swconfig_trig_set_brightness(trig_data, LED_OFF); /* and stop */
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
unsigned long traffic;
|
|
||||||
int speedok; /* link speed flag */
|
|
||||||
int i;
|
|
||||||
|
|
||||||
led_base = LED_FULL;
|
|
||||||
led_blink = LED_OFF;
|
|
||||||
traffic = 0;
|
|
||||||
speedok = 0;
|
|
||||||
for (i = 0; i < SWCONFIG_LED_NUM_PORTS; i++) {
|
|
||||||
if (port_mask & (1 << i)) {
|
|
||||||
if (sw_trig->link_speed[i] & speed_mask) {
|
|
||||||
traffic += ((mode & SWCONFIG_LED_MODE_TX) ?
|
|
||||||
sw_trig->port_tx_traffic[i] : 0) +
|
|
||||||
((mode & SWCONFIG_LED_MODE_RX) ?
|
|
||||||
sw_trig->port_rx_traffic[i] : 0);
|
|
||||||
speedok = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (speedok) {
|
|
||||||
/* At least one port speed matches speed_mask */
|
|
||||||
if (!(mode & SWCONFIG_LED_MODE_LINK)) {
|
|
||||||
led_base = LED_OFF;
|
|
||||||
led_blink = LED_FULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (trig_data->prev_brightness != led_base)
|
|
||||||
swconfig_trig_set_brightness(trig_data,
|
|
||||||
led_base);
|
|
||||||
else if (traffic != trig_data->prev_traffic)
|
|
||||||
swconfig_trig_set_brightness(trig_data,
|
|
||||||
led_blink);
|
|
||||||
} else if (trig_data->prev_brightness != LED_OFF)
|
|
||||||
swconfig_trig_set_brightness(trig_data, LED_OFF);
|
|
||||||
|
|
||||||
trig_data->prev_traffic = traffic;
|
|
||||||
}
|
|
||||||
|
|
||||||
trig_data->prev_link = link;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
swconfig_trig_update_leds(struct switch_led_trigger *sw_trig)
|
|
||||||
{
|
|
||||||
struct list_head *entry;
|
|
||||||
struct led_trigger *trigger;
|
|
||||||
|
|
||||||
trigger = &sw_trig->trig;
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
|
|
||||||
spin_lock(&trigger->leddev_list_lock);
|
|
||||||
#else
|
|
||||||
read_lock(&trigger->leddev_list_lock);
|
|
||||||
#endif
|
|
||||||
list_for_each(entry, &trigger->led_cdevs) {
|
|
||||||
struct led_classdev *led_cdev;
|
|
||||||
|
|
||||||
led_cdev = list_entry(entry, struct led_classdev, trig_list);
|
|
||||||
swconfig_trig_led_event(sw_trig, led_cdev);
|
|
||||||
}
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
|
|
||||||
spin_unlock(&trigger->leddev_list_lock);
|
|
||||||
#else
|
|
||||||
read_unlock(&trigger->leddev_list_lock);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
swconfig_led_work_func(struct work_struct *work)
|
|
||||||
{
|
|
||||||
struct switch_led_trigger *sw_trig;
|
|
||||||
struct switch_dev *swdev;
|
|
||||||
u32 port_mask;
|
|
||||||
u32 link;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
sw_trig = container_of(work, struct switch_led_trigger,
|
|
||||||
sw_led_work.work);
|
|
||||||
|
|
||||||
port_mask = sw_trig->port_mask;
|
|
||||||
swdev = sw_trig->swdev;
|
|
||||||
|
|
||||||
link = 0;
|
|
||||||
for (i = 0; i < SWCONFIG_LED_NUM_PORTS; i++) {
|
|
||||||
u32 port_bit;
|
|
||||||
|
|
||||||
sw_trig->link_speed[i] = 0;
|
|
||||||
|
|
||||||
port_bit = BIT(i);
|
|
||||||
if ((port_mask & port_bit) == 0)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (swdev->ops->get_port_link) {
|
|
||||||
struct switch_port_link port_link;
|
|
||||||
|
|
||||||
memset(&port_link, '\0', sizeof(port_link));
|
|
||||||
swdev->ops->get_port_link(swdev, i, &port_link);
|
|
||||||
|
|
||||||
if (port_link.link) {
|
|
||||||
link |= port_bit;
|
|
||||||
switch (port_link.speed) {
|
|
||||||
case SWITCH_PORT_SPEED_UNKNOWN:
|
|
||||||
sw_trig->link_speed[i] =
|
|
||||||
SWCONFIG_LED_PORT_SPEED_NA;
|
|
||||||
break;
|
|
||||||
case SWITCH_PORT_SPEED_10:
|
|
||||||
sw_trig->link_speed[i] =
|
|
||||||
SWCONFIG_LED_PORT_SPEED_10;
|
|
||||||
break;
|
|
||||||
case SWITCH_PORT_SPEED_100:
|
|
||||||
sw_trig->link_speed[i] =
|
|
||||||
SWCONFIG_LED_PORT_SPEED_100;
|
|
||||||
break;
|
|
||||||
case SWITCH_PORT_SPEED_1000:
|
|
||||||
sw_trig->link_speed[i] =
|
|
||||||
SWCONFIG_LED_PORT_SPEED_1000;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (swdev->ops->get_port_stats) {
|
|
||||||
struct switch_port_stats port_stats;
|
|
||||||
|
|
||||||
memset(&port_stats, '\0', sizeof(port_stats));
|
|
||||||
swdev->ops->get_port_stats(swdev, i, &port_stats);
|
|
||||||
sw_trig->port_tx_traffic[i] = port_stats.tx_bytes;
|
|
||||||
sw_trig->port_rx_traffic[i] = port_stats.rx_bytes;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sw_trig->port_link = link;
|
|
||||||
|
|
||||||
swconfig_trig_update_leds(sw_trig);
|
|
||||||
|
|
||||||
schedule_delayed_work(&sw_trig->sw_led_work,
|
|
||||||
SWCONFIG_LED_TIMER_INTERVAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
swconfig_create_led_trigger(struct switch_dev *swdev)
|
|
||||||
{
|
|
||||||
struct switch_led_trigger *sw_trig;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
if (!swdev->ops->get_port_link)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
sw_trig = kzalloc(sizeof(struct switch_led_trigger), GFP_KERNEL);
|
|
||||||
if (!sw_trig)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
sw_trig->swdev = swdev;
|
|
||||||
sw_trig->trig.name = swdev->devname;
|
|
||||||
sw_trig->trig.activate = swconfig_trig_activate;
|
|
||||||
sw_trig->trig.deactivate = swconfig_trig_deactivate;
|
|
||||||
|
|
||||||
INIT_DELAYED_WORK(&sw_trig->sw_led_work, swconfig_led_work_func);
|
|
||||||
|
|
||||||
err = led_trigger_register(&sw_trig->trig);
|
|
||||||
if (err)
|
|
||||||
goto err_free;
|
|
||||||
|
|
||||||
swdev->led_trigger = sw_trig;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
err_free:
|
|
||||||
kfree(sw_trig);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
swconfig_destroy_led_trigger(struct switch_dev *swdev)
|
|
||||||
{
|
|
||||||
struct switch_led_trigger *sw_trig;
|
|
||||||
|
|
||||||
sw_trig = swdev->led_trigger;
|
|
||||||
if (sw_trig) {
|
|
||||||
cancel_delayed_work_sync(&sw_trig->sw_led_work);
|
|
||||||
led_trigger_unregister(&sw_trig->trig);
|
|
||||||
kfree(sw_trig);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#else /* SWCONFIG_LEDS */
|
|
||||||
static inline int
|
|
||||||
swconfig_create_led_trigger(struct switch_dev *swdev) { return 0; }
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
swconfig_destroy_led_trigger(struct switch_dev *swdev) { }
|
|
||||||
#endif /* CONFIG_SWCONFIG_LEDS */
|
|
|
@ -1,210 +0,0 @@
|
||||||
From a779a482fb9b9f8fcdf8b2519c789b4b9bb5dd05 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Fri, 7 Jul 2017 16:56:48 +0200
|
|
||||||
Subject: build: add a hack for removing non-essential module info
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
include/linux/module.h | 13 ++++++++-----
|
|
||||||
include/linux/moduleparam.h | 15 ++++++++++++---
|
|
||||||
init/Kconfig | 7 +++++++
|
|
||||||
kernel/module.c | 5 ++++-
|
|
||||||
scripts/mod/modpost.c | 12 ++++++++++++
|
|
||||||
5 files changed, 43 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
--- a/include/linux/module.h
|
|
||||||
+++ b/include/linux/module.h
|
|
||||||
@@ -163,6 +163,7 @@ extern void cleanup_module(void);
|
|
||||||
|
|
||||||
/* Generic info of form tag = "info" */
|
|
||||||
#define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info)
|
|
||||||
+#define MODULE_INFO_STRIP(tag, info) __MODULE_INFO_STRIP(tag, tag, info)
|
|
||||||
|
|
||||||
/* For userspace: you can also call me... */
|
|
||||||
#define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias)
|
|
||||||
@@ -232,12 +233,12 @@ extern void cleanup_module(void);
|
|
||||||
* Author(s), use "Name <email>" or just "Name", for multiple
|
|
||||||
* authors use multiple MODULE_AUTHOR() statements/lines.
|
|
||||||
*/
|
|
||||||
-#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author)
|
|
||||||
+#define MODULE_AUTHOR(_author) MODULE_INFO_STRIP(author, _author)
|
|
||||||
|
|
||||||
/* What your module does. */
|
|
||||||
-#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description)
|
|
||||||
+#define MODULE_DESCRIPTION(_description) MODULE_INFO_STRIP(description, _description)
|
|
||||||
|
|
||||||
-#ifdef MODULE
|
|
||||||
+#if defined(MODULE) && !defined(CONFIG_MODULE_STRIPPED)
|
|
||||||
/* Creates an alias so file2alias.c can find device table. */
|
|
||||||
#define MODULE_DEVICE_TABLE(type, name) \
|
|
||||||
extern typeof(name) __mod_##type##__##name##_device_table \
|
|
||||||
@@ -264,7 +265,9 @@ extern typeof(name) __mod_##type##__##na
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(MODULE) || !defined(CONFIG_SYSFS)
|
|
||||||
-#define MODULE_VERSION(_version) MODULE_INFO(version, _version)
|
|
||||||
+#define MODULE_VERSION(_version) MODULE_INFO_STRIP(version, _version)
|
|
||||||
+#elif defined(CONFIG_MODULE_STRIPPED)
|
|
||||||
+#define MODULE_VERSION(_version) __MODULE_INFO_DISABLED(version)
|
|
||||||
#else
|
|
||||||
#define MODULE_VERSION(_version) \
|
|
||||||
MODULE_INFO(version, _version); \
|
|
||||||
@@ -287,7 +290,7 @@ extern typeof(name) __mod_##type##__##na
|
|
||||||
/* Optional firmware file (or files) needed by the module
|
|
||||||
* format is simply firmware file name. Multiple firmware
|
|
||||||
* files require multiple MODULE_FIRMWARE() specifiers */
|
|
||||||
-#define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)
|
|
||||||
+#define MODULE_FIRMWARE(_firmware) MODULE_INFO_STRIP(firmware, _firmware)
|
|
||||||
|
|
||||||
#define MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, __stringify(ns))
|
|
||||||
|
|
||||||
--- a/include/linux/moduleparam.h
|
|
||||||
+++ b/include/linux/moduleparam.h
|
|
||||||
@@ -20,6 +20,16 @@
|
|
||||||
/* Chosen so that structs with an unsigned long line up. */
|
|
||||||
#define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
|
|
||||||
|
|
||||||
+/* This struct is here for syntactic coherency, it is not used */
|
|
||||||
+#define __MODULE_INFO_DISABLED(name) \
|
|
||||||
+ struct __UNIQUE_ID(name) {}
|
|
||||||
+
|
|
||||||
+#ifdef CONFIG_MODULE_STRIPPED
|
|
||||||
+#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO_DISABLED(name)
|
|
||||||
+#else
|
|
||||||
+#define __MODULE_INFO_STRIP(tag, name, info) __MODULE_INFO(tag, name, info)
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#define __MODULE_INFO(tag, name, info) \
|
|
||||||
static const char __UNIQUE_ID(name)[] \
|
|
||||||
__used __section(".modinfo") __aligned(1) \
|
|
||||||
@@ -31,7 +41,7 @@
|
|
||||||
/* One for each parameter, describing how to use it. Some files do
|
|
||||||
multiple of these per line, so can't just use MODULE_INFO. */
|
|
||||||
#define MODULE_PARM_DESC(_parm, desc) \
|
|
||||||
- __MODULE_INFO(parm, _parm, #_parm ":" desc)
|
|
||||||
+ __MODULE_INFO_STRIP(parm, _parm, #_parm ":" desc)
|
|
||||||
|
|
||||||
struct kernel_param;
|
|
||||||
|
|
||||||
--- a/kernel/module/Kconfig
|
|
||||||
+++ b/kernel/module/Kconfig
|
|
||||||
@@ -290,4 +290,11 @@ config MODULES_TREE_LOOKUP
|
|
||||||
def_bool y
|
|
||||||
depends on PERF_EVENTS || TRACING || CFI_CLANG
|
|
||||||
|
|
||||||
+config MODULE_STRIPPED
|
|
||||||
+ bool "Reduce module size"
|
|
||||||
+ depends on MODULES
|
|
||||||
+ help
|
|
||||||
+ Remove module parameter descriptions, author info, version, aliases,
|
|
||||||
+ device tables, etc.
|
|
||||||
+
|
|
||||||
endif # MODULES
|
|
||||||
--- a/kernel/module/main.c
|
|
||||||
+++ b/kernel/module/main.c
|
|
||||||
@@ -988,6 +988,7 @@ size_t modinfo_attrs_count = ARRAY_SIZE(
|
|
||||||
|
|
||||||
static const char vermagic[] = VERMAGIC_STRING;
|
|
||||||
|
|
||||||
+#if defined(CONFIG_MODVERSIONS) || !defined(CONFIG_MODULE_STRIPPED)
|
|
||||||
int try_to_force_load(struct module *mod, const char *reason)
|
|
||||||
{
|
|
||||||
#ifdef CONFIG_MODULE_FORCE_LOAD
|
|
||||||
@@ -999,6 +1000,7 @@ int try_to_force_load(struct module *mod
|
|
||||||
return -ENOEXEC;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
static char *get_modinfo(const struct load_info *info, const char *tag);
|
|
||||||
static char *get_next_modinfo(const struct load_info *info, const char *tag,
|
|
||||||
@@ -1958,9 +1960,11 @@ static int setup_load_info(struct load_i
|
|
||||||
|
|
||||||
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
|
|
||||||
{
|
|
||||||
- const char *modmagic = get_modinfo(info, "vermagic");
|
|
||||||
int err;
|
|
||||||
|
|
||||||
+#ifndef CONFIG_MODULE_STRIPPED
|
|
||||||
+ const char *modmagic = get_modinfo(info, "vermagic");
|
|
||||||
+
|
|
||||||
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
|
|
||||||
modmagic = NULL;
|
|
||||||
|
|
||||||
@@ -1981,6 +1985,7 @@ static int check_modinfo(struct module *
|
|
||||||
mod->name);
|
|
||||||
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
check_modinfo_retpoline(mod, info);
|
|
||||||
|
|
||||||
--- a/scripts/mod/modpost.c
|
|
||||||
+++ b/scripts/mod/modpost.c
|
|
||||||
@@ -1781,7 +1781,9 @@ static void read_symbols(const char *mod
|
|
||||||
symname = remove_dot(info.strtab + sym->st_name);
|
|
||||||
|
|
||||||
handle_symbol(mod, &info, sym, symname);
|
|
||||||
+#ifndef CONFIG_MODULE_STRIPPED
|
|
||||||
handle_moddevtable(mod, &info, sym, symname);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
for (sym = info.symtab_start; sym < info.symtab_stop; sym++) {
|
|
||||||
@@ -1944,8 +1946,10 @@ static void add_header(struct buffer *b,
|
|
||||||
buf_printf(b, "BUILD_SALT;\n");
|
|
||||||
buf_printf(b, "BUILD_LTO_INFO;\n");
|
|
||||||
buf_printf(b, "\n");
|
|
||||||
+#ifndef CONFIG_MODULE_STRIPPED
|
|
||||||
buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
|
|
||||||
buf_printf(b, "MODULE_INFO(name, KBUILD_MODNAME);\n");
|
|
||||||
+#endif
|
|
||||||
buf_printf(b, "\n");
|
|
||||||
buf_printf(b, "__visible struct module __this_module\n");
|
|
||||||
buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n");
|
|
||||||
@@ -1959,8 +1963,10 @@ static void add_header(struct buffer *b,
|
|
||||||
buf_printf(b, "\t.arch = MODULE_ARCH_INIT,\n");
|
|
||||||
buf_printf(b, "};\n");
|
|
||||||
|
|
||||||
+#ifndef CONFIG_MODULE_STRIPPED
|
|
||||||
if (!external_module)
|
|
||||||
buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
buf_printf(b,
|
|
||||||
"\n"
|
|
||||||
@@ -1968,8 +1974,10 @@ static void add_header(struct buffer *b,
|
|
||||||
"MODULE_INFO(retpoline, \"Y\");\n"
|
|
||||||
"#endif\n");
|
|
||||||
|
|
||||||
+#ifndef CONFIG_MODULE_STRIPPED
|
|
||||||
if (strstarts(mod->name, "drivers/staging"))
|
|
||||||
buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
if (strstarts(mod->name, "tools/testing"))
|
|
||||||
buf_printf(b, "\nMODULE_INFO(test, \"Y\");\n");
|
|
||||||
@@ -2065,11 +2073,13 @@ static void add_depends(struct buffer *b
|
|
||||||
|
|
||||||
static void add_srcversion(struct buffer *b, struct module *mod)
|
|
||||||
{
|
|
||||||
+#ifndef CONFIG_MODULE_STRIPPED
|
|
||||||
if (mod->srcversion[0]) {
|
|
||||||
buf_printf(b, "\n");
|
|
||||||
buf_printf(b, "MODULE_INFO(srcversion, \"%s\");\n",
|
|
||||||
mod->srcversion);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static void write_buf(struct buffer *b, const char *fname)
|
|
||||||
@@ -2155,7 +2165,9 @@ static void write_mod_c_file(struct modu
|
|
||||||
add_exported_symbols(&buf, mod);
|
|
||||||
add_versions(&buf, mod);
|
|
||||||
add_depends(&buf, mod);
|
|
||||||
+#ifndef CONFIG_MODULE_STRIPPED
|
|
||||||
add_moddevtable(&buf, mod);
|
|
||||||
+#endif
|
|
||||||
add_srcversion(&buf, mod);
|
|
||||||
|
|
||||||
ret = snprintf(fname, sizeof(fname), "%s.mod.c", mod->name);
|
|
|
@ -1,41 +0,0 @@
|
||||||
From 310e8e04a05d9eb43fa9dd7f00143300afcaa37a Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Bauer <mail@david-bauer.net>
|
|
||||||
Date: Fri, 11 Nov 2022 13:33:44 +0100
|
|
||||||
Subject: [PATCH] kconfig: abort configuration on unset symbol
|
|
||||||
|
|
||||||
When a target configuration has unset Kconfig symbols, the build will
|
|
||||||
fail when OpenWrt is compiled with V=s and stdin is connected to a tty.
|
|
||||||
|
|
||||||
In case OpenWrt is compiled without either of these preconditions, the
|
|
||||||
build will succeed with the symbols in question being unset.
|
|
||||||
|
|
||||||
Modify the kernel configuration in a way it fails on unset symbols
|
|
||||||
regardless of the aforementioned preconditions.
|
|
||||||
|
|
||||||
Signed-off-by: David Bauer <mail@david-bauer.net>
|
|
||||||
---
|
|
||||||
scripts/kconfig/conf.c | 6 ++++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
|
|
||||||
--- a/scripts/kconfig/conf.c
|
|
||||||
+++ b/scripts/kconfig/conf.c
|
|
||||||
@@ -338,6 +338,9 @@ static int conf_askvalue(struct symbol *
|
|
||||||
}
|
|
||||||
/* fall through */
|
|
||||||
default:
|
|
||||||
+ if (!tty_stdio && getenv("FAIL_ON_UNCONFIGURED")) {
|
|
||||||
+ exit(1);
|
|
||||||
+ }
|
|
||||||
fflush(stdout);
|
|
||||||
xfgets(line, sizeof(line), stdin);
|
|
||||||
break;
|
|
||||||
@@ -520,6 +523,9 @@ static int conf_choice(struct menu *menu
|
|
||||||
}
|
|
||||||
/* fall through */
|
|
||||||
case oldaskconfig:
|
|
||||||
+ if (!tty_stdio && getenv("FAIL_ON_UNCONFIGURED")) {
|
|
||||||
+ exit(1);
|
|
||||||
+ }
|
|
||||||
fflush(stdout);
|
|
||||||
xfgets(line, sizeof(line), stdin);
|
|
||||||
strip(line);
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,93 +0,0 @@
|
||||||
From 48232d3d931c95953ce2ddfe7da7bb164aef6a73 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Fri, 7 Jul 2017 17:03:16 +0200
|
|
||||||
Subject: fix portability of some includes files in tools/ used on the host
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
tools/include/tools/be_byteshift.h | 4 ++++
|
|
||||||
tools/include/tools/le_byteshift.h | 4 ++++
|
|
||||||
tools/include/tools/linux_types.h | 22 ++++++++++++++++++++++
|
|
||||||
3 files changed, 30 insertions(+)
|
|
||||||
create mode 100644 tools/include/tools/linux_types.h
|
|
||||||
|
|
||||||
--- a/tools/include/tools/be_byteshift.h
|
|
||||||
+++ b/tools/include/tools/be_byteshift.h
|
|
||||||
@@ -2,6 +2,10 @@
|
|
||||||
#ifndef _TOOLS_BE_BYTESHIFT_H
|
|
||||||
#define _TOOLS_BE_BYTESHIFT_H
|
|
||||||
|
|
||||||
+#ifndef __linux__
|
|
||||||
+#include "linux_types.h"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
static inline uint16_t __get_unaligned_be16(const uint8_t *p)
|
|
||||||
--- a/tools/include/tools/le_byteshift.h
|
|
||||||
+++ b/tools/include/tools/le_byteshift.h
|
|
||||||
@@ -2,6 +2,10 @@
|
|
||||||
#ifndef _TOOLS_LE_BYTESHIFT_H
|
|
||||||
#define _TOOLS_LE_BYTESHIFT_H
|
|
||||||
|
|
||||||
+#ifndef __linux__
|
|
||||||
+#include "linux_types.h"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
static inline uint16_t __get_unaligned_le16(const uint8_t *p)
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tools/include/tools/linux_types.h
|
|
||||||
@@ -0,0 +1,26 @@
|
|
||||||
+#ifndef __LINUX_TYPES_H
|
|
||||||
+#define __LINUX_TYPES_H
|
|
||||||
+
|
|
||||||
+#include <stdint.h>
|
|
||||||
+
|
|
||||||
+typedef int8_t __s8;
|
|
||||||
+typedef uint8_t __u8;
|
|
||||||
+typedef uint8_t __be8;
|
|
||||||
+typedef uint8_t __le8;
|
|
||||||
+
|
|
||||||
+typedef int16_t __s16;
|
|
||||||
+typedef uint16_t __u16;
|
|
||||||
+typedef uint16_t __be16;
|
|
||||||
+typedef uint16_t __le16;
|
|
||||||
+
|
|
||||||
+typedef int32_t __s32;
|
|
||||||
+typedef uint32_t __u32;
|
|
||||||
+typedef uint32_t __be32;
|
|
||||||
+typedef uint32_t __le32;
|
|
||||||
+
|
|
||||||
+typedef int64_t __s64;
|
|
||||||
+typedef uint64_t __u64;
|
|
||||||
+typedef uint64_t __be64;
|
|
||||||
+typedef uint64_t __le64;
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
--- a/tools/include/linux/types.h
|
|
||||||
+++ b/tools/include/linux/types.h
|
|
||||||
@@ -10,8 +10,12 @@
|
|
||||||
#define __SANE_USERSPACE_TYPES__ /* For PPC64, to get LL64 types */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifndef __linux__
|
|
||||||
+#include <tools/linux_types.h>
|
|
||||||
+#else
|
|
||||||
#include <asm/types.h>
|
|
||||||
#include <asm/posix_types.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
struct page;
|
|
||||||
struct kmem_cache;
|
|
||||||
--- a/tools/perf/pmu-events/jevents.py
|
|
||||||
+++ b/tools/perf/pmu-events/jevents.py
|
|
||||||
@@ -684,6 +684,7 @@ def main() -> None:
|
|
||||||
#include "util/header.h"
|
|
||||||
#include "util/pmu.h"
|
|
||||||
#include <string.h>
|
|
||||||
+#include <strings.h>
|
|
||||||
#include <stddef.h>
|
|
||||||
|
|
||||||
struct compact_pmu_event {
|
|
|
@ -1,24 +0,0 @@
|
||||||
From be9be95ff10e16a5b4ad36f903978d0cc5747024 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Fri, 7 Jul 2017 17:04:08 +0200
|
|
||||||
Subject: kernel: fix linux/spi/spidev.h portability issues with musl
|
|
||||||
|
|
||||||
Felix will try to get this define included into musl
|
|
||||||
|
|
||||||
lede-commit: 795e7cf60de19e7a076a46874fab7bb88b43bbff
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
include/uapi/linux/spi/spidev.h | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/include/uapi/linux/spi/spidev.h
|
|
||||||
+++ b/include/uapi/linux/spi/spidev.h
|
|
||||||
@@ -93,7 +93,7 @@ struct spi_ioc_transfer {
|
|
||||||
|
|
||||||
/* not all platforms use <asm-generic/ioctl.h> or _IOC_TYPECHECK() ... */
|
|
||||||
#define SPI_MSGSIZE(N) \
|
|
||||||
- ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << _IOC_SIZEBITS)) \
|
|
||||||
+ ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << 13)) \
|
|
||||||
? ((N)*(sizeof (struct spi_ioc_transfer))) : 0)
|
|
||||||
#define SPI_IOC_MESSAGE(N) _IOW(SPI_IOC_MAGIC, 0, char[SPI_MSGSIZE(N)])
|
|
||||||
|
|
|
@ -1,123 +0,0 @@
|
||||||
From e3d8676f5722b7622685581e06e8f53e6138e3ab Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Sat, 15 Jul 2017 23:42:36 +0200
|
|
||||||
Subject: use -ffunction-sections, -fdata-sections and --gc-sections
|
|
||||||
|
|
||||||
In combination with kernel symbol export stripping this significantly reduces
|
|
||||||
the kernel image size. Used on both ARM and MIPS architectures.
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
||||||
---
|
|
||||||
--- a/arch/arm/Kconfig
|
|
||||||
+++ b/arch/arm/Kconfig
|
|
||||||
@@ -124,6 +124,7 @@ config ARM
|
|
||||||
select HAVE_VIRT_CPU_ACCOUNTING_GEN
|
|
||||||
select IRQ_FORCED_THREADING
|
|
||||||
select LOCK_MM_AND_FIND_VMA
|
|
||||||
+ select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
|
|
||||||
select MODULES_USE_ELF_REL
|
|
||||||
select NEED_DMA_MAP_STATE
|
|
||||||
select OF_EARLY_FLATTREE if OF
|
|
||||||
--- a/arch/arm/boot/compressed/Makefile
|
|
||||||
+++ b/arch/arm/boot/compressed/Makefile
|
|
||||||
@@ -91,6 +91,7 @@ endif
|
|
||||||
ifeq ($(CONFIG_USE_OF),y)
|
|
||||||
OBJS += $(libfdt_objs) fdt_check_mem_start.o
|
|
||||||
endif
|
|
||||||
+KBUILD_CFLAGS_KERNEL := $(patsubst -f%-sections,,$(KBUILD_CFLAGS_KERNEL))
|
|
||||||
|
|
||||||
OBJS += lib1funcs.o ashldi3.o bswapsdi2.o
|
|
||||||
|
|
||||||
--- a/arch/arm/kernel/vmlinux.lds.S
|
|
||||||
+++ b/arch/arm/kernel/vmlinux.lds.S
|
|
||||||
@@ -75,7 +75,7 @@ SECTIONS
|
|
||||||
. = ALIGN(4);
|
|
||||||
__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
|
|
||||||
__start___ex_table = .;
|
|
||||||
- ARM_MMU_KEEP(*(__ex_table))
|
|
||||||
+ KEEP(*(__ex_table))
|
|
||||||
__stop___ex_table = .;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -100,24 +100,24 @@ SECTIONS
|
|
||||||
}
|
|
||||||
.init.arch.info : {
|
|
||||||
__arch_info_begin = .;
|
|
||||||
- *(.arch.info.init)
|
|
||||||
+ KEEP(*(.arch.info.init))
|
|
||||||
__arch_info_end = .;
|
|
||||||
}
|
|
||||||
.init.tagtable : {
|
|
||||||
__tagtable_begin = .;
|
|
||||||
- *(.taglist.init)
|
|
||||||
+ KEEP(*(.taglist.init))
|
|
||||||
__tagtable_end = .;
|
|
||||||
}
|
|
||||||
#ifdef CONFIG_SMP_ON_UP
|
|
||||||
.init.smpalt : {
|
|
||||||
__smpalt_begin = .;
|
|
||||||
- *(.alt.smp.init)
|
|
||||||
+ KEEP(*(.alt.smp.init))
|
|
||||||
__smpalt_end = .;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
.init.pv_table : {
|
|
||||||
__pv_table_begin = .;
|
|
||||||
- *(.pv_table)
|
|
||||||
+ KEEP(*(.pv_table))
|
|
||||||
__pv_table_end = .;
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/arch/arm/include/asm/vmlinux.lds.h
|
|
||||||
+++ b/arch/arm/include/asm/vmlinux.lds.h
|
|
||||||
@@ -42,13 +42,13 @@
|
|
||||||
#define PROC_INFO \
|
|
||||||
. = ALIGN(4); \
|
|
||||||
__proc_info_begin = .; \
|
|
||||||
- *(.proc.info.init) \
|
|
||||||
+ KEEP(*(.proc.info.init)) \
|
|
||||||
__proc_info_end = .;
|
|
||||||
|
|
||||||
#define IDMAP_TEXT \
|
|
||||||
ALIGN_FUNCTION(); \
|
|
||||||
__idmap_text_start = .; \
|
|
||||||
- *(.idmap.text) \
|
|
||||||
+ KEEP(*(.idmap.text)) \
|
|
||||||
__idmap_text_end = .; \
|
|
||||||
|
|
||||||
#define ARM_DISCARD \
|
|
||||||
@@ -109,12 +109,12 @@
|
|
||||||
. = ALIGN(8); \
|
|
||||||
.ARM.unwind_idx : { \
|
|
||||||
__start_unwind_idx = .; \
|
|
||||||
- *(.ARM.exidx*) \
|
|
||||||
+ KEEP(*(.ARM.exidx*)) \
|
|
||||||
__stop_unwind_idx = .; \
|
|
||||||
} \
|
|
||||||
.ARM.unwind_tab : { \
|
|
||||||
__start_unwind_tab = .; \
|
|
||||||
- *(.ARM.extab*) \
|
|
||||||
+ KEEP(*(.ARM.extab*)) \
|
|
||||||
__stop_unwind_tab = .; \
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -126,7 +126,7 @@
|
|
||||||
__vectors_lma = .; \
|
|
||||||
OVERLAY 0xffff0000 : NOCROSSREFS AT(__vectors_lma) { \
|
|
||||||
.vectors { \
|
|
||||||
- *(.vectors) \
|
|
||||||
+ KEEP(*(.vectors)) \
|
|
||||||
} \
|
|
||||||
.vectors.bhb.loop8 { \
|
|
||||||
*(.vectors.bhb.loop8) \
|
|
||||||
@@ -144,7 +144,7 @@
|
|
||||||
\
|
|
||||||
__stubs_lma = .; \
|
|
||||||
.stubs ADDR(.vectors) + 0x1000 : AT(__stubs_lma) { \
|
|
||||||
- *(.stubs) \
|
|
||||||
+ KEEP(*(.stubs)) \
|
|
||||||
} \
|
|
||||||
ARM_LMA(__stubs, .stubs); \
|
|
||||||
. = __stubs_lma + SIZEOF(.stubs); \
|
|
|
@ -1,38 +0,0 @@
|
||||||
From b3d00b452467f621317953d9e4c6f9ae8dcfd271 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Imre Kaloz <kaloz@openwrt.org>
|
|
||||||
Date: Fri, 7 Jul 2017 17:06:55 +0200
|
|
||||||
Subject: use the openwrt lzma options for now
|
|
||||||
|
|
||||||
lede-commit: 548de949f392049420a6a1feeef118b30ab8ea8c
|
|
||||||
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|
||||||
---
|
|
||||||
lib/decompress.c | 1 +
|
|
||||||
scripts/Makefile.lib | 2 +-
|
|
||||||
usr/gen_initramfs_list.sh | 10 +++++-----
|
|
||||||
3 files changed, 7 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
--- a/lib/decompress.c
|
|
||||||
+++ b/lib/decompress.c
|
|
||||||
@@ -53,6 +53,7 @@ static const struct compress_format comp
|
|
||||||
{ {0x1f, 0x9e}, "gzip", gunzip },
|
|
||||||
{ {0x42, 0x5a}, "bzip2", bunzip2 },
|
|
||||||
{ {0x5d, 0x00}, "lzma", unlzma },
|
|
||||||
+ { {0x6d, 0x00}, "lzma-openwrt", unlzma },
|
|
||||||
{ {0xfd, 0x37}, "xz", unxz },
|
|
||||||
{ {0x89, 0x4c}, "lzo", unlzo },
|
|
||||||
{ {0x02, 0x21}, "lz4", unlz4 },
|
|
||||||
--- a/scripts/Makefile.lib
|
|
||||||
+++ b/scripts/Makefile.lib
|
|
||||||
@@ -443,10 +443,10 @@ quiet_cmd_bzip2_with_size = BZIP2 $@
|
|
||||||
# ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
quiet_cmd_lzma = LZMA $@
|
|
||||||
- cmd_lzma = cat $(real-prereqs) | $(LZMA) -9 > $@
|
|
||||||
+ cmd_lzma = cat $(real-prereqs) | $(LZMA) e -d20 -lc1 -lp2 -pb2 -eos -si -so > $@
|
|
||||||
|
|
||||||
quiet_cmd_lzma_with_size = LZMA $@
|
|
||||||
- cmd_lzma_with_size = { cat $(real-prereqs) | $(LZMA) -9; $(size_append); } > $@
|
|
||||||
+ cmd_lzma_with_size = { cat $(real-prereqs) | $(LZMA) e -d20 -lc1 -lp2 -pb2 -eos -si -so; $(size_append); } > $@
|
|
||||||
|
|
||||||
quiet_cmd_lzo = LZO $@
|
|
||||||
cmd_lzo = cat $(real-prereqs) | $(KLZOP) -9 > $@
|
|
|
@ -1,27 +0,0 @@
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Subject: hack: net: remove bogus netfilter dependencies
|
|
||||||
|
|
||||||
lede-commit: 589d2a377dee27d206fc3725325309cf649e4df6
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
net/netfilter/Kconfig | 2 --
|
|
||||||
1 file changed, 2 deletions(-)
|
|
||||||
|
|
||||||
--- a/net/netfilter/Kconfig
|
|
||||||
+++ b/net/netfilter/Kconfig
|
|
||||||
@@ -253,7 +253,6 @@ config NF_CONNTRACK_FTP
|
|
||||||
|
|
||||||
config NF_CONNTRACK_H323
|
|
||||||
tristate "H.323 protocol support"
|
|
||||||
- depends on IPV6 || IPV6=n
|
|
||||||
depends on NETFILTER_ADVANCED
|
|
||||||
help
|
|
||||||
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
|
|
||||||
@@ -1118,7 +1117,6 @@ config NETFILTER_XT_TARGET_SECMARK
|
|
||||||
|
|
||||||
config NETFILTER_XT_TARGET_TCPMSS
|
|
||||||
tristate '"TCPMSS" target support'
|
|
||||||
- depends on IPV6 || IPV6=n
|
|
||||||
default m if NETFILTER_ADVANCED=n
|
|
||||||
help
|
|
||||||
This option adds a `TCPMSS' target, which allows you to alter the
|
|
|
@ -1,210 +0,0 @@
|
||||||
From da3c50704f14132f4adf80d48e9a4cd5d46e54c9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: John Crispin <john@phrozen.org>
|
|
||||||
Date: Fri, 7 Jul 2017 17:09:21 +0200
|
|
||||||
Subject: kconfig: owrt specifc dependencies
|
|
||||||
|
|
||||||
Signed-off-by: John Crispin <john@phrozen.org>
|
|
||||||
---
|
|
||||||
crypto/Kconfig | 10 +++++-----
|
|
||||||
drivers/bcma/Kconfig | 1 +
|
|
||||||
drivers/ssb/Kconfig | 3 ++-
|
|
||||||
lib/Kconfig | 8 ++++----
|
|
||||||
net/netfilter/Kconfig | 2 +-
|
|
||||||
net/wireless/Kconfig | 17 ++++++++++-------
|
|
||||||
sound/core/Kconfig | 4 ++--
|
|
||||||
7 files changed, 25 insertions(+), 20 deletions(-)
|
|
||||||
|
|
||||||
--- a/crypto/Kconfig
|
|
||||||
+++ b/crypto/Kconfig
|
|
||||||
@@ -55,7 +55,7 @@ config CRYPTO_FIPS_VERSION
|
|
||||||
By default the KERNELRELEASE value is used.
|
|
||||||
|
|
||||||
config CRYPTO_ALGAPI
|
|
||||||
- tristate
|
|
||||||
+ tristate "ALGAPI"
|
|
||||||
select CRYPTO_ALGAPI2
|
|
||||||
help
|
|
||||||
This option provides the API for cryptographic algorithms.
|
|
||||||
@@ -64,7 +64,7 @@ config CRYPTO_ALGAPI2
|
|
||||||
tristate
|
|
||||||
|
|
||||||
config CRYPTO_AEAD
|
|
||||||
- tristate
|
|
||||||
+ tristate "AEAD"
|
|
||||||
select CRYPTO_AEAD2
|
|
||||||
select CRYPTO_ALGAPI
|
|
||||||
|
|
||||||
@@ -75,7 +75,7 @@ config CRYPTO_AEAD2
|
|
||||||
select CRYPTO_RNG2
|
|
||||||
|
|
||||||
config CRYPTO_SKCIPHER
|
|
||||||
- tristate
|
|
||||||
+ tristate "SKCIPHER"
|
|
||||||
select CRYPTO_SKCIPHER2
|
|
||||||
select CRYPTO_ALGAPI
|
|
||||||
|
|
||||||
@@ -85,7 +85,7 @@ config CRYPTO_SKCIPHER2
|
|
||||||
select CRYPTO_RNG2
|
|
||||||
|
|
||||||
config CRYPTO_HASH
|
|
||||||
- tristate
|
|
||||||
+ tristate "HASH"
|
|
||||||
select CRYPTO_HASH2
|
|
||||||
select CRYPTO_ALGAPI
|
|
||||||
|
|
||||||
@@ -94,7 +94,7 @@ config CRYPTO_HASH2
|
|
||||||
select CRYPTO_ALGAPI2
|
|
||||||
|
|
||||||
config CRYPTO_RNG
|
|
||||||
- tristate
|
|
||||||
+ tristate "RNG"
|
|
||||||
select CRYPTO_RNG2
|
|
||||||
select CRYPTO_ALGAPI
|
|
||||||
|
|
||||||
--- a/drivers/bcma/Kconfig
|
|
||||||
+++ b/drivers/bcma/Kconfig
|
|
||||||
@@ -16,6 +16,7 @@ if BCMA
|
|
||||||
# Support for Block-I/O. SELECT this from the driver that needs it.
|
|
||||||
config BCMA_BLOCKIO
|
|
||||||
bool
|
|
||||||
+ default y
|
|
||||||
|
|
||||||
config BCMA_HOST_PCI_POSSIBLE
|
|
||||||
bool
|
|
||||||
--- a/drivers/ssb/Kconfig
|
|
||||||
+++ b/drivers/ssb/Kconfig
|
|
||||||
@@ -29,6 +29,7 @@ config SSB_SPROM
|
|
||||||
config SSB_BLOCKIO
|
|
||||||
bool
|
|
||||||
depends on SSB
|
|
||||||
+ default y
|
|
||||||
|
|
||||||
config SSB_PCIHOST_POSSIBLE
|
|
||||||
bool
|
|
||||||
@@ -49,7 +50,7 @@ config SSB_PCIHOST
|
|
||||||
config SSB_B43_PCI_BRIDGE
|
|
||||||
bool
|
|
||||||
depends on SSB_PCIHOST
|
|
||||||
- default n
|
|
||||||
+ default y
|
|
||||||
|
|
||||||
config SSB_PCMCIAHOST_POSSIBLE
|
|
||||||
bool
|
|
||||||
--- a/lib/Kconfig
|
|
||||||
+++ b/lib/Kconfig
|
|
||||||
@@ -457,16 +457,16 @@ config BCH_CONST_T
|
|
||||||
# Textsearch support is select'ed if needed
|
|
||||||
#
|
|
||||||
config TEXTSEARCH
|
|
||||||
- bool
|
|
||||||
+ bool "Textsearch support"
|
|
||||||
|
|
||||||
config TEXTSEARCH_KMP
|
|
||||||
- tristate
|
|
||||||
+ tristate "Textsearch KMP"
|
|
||||||
|
|
||||||
config TEXTSEARCH_BM
|
|
||||||
- tristate
|
|
||||||
+ tristate "Textsearch BM"
|
|
||||||
|
|
||||||
config TEXTSEARCH_FSM
|
|
||||||
- tristate
|
|
||||||
+ tristate "Textsearch FSM"
|
|
||||||
|
|
||||||
config BTREE
|
|
||||||
bool
|
|
||||||
--- a/net/netfilter/Kconfig
|
|
||||||
+++ b/net/netfilter/Kconfig
|
|
||||||
@@ -22,7 +22,7 @@ config NETFILTER_SKIP_EGRESS
|
|
||||||
def_bool NETFILTER_EGRESS && (NET_CLS_ACT || IFB)
|
|
||||||
|
|
||||||
config NETFILTER_NETLINK
|
|
||||||
- tristate
|
|
||||||
+ tristate "Netfilter NFNETLINK interface"
|
|
||||||
|
|
||||||
config NETFILTER_FAMILY_BRIDGE
|
|
||||||
bool
|
|
||||||
--- a/net/wireless/Kconfig
|
|
||||||
+++ b/net/wireless/Kconfig
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
|
||||||
config WIRELESS_EXT
|
|
||||||
- bool
|
|
||||||
+ bool "Wireless extensions"
|
|
||||||
|
|
||||||
config WEXT_CORE
|
|
||||||
def_bool y
|
|
||||||
@@ -12,10 +12,10 @@ config WEXT_PROC
|
|
||||||
depends on WEXT_CORE
|
|
||||||
|
|
||||||
config WEXT_SPY
|
|
||||||
- bool
|
|
||||||
+ bool "WEXT_SPY"
|
|
||||||
|
|
||||||
config WEXT_PRIV
|
|
||||||
- bool
|
|
||||||
+ bool "WEXT_PRIV"
|
|
||||||
|
|
||||||
config CFG80211
|
|
||||||
tristate "cfg80211 - wireless configuration API"
|
|
||||||
@@ -208,7 +208,7 @@ config CFG80211_WEXT_EXPORT
|
|
||||||
endif # CFG80211
|
|
||||||
|
|
||||||
config LIB80211
|
|
||||||
- tristate
|
|
||||||
+ tristate "LIB80211"
|
|
||||||
default n
|
|
||||||
help
|
|
||||||
This options enables a library of common routines used
|
|
||||||
@@ -217,17 +217,17 @@ config LIB80211
|
|
||||||
Drivers should select this themselves if needed.
|
|
||||||
|
|
||||||
config LIB80211_CRYPT_WEP
|
|
||||||
- tristate
|
|
||||||
+ tristate "LIB80211_CRYPT_WEP"
|
|
||||||
select CRYPTO_LIB_ARC4
|
|
||||||
|
|
||||||
config LIB80211_CRYPT_CCMP
|
|
||||||
- tristate
|
|
||||||
+ tristate "LIB80211_CRYPT_CCMP"
|
|
||||||
select CRYPTO
|
|
||||||
select CRYPTO_AES
|
|
||||||
select CRYPTO_CCM
|
|
||||||
|
|
||||||
config LIB80211_CRYPT_TKIP
|
|
||||||
- tristate
|
|
||||||
+ tristate "LIB80211_CRYPT_TKIP"
|
|
||||||
select CRYPTO_LIB_ARC4
|
|
||||||
|
|
||||||
config LIB80211_DEBUG
|
|
||||||
--- a/sound/core/Kconfig
|
|
||||||
+++ b/sound/core/Kconfig
|
|
||||||
@@ -17,7 +17,7 @@ config SND_DMAENGINE_PCM
|
|
||||||
tristate
|
|
||||||
|
|
||||||
config SND_HWDEP
|
|
||||||
- tristate
|
|
||||||
+ tristate "Sound hardware support"
|
|
||||||
|
|
||||||
config SND_SEQ_DEVICE
|
|
||||||
tristate
|
|
||||||
@@ -27,7 +27,7 @@ config SND_RAWMIDI
|
|
||||||
select SND_SEQ_DEVICE if SND_SEQUENCER != n
|
|
||||||
|
|
||||||
config SND_COMPRESS_OFFLOAD
|
|
||||||
- tristate
|
|
||||||
+ tristate "Compression offloading support"
|
|
||||||
|
|
||||||
config SND_JACK
|
|
||||||
bool
|
|
||||||
--- a/net/Kconfig
|
|
||||||
+++ b/net/Kconfig
|
|
||||||
@@ -430,7 +430,7 @@ config NET_DEVLINK
|
|
||||||
default n
|
|
||||||
|
|
||||||
config PAGE_POOL
|
|
||||||
- bool
|
|
||||||
+ bool "Page pool support"
|
|
||||||
|
|
||||||
config PAGE_POOL_STATS
|
|
||||||
default n
|
|
|
@ -1,32 +0,0 @@
|
||||||
From dcd966fa7ca63f38cf7147e1184d13d66e2ca340 Mon Sep 17 00:00:00 2001
|
|
||||||
From: OpenWrt community <openwrt-devel@lists.openwrt.org>
|
|
||||||
Date: Wed, 13 Jul 2022 13:33:30 +0200
|
|
||||||
Subject: [PATCH] Kconfig: add tristate for OID and ASNI string
|
|
||||||
|
|
||||||
---
|
|
||||||
init/Kconfig | 2 +-
|
|
||||||
lib/Kconfig | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- a/init/Kconfig
|
|
||||||
+++ b/init/Kconfig
|
|
||||||
@@ -2004,7 +2004,7 @@ config PADATA
|
|
||||||
bool
|
|
||||||
|
|
||||||
config ASN1
|
|
||||||
- tristate
|
|
||||||
+ tristate "ASN1"
|
|
||||||
help
|
|
||||||
Build a simple ASN.1 grammar compiler that produces a bytecode output
|
|
||||||
that can be interpreted by the ASN.1 stream decoder and used to
|
|
||||||
--- a/lib/Kconfig
|
|
||||||
+++ b/lib/Kconfig
|
|
||||||
@@ -637,7 +637,7 @@ config LIBFDT
|
|
||||||
bool
|
|
||||||
|
|
||||||
config OID_REGISTRY
|
|
||||||
- tristate
|
|
||||||
+ tristate "OID"
|
|
||||||
help
|
|
||||||
Enable fast lookup object identifier registry.
|
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
From 241e5d3f7b0dd3c01f8c7fa83cbc9a3882286d53 Mon Sep 17 00:00:00 2001
|
|
||||||
From: OpenWrt community <openwrt-devel@lists.openwrt.org>
|
|
||||||
Date: Wed, 13 Jul 2022 13:35:18 +0200
|
|
||||||
Subject: [PATCH] lib/crypto: add tristate string for ARC4
|
|
||||||
|
|
||||||
This makes it possible to select CONFIG_CRYPTO_LIB_ARC4 directly. We
|
|
||||||
need this to be able to compile this into the kernel and make use of it
|
|
||||||
from backports.
|
|
||||||
|
|
||||||
---
|
|
||||||
lib/crypto/Kconfig | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/lib/crypto/Kconfig
|
|
||||||
+++ b/lib/crypto/Kconfig
|
|
||||||
@@ -9,7 +9,7 @@ config CRYPTO_LIB_AES
|
|
||||||
tristate
|
|
||||||
|
|
||||||
config CRYPTO_LIB_ARC4
|
|
||||||
- tristate
|
|
||||||
+ tristate "ARC4 cipher library"
|
|
||||||
|
|
||||||
config CRYPTO_ARCH_HAVE_LIB_BLAKE2S
|
|
||||||
bool
|
|
|
@ -1,84 +0,0 @@
|
||||||
From 236c1acdfef5958010ac9814a9872e0a46fd78ee Mon Sep 17 00:00:00 2001
|
|
||||||
From: John Crispin <john@phrozen.org>
|
|
||||||
Date: Fri, 7 Jul 2017 17:13:44 +0200
|
|
||||||
Subject: rfkill: add fake rfkill support
|
|
||||||
|
|
||||||
allow building of modules depending on RFKILL even if RFKILL is not enabled.
|
|
||||||
|
|
||||||
Signed-off-by: John Crispin <john@phrozen.org>
|
|
||||||
---
|
|
||||||
include/linux/rfkill.h | 2 +-
|
|
||||||
net/Makefile | 2 +-
|
|
||||||
net/rfkill/Kconfig | 14 +++++++++-----
|
|
||||||
net/rfkill/Makefile | 2 +-
|
|
||||||
4 files changed, 12 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
--- a/include/linux/rfkill.h
|
|
||||||
+++ b/include/linux/rfkill.h
|
|
||||||
@@ -64,7 +64,7 @@ struct rfkill_ops {
|
|
||||||
int (*set_block)(void *data, bool blocked);
|
|
||||||
};
|
|
||||||
|
|
||||||
-#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
|
|
||||||
+#if defined(CONFIG_RFKILL_FULL) || defined(CONFIG_RFKILL_FULL_MODULE)
|
|
||||||
/**
|
|
||||||
* rfkill_alloc - Allocate rfkill structure
|
|
||||||
* @name: name of the struct -- the string is not copied internally
|
|
||||||
--- a/net/Makefile
|
|
||||||
+++ b/net/Makefile
|
|
||||||
@@ -52,7 +52,7 @@ obj-$(CONFIG_TIPC) += tipc/
|
|
||||||
obj-$(CONFIG_NETLABEL) += netlabel/
|
|
||||||
obj-$(CONFIG_IUCV) += iucv/
|
|
||||||
obj-$(CONFIG_SMC) += smc/
|
|
||||||
-obj-$(CONFIG_RFKILL) += rfkill/
|
|
||||||
+obj-$(CONFIG_RFKILL_FULL) += rfkill/
|
|
||||||
obj-$(CONFIG_NET_9P) += 9p/
|
|
||||||
obj-$(CONFIG_CAIF) += caif/
|
|
||||||
obj-$(CONFIG_DCB) += dcb/
|
|
||||||
--- a/net/rfkill/Kconfig
|
|
||||||
+++ b/net/rfkill/Kconfig
|
|
||||||
@@ -2,7 +2,11 @@
|
|
||||||
#
|
|
||||||
# RF switch subsystem configuration
|
|
||||||
#
|
|
||||||
-menuconfig RFKILL
|
|
||||||
+config RFKILL
|
|
||||||
+ bool
|
|
||||||
+ default y
|
|
||||||
+
|
|
||||||
+menuconfig RFKILL_FULL
|
|
||||||
tristate "RF switch subsystem support"
|
|
||||||
help
|
|
||||||
Say Y here if you want to have control over RF switches
|
|
||||||
@@ -14,19 +18,19 @@ menuconfig RFKILL
|
|
||||||
# LED trigger support
|
|
||||||
config RFKILL_LEDS
|
|
||||||
bool
|
|
||||||
- depends on RFKILL
|
|
||||||
+ depends on RFKILL_FULL
|
|
||||||
depends on LEDS_TRIGGERS = y || RFKILL = LEDS_TRIGGERS
|
|
||||||
default y
|
|
||||||
|
|
||||||
config RFKILL_INPUT
|
|
||||||
bool "RF switch input support" if EXPERT
|
|
||||||
- depends on RFKILL
|
|
||||||
+ depends on RFKILL_FULL
|
|
||||||
depends on INPUT = y || RFKILL = INPUT
|
|
||||||
default y if !EXPERT
|
|
||||||
|
|
||||||
config RFKILL_GPIO
|
|
||||||
tristate "GPIO RFKILL driver"
|
|
||||||
- depends on RFKILL
|
|
||||||
+ depends on RFKILL_FULL
|
|
||||||
depends on GPIOLIB || COMPILE_TEST
|
|
||||||
default n
|
|
||||||
help
|
|
||||||
--- a/net/rfkill/Makefile
|
|
||||||
+++ b/net/rfkill/Makefile
|
|
||||||
@@ -5,5 +5,5 @@
|
|
||||||
|
|
||||||
rfkill-y += core.o
|
|
||||||
rfkill-$(CONFIG_RFKILL_INPUT) += input.o
|
|
||||||
-obj-$(CONFIG_RFKILL) += rfkill.o
|
|
||||||
+obj-$(CONFIG_RFKILL_FULL) += rfkill.o
|
|
||||||
obj-$(CONFIG_RFKILL_GPIO) += rfkill-gpio.o
|
|
|
@ -1,64 +0,0 @@
|
||||||
From: Ben Menchaca <ben.menchaca@qca.qualcomm.com>
|
|
||||||
Date: Fri, 7 Jun 2013 18:35:22 -0500
|
|
||||||
Subject: MIPS: r4k_cache: use more efficient cache blast
|
|
||||||
|
|
||||||
Optimize the compiler output for larger cache blast cases that are
|
|
||||||
common for DMA-based networking.
|
|
||||||
|
|
||||||
Signed-off-by: Ben Menchaca <ben.menchaca@qca.qualcomm.com>
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
--- a/arch/mips/include/asm/r4kcache.h
|
|
||||||
+++ b/arch/mips/include/asm/r4kcache.h
|
|
||||||
@@ -286,14 +286,46 @@ static inline void prot##extra##blast_##
|
|
||||||
unsigned long end) \
|
|
||||||
{ \
|
|
||||||
unsigned long lsize = cpu_##desc##_line_size(); \
|
|
||||||
+ unsigned long lsize_2 = lsize * 2; \
|
|
||||||
+ unsigned long lsize_3 = lsize * 3; \
|
|
||||||
+ unsigned long lsize_4 = lsize * 4; \
|
|
||||||
+ unsigned long lsize_5 = lsize * 5; \
|
|
||||||
+ unsigned long lsize_6 = lsize * 6; \
|
|
||||||
+ unsigned long lsize_7 = lsize * 7; \
|
|
||||||
+ unsigned long lsize_8 = lsize * 8; \
|
|
||||||
unsigned long addr = start & ~(lsize - 1); \
|
|
||||||
- unsigned long aend = (end - 1) & ~(lsize - 1); \
|
|
||||||
+ unsigned long aend = (end + lsize - 1) & ~(lsize - 1); \
|
|
||||||
+ int lines = (aend - addr) / lsize; \
|
|
||||||
\
|
|
||||||
- while (1) { \
|
|
||||||
+ while (lines >= 8) { \
|
|
||||||
+ prot##cache_op(hitop, addr); \
|
|
||||||
+ prot##cache_op(hitop, addr + lsize); \
|
|
||||||
+ prot##cache_op(hitop, addr + lsize_2); \
|
|
||||||
+ prot##cache_op(hitop, addr + lsize_3); \
|
|
||||||
+ prot##cache_op(hitop, addr + lsize_4); \
|
|
||||||
+ prot##cache_op(hitop, addr + lsize_5); \
|
|
||||||
+ prot##cache_op(hitop, addr + lsize_6); \
|
|
||||||
+ prot##cache_op(hitop, addr + lsize_7); \
|
|
||||||
+ addr += lsize_8; \
|
|
||||||
+ lines -= 8; \
|
|
||||||
+ } \
|
|
||||||
+ \
|
|
||||||
+ if (lines & 0x4) { \
|
|
||||||
+ prot##cache_op(hitop, addr); \
|
|
||||||
+ prot##cache_op(hitop, addr + lsize); \
|
|
||||||
+ prot##cache_op(hitop, addr + lsize_2); \
|
|
||||||
+ prot##cache_op(hitop, addr + lsize_3); \
|
|
||||||
+ addr += lsize_4; \
|
|
||||||
+ } \
|
|
||||||
+ \
|
|
||||||
+ if (lines & 0x2) { \
|
|
||||||
+ prot##cache_op(hitop, addr); \
|
|
||||||
+ prot##cache_op(hitop, addr + lsize); \
|
|
||||||
+ addr += lsize_2; \
|
|
||||||
+ } \
|
|
||||||
+ \
|
|
||||||
+ if (lines & 0x1) { \
|
|
||||||
prot##cache_op(hitop, addr); \
|
|
||||||
- if (addr == aend) \
|
|
||||||
- break; \
|
|
||||||
- addr += lsize; \
|
|
||||||
} \
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,112 +0,0 @@
|
||||||
From 0bccc3722bdd88e8ae995e77ef9f7b77ee4cbdee Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Golle <daniel@makrotopia.org>
|
|
||||||
Date: Wed, 7 Apr 2021 22:45:54 +0100
|
|
||||||
Subject: [PATCH 2/2] mtd: blktrans: call add disks after mtd device
|
|
||||||
To: linux-mtd@lists.infradead.org
|
|
||||||
Cc: Vignesh Raghavendra <vigneshr@ti.com>,
|
|
||||||
Richard Weinberger <richard@nod.at>,
|
|
||||||
Miquel Raynal <miquel.raynal@bootlin.com>,
|
|
||||||
David Woodhouse <dwmw2@infradead.org>
|
|
||||||
|
|
||||||
Calling device_add_disk while holding mtd_table_mutex leads
|
|
||||||
to deadlock in case part_bits!=0 as block partition parsers
|
|
||||||
will try to open the newly created disks, trying to acquire
|
|
||||||
mutex once again.
|
|
||||||
Move device_add_disk to additional function called after
|
|
||||||
add partitions of an MTD device have been added and locks
|
|
||||||
have been released.
|
|
||||||
|
|
||||||
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
||||||
---
|
|
||||||
drivers/mtd/mtd_blkdevs.c | 33 ++++++++++++++++++++++++++-------
|
|
||||||
drivers/mtd/mtdcore.c | 3 +++
|
|
||||||
include/linux/mtd/blktrans.h | 1 +
|
|
||||||
3 files changed, 30 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/mtd/mtd_blkdevs.c
|
|
||||||
+++ b/drivers/mtd/mtd_blkdevs.c
|
|
||||||
@@ -386,19 +386,8 @@ int add_mtd_blktrans_dev(struct mtd_blkt
|
|
||||||
if (new->readonly)
|
|
||||||
set_disk_ro(gd, 1);
|
|
||||||
|
|
||||||
- ret = device_add_disk(&new->mtd->dev, gd, NULL);
|
|
||||||
- if (ret)
|
|
||||||
- goto out_cleanup_disk;
|
|
||||||
-
|
|
||||||
- if (new->disk_attributes) {
|
|
||||||
- ret = sysfs_create_group(&disk_to_dev(gd)->kobj,
|
|
||||||
- new->disk_attributes);
|
|
||||||
- WARN_ON(ret);
|
|
||||||
- }
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
-out_cleanup_disk:
|
|
||||||
- put_disk(new->disk);
|
|
||||||
out_free_tag_set:
|
|
||||||
blk_mq_free_tag_set(new->tag_set);
|
|
||||||
out_kfree_tag_set:
|
|
||||||
@@ -408,6 +397,35 @@ out_list_del:
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
+void register_mtd_blktrans_devs(void)
|
|
||||||
+{
|
|
||||||
+ struct mtd_blktrans_ops *tr;
|
|
||||||
+ struct mtd_blktrans_dev *dev, *next;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ list_for_each_entry(tr, &blktrans_majors, list) {
|
|
||||||
+ list_for_each_entry_safe(dev, next, &tr->devs, list) {
|
|
||||||
+ if (disk_live(dev->disk))
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ ret = device_add_disk(&dev->mtd->dev, dev->disk, NULL);
|
|
||||||
+ if (ret)
|
|
||||||
+ goto out_cleanup_disk;
|
|
||||||
+
|
|
||||||
+ if (dev->disk_attributes) {
|
|
||||||
+ ret = sysfs_create_group(&disk_to_dev(dev->disk)->kobj,
|
|
||||||
+ dev->disk_attributes);
|
|
||||||
+ WARN_ON(ret);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+out_cleanup_disk:
|
|
||||||
+ put_disk(dev->disk);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old)
|
|
||||||
{
|
|
||||||
unsigned long flags;
|
|
||||||
--- a/drivers/mtd/mtdcore.c
|
|
||||||
+++ b/drivers/mtd/mtdcore.c
|
|
||||||
@@ -32,6 +32,7 @@
|
|
||||||
|
|
||||||
#include <linux/mtd/mtd.h>
|
|
||||||
#include <linux/mtd/partitions.h>
|
|
||||||
+#include <linux/mtd/blktrans.h>
|
|
||||||
|
|
||||||
#include "mtdcore.h"
|
|
||||||
|
|
||||||
@@ -1074,6 +1075,8 @@ int mtd_device_parse_register(struct mtd
|
|
||||||
register_reboot_notifier(&mtd->reboot_notifier);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ register_mtd_blktrans_devs();
|
|
||||||
+
|
|
||||||
out:
|
|
||||||
if (ret) {
|
|
||||||
nvmem_unregister(mtd->otp_user_nvmem);
|
|
||||||
--- a/include/linux/mtd/blktrans.h
|
|
||||||
+++ b/include/linux/mtd/blktrans.h
|
|
||||||
@@ -76,6 +76,7 @@ extern int deregister_mtd_blktrans(struc
|
|
||||||
extern int add_mtd_blktrans_dev(struct mtd_blktrans_dev *dev);
|
|
||||||
extern int del_mtd_blktrans_dev(struct mtd_blktrans_dev *dev);
|
|
||||||
extern int mtd_blktrans_cease_background(struct mtd_blktrans_dev *dev);
|
|
||||||
+extern void register_mtd_blktrans_devs(void);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* module_mtd_blktrans() - Helper macro for registering a mtd blktrans driver
|
|
|
@ -1,217 +0,0 @@
|
||||||
From 69357074558daf6ff24c9f58714935e9e095a865 Mon Sep 17 00:00:00 2001
|
|
||||||
From: OpenWrt community <openwrt-devel@lists.openwrt.org>
|
|
||||||
Date: Wed, 13 Jul 2022 13:37:33 +0200
|
|
||||||
Subject: [PATCH] kernel: add block fit partition parser
|
|
||||||
|
|
||||||
---
|
|
||||||
block/blk.h | 2 ++
|
|
||||||
block/partitions/Kconfig | 7 +++++++
|
|
||||||
block/partitions/Makefile | 1 +
|
|
||||||
block/partitions/check.h | 3 +++
|
|
||||||
block/partitions/core.c | 17 +++++++++++++++++
|
|
||||||
block/partitions/efi.c | 8 ++++++++
|
|
||||||
block/partitions/efi.h | 3 +++
|
|
||||||
block/partitions/msdos.c | 10 ++++++++++
|
|
||||||
drivers/mtd/mtd_blkdevs.c | 2 ++
|
|
||||||
drivers/mtd/ubi/block.c | 3 +++
|
|
||||||
include/linux/msdos_partition.h | 1 +
|
|
||||||
11 files changed, 57 insertions(+)
|
|
||||||
|
|
||||||
--- a/block/blk.h
|
|
||||||
+++ b/block/blk.h
|
|
||||||
@@ -414,6 +414,8 @@ void blk_free_ext_minor(unsigned int min
|
|
||||||
#define ADDPART_FLAG_NONE 0
|
|
||||||
#define ADDPART_FLAG_RAID 1
|
|
||||||
#define ADDPART_FLAG_WHOLEDISK 2
|
|
||||||
+#define ADDPART_FLAG_READONLY 4
|
|
||||||
+#define ADDPART_FLAG_ROOTDEV 8
|
|
||||||
int bdev_add_partition(struct gendisk *disk, int partno, sector_t start,
|
|
||||||
sector_t length);
|
|
||||||
int bdev_del_partition(struct gendisk *disk, int partno);
|
|
||||||
--- a/block/partitions/Kconfig
|
|
||||||
+++ b/block/partitions/Kconfig
|
|
||||||
@@ -103,6 +103,13 @@ config ATARI_PARTITION
|
|
||||||
Say Y here if you would like to use hard disks under Linux which
|
|
||||||
were partitioned under the Atari OS.
|
|
||||||
|
|
||||||
+config FIT_PARTITION
|
|
||||||
+ bool "Flattened-Image-Tree (FIT) partition support" if PARTITION_ADVANCED
|
|
||||||
+ default n
|
|
||||||
+ help
|
|
||||||
+ Say Y here if your system needs to mount the filesystem part of
|
|
||||||
+ a Flattened-Image-Tree (FIT) image commonly used with Das U-Boot.
|
|
||||||
+
|
|
||||||
config IBM_PARTITION
|
|
||||||
bool "IBM disk label and partition support"
|
|
||||||
depends on PARTITION_ADVANCED && S390
|
|
||||||
--- a/block/partitions/Makefile
|
|
||||||
+++ b/block/partitions/Makefile
|
|
||||||
@@ -8,6 +8,7 @@ obj-$(CONFIG_ACORN_PARTITION) += acorn.o
|
|
||||||
obj-$(CONFIG_AMIGA_PARTITION) += amiga.o
|
|
||||||
obj-$(CONFIG_ATARI_PARTITION) += atari.o
|
|
||||||
obj-$(CONFIG_AIX_PARTITION) += aix.o
|
|
||||||
+obj-$(CONFIG_FIT_PARTITION) += fit.o
|
|
||||||
obj-$(CONFIG_CMDLINE_PARTITION) += cmdline.o
|
|
||||||
obj-$(CONFIG_MAC_PARTITION) += mac.o
|
|
||||||
obj-$(CONFIG_LDM_PARTITION) += ldm.o
|
|
||||||
--- a/block/partitions/check.h
|
|
||||||
+++ b/block/partitions/check.h
|
|
||||||
@@ -57,6 +57,7 @@ int amiga_partition(struct parsed_partit
|
|
||||||
int atari_partition(struct parsed_partitions *state);
|
|
||||||
int cmdline_partition(struct parsed_partitions *state);
|
|
||||||
int efi_partition(struct parsed_partitions *state);
|
|
||||||
+int fit_partition(struct parsed_partitions *state);
|
|
||||||
int ibm_partition(struct parsed_partitions *);
|
|
||||||
int karma_partition(struct parsed_partitions *state);
|
|
||||||
int ldm_partition(struct parsed_partitions *state);
|
|
||||||
@@ -67,3 +68,5 @@ int sgi_partition(struct parsed_partitio
|
|
||||||
int sun_partition(struct parsed_partitions *state);
|
|
||||||
int sysv68_partition(struct parsed_partitions *state);
|
|
||||||
int ultrix_partition(struct parsed_partitions *state);
|
|
||||||
+
|
|
||||||
+int parse_fit_partitions(struct parsed_partitions *state, u64 start_sector, u64 nr_sectors, int *slot, int add_remain);
|
|
||||||
--- a/block/partitions/core.c
|
|
||||||
+++ b/block/partitions/core.c
|
|
||||||
@@ -10,6 +10,10 @@
|
|
||||||
#include <linux/ctype.h>
|
|
||||||
#include <linux/vmalloc.h>
|
|
||||||
#include <linux/raid/detect.h>
|
|
||||||
+#ifdef CONFIG_FIT_PARTITION
|
|
||||||
+#include <linux/root_dev.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include "check.h"
|
|
||||||
|
|
||||||
static int (*check_part[])(struct parsed_partitions *) = {
|
|
||||||
@@ -46,6 +50,9 @@ static int (*check_part[])(struct parsed
|
|
||||||
#ifdef CONFIG_EFI_PARTITION
|
|
||||||
efi_partition, /* this must come before msdos */
|
|
||||||
#endif
|
|
||||||
+#ifdef CONFIG_FIT_PARTITION
|
|
||||||
+ fit_partition,
|
|
||||||
+#endif
|
|
||||||
#ifdef CONFIG_SGI_PARTITION
|
|
||||||
sgi_partition,
|
|
||||||
#endif
|
|
||||||
@@ -398,6 +405,11 @@ static struct block_device *add_partitio
|
|
||||||
goto out_del;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef CONFIG_FIT_PARTITION
|
|
||||||
+ if (flags & ADDPART_FLAG_READONLY)
|
|
||||||
+ bdev->bd_read_only = true;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* everything is up and running, commence */
|
|
||||||
err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL);
|
|
||||||
if (err)
|
|
||||||
@@ -585,6 +597,11 @@ static bool blk_add_partition(struct gen
|
|
||||||
(state->parts[p].flags & ADDPART_FLAG_RAID))
|
|
||||||
md_autodetect_dev(part->bd_dev);
|
|
||||||
|
|
||||||
+#ifdef CONFIG_FIT_PARTITION
|
|
||||||
+ if ((state->parts[p].flags & ADDPART_FLAG_ROOTDEV) && ROOT_DEV == 0)
|
|
||||||
+ ROOT_DEV = part->bd_dev;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/block/partitions/efi.c
|
|
||||||
+++ b/block/partitions/efi.c
|
|
||||||
@@ -716,6 +716,9 @@ int efi_partition(struct parsed_partitio
|
|
||||||
gpt_entry *ptes = NULL;
|
|
||||||
u32 i;
|
|
||||||
unsigned ssz = queue_logical_block_size(state->disk->queue) / 512;
|
|
||||||
+#ifdef CONFIG_FIT_PARTITION
|
|
||||||
+ u32 extra_slot = 64;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
if (!find_valid_gpt(state, &gpt, &ptes) || !gpt || !ptes) {
|
|
||||||
kfree(gpt);
|
|
||||||
@@ -749,6 +752,11 @@ int efi_partition(struct parsed_partitio
|
|
||||||
ARRAY_SIZE(ptes[i].partition_name));
|
|
||||||
utf16_le_to_7bit(ptes[i].partition_name, label_max, info->volname);
|
|
||||||
state->parts[i + 1].has_info = true;
|
|
||||||
+#ifdef CONFIG_FIT_PARTITION
|
|
||||||
+ /* If this is a U-Boot FIT volume it may have subpartitions */
|
|
||||||
+ if (!efi_guidcmp(ptes[i].partition_type_guid, PARTITION_LINUX_FIT_GUID))
|
|
||||||
+ (void) parse_fit_partitions(state, start * ssz, size * ssz, &extra_slot, 1);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
kfree(ptes);
|
|
||||||
kfree(gpt);
|
|
||||||
--- a/block/partitions/efi.h
|
|
||||||
+++ b/block/partitions/efi.h
|
|
||||||
@@ -51,6 +51,9 @@
|
|
||||||
#define PARTITION_LINUX_LVM_GUID \
|
|
||||||
EFI_GUID( 0xe6d6d379, 0xf507, 0x44c2, \
|
|
||||||
0xa2, 0x3c, 0x23, 0x8f, 0x2a, 0x3d, 0xf9, 0x28)
|
|
||||||
+#define PARTITION_LINUX_FIT_GUID \
|
|
||||||
+ EFI_GUID( 0xcae9be83, 0xb15f, 0x49cc, \
|
|
||||||
+ 0x86, 0x3f, 0x08, 0x1b, 0x74, 0x4a, 0x2d, 0x93)
|
|
||||||
|
|
||||||
typedef struct _gpt_header {
|
|
||||||
__le64 signature;
|
|
||||||
--- a/block/partitions/msdos.c
|
|
||||||
+++ b/block/partitions/msdos.c
|
|
||||||
@@ -564,6 +564,15 @@ static void parse_minix(struct parsed_pa
|
|
||||||
#endif /* CONFIG_MINIX_SUBPARTITION */
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void parse_fit_mbr(struct parsed_partitions *state,
|
|
||||||
+ sector_t offset, sector_t size, int origin)
|
|
||||||
+{
|
|
||||||
+#ifdef CONFIG_FIT_PARTITION
|
|
||||||
+ u32 extra_slot = 64;
|
|
||||||
+ (void) parse_fit_partitions(state, offset, size, &extra_slot, 1);
|
|
||||||
+#endif /* CONFIG_FIT_PARTITION */
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static struct {
|
|
||||||
unsigned char id;
|
|
||||||
void (*parse)(struct parsed_partitions *, sector_t, sector_t, int);
|
|
||||||
@@ -575,6 +584,7 @@ static struct {
|
|
||||||
{UNIXWARE_PARTITION, parse_unixware},
|
|
||||||
{SOLARIS_X86_PARTITION, parse_solaris_x86},
|
|
||||||
{NEW_SOLARIS_X86_PARTITION, parse_solaris_x86},
|
|
||||||
+ {FIT_PARTITION, parse_fit_mbr},
|
|
||||||
{0, NULL},
|
|
||||||
};
|
|
||||||
|
|
||||||
--- a/drivers/mtd/mtd_blkdevs.c
|
|
||||||
+++ b/drivers/mtd/mtd_blkdevs.c
|
|
||||||
@@ -359,7 +359,9 @@ int add_mtd_blktrans_dev(struct mtd_blkt
|
|
||||||
} else {
|
|
||||||
snprintf(gd->disk_name, sizeof(gd->disk_name),
|
|
||||||
"%s%d", tr->name, new->devnum);
|
|
||||||
- gd->flags |= GENHD_FL_NO_PART;
|
|
||||||
+
|
|
||||||
+ if (!IS_ENABLED(CONFIG_FIT_PARTITION) || mtd_type_is_nand(new->mtd))
|
|
||||||
+ gd->flags |= GENHD_FL_NO_PART;
|
|
||||||
}
|
|
||||||
|
|
||||||
set_capacity(gd, ((u64)new->size * tr->blksize) >> 9);
|
|
||||||
--- a/drivers/mtd/ubi/block.c
|
|
||||||
+++ b/drivers/mtd/ubi/block.c
|
|
||||||
@@ -431,7 +431,9 @@ int ubiblock_create(struct ubi_volume_in
|
|
||||||
ret = -ENODEV;
|
|
||||||
goto out_cleanup_disk;
|
|
||||||
}
|
|
||||||
- gd->flags |= GENHD_FL_NO_PART;
|
|
||||||
+ if (!IS_ENABLED(CONFIG_FIT_PARTITION))
|
|
||||||
+ gd->flags |= GENHD_FL_NO_PART;
|
|
||||||
+
|
|
||||||
gd->private_data = dev;
|
|
||||||
sprintf(gd->disk_name, "ubiblock%d_%d", dev->ubi_num, dev->vol_id);
|
|
||||||
set_capacity(gd, disk_capacity);
|
|
||||||
--- a/include/linux/msdos_partition.h
|
|
||||||
+++ b/include/linux/msdos_partition.h
|
|
||||||
@@ -31,6 +31,7 @@ enum msdos_sys_ind {
|
|
||||||
LINUX_LVM_PARTITION = 0x8e,
|
|
||||||
LINUX_RAID_PARTITION = 0xfd, /* autodetect RAID partition */
|
|
||||||
|
|
||||||
+ FIT_PARTITION = 0x2e, /* U-Boot uImage.FIT */
|
|
||||||
SOLARIS_X86_PARTITION = 0x82, /* also Linux swap partitions */
|
|
||||||
NEW_SOLARIS_X86_PARTITION = 0xbf,
|
|
||||||
|
|
|
@ -1,120 +0,0 @@
|
||||||
From 6fa9e3678eb002246df1280322b6a024853950a5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ansuel Smith <ansuelsmth@gmail.com>
|
|
||||||
Date: Mon, 11 Oct 2021 00:53:14 +0200
|
|
||||||
Subject: [PATCH] drivers: mtd: parsers: add nvmem support to cmdlinepart
|
|
||||||
|
|
||||||
Assuming cmdlinepart is only one level deep partition scheme and that
|
|
||||||
static partition are also defined in DTS, we can assign an of_node for
|
|
||||||
partition declared from bootargs. cmdlinepart have priority than
|
|
||||||
fiexed-partition parser so in this specific case the parser doesn't
|
|
||||||
assign an of_node. Fix this by searching a defined of_node using a
|
|
||||||
similar fixed_partition parser and if a partition is found with the same
|
|
||||||
label, check that it has the same offset and size and return the DT
|
|
||||||
of_node to correctly use NVMEM cells.
|
|
||||||
|
|
||||||
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/mtd/parsers/cmdlinepart.c | 71 +++++++++++++++++++++++++++++++
|
|
||||||
1 file changed, 71 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/mtd/parsers/cmdlinepart.c
|
|
||||||
+++ b/drivers/mtd/parsers/cmdlinepart.c
|
|
||||||
@@ -43,6 +43,7 @@
|
|
||||||
#include <linux/mtd/partitions.h>
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/err.h>
|
|
||||||
+#include <linux/of.h>
|
|
||||||
|
|
||||||
/* debug macro */
|
|
||||||
#if 0
|
|
||||||
@@ -323,6 +324,68 @@ static int mtdpart_setup_real(char *s)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int search_fixed_partition(struct mtd_info *master,
|
|
||||||
+ struct mtd_partition *target_part,
|
|
||||||
+ struct mtd_partition *fixed_part)
|
|
||||||
+{
|
|
||||||
+ struct device_node *mtd_node;
|
|
||||||
+ struct device_node *ofpart_node;
|
|
||||||
+ struct device_node *pp;
|
|
||||||
+ struct mtd_partition part;
|
|
||||||
+ const char *partname;
|
|
||||||
+
|
|
||||||
+ mtd_node = mtd_get_of_node(master);
|
|
||||||
+ if (!mtd_node)
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ ofpart_node = of_get_child_by_name(mtd_node, "partitions");
|
|
||||||
+
|
|
||||||
+ for_each_child_of_node(ofpart_node, pp) {
|
|
||||||
+ const __be32 *reg;
|
|
||||||
+ int len;
|
|
||||||
+ int a_cells, s_cells;
|
|
||||||
+
|
|
||||||
+ reg = of_get_property(pp, "reg", &len);
|
|
||||||
+ if (!reg) {
|
|
||||||
+ pr_debug("%s: ofpart partition %pOF (%pOF) missing reg property.\n",
|
|
||||||
+ master->name, pp,
|
|
||||||
+ mtd_node);
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ a_cells = of_n_addr_cells(pp);
|
|
||||||
+ s_cells = of_n_size_cells(pp);
|
|
||||||
+ if (len / 4 != a_cells + s_cells) {
|
|
||||||
+ pr_debug("%s: ofpart partition %pOF (%pOF) error parsing reg property.\n",
|
|
||||||
+ master->name, pp,
|
|
||||||
+ mtd_node);
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ part.offset = of_read_number(reg, a_cells);
|
|
||||||
+ part.size = of_read_number(reg + a_cells, s_cells);
|
|
||||||
+ part.of_node = pp;
|
|
||||||
+
|
|
||||||
+ partname = of_get_property(pp, "label", &len);
|
|
||||||
+ if (!partname)
|
|
||||||
+ partname = of_get_property(pp, "name", &len);
|
|
||||||
+ part.name = partname;
|
|
||||||
+
|
|
||||||
+ if (!strncmp(target_part->name, part.name, len)) {
|
|
||||||
+ if (part.offset != target_part->offset)
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ if (part.size != target_part->size)
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ memcpy(fixed_part, &part, sizeof(struct mtd_partition));
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return -EINVAL;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Main function to be called from the MTD mapping driver/device to
|
|
||||||
* obtain the partitioning information. At this point the command line
|
|
||||||
@@ -338,6 +401,7 @@ static int parse_cmdline_partitions(stru
|
|
||||||
int i, err;
|
|
||||||
struct cmdline_mtd_partition *part;
|
|
||||||
const char *mtd_id = master->name;
|
|
||||||
+ struct mtd_partition fixed_part;
|
|
||||||
|
|
||||||
/* parse command line */
|
|
||||||
if (!cmdline_parsed) {
|
|
||||||
@@ -382,6 +446,13 @@ static int parse_cmdline_partitions(stru
|
|
||||||
sizeof(*part->parts) * (part->num_parts - i));
|
|
||||||
i--;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ err = search_fixed_partition(master, &part->parts[i], &fixed_part);
|
|
||||||
+ if (!err) {
|
|
||||||
+ part->parts[i].of_node = fixed_part.of_node;
|
|
||||||
+ pr_info("Found partition defined in DT for %s. Assigning OF node to support nvmem.",
|
|
||||||
+ part->parts[i].name);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
*pparts = kmemdup(part->parts, sizeof(*part->parts) * part->num_parts,
|
|
|
@ -1,33 +0,0 @@
|
||||||
From ac84397efb3b3868c71c10ad7521161773228a17 Mon Sep 17 00:00:00 2001
|
|
||||||
From: OpenWrt community <openwrt-devel@lists.openwrt.org>
|
|
||||||
Date: Wed, 13 Jul 2022 13:41:44 +0200
|
|
||||||
Subject: [PATCH] mtd/nand: add MediaTek NAND bad block managment table
|
|
||||||
|
|
||||||
---
|
|
||||||
drivers/mtd/nand/Kconfig | 4 ++++
|
|
||||||
drivers/mtd/nand/Makefile | 1 +
|
|
||||||
2 files changed, 5 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/mtd/nand/Kconfig
|
|
||||||
+++ b/drivers/mtd/nand/Kconfig
|
|
||||||
@@ -46,6 +46,10 @@ config MTD_NAND_ECC_SW_BCH
|
|
||||||
ECC codes. They are used with NAND devices requiring more than 1 bit
|
|
||||||
of error correction.
|
|
||||||
|
|
||||||
+config MTD_NAND_MTK_BMT
|
|
||||||
+ bool "Support MediaTek NAND Bad-block Management Table"
|
|
||||||
+ default n
|
|
||||||
+
|
|
||||||
config MTD_NAND_ECC_MXIC
|
|
||||||
bool "Macronix external hardware ECC engine"
|
|
||||||
depends on HAS_IOMEM
|
|
||||||
--- a/drivers/mtd/nand/Makefile
|
|
||||||
+++ b/drivers/mtd/nand/Makefile
|
|
||||||
@@ -3,6 +3,7 @@
|
|
||||||
nandcore-objs := core.o bbt.o
|
|
||||||
obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o
|
|
||||||
obj-$(CONFIG_MTD_NAND_ECC_MEDIATEK) += ecc-mtk.o
|
|
||||||
+obj-$(CONFIG_MTD_NAND_MTK_BMT) += mtk_bmt.o mtk_bmt_v2.o mtk_bmt_bbt.o mtk_bmt_nmbm.o
|
|
||||||
|
|
||||||
obj-y += onenand/
|
|
||||||
obj-y += raw/
|
|
|
@ -1,214 +0,0 @@
|
||||||
From eda40b8c8c82e0f2789d6bc8bf63846dce2e8f32 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
||||||
Date: Sat, 23 Mar 2019 09:29:49 +0000
|
|
||||||
Subject: [PATCH] netfilter: connmark: introduce set-dscpmark
|
|
||||||
|
|
||||||
set-dscpmark is a method of storing the DSCP of an ip packet into
|
|
||||||
conntrack mark. In combination with a suitable tc filter action
|
|
||||||
(act_ctinfo) DSCP values are able to be stored in the mark on egress and
|
|
||||||
restored on ingress across links that otherwise alter or bleach DSCP.
|
|
||||||
|
|
||||||
This is useful for qdiscs such as CAKE which are able to shape according
|
|
||||||
to policies based on DSCP.
|
|
||||||
|
|
||||||
Ingress classification is traditionally a challenging task since
|
|
||||||
iptables rules haven't yet run and tc filter/eBPF programs are pre-NAT
|
|
||||||
lookups, hence are unable to see internal IPv4 addresses as used on the
|
|
||||||
typical home masquerading gateway.
|
|
||||||
|
|
||||||
x_tables CONNMARK set-dscpmark target solves the problem of storing the
|
|
||||||
DSCP to the conntrack mark in a way suitable for the new act_ctinfo tc
|
|
||||||
action to restore.
|
|
||||||
|
|
||||||
The set-dscpmark option accepts 2 parameters, a 32bit 'dscpmask' and a
|
|
||||||
32bit 'statemask'. The dscp mask must be 6 contiguous bits and
|
|
||||||
represents the area where the DSCP will be stored in the connmark. The
|
|
||||||
state mask is a minimum 1 bit length mask that must not overlap with the
|
|
||||||
dscpmask. It represents a flag which is set when the DSCP has been
|
|
||||||
stored in the conntrack mark. This is useful to implement a 'one shot'
|
|
||||||
iptables based classification where the 'complicated' iptables rules are
|
|
||||||
only run once to classify the connection on initial (egress) packet and
|
|
||||||
subsequent packets are all marked/restored with the same DSCP. A state
|
|
||||||
mask of zero disables the setting of a status bit/s.
|
|
||||||
|
|
||||||
example syntax with a suitably modified iptables user space application:
|
|
||||||
|
|
||||||
iptables -A QOS_MARK_eth0 -t mangle -j CONNMARK --set-dscpmark 0xfc000000/0x01000000
|
|
||||||
|
|
||||||
Would store the DSCP in the top 6 bits of the 32bit mark field, and use
|
|
||||||
the LSB of the top byte as the 'DSCP has been stored' marker.
|
|
||||||
|
|
||||||
|----0xFC----conntrack mark----000000---|
|
|
||||||
| Bits 31-26 | bit 25 | bit24 |~~~ Bit 0|
|
|
||||||
| DSCP | unused | flag |unused |
|
|
||||||
|-----------------------0x01---000000---|
|
|
||||||
^ ^
|
|
||||||
| |
|
|
||||||
---| Conditional flag
|
|
||||||
| set this when dscp
|
|
||||||
|-ip diffserv-| stored in mark
|
|
||||||
| 6 bits |
|
|
||||||
|-------------|
|
|
||||||
|
|
||||||
an identically configured tc action to restore looks like:
|
|
||||||
|
|
||||||
tc filter show dev eth0 ingress
|
|
||||||
filter parent ffff: protocol all pref 10 u32 chain 0
|
|
||||||
filter parent ffff: protocol all pref 10 u32 chain 0 fh 800: ht divisor 1
|
|
||||||
filter parent ffff: protocol all pref 10 u32 chain 0 fh 800::800 order 2048 key ht 800 bkt 0 flowid 1: not_in_hw
|
|
||||||
match 00000000/00000000 at 0
|
|
||||||
action order 1: ctinfo zone 0 pipe
|
|
||||||
index 2 ref 1 bind 1 dscp 0xfc000000/0x1000000
|
|
||||||
|
|
||||||
action order 2: mirred (Egress Redirect to device ifb4eth0) stolen
|
|
||||||
index 1 ref 1 bind 1
|
|
||||||
|
|
||||||
|----0xFC----conntrack mark----000000---|
|
|
||||||
| Bits 31-26 | bit 25 | bit24 |~~~ Bit 0|
|
|
||||||
| DSCP | unused | flag |unused |
|
|
||||||
|-----------------------0x01---000000---|
|
|
||||||
| |
|
|
||||||
| |
|
|
||||||
---| Conditional flag
|
|
||||||
v only restore if set
|
|
||||||
|-ip diffserv-|
|
|
||||||
| 6 bits |
|
|
||||||
|-------------|
|
|
||||||
|
|
||||||
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
||||||
---
|
|
||||||
include/uapi/linux/netfilter/xt_connmark.h | 10 ++++
|
|
||||||
net/netfilter/xt_connmark.c | 55 ++++++++++++++++++----
|
|
||||||
2 files changed, 57 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
--- a/include/uapi/linux/netfilter/xt_connmark.h
|
|
||||||
+++ b/include/uapi/linux/netfilter/xt_connmark.h
|
|
||||||
@@ -15,6 +15,11 @@ enum {
|
|
||||||
};
|
|
||||||
|
|
||||||
enum {
|
|
||||||
+ XT_CONNMARK_VALUE = (1 << 0),
|
|
||||||
+ XT_CONNMARK_DSCP = (1 << 1)
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+enum {
|
|
||||||
D_SHIFT_LEFT = 0,
|
|
||||||
D_SHIFT_RIGHT,
|
|
||||||
};
|
|
||||||
@@ -29,6 +34,11 @@ struct xt_connmark_tginfo2 {
|
|
||||||
__u8 shift_dir, shift_bits, mode;
|
|
||||||
};
|
|
||||||
|
|
||||||
+struct xt_connmark_tginfo3 {
|
|
||||||
+ __u32 ctmark, ctmask, nfmask;
|
|
||||||
+ __u8 shift_dir, shift_bits, mode, func;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
struct xt_connmark_mtinfo1 {
|
|
||||||
__u32 mark, mask;
|
|
||||||
__u8 invert;
|
|
||||||
--- a/net/netfilter/xt_connmark.c
|
|
||||||
+++ b/net/netfilter/xt_connmark.c
|
|
||||||
@@ -24,13 +24,13 @@ MODULE_ALIAS("ipt_connmark");
|
|
||||||
MODULE_ALIAS("ip6t_connmark");
|
|
||||||
|
|
||||||
static unsigned int
|
|
||||||
-connmark_tg_shift(struct sk_buff *skb, const struct xt_connmark_tginfo2 *info)
|
|
||||||
+connmark_tg_shift(struct sk_buff *skb, const struct xt_connmark_tginfo3 *info)
|
|
||||||
{
|
|
||||||
enum ip_conntrack_info ctinfo;
|
|
||||||
u_int32_t new_targetmark;
|
|
||||||
struct nf_conn *ct;
|
|
||||||
u_int32_t newmark;
|
|
||||||
- u_int32_t oldmark;
|
|
||||||
+ u_int8_t dscp;
|
|
||||||
|
|
||||||
ct = nf_ct_get(skb, &ctinfo);
|
|
||||||
if (ct == NULL)
|
|
||||||
@@ -38,13 +38,24 @@ connmark_tg_shift(struct sk_buff *skb, c
|
|
||||||
|
|
||||||
switch (info->mode) {
|
|
||||||
case XT_CONNMARK_SET:
|
|
||||||
- oldmark = READ_ONCE(ct->mark);
|
|
||||||
- newmark = (oldmark & ~info->ctmask) ^ info->ctmark;
|
|
||||||
- if (info->shift_dir == D_SHIFT_RIGHT)
|
|
||||||
- newmark >>= info->shift_bits;
|
|
||||||
- else
|
|
||||||
- newmark <<= info->shift_bits;
|
|
||||||
+ newmark = READ_ONCE(ct->mark);
|
|
||||||
+ if (info->func & XT_CONNMARK_VALUE) {
|
|
||||||
+ newmark = (newmark & ~info->ctmask) ^ info->ctmark;
|
|
||||||
+ if (info->shift_dir == D_SHIFT_RIGHT)
|
|
||||||
+ newmark >>= info->shift_bits;
|
|
||||||
+ else
|
|
||||||
+ newmark <<= info->shift_bits;
|
|
||||||
+ } else if (info->func & XT_CONNMARK_DSCP) {
|
|
||||||
+ if (skb->protocol == htons(ETH_P_IP))
|
|
||||||
+ dscp = ipv4_get_dsfield(ip_hdr(skb)) >> 2;
|
|
||||||
+ else if (skb->protocol == htons(ETH_P_IPV6))
|
|
||||||
+ dscp = ipv6_get_dsfield(ipv6_hdr(skb)) >> 2;
|
|
||||||
+ else /* protocol doesn't have diffserv */
|
|
||||||
+ break;
|
|
||||||
|
|
||||||
+ newmark = (newmark & ~info->ctmark) |
|
|
||||||
+ (info->ctmask | (dscp << info->shift_bits));
|
|
||||||
+ }
|
|
||||||
if (READ_ONCE(ct->mark) != newmark) {
|
|
||||||
WRITE_ONCE(ct->mark, newmark);
|
|
||||||
nf_conntrack_event_cache(IPCT_MARK, ct);
|
|
||||||
@@ -83,20 +94,36 @@ static unsigned int
|
|
||||||
connmark_tg(struct sk_buff *skb, const struct xt_action_param *par)
|
|
||||||
{
|
|
||||||
const struct xt_connmark_tginfo1 *info = par->targinfo;
|
|
||||||
- const struct xt_connmark_tginfo2 info2 = {
|
|
||||||
+ const struct xt_connmark_tginfo3 info3 = {
|
|
||||||
.ctmark = info->ctmark,
|
|
||||||
.ctmask = info->ctmask,
|
|
||||||
.nfmask = info->nfmask,
|
|
||||||
.mode = info->mode,
|
|
||||||
+ .func = XT_CONNMARK_VALUE
|
|
||||||
};
|
|
||||||
|
|
||||||
- return connmark_tg_shift(skb, &info2);
|
|
||||||
+ return connmark_tg_shift(skb, &info3);
|
|
||||||
}
|
|
||||||
|
|
||||||
static unsigned int
|
|
||||||
connmark_tg_v2(struct sk_buff *skb, const struct xt_action_param *par)
|
|
||||||
{
|
|
||||||
const struct xt_connmark_tginfo2 *info = par->targinfo;
|
|
||||||
+ const struct xt_connmark_tginfo3 info3 = {
|
|
||||||
+ .ctmark = info->ctmark,
|
|
||||||
+ .ctmask = info->ctmask,
|
|
||||||
+ .nfmask = info->nfmask,
|
|
||||||
+ .mode = info->mode,
|
|
||||||
+ .func = XT_CONNMARK_VALUE
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ return connmark_tg_shift(skb, &info3);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static unsigned int
|
|
||||||
+connmark_tg_v3(struct sk_buff *skb, const struct xt_action_param *par)
|
|
||||||
+{
|
|
||||||
+ const struct xt_connmark_tginfo3 *info = par->targinfo;
|
|
||||||
|
|
||||||
return connmark_tg_shift(skb, info);
|
|
||||||
}
|
|
||||||
@@ -167,6 +194,16 @@ static struct xt_target connmark_tg_reg[
|
|
||||||
.targetsize = sizeof(struct xt_connmark_tginfo2),
|
|
||||||
.destroy = connmark_tg_destroy,
|
|
||||||
.me = THIS_MODULE,
|
|
||||||
+ },
|
|
||||||
+ {
|
|
||||||
+ .name = "CONNMARK",
|
|
||||||
+ .revision = 3,
|
|
||||||
+ .family = NFPROTO_UNSPEC,
|
|
||||||
+ .checkentry = connmark_tg_check,
|
|
||||||
+ .target = connmark_tg_v3,
|
|
||||||
+ .targetsize = sizeof(struct xt_connmark_tginfo3),
|
|
||||||
+ .destroy = connmark_tg_destroy,
|
|
||||||
+ .me = THIS_MODULE,
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
From 6d3bc769657b0ee7c7506dad9911111c4226a7ea Mon Sep 17 00:00:00 2001
|
|
||||||
From: Imre Kaloz <kaloz@openwrt.org>
|
|
||||||
Date: Fri, 7 Jul 2017 17:21:05 +0200
|
|
||||||
Subject: mac80211: increase wireless mesh header size
|
|
||||||
|
|
||||||
lede-commit 3d4466cfd8f75f717efdb1f96fdde3c70d865fc1
|
|
||||||
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|
||||||
---
|
|
||||||
include/linux/netdevice.h | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- a/include/linux/netdevice.h
|
|
||||||
+++ b/include/linux/netdevice.h
|
|
||||||
@@ -149,8 +149,8 @@ static inline bool dev_xmit_complete(int
|
|
||||||
|
|
||||||
#if defined(CONFIG_HYPERV_NET)
|
|
||||||
# define LL_MAX_HEADER 128
|
|
||||||
-#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
|
|
||||||
-# if defined(CONFIG_MAC80211_MESH)
|
|
||||||
+#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25) || 1
|
|
||||||
+# if defined(CONFIG_MAC80211_MESH) || 1
|
|
||||||
# define LL_MAX_HEADER 128
|
|
||||||
# else
|
|
||||||
# define LL_MAX_HEADER 96
|
|
|
@ -1,27 +0,0 @@
|
||||||
From a6ccb238939b25851474a279b20367fd24a0e816 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Fri, 7 Jul 2017 17:21:53 +0200
|
|
||||||
Subject: hack: net: fq_codel: tune defaults for small devices
|
|
||||||
|
|
||||||
Assume that x86_64 devices always have a big memory and do not need this
|
|
||||||
optimization compared to devices with only 32 MB or 64 MB RAM.
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
net/sched/sch_fq_codel.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/net/sched/sch_fq_codel.c
|
|
||||||
+++ b/net/sched/sch_fq_codel.c
|
|
||||||
@@ -471,7 +471,11 @@ static int fq_codel_init(struct Qdisc *s
|
|
||||||
|
|
||||||
sch->limit = 10*1024;
|
|
||||||
q->flows_cnt = 1024;
|
|
||||||
+#ifdef CONFIG_X86_64
|
|
||||||
q->memory_limit = 32 << 20; /* 32 MBytes */
|
|
||||||
+#else
|
|
||||||
+ q->memory_limit = 4 << 20; /* 4 MBytes */
|
|
||||||
+#endif
|
|
||||||
q->drop_batch_size = 64;
|
|
||||||
q->quantum = psched_mtu(qdisc_dev(sch));
|
|
||||||
INIT_LIST_HEAD(&q->new_flows);
|
|
|
@ -1,25 +0,0 @@
|
||||||
From 804fbb3f2ec9283f7b778e057a68bfff440a0be6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rui Salvaterra <rsalvaterra@gmail.com>
|
|
||||||
Date: Wed, 30 Mar 2022 22:51:55 +0100
|
|
||||||
Subject: [PATCH] kernel: ct: size the hashtable more adequately
|
|
||||||
|
|
||||||
To set the default size of the connection tracking hash table, a divider of
|
|
||||||
16384 becomes inadequate for a router handling lots of connections. Divide by
|
|
||||||
2048 instead, making the default size scale better with the available RAM.
|
|
||||||
|
|
||||||
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
|
|
||||||
---
|
|
||||||
net/netfilter/nf_conntrack_core.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/net/netfilter/nf_conntrack_core.c
|
|
||||||
+++ b/net/netfilter/nf_conntrack_core.c
|
|
||||||
@@ -2705,7 +2705,7 @@ int nf_conntrack_init_start(void)
|
|
||||||
|
|
||||||
if (!nf_conntrack_htable_size) {
|
|
||||||
nf_conntrack_htable_size
|
|
||||||
- = (((nr_pages << PAGE_SHIFT) / 16384)
|
|
||||||
+ = (((nr_pages << PAGE_SHIFT) / 2048)
|
|
||||||
/ sizeof(struct hlist_head));
|
|
||||||
if (BITS_PER_LONG >= 64 &&
|
|
||||||
nr_pages > (4 * (1024 * 1024 * 1024 / PAGE_SIZE)))
|
|
|
@ -1,131 +0,0 @@
|
||||||
From 36e516290611e613aa92996cb4339561452695b4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Fri, 7 Jul 2017 17:24:23 +0200
|
|
||||||
Subject: net: swconfig: adds openwrt switch layer
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
drivers/net/phy/Kconfig | 83 +++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
drivers/net/phy/Makefile | 15 +++++++++
|
|
||||||
include/uapi/linux/Kbuild | 1 +
|
|
||||||
3 files changed, 99 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/net/phy/Kconfig
|
|
||||||
+++ b/drivers/net/phy/Kconfig
|
|
||||||
@@ -69,6 +69,80 @@ config SFP
|
|
||||||
depends on HWMON || HWMON=n
|
|
||||||
select MDIO_I2C
|
|
||||||
|
|
||||||
+comment "Switch configuration API + drivers"
|
|
||||||
+
|
|
||||||
+config SWCONFIG
|
|
||||||
+ tristate "Switch configuration API"
|
|
||||||
+ help
|
|
||||||
+ Switch configuration API using netlink. This allows
|
|
||||||
+ you to configure the VLAN features of certain switches.
|
|
||||||
+
|
|
||||||
+config SWCONFIG_LEDS
|
|
||||||
+ bool "Switch LED trigger support"
|
|
||||||
+ depends on (SWCONFIG && LEDS_TRIGGERS)
|
|
||||||
+
|
|
||||||
+config ADM6996_PHY
|
|
||||||
+ tristate "Driver for ADM6996 switches"
|
|
||||||
+ select SWCONFIG
|
|
||||||
+ help
|
|
||||||
+ Currently supports the ADM6996FC and ADM6996M switches.
|
|
||||||
+ Support for FC is very limited.
|
|
||||||
+
|
|
||||||
+config AR8216_PHY
|
|
||||||
+ tristate "Driver for Atheros AR8216/8327 switches"
|
|
||||||
+ select SWCONFIG
|
|
||||||
+ select ETHERNET_PACKET_MANGLE
|
|
||||||
+
|
|
||||||
+config AR8216_PHY_LEDS
|
|
||||||
+ bool "Atheros AR8216 switch LED support"
|
|
||||||
+ depends on (AR8216_PHY && LEDS_CLASS)
|
|
||||||
+
|
|
||||||
+source "drivers/net/phy/b53/Kconfig"
|
|
||||||
+
|
|
||||||
+config IP17XX_PHY
|
|
||||||
+ tristate "Driver for IC+ IP17xx switches"
|
|
||||||
+ select SWCONFIG
|
|
||||||
+
|
|
||||||
+config PSB6970_PHY
|
|
||||||
+ tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
|
|
||||||
+ select SWCONFIG
|
|
||||||
+
|
|
||||||
+config RTL8306_PHY
|
|
||||||
+ tristate "Driver for Realtek RTL8306S switches"
|
|
||||||
+ select SWCONFIG
|
|
||||||
+
|
|
||||||
+config RTL8366_SMI
|
|
||||||
+ tristate "Driver for the RTL8366 SMI interface"
|
|
||||||
+ depends on GPIOLIB
|
|
||||||
+ help
|
|
||||||
+ This module implements the SMI interface protocol which is used
|
|
||||||
+ by some RTL8366 ethernet switch devices via the generic GPIO API.
|
|
||||||
+
|
|
||||||
+if RTL8366_SMI
|
|
||||||
+
|
|
||||||
+config RTL8366_SMI_DEBUG_FS
|
|
||||||
+ bool "RTL8366 SMI interface debugfs support"
|
|
||||||
+ depends on DEBUG_FS
|
|
||||||
+ default n
|
|
||||||
+
|
|
||||||
+config RTL8366S_PHY
|
|
||||||
+ tristate "Driver for the Realtek RTL8366S switch"
|
|
||||||
+ select SWCONFIG
|
|
||||||
+
|
|
||||||
+config RTL8366RB_PHY
|
|
||||||
+ tristate "Driver for the Realtek RTL8366RB switch"
|
|
||||||
+ select SWCONFIG
|
|
||||||
+
|
|
||||||
+config RTL8367_PHY
|
|
||||||
+ tristate "Driver for the Realtek RTL8367R/M switches"
|
|
||||||
+ select SWCONFIG
|
|
||||||
+
|
|
||||||
+config RTL8367B_PHY
|
|
||||||
+ tristate "Driver fot the Realtek RTL8367R-VB switch"
|
|
||||||
+ select SWCONFIG
|
|
||||||
+
|
|
||||||
+endif # RTL8366_SMI
|
|
||||||
+
|
|
||||||
comment "MII PHY device drivers"
|
|
||||||
|
|
||||||
config AMD_PHY
|
|
||||||
--- a/drivers/net/phy/Makefile
|
|
||||||
+++ b/drivers/net/phy/Makefile
|
|
||||||
@@ -24,6 +24,21 @@ libphy-$(CONFIG_LED_TRIGGER_PHY) += phy_
|
|
||||||
obj-$(CONFIG_PHYLINK) += phylink.o
|
|
||||||
obj-$(CONFIG_PHYLIB) += libphy.o
|
|
||||||
|
|
||||||
+obj-$(CONFIG_SWCONFIG) += swconfig.o
|
|
||||||
+obj-$(CONFIG_ADM6996_PHY) += adm6996.o
|
|
||||||
+obj-$(CONFIG_AR8216_PHY) += ar8xxx.o
|
|
||||||
+ar8xxx-y += ar8216.o
|
|
||||||
+ar8xxx-y += ar8327.o
|
|
||||||
+obj-$(CONFIG_SWCONFIG_B53) += b53/
|
|
||||||
+obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
|
|
||||||
+obj-$(CONFIG_PSB6970_PHY) += psb6970.o
|
|
||||||
+obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
|
|
||||||
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
|
|
||||||
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
|
|
||||||
+obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.o
|
|
||||||
+obj-$(CONFIG_RTL8367_PHY) += rtl8367.o
|
|
||||||
+obj-$(CONFIG_RTL8367B_PHY) += rtl8367b.o
|
|
||||||
+
|
|
||||||
obj-$(CONFIG_NETWORK_PHY_TIMESTAMPING) += mii_timestamper.o
|
|
||||||
|
|
||||||
obj-$(CONFIG_SFP) += sfp.o
|
|
||||||
--- a/include/linux/platform_data/b53.h
|
|
||||||
+++ b/include/linux/platform_data/b53.h
|
|
||||||
@@ -29,6 +29,9 @@ struct b53_platform_data {
|
|
||||||
u32 chip_id;
|
|
||||||
u16 enabled_ports;
|
|
||||||
|
|
||||||
+ /* allow to specify an ethX alias */
|
|
||||||
+ const char *alias;
|
|
||||||
+
|
|
||||||
/* only used by MMAP'd driver */
|
|
||||||
unsigned big_endian:1;
|
|
||||||
void __iomem *regs;
|
|
|
@ -1,21 +0,0 @@
|
||||||
From ebd924d773223593142d417c41d4ee6fa16f1805 Mon Sep 17 00:00:00 2001
|
|
||||||
From: OpenWrt community <openwrt-devel@lists.openwrt.org>
|
|
||||||
Date: Wed, 13 Jul 2022 13:45:56 +0200
|
|
||||||
Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation
|
|
||||||
|
|
||||||
---
|
|
||||||
drivers/net/dsa/mv88e6xxx/chip.c | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
|
||||||
@@ -3486,6 +3486,9 @@ static int mv88e6xxx_setup_port(struct m
|
|
||||||
else
|
|
||||||
reg = 1 << port;
|
|
||||||
|
|
||||||
+ /* Disable ATU member violation interrupt */
|
|
||||||
+ reg |= MV88E6XXX_PORT_ASSOC_VECTOR_IGNORE_WRONG;
|
|
||||||
+
|
|
||||||
err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_ASSOC_VECTOR,
|
|
||||||
reg);
|
|
||||||
if (err)
|
|
|
@ -1,74 +0,0 @@
|
||||||
From 82985725e071f2a5735052f18e109a32aeac3a0b Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Bauer <mail@david-bauer.net>
|
|
||||||
Date: Sun, 26 Jul 2020 02:38:31 +0200
|
|
||||||
Subject: [PATCH] net: usb: r8152: add LED configuration from OF
|
|
||||||
|
|
||||||
This adds the ability to configure the LED configuration register using
|
|
||||||
OF. This way, the correct value for board specific LED configuration can
|
|
||||||
be determined.
|
|
||||||
|
|
||||||
Signed-off-by: David Bauer <mail@david-bauer.net>
|
|
||||||
---
|
|
||||||
drivers/net/usb/r8152.c | 23 +++++++++++++++++++++++
|
|
||||||
1 file changed, 23 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/net/usb/r8152.c
|
|
||||||
+++ b/drivers/net/usb/r8152.c
|
|
||||||
@@ -11,6 +11,7 @@
|
|
||||||
#include <linux/mii.h>
|
|
||||||
#include <linux/ethtool.h>
|
|
||||||
#include <linux/usb.h>
|
|
||||||
+#include <linux/of.h>
|
|
||||||
#include <linux/crc32.h>
|
|
||||||
#include <linux/if_vlan.h>
|
|
||||||
#include <linux/uaccess.h>
|
|
||||||
@@ -6896,6 +6897,22 @@ static void rtl_tally_reset(struct r8152
|
|
||||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int r8152_led_configuration(struct r8152 *tp)
|
|
||||||
+{
|
|
||||||
+ u32 led_data;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ ret = of_property_read_u32(tp->udev->dev.of_node, "realtek,led-data",
|
|
||||||
+ &led_data);
|
|
||||||
+
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+
|
|
||||||
+ ocp_write_word(tp, MCU_TYPE_PLA, PLA_LEDSEL, led_data);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void r8152b_init(struct r8152 *tp)
|
|
||||||
{
|
|
||||||
u32 ocp_data;
|
|
||||||
@@ -6937,6 +6954,8 @@ static void r8152b_init(struct r8152 *tp
|
|
||||||
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
|
|
||||||
ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
|
|
||||||
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
|
|
||||||
+
|
|
||||||
+ r8152_led_configuration(tp);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void r8153_init(struct r8152 *tp)
|
|
||||||
@@ -7077,6 +7096,8 @@ static void r8153_init(struct r8152 *tp)
|
|
||||||
tp->coalesce = COALESCE_SLOW;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ r8152_led_configuration(tp);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void r8153b_init(struct r8152 *tp)
|
|
||||||
@@ -7159,6 +7180,8 @@ static void r8153b_init(struct r8152 *tp
|
|
||||||
rtl_tally_reset(tp);
|
|
||||||
|
|
||||||
tp->coalesce = 15000; /* 15 us */
|
|
||||||
+
|
|
||||||
+ r8152_led_configuration(tp);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void r8153c_init(struct r8152 *tp)
|
|
|
@ -1,54 +0,0 @@
|
||||||
From 3ee05f4aa64fc86af3be5bc176ba5808de9260a7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Bauer <mail@david-bauer.net>
|
|
||||||
Date: Sun, 26 Jul 2020 15:30:33 +0200
|
|
||||||
Subject: [PATCH] dt-bindings: net: add RTL8152 binding documentation
|
|
||||||
|
|
||||||
Add binding documentation for the Realtek RTL8152 / RTL8153 USB ethernet
|
|
||||||
adapters.
|
|
||||||
|
|
||||||
Signed-off-by: David Bauer <mail@david-bauer.net>
|
|
||||||
---
|
|
||||||
.../bindings/net/realtek,rtl8152.yaml | 36 +++++++++++++++++++
|
|
||||||
1 file changed, 36 insertions(+)
|
|
||||||
create mode 100644 Documentation/devicetree/bindings/net/realtek,rtl8152.yaml
|
|
||||||
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/Documentation/devicetree/bindings/net/realtek,rtl8152.yaml
|
|
||||||
@@ -0,0 +1,36 @@
|
|
||||||
+# SPDX-License-Identifier: GPL-2.0
|
|
||||||
+%YAML 1.2
|
|
||||||
+---
|
|
||||||
+$id: http://devicetree.org/schemas/net/realtek,rtl8152.yaml#
|
|
||||||
+$schema: http://devicetree.org/meta-schemas/core.yaml#
|
|
||||||
+
|
|
||||||
+title: Realtek RTL8152/RTL8153 series USB ethernet
|
|
||||||
+
|
|
||||||
+maintainers:
|
|
||||||
+ - David Bauer <mail@david-bauer.net>
|
|
||||||
+
|
|
||||||
+properties:
|
|
||||||
+ compatible:
|
|
||||||
+ oneOf:
|
|
||||||
+ - items:
|
|
||||||
+ - enum:
|
|
||||||
+ - realtek,rtl8152
|
|
||||||
+ - realtek,rtl8153
|
|
||||||
+
|
|
||||||
+ reg:
|
|
||||||
+ description: The device number on the USB bus
|
|
||||||
+
|
|
||||||
+ realtek,led-data:
|
|
||||||
+ description: Value to be written to the LED configuration register.
|
|
||||||
+
|
|
||||||
+required:
|
|
||||||
+ - compatible
|
|
||||||
+ - reg
|
|
||||||
+
|
|
||||||
+examples:
|
|
||||||
+ - |
|
|
||||||
+ usb-eth@2 {
|
|
||||||
+ compatible = "realtek,rtl8153";
|
|
||||||
+ reg = <2>;
|
|
||||||
+ realtek,led-data = <0x87>;
|
|
||||||
+ };
|
|
||||||
\ No newline at end of file
|
|
|
@ -1,72 +0,0 @@
|
||||||
From cc225d163b5a4f7a0d1968298bf7927306646a47 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Bauer <mail@david-bauer.net>
|
|
||||||
Date: Fri, 28 Apr 2023 01:53:01 +0200
|
|
||||||
Subject: [PATCH] net: phy: mediatek-ge: add LED configuration interface
|
|
||||||
|
|
||||||
This adds a small hack similar to the one used for ar8xxx switches to
|
|
||||||
read a reg:value map for configuring the LED configuration registers.
|
|
||||||
|
|
||||||
This allows OpenWrt to write device-specific LED action as well as blink
|
|
||||||
configurations. It is unlikely to be accepted upstream, as upstream
|
|
||||||
plans on integrating their own framework for handling these LEDs.
|
|
||||||
|
|
||||||
Signed-off-by: David Bauer <mail@david-bauer.net>
|
|
||||||
---
|
|
||||||
drivers/net/phy/mediatek-ge.c | 33 +++++++++++++++++++++++++++++++++
|
|
||||||
1 file changed, 33 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/net/phy/mediatek-ge.c
|
|
||||||
+++ b/drivers/net/phy/mediatek-ge.c
|
|
||||||
@@ -1,4 +1,5 @@
|
|
||||||
// SPDX-License-Identifier: GPL-2.0+
|
|
||||||
+#include <linux/of.h>
|
|
||||||
#include <linux/bitfield.h>
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/phy.h>
|
|
||||||
@@ -53,6 +54,36 @@ static int mt7530_phy_config_init(struct
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int mt7530_led_config_of(struct phy_device *phydev)
|
|
||||||
+{
|
|
||||||
+ struct device_node *np = phydev->mdio.dev.of_node;
|
|
||||||
+ const __be32 *paddr;
|
|
||||||
+ int len;
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
+ paddr = of_get_property(np, "mediatek,led-config", &len);
|
|
||||||
+ if (!paddr)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ if (len < (2 * sizeof(*paddr)))
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ len /= sizeof(*paddr);
|
|
||||||
+
|
|
||||||
+ phydev_warn(phydev, "Configure LED registers (num=%d)\n", len);
|
|
||||||
+ for (i = 0; i < len - 1; i += 2) {
|
|
||||||
+ u32 reg;
|
|
||||||
+ u32 val;
|
|
||||||
+
|
|
||||||
+ reg = be32_to_cpup(paddr + i);
|
|
||||||
+ val = be32_to_cpup(paddr + i + 1);
|
|
||||||
+
|
|
||||||
+ phy_write_mmd(phydev, MDIO_MMD_VEND2, reg, val);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int mt7531_phy_config_init(struct phy_device *phydev)
|
|
||||||
{
|
|
||||||
mtk_gephy_config_init(phydev);
|
|
||||||
@@ -65,6 +96,9 @@ static int mt7531_phy_config_init(struct
|
|
||||||
phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x13, 0x404);
|
|
||||||
phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x14, 0x404);
|
|
||||||
|
|
||||||
+ /* LED Config*/
|
|
||||||
+ mt7530_led_config_of(phydev);
|
|
||||||
+
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,98 +0,0 @@
|
||||||
From 3cb240533ab787899dc7f17aa7d6c5b4810e2e58 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Date: Fri, 7 Jul 2017 17:26:01 +0200
|
|
||||||
Subject: bcm53xx: bgmac: use srab switch driver
|
|
||||||
|
|
||||||
use the srab switch driver on these SoCs.
|
|
||||||
|
|
||||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
---
|
|
||||||
drivers/net/ethernet/broadcom/bgmac-bcma.c | 1 +
|
|
||||||
drivers/net/ethernet/broadcom/bgmac.c | 24 ++++++++++++++++++++++++
|
|
||||||
drivers/net/ethernet/broadcom/bgmac.h | 4 ++++
|
|
||||||
3 files changed, 29 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
|
|
||||||
+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
|
|
||||||
@@ -280,6 +280,7 @@ static int bgmac_probe(struct bcma_devic
|
|
||||||
bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
|
|
||||||
bgmac->feature_flags |= BGMAC_FEAT_NO_RESET;
|
|
||||||
bgmac->feature_flags |= BGMAC_FEAT_FORCE_SPEED_2500;
|
|
||||||
+ bgmac->feature_flags |= BGMAC_FEAT_SRAB;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
|
|
||||||
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
|
||||||
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
|
||||||
@@ -12,6 +12,7 @@
|
|
||||||
#include <linux/bcma/bcma.h>
|
|
||||||
#include <linux/etherdevice.h>
|
|
||||||
#include <linux/interrupt.h>
|
|
||||||
+#include <linux/platform_data/b53.h>
|
|
||||||
#include <linux/bcm47xx_nvram.h>
|
|
||||||
#include <linux/phy.h>
|
|
||||||
#include <linux/phy_fixed.h>
|
|
||||||
@@ -1408,6 +1409,17 @@ static const struct ethtool_ops bgmac_et
|
|
||||||
.set_link_ksettings = phy_ethtool_set_link_ksettings,
|
|
||||||
};
|
|
||||||
|
|
||||||
+static struct b53_platform_data bgmac_b53_pdata = {
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static struct platform_device bgmac_b53_dev = {
|
|
||||||
+ .name = "b53-srab-switch",
|
|
||||||
+ .id = -1,
|
|
||||||
+ .dev = {
|
|
||||||
+ .platform_data = &bgmac_b53_pdata,
|
|
||||||
+ },
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
/**************************************************
|
|
||||||
* MII
|
|
||||||
**************************************************/
|
|
||||||
@@ -1546,6 +1558,14 @@ int bgmac_enet_probe(struct bgmac *bgmac
|
|
||||||
|
|
||||||
bgmac->in_init = false;
|
|
||||||
|
|
||||||
+ if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) {
|
|
||||||
+ bgmac_b53_pdata.regs = ioremap(0x18007000, 0x1000);
|
|
||||||
+
|
|
||||||
+ err = platform_device_register(&bgmac_b53_dev);
|
|
||||||
+ if (!err)
|
|
||||||
+ bgmac->b53_device = &bgmac_b53_dev;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
err = register_netdev(bgmac->net_dev);
|
|
||||||
if (err) {
|
|
||||||
dev_err(bgmac->dev, "Cannot register net device\n");
|
|
||||||
@@ -1568,6 +1588,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
|
|
||||||
|
|
||||||
void bgmac_enet_remove(struct bgmac *bgmac)
|
|
||||||
{
|
|
||||||
+ if (bgmac->b53_device)
|
|
||||||
+ platform_device_unregister(&bgmac_b53_dev);
|
|
||||||
+ bgmac->b53_device = NULL;
|
|
||||||
+
|
|
||||||
unregister_netdev(bgmac->net_dev);
|
|
||||||
phy_disconnect(bgmac->net_dev->phydev);
|
|
||||||
netif_napi_del(&bgmac->napi);
|
|
||||||
--- a/drivers/net/ethernet/broadcom/bgmac.h
|
|
||||||
+++ b/drivers/net/ethernet/broadcom/bgmac.h
|
|
||||||
@@ -388,6 +388,7 @@
|
|
||||||
#define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII BIT(18)
|
|
||||||
#define BGMAC_FEAT_CC7_IF_TYPE_RGMII BIT(19)
|
|
||||||
#define BGMAC_FEAT_IDM_MASK BIT(20)
|
|
||||||
+#define BGMAC_FEAT_SRAB BIT(21)
|
|
||||||
|
|
||||||
struct bgmac_slot_info {
|
|
||||||
union {
|
|
||||||
@@ -495,6 +496,9 @@ struct bgmac {
|
|
||||||
void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask,
|
|
||||||
u32 set);
|
|
||||||
int (*phy_connect)(struct bgmac *bgmac);
|
|
||||||
+
|
|
||||||
+ /* platform device for associated switch */
|
|
||||||
+ struct platform_device *b53_device;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct bgmac *bgmac_alloc(struct device *dev);
|
|
|
@ -1,43 +0,0 @@
|
||||||
From f81700b6bb2eda3756247bce472d8eaf6f466f61 Mon Sep 17 00:00:00 2001
|
|
||||||
From: OpenWrt community <openwrt-devel@lists.openwrt.org>
|
|
||||||
Date: Wed, 13 Jul 2022 13:49:26 +0200
|
|
||||||
Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
|
||||||
|
|
||||||
---
|
|
||||||
drivers/net/usb/qmi_wwan.c | 1 +
|
|
||||||
drivers/usb/serial/option.c | 7 +++++++
|
|
||||||
2 files changed, 8 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/net/usb/qmi_wwan.c
|
|
||||||
+++ b/drivers/net/usb/qmi_wwan.c
|
|
||||||
@@ -1088,6 +1088,7 @@ static const struct usb_device_id produc
|
|
||||||
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)}, /* Quectel EM160R-GL */
|
|
||||||
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)}, /* Quectel RM500Q-GL */
|
|
||||||
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)}, /* Quectel RM520N */
|
|
||||||
+ {QMI_MATCH_FF_FF_FF(0x05c6, 0xf601)}, /* MeigLink SLM750 */
|
|
||||||
|
|
||||||
/* 3. Combined interface devices matching on interface number */
|
|
||||||
{QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */
|
|
||||||
--- a/drivers/usb/serial/option.c
|
|
||||||
+++ b/drivers/usb/serial/option.c
|
|
||||||
@@ -244,6 +244,8 @@ static void option_instat_callback(struc
|
|
||||||
#define UBLOX_PRODUCT_R410M 0x90b2
|
|
||||||
/* These Yuga products use Qualcomm's vendor ID */
|
|
||||||
#define YUGA_PRODUCT_CLM920_NC5 0x9625
|
|
||||||
+/* These MeigLink products use Qualcomm's vendor ID */
|
|
||||||
+#define MEIGLINK_PRODUCT_SLM750 0xf601
|
|
||||||
|
|
||||||
#define QUECTEL_VENDOR_ID 0x2c7c
|
|
||||||
/* These Quectel products use Quectel's vendor ID */
|
|
||||||
@@ -1180,6 +1182,11 @@ static const struct usb_device_id option
|
|
||||||
.driver_info = ZLP },
|
|
||||||
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
|
||||||
.driver_info = RSVD(4) },
|
|
||||||
+ /* Meiglink products using Qualcomm vendor ID */
|
|
||||||
+ // Works OK. In case of some issues check macros that are used by Quectel Products
|
|
||||||
+ { USB_DEVICE_AND_INTERFACE_INFO(QUALCOMM_VENDOR_ID, MEIGLINK_PRODUCT_SLM750, 0xff, 0xff, 0xff),
|
|
||||||
+ .driver_info = NUMEP2 },
|
|
||||||
+ { USB_DEVICE_AND_INTERFACE_INFO(QUALCOMM_VENDOR_ID, MEIGLINK_PRODUCT_SLM750, 0xff, 0, 0) },
|
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff),
|
|
||||||
.driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 },
|
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0, 0) },
|
|
|
@ -1,63 +0,0 @@
|
||||||
From 7cc39a6bedbd85f3ff7e16845f310e4ce8d9833f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Golle <daniel@makrotopia.org>
|
|
||||||
Date: Tue, 6 Sep 2022 00:31:19 +0100
|
|
||||||
Subject: [PATCH] net: sfp: add quirk for ATS SFP-GE-T 1000Base-TX module
|
|
||||||
To: netdev@vger.kernel.org,
|
|
||||||
linux-kernel@vger.kernel.org,
|
|
||||||
Russell King <linux@armlinux.org.uk>,
|
|
||||||
Andrew Lunn <andrew@lunn.ch>,
|
|
||||||
Heiner Kallweit <hkallweit1@gmail.com>
|
|
||||||
Cc: David S. Miller <davem@davemloft.net>,
|
|
||||||
Eric Dumazet <edumazet@google.com>,
|
|
||||||
Jakub Kicinski <kuba@kernel.org>,
|
|
||||||
Paolo Abeni <pabeni@redhat.com>,
|
|
||||||
Josef Schlehofer <pepe.schlehofer@gmail.com>
|
|
||||||
|
|
||||||
This copper module comes with broken TX_FAULT indicator which must be
|
|
||||||
ignored for it to work. Implement ignoring TX_FAULT state bit also
|
|
||||||
during reset/insertion and mute the warning telling the user that the
|
|
||||||
module indicates TX_FAULT.
|
|
||||||
|
|
||||||
Co-authored-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
|
|
||||||
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
||||||
---
|
|
||||||
drivers/net/phy/sfp.c | 14 +++++++++++---
|
|
||||||
1 file changed, 11 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/net/phy/sfp.c
|
|
||||||
+++ b/drivers/net/phy/sfp.c
|
|
||||||
@@ -404,6 +404,9 @@ static const struct sfp_quirk sfp_quirks
|
|
||||||
SFP_QUIRK("HUAWEI", "MA5671A", sfp_quirk_2500basex,
|
|
||||||
sfp_fixup_ignore_tx_fault),
|
|
||||||
|
|
||||||
+ // OEM SFP-GE-T is 1000Base-T module
|
|
||||||
+ SFP_QUIRK_F("OEM", "SFP-GE-T", sfp_fixup_ignore_tx_fault),
|
|
||||||
+
|
|
||||||
// Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report
|
|
||||||
// 2500MBd NRZ in their EEPROM
|
|
||||||
SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex),
|
|
||||||
@@ -2339,7 +2342,8 @@ static void sfp_sm_main(struct sfp *sfp,
|
|
||||||
* or t_start_up, so assume there is a fault.
|
|
||||||
*/
|
|
||||||
sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT,
|
|
||||||
- sfp->sm_fault_retries == N_FAULT_INIT);
|
|
||||||
+ !sfp->tx_fault_ignore &&
|
|
||||||
+ (sfp->sm_fault_retries == N_FAULT_INIT));
|
|
||||||
} else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) {
|
|
||||||
init_done:
|
|
||||||
/* Create mdiobus and start trying for PHY */
|
|
||||||
@@ -2568,10 +2572,12 @@ static void sfp_check_state(struct sfp *
|
|
||||||
mutex_lock(&sfp->st_mutex);
|
|
||||||
state = sfp_get_state(sfp);
|
|
||||||
changed = state ^ sfp->state;
|
|
||||||
- if (sfp->tx_fault_ignore)
|
|
||||||
+ if (sfp->tx_fault_ignore) {
|
|
||||||
changed &= SFP_F_PRESENT | SFP_F_LOS;
|
|
||||||
- else
|
|
||||||
+ state &= ~SFP_F_TX_FAULT;
|
|
||||||
+ } else {
|
|
||||||
changed &= SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
for (i = 0; i < GPIO_MAX; i++)
|
|
||||||
if (changed & BIT(i))
|
|
|
@ -1,187 +0,0 @@
|
||||||
From e4d708702e6c98f2111e33201a264d6788564cb2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: OpenWrt community <openwrt-devel@lists.openwrt.org>
|
|
||||||
Date: Fri, 12 May 2023 11:08:43 +0200
|
|
||||||
Subject: [PATCH] ssb_sprom: add generic kernel support for Broadcom Fallback SPROMs
|
|
||||||
|
|
||||||
---
|
|
||||||
drivers/bcma/Kconfig | 4 ++++
|
|
||||||
drivers/bcma/Makefile | 1 +
|
|
||||||
drivers/bcma/bcma_private.h | 4 ++++
|
|
||||||
drivers/bcma/main.c | 8 ++++++++
|
|
||||||
drivers/bcma/sprom.c | 23 ++++++++++++++---------
|
|
||||||
drivers/ssb/Kconfig | 5 +++++
|
|
||||||
drivers/ssb/Makefile | 1 +
|
|
||||||
drivers/ssb/main.c | 8 ++++++++
|
|
||||||
drivers/ssb/sprom.c | 12 +++++++++++-
|
|
||||||
drivers/ssb/ssb_private.h | 4 ++++
|
|
||||||
10 files changed, 60 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/bcma/Kconfig
|
|
||||||
+++ b/drivers/bcma/Kconfig
|
|
||||||
@@ -18,6 +18,10 @@ config BCMA_BLOCKIO
|
|
||||||
bool
|
|
||||||
default y
|
|
||||||
|
|
||||||
+config BCMA_FALLBACK_SPROM
|
|
||||||
+ bool
|
|
||||||
+ default y
|
|
||||||
+
|
|
||||||
config BCMA_HOST_PCI_POSSIBLE
|
|
||||||
bool
|
|
||||||
depends on PCI = y
|
|
||||||
--- a/drivers/bcma/Makefile
|
|
||||||
+++ b/drivers/bcma/Makefile
|
|
||||||
@@ -11,6 +11,7 @@ bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE)
|
|
||||||
bcma-$(CONFIG_BCMA_DRIVER_MIPS) += driver_mips.o
|
|
||||||
bcma-$(CONFIG_BCMA_DRIVER_GMAC_CMN) += driver_gmac_cmn.o
|
|
||||||
bcma-$(CONFIG_BCMA_DRIVER_GPIO) += driver_gpio.o
|
|
||||||
+bcma-$(CONFIG_BCMA_FALLBACK_SPROM) += fallback-sprom.o
|
|
||||||
bcma-$(CONFIG_BCMA_HOST_PCI) += host_pci.o
|
|
||||||
bcma-$(CONFIG_BCMA_HOST_SOC) += host_soc.o
|
|
||||||
obj-$(CONFIG_BCMA) += bcma.o
|
|
||||||
--- a/drivers/bcma/bcma_private.h
|
|
||||||
+++ b/drivers/bcma/bcma_private.h
|
|
||||||
@@ -38,6 +38,10 @@ int bcma_bus_resume(struct bcma_bus *bus
|
|
||||||
void bcma_detect_chip(struct bcma_bus *bus);
|
|
||||||
int bcma_bus_scan(struct bcma_bus *bus);
|
|
||||||
|
|
||||||
+/* fallback-sprom.c */
|
|
||||||
+int __init bcma_fbs_register(void);
|
|
||||||
+int bcma_get_fallback_sprom(struct bcma_bus *dev, struct ssb_sprom *out);
|
|
||||||
+
|
|
||||||
/* sprom.c */
|
|
||||||
int bcma_sprom_get(struct bcma_bus *bus);
|
|
||||||
|
|
||||||
--- a/drivers/bcma/main.c
|
|
||||||
+++ b/drivers/bcma/main.c
|
|
||||||
@@ -668,6 +668,14 @@ static int __init bcma_modinit(void)
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
|
|
||||||
+#ifdef CONFIG_BCMA_FALLBACK_SPROM
|
|
||||||
+ err = bcma_fbs_register();
|
|
||||||
+ if (err) {
|
|
||||||
+ pr_err("Fallback SPROM initialization failed\n");
|
|
||||||
+ err = 0;
|
|
||||||
+ }
|
|
||||||
+#endif /* CONFIG_BCMA_FALLBACK_SPROM */
|
|
||||||
+
|
|
||||||
err = bcma_init_bus_register();
|
|
||||||
if (err)
|
|
||||||
return err;
|
|
||||||
--- a/drivers/bcma/sprom.c
|
|
||||||
+++ b/drivers/bcma/sprom.c
|
|
||||||
@@ -51,21 +51,26 @@ static int bcma_fill_sprom_with_fallback
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
|
|
||||||
- if (!get_fallback_sprom) {
|
|
||||||
+ if (get_fallback_sprom)
|
|
||||||
+ err = get_fallback_sprom(bus, out);
|
|
||||||
+
|
|
||||||
+#ifdef CONFIG_BCMA_FALLBACK_SPROM
|
|
||||||
+ if (!get_fallback_sprom || err)
|
|
||||||
+ err = bcma_get_fallback_sprom(bus, out);
|
|
||||||
+#else
|
|
||||||
+ if (!get_fallback_sprom)
|
|
||||||
err = -ENOENT;
|
|
||||||
- goto fail;
|
|
||||||
- }
|
|
||||||
+#endif /* CONFIG_BCMA_FALLBACK_SPROM */
|
|
||||||
|
|
||||||
- err = get_fallback_sprom(bus, out);
|
|
||||||
- if (err)
|
|
||||||
- goto fail;
|
|
||||||
+ if (err) {
|
|
||||||
+ bcma_warn(bus, "Using fallback SPROM failed (err %d)\n", err);
|
|
||||||
+ return err;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
bcma_debug(bus, "Using SPROM revision %d provided by platform.\n",
|
|
||||||
bus->sprom.revision);
|
|
||||||
+
|
|
||||||
return 0;
|
|
||||||
-fail:
|
|
||||||
- bcma_warn(bus, "Using fallback SPROM failed (err %d)\n", err);
|
|
||||||
- return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************
|
|
||||||
--- a/drivers/ssb/Kconfig
|
|
||||||
+++ b/drivers/ssb/Kconfig
|
|
||||||
@@ -25,6 +25,11 @@ if SSB
|
|
||||||
config SSB_SPROM
|
|
||||||
bool
|
|
||||||
|
|
||||||
+config SSB_FALLBACK_SPROM
|
|
||||||
+ bool
|
|
||||||
+ depends on SSB_PCIHOST
|
|
||||||
+ default y
|
|
||||||
+
|
|
||||||
# Support for Block-I/O. SELECT this from the driver that needs it.
|
|
||||||
config SSB_BLOCKIO
|
|
||||||
bool
|
|
||||||
--- a/drivers/ssb/Makefile
|
|
||||||
+++ b/drivers/ssb/Makefile
|
|
||||||
@@ -2,6 +2,7 @@
|
|
||||||
# core
|
|
||||||
ssb-y += main.o scan.o
|
|
||||||
ssb-$(CONFIG_SSB_EMBEDDED) += embedded.o
|
|
||||||
+ssb-$(CONFIG_SSB_FALLBACK_SPROM) += fallback-sprom.o
|
|
||||||
ssb-$(CONFIG_SSB_SPROM) += sprom.o
|
|
||||||
|
|
||||||
# host support
|
|
||||||
--- a/drivers/ssb/main.c
|
|
||||||
+++ b/drivers/ssb/main.c
|
|
||||||
@@ -1287,6 +1287,14 @@ static int __init ssb_modinit(void)
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
|
|
||||||
+#ifdef CONFIG_SSB_FALLBACK_SPROM
|
|
||||||
+ err = ssb_fbs_register();
|
|
||||||
+ if (err) {
|
|
||||||
+ pr_err("Fallback SPROM initialization failed\n");
|
|
||||||
+ err = 0;
|
|
||||||
+ }
|
|
||||||
+#endif /* CONFIG_SSB_FALLBACK_SPROM */
|
|
||||||
+
|
|
||||||
/* See the comment at the ssb_is_early_boot definition */
|
|
||||||
ssb_is_early_boot = 0;
|
|
||||||
err = bus_register(&ssb_bustype);
|
|
||||||
--- a/drivers/ssb/sprom.c
|
|
||||||
+++ b/drivers/ssb/sprom.c
|
|
||||||
@@ -180,10 +180,20 @@ int ssb_arch_register_fallback_sprom(int
|
|
||||||
|
|
||||||
int ssb_fill_sprom_with_fallback(struct ssb_bus *bus, struct ssb_sprom *out)
|
|
||||||
{
|
|
||||||
+ int err;
|
|
||||||
+
|
|
||||||
+ if (get_fallback_sprom)
|
|
||||||
+ err = get_fallback_sprom(bus, out);
|
|
||||||
+
|
|
||||||
+#ifdef CONFIG_SSB_FALLBACK_SPROM
|
|
||||||
+ if (!get_fallback_sprom || err)
|
|
||||||
+ err = ssb_get_fallback_sprom(bus, out);
|
|
||||||
+#else
|
|
||||||
if (!get_fallback_sprom)
|
|
||||||
return -ENOENT;
|
|
||||||
+#endif /* CONFIG_SSB_FALLBACK_SPROM */
|
|
||||||
|
|
||||||
- return get_fallback_sprom(bus, out);
|
|
||||||
+ return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* https://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
|
|
||||||
--- a/drivers/ssb/ssb_private.h
|
|
||||||
+++ b/drivers/ssb/ssb_private.h
|
|
||||||
@@ -143,6 +143,10 @@ extern int ssb_bus_scan(struct ssb_bus *
|
|
||||||
extern void ssb_iounmap(struct ssb_bus *ssb);
|
|
||||||
|
|
||||||
|
|
||||||
+/* fallback-sprom.c */
|
|
||||||
+int __init ssb_fbs_register(void);
|
|
||||||
+int ssb_get_fallback_sprom(struct ssb_bus *dev, struct ssb_sprom *out);
|
|
||||||
+
|
|
||||||
/* sprom.c */
|
|
||||||
extern
|
|
||||||
ssize_t ssb_attr_sprom_show(struct ssb_bus *bus, char *buf,
|
|
|
@ -1,408 +0,0 @@
|
||||||
From 9e3f1d0805b2d919904dd9a4ff0d956314cc3cba Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Sat, 8 Jul 2017 08:20:09 +0200
|
|
||||||
Subject: debloat: procfs
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
fs/locks.c | 2 ++
|
|
||||||
fs/proc/Kconfig | 5 +++++
|
|
||||||
fs/proc/consoles.c | 3 +++
|
|
||||||
fs/proc/proc_tty.c | 11 ++++++++++-
|
|
||||||
include/net/snmp.h | 18 +++++++++++++++++-
|
|
||||||
ipc/msg.c | 3 +++
|
|
||||||
ipc/sem.c | 2 ++
|
|
||||||
ipc/shm.c | 2 ++
|
|
||||||
ipc/util.c | 3 +++
|
|
||||||
kernel/exec_domain.c | 2 ++
|
|
||||||
kernel/irq/proc.c | 9 +++++++++
|
|
||||||
kernel/time/timer_list.c | 2 ++
|
|
||||||
mm/vmalloc.c | 2 ++
|
|
||||||
mm/vmstat.c | 8 +++++---
|
|
||||||
net/8021q/vlanproc.c | 6 ++++++
|
|
||||||
net/core/net-procfs.c | 18 ++++++++++++------
|
|
||||||
net/core/sock.c | 2 ++
|
|
||||||
net/ipv4/fib_trie.c | 18 ++++++++++++------
|
|
||||||
net/ipv4/proc.c | 3 +++
|
|
||||||
net/ipv4/route.c | 3 +++
|
|
||||||
20 files changed, 105 insertions(+), 17 deletions(-)
|
|
||||||
|
|
||||||
--- a/fs/locks.c
|
|
||||||
+++ b/fs/locks.c
|
|
||||||
@@ -2909,6 +2909,8 @@ static const struct seq_operations locks
|
|
||||||
|
|
||||||
static int __init proc_locks_init(void)
|
|
||||||
{
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return 0;
|
|
||||||
proc_create_seq_private("locks", 0, NULL, &locks_seq_operations,
|
|
||||||
sizeof(struct locks_iterator), NULL);
|
|
||||||
return 0;
|
|
||||||
--- a/fs/proc/Kconfig
|
|
||||||
+++ b/fs/proc/Kconfig
|
|
||||||
@@ -101,6 +101,11 @@ config PROC_CHILDREN
|
|
||||||
Say Y if you are running any user-space software which takes benefit from
|
|
||||||
this interface. For example, rkt is such a piece of software.
|
|
||||||
|
|
||||||
+config PROC_STRIPPED
|
|
||||||
+ default n
|
|
||||||
+ depends on EXPERT
|
|
||||||
+ bool "Strip non-essential /proc functionality to reduce code size"
|
|
||||||
+
|
|
||||||
config PROC_PID_ARCH_STATUS
|
|
||||||
def_bool n
|
|
||||||
depends on PROC_FS
|
|
||||||
--- a/fs/proc/consoles.c
|
|
||||||
+++ b/fs/proc/consoles.c
|
|
||||||
@@ -92,6 +92,9 @@ static const struct seq_operations conso
|
|
||||||
|
|
||||||
static int __init proc_consoles_init(void)
|
|
||||||
{
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
proc_create_seq("consoles", 0, NULL, &consoles_op);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
--- a/fs/proc/proc_tty.c
|
|
||||||
+++ b/fs/proc/proc_tty.c
|
|
||||||
@@ -131,7 +131,10 @@ static const struct seq_operations tty_d
|
|
||||||
void proc_tty_register_driver(struct tty_driver *driver)
|
|
||||||
{
|
|
||||||
struct proc_dir_entry *ent;
|
|
||||||
-
|
|
||||||
+
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
if (!driver->driver_name || driver->proc_entry ||
|
|
||||||
!driver->ops->proc_show)
|
|
||||||
return;
|
|
||||||
@@ -148,6 +151,9 @@ void proc_tty_unregister_driver(struct t
|
|
||||||
{
|
|
||||||
struct proc_dir_entry *ent;
|
|
||||||
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
ent = driver->proc_entry;
|
|
||||||
if (!ent)
|
|
||||||
return;
|
|
||||||
@@ -162,6 +168,9 @@ void proc_tty_unregister_driver(struct t
|
|
||||||
*/
|
|
||||||
void __init proc_tty_init(void)
|
|
||||||
{
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
if (!proc_mkdir("tty", NULL))
|
|
||||||
return;
|
|
||||||
proc_mkdir("tty/ldisc", NULL); /* Preserved: it's userspace visible */
|
|
||||||
--- a/include/net/snmp.h
|
|
||||||
+++ b/include/net/snmp.h
|
|
||||||
@@ -124,6 +124,21 @@ struct linux_tls_mib {
|
|
||||||
#define DECLARE_SNMP_STAT(type, name) \
|
|
||||||
extern __typeof__(type) __percpu *name
|
|
||||||
|
|
||||||
+#ifdef CONFIG_PROC_STRIPPED
|
|
||||||
+#define __SNMP_STATS_DUMMY(mib) \
|
|
||||||
+ do { (void) mib->mibs[0]; } while(0)
|
|
||||||
+
|
|
||||||
+#define __SNMP_INC_STATS(mib, field) __SNMP_STATS_DUMMY(mib)
|
|
||||||
+#define SNMP_INC_STATS_ATOMIC_LONG(mib, field) __SNMP_STATS_DUMMY(mib)
|
|
||||||
+#define SNMP_INC_STATS(mib, field) __SNMP_STATS_DUMMY(mib)
|
|
||||||
+#define SNMP_DEC_STATS(mib, field) __SNMP_STATS_DUMMY(mib)
|
|
||||||
+#define __SNMP_ADD_STATS(mib, field, addend) __SNMP_STATS_DUMMY(mib)
|
|
||||||
+#define SNMP_ADD_STATS(mib, field, addend) __SNMP_STATS_DUMMY(mib)
|
|
||||||
+#define SNMP_UPD_PO_STATS(mib, basefield, addend) __SNMP_STATS_DUMMY(mib)
|
|
||||||
+#define __SNMP_UPD_PO_STATS(mib, basefield, addend) __SNMP_STATS_DUMMY(mib)
|
|
||||||
+
|
|
||||||
+#else
|
|
||||||
+
|
|
||||||
#define __SNMP_INC_STATS(mib, field) \
|
|
||||||
__this_cpu_inc(mib->mibs[field])
|
|
||||||
|
|
||||||
@@ -154,8 +169,9 @@ struct linux_tls_mib {
|
|
||||||
__this_cpu_add(ptr[basefield##OCTETS], addend); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
-#if BITS_PER_LONG==32
|
|
||||||
+#if (BITS_PER_LONG==32) && !defined(CONFIG_PROC_STRIPPED)
|
|
||||||
|
|
||||||
#define __SNMP_ADD_STATS64(mib, field, addend) \
|
|
||||||
do { \
|
|
||||||
--- a/ipc/msg.c
|
|
||||||
+++ b/ipc/msg.c
|
|
||||||
@@ -1370,6 +1370,9 @@ void __init msg_init(void)
|
|
||||||
{
|
|
||||||
msg_init_ns(&init_ipc_ns);
|
|
||||||
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
ipc_init_proc_interface("sysvipc/msg",
|
|
||||||
" key msqid perms cbytes qnum lspid lrpid uid gid cuid cgid stime rtime ctime\n",
|
|
||||||
IPC_MSG_IDS, sysvipc_msg_proc_show);
|
|
||||||
--- a/ipc/sem.c
|
|
||||||
+++ b/ipc/sem.c
|
|
||||||
@@ -268,6 +268,8 @@ void sem_exit_ns(struct ipc_namespace *n
|
|
||||||
void __init sem_init(void)
|
|
||||||
{
|
|
||||||
sem_init_ns(&init_ipc_ns);
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return;
|
|
||||||
ipc_init_proc_interface("sysvipc/sem",
|
|
||||||
" key semid perms nsems uid gid cuid cgid otime ctime\n",
|
|
||||||
IPC_SEM_IDS, sysvipc_sem_proc_show);
|
|
||||||
--- a/ipc/shm.c
|
|
||||||
+++ b/ipc/shm.c
|
|
||||||
@@ -154,6 +154,8 @@ pure_initcall(ipc_ns_init);
|
|
||||||
|
|
||||||
void __init shm_init(void)
|
|
||||||
{
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return;
|
|
||||||
ipc_init_proc_interface("sysvipc/shm",
|
|
||||||
#if BITS_PER_LONG <= 32
|
|
||||||
" key shmid perms size cpid lpid nattch uid gid cuid cgid atime dtime ctime rss swap\n",
|
|
||||||
--- a/ipc/util.c
|
|
||||||
+++ b/ipc/util.c
|
|
||||||
@@ -141,6 +141,9 @@ void __init ipc_init_proc_interface(cons
|
|
||||||
struct proc_dir_entry *pde;
|
|
||||||
struct ipc_proc_iface *iface;
|
|
||||||
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
iface = kmalloc(sizeof(*iface), GFP_KERNEL);
|
|
||||||
if (!iface)
|
|
||||||
return;
|
|
||||||
--- a/kernel/exec_domain.c
|
|
||||||
+++ b/kernel/exec_domain.c
|
|
||||||
@@ -29,6 +29,8 @@ static int execdomains_proc_show(struct
|
|
||||||
|
|
||||||
static int __init proc_execdomains_init(void)
|
|
||||||
{
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return 0;
|
|
||||||
proc_create_single("execdomains", 0, NULL, execdomains_proc_show);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
--- a/kernel/irq/proc.c
|
|
||||||
+++ b/kernel/irq/proc.c
|
|
||||||
@@ -341,6 +341,9 @@ void register_irq_proc(unsigned int irq,
|
|
||||||
void __maybe_unused *irqp = (void *)(unsigned long) irq;
|
|
||||||
char name [MAX_NAMELEN];
|
|
||||||
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip))
|
|
||||||
return;
|
|
||||||
|
|
||||||
@@ -394,6 +397,9 @@ void unregister_irq_proc(unsigned int ir
|
|
||||||
{
|
|
||||||
char name [MAX_NAMELEN];
|
|
||||||
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
if (!root_irq_dir || !desc->dir)
|
|
||||||
return;
|
|
||||||
#ifdef CONFIG_SMP
|
|
||||||
@@ -432,6 +438,9 @@ void init_irq_proc(void)
|
|
||||||
unsigned int irq;
|
|
||||||
struct irq_desc *desc;
|
|
||||||
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED) && !IS_ENABLED(CONFIG_SMP))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
/* create /proc/irq */
|
|
||||||
root_irq_dir = proc_mkdir("irq", NULL);
|
|
||||||
if (!root_irq_dir)
|
|
||||||
--- a/kernel/time/timer_list.c
|
|
||||||
+++ b/kernel/time/timer_list.c
|
|
||||||
@@ -350,6 +350,8 @@ static int __init init_timer_list_procfs
|
|
||||||
{
|
|
||||||
struct proc_dir_entry *pe;
|
|
||||||
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return 0;
|
|
||||||
pe = proc_create_seq_private("timer_list", 0400, NULL, &timer_list_sops,
|
|
||||||
sizeof(struct timer_list_iter), NULL);
|
|
||||||
if (!pe)
|
|
||||||
--- a/mm/vmalloc.c
|
|
||||||
+++ b/mm/vmalloc.c
|
|
||||||
@@ -4205,6 +4205,8 @@ static const struct seq_operations vmall
|
|
||||||
|
|
||||||
static int __init proc_vmalloc_init(void)
|
|
||||||
{
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return 0;
|
|
||||||
if (IS_ENABLED(CONFIG_NUMA))
|
|
||||||
proc_create_seq_private("vmallocinfo", 0400, NULL,
|
|
||||||
&vmalloc_op,
|
|
||||||
--- a/mm/vmstat.c
|
|
||||||
+++ b/mm/vmstat.c
|
|
||||||
@@ -2109,10 +2109,12 @@ void __init init_mm_internals(void)
|
|
||||||
start_shepherd_timer();
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_PROC_FS
|
|
||||||
- proc_create_seq("buddyinfo", 0444, NULL, &fragmentation_op);
|
|
||||||
- proc_create_seq("pagetypeinfo", 0400, NULL, &pagetypeinfo_op);
|
|
||||||
+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
|
|
||||||
+ proc_create_seq("buddyinfo", 0444, NULL, &fragmentation_op);
|
|
||||||
+ proc_create_seq("pagetypeinfo", 0400, NULL, &pagetypeinfo_op);
|
|
||||||
+ proc_create_seq("zoneinfo", 0444, NULL, &zoneinfo_op);
|
|
||||||
+ }
|
|
||||||
proc_create_seq("vmstat", 0444, NULL, &vmstat_op);
|
|
||||||
- proc_create_seq("zoneinfo", 0444, NULL, &zoneinfo_op);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/net/8021q/vlanproc.c
|
|
||||||
+++ b/net/8021q/vlanproc.c
|
|
||||||
@@ -93,6 +93,9 @@ void vlan_proc_cleanup(struct net *net)
|
|
||||||
{
|
|
||||||
struct vlan_net *vn = net_generic(net, vlan_net_id);
|
|
||||||
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
if (vn->proc_vlan_conf)
|
|
||||||
remove_proc_entry(name_conf, vn->proc_vlan_dir);
|
|
||||||
|
|
||||||
@@ -112,6 +115,9 @@ int __net_init vlan_proc_init(struct net
|
|
||||||
{
|
|
||||||
struct vlan_net *vn = net_generic(net, vlan_net_id);
|
|
||||||
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
vn->proc_vlan_dir = proc_net_mkdir(net, name_root, net->proc_net);
|
|
||||||
if (!vn->proc_vlan_dir)
|
|
||||||
goto err;
|
|
||||||
--- a/net/core/net-procfs.c
|
|
||||||
+++ b/net/core/net-procfs.c
|
|
||||||
@@ -319,10 +319,12 @@ static int __net_init dev_proc_net_init(
|
|
||||||
if (!proc_create_net("dev", 0444, net->proc_net, &dev_seq_ops,
|
|
||||||
sizeof(struct seq_net_private)))
|
|
||||||
goto out;
|
|
||||||
- if (!proc_create_seq("softnet_stat", 0444, net->proc_net,
|
|
||||||
+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
|
|
||||||
+ !proc_create_seq("softnet_stat", 0444, net->proc_net,
|
|
||||||
&softnet_seq_ops))
|
|
||||||
goto out_dev;
|
|
||||||
- if (!proc_create_net("ptype", 0444, net->proc_net, &ptype_seq_ops,
|
|
||||||
+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
|
|
||||||
+ !proc_create_net("ptype", 0444, net->proc_net, &ptype_seq_ops,
|
|
||||||
sizeof(struct seq_net_private)))
|
|
||||||
goto out_softnet;
|
|
||||||
|
|
||||||
@@ -332,9 +334,11 @@ static int __net_init dev_proc_net_init(
|
|
||||||
out:
|
|
||||||
return rc;
|
|
||||||
out_ptype:
|
|
||||||
- remove_proc_entry("ptype", net->proc_net);
|
|
||||||
+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ remove_proc_entry("ptype", net->proc_net);
|
|
||||||
out_softnet:
|
|
||||||
- remove_proc_entry("softnet_stat", net->proc_net);
|
|
||||||
+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ remove_proc_entry("softnet_stat", net->proc_net);
|
|
||||||
out_dev:
|
|
||||||
remove_proc_entry("dev", net->proc_net);
|
|
||||||
goto out;
|
|
||||||
@@ -344,8 +348,10 @@ static void __net_exit dev_proc_net_exit
|
|
||||||
{
|
|
||||||
wext_proc_exit(net);
|
|
||||||
|
|
||||||
- remove_proc_entry("ptype", net->proc_net);
|
|
||||||
- remove_proc_entry("softnet_stat", net->proc_net);
|
|
||||||
+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
|
|
||||||
+ remove_proc_entry("ptype", net->proc_net);
|
|
||||||
+ remove_proc_entry("softnet_stat", net->proc_net);
|
|
||||||
+ }
|
|
||||||
remove_proc_entry("dev", net->proc_net);
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/net/core/sock.c
|
|
||||||
+++ b/net/core/sock.c
|
|
||||||
@@ -4105,6 +4105,8 @@ static __net_initdata struct pernet_oper
|
|
||||||
|
|
||||||
static int __init proto_init(void)
|
|
||||||
{
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return 0;
|
|
||||||
return register_pernet_subsys(&proto_net_ops);
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/net/ipv4/fib_trie.c
|
|
||||||
+++ b/net/ipv4/fib_trie.c
|
|
||||||
@@ -3032,11 +3032,13 @@ static const struct seq_operations fib_r
|
|
||||||
|
|
||||||
int __net_init fib_proc_init(struct net *net)
|
|
||||||
{
|
|
||||||
- if (!proc_create_net("fib_trie", 0444, net->proc_net, &fib_trie_seq_ops,
|
|
||||||
+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
|
|
||||||
+ !proc_create_net("fib_trie", 0444, net->proc_net, &fib_trie_seq_ops,
|
|
||||||
sizeof(struct fib_trie_iter)))
|
|
||||||
goto out1;
|
|
||||||
|
|
||||||
- if (!proc_create_net_single("fib_triestat", 0444, net->proc_net,
|
|
||||||
+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED) &&
|
|
||||||
+ !proc_create_net_single("fib_triestat", 0444, net->proc_net,
|
|
||||||
fib_triestat_seq_show, NULL))
|
|
||||||
goto out2;
|
|
||||||
|
|
||||||
@@ -3047,17 +3049,21 @@ int __net_init fib_proc_init(struct net
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
out3:
|
|
||||||
- remove_proc_entry("fib_triestat", net->proc_net);
|
|
||||||
+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ remove_proc_entry("fib_triestat", net->proc_net);
|
|
||||||
out2:
|
|
||||||
- remove_proc_entry("fib_trie", net->proc_net);
|
|
||||||
+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ remove_proc_entry("fib_trie", net->proc_net);
|
|
||||||
out1:
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
void __net_exit fib_proc_exit(struct net *net)
|
|
||||||
{
|
|
||||||
- remove_proc_entry("fib_trie", net->proc_net);
|
|
||||||
- remove_proc_entry("fib_triestat", net->proc_net);
|
|
||||||
+ if (!IS_ENABLED(CONFIG_PROC_STRIPPED)) {
|
|
||||||
+ remove_proc_entry("fib_trie", net->proc_net);
|
|
||||||
+ remove_proc_entry("fib_triestat", net->proc_net);
|
|
||||||
+ }
|
|
||||||
remove_proc_entry("route", net->proc_net);
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/net/ipv4/proc.c
|
|
||||||
+++ b/net/ipv4/proc.c
|
|
||||||
@@ -553,5 +553,8 @@ static __net_initdata struct pernet_oper
|
|
||||||
|
|
||||||
int __init ip_misc_proc_init(void)
|
|
||||||
{
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
return register_pernet_subsys(&ip_proc_ops);
|
|
||||||
}
|
|
||||||
--- a/net/ipv4/route.c
|
|
||||||
+++ b/net/ipv4/route.c
|
|
||||||
@@ -380,6 +380,9 @@ static struct pernet_operations ip_rt_pr
|
|
||||||
|
|
||||||
static int __init ip_rt_proc_init(void)
|
|
||||||
{
|
|
||||||
+ if (IS_ENABLED(CONFIG_PROC_STRIPPED))
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
return register_pernet_subsys(&ip_rt_proc_ops);
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,93 +0,0 @@
|
||||||
From e3692cb2fcd5ba1244512a0f43b8118f65f1c375 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Sat, 8 Jul 2017 08:20:43 +0200
|
|
||||||
Subject: debloat: dmabuf
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
drivers/base/Kconfig | 2 +-
|
|
||||||
drivers/dma-buf/Makefile | 10 +++++++---
|
|
||||||
drivers/dma-buf/dma-buf.c | 4 +++-
|
|
||||||
kernel/sched/core.c | 1 +
|
|
||||||
4 files changed, 12 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/base/Kconfig
|
|
||||||
+++ b/drivers/base/Kconfig
|
|
||||||
@@ -198,7 +198,7 @@ config SOC_BUS
|
|
||||||
source "drivers/base/regmap/Kconfig"
|
|
||||||
|
|
||||||
config DMA_SHARED_BUFFER
|
|
||||||
- bool
|
|
||||||
+ tristate
|
|
||||||
default n
|
|
||||||
select IRQ_WORK
|
|
||||||
help
|
|
||||||
--- a/drivers/dma-buf/heaps/Makefile
|
|
||||||
+++ b/drivers/dma-buf/heaps/Makefile
|
|
||||||
@@ -1,3 +1,3 @@
|
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
|
||||||
-obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o
|
|
||||||
-obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o
|
|
||||||
+dma-buf-objs-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o
|
|
||||||
+dma-buf-objs-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o
|
|
||||||
--- a/drivers/dma-buf/Makefile
|
|
||||||
+++ b/drivers/dma-buf/Makefile
|
|
||||||
@@ -1,12 +1,14 @@
|
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
|
||||||
-obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \
|
|
||||||
+obj-$(CONFIG_DMA_SHARED_BUFFER) := dma-shared-buffer.o
|
|
||||||
+
|
|
||||||
+dma-buf-objs-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \
|
|
||||||
dma-fence-unwrap.o dma-resv.o
|
|
||||||
-obj-$(CONFIG_DMABUF_HEAPS) += dma-heap.o
|
|
||||||
-obj-$(CONFIG_DMABUF_HEAPS) += heaps/
|
|
||||||
-obj-$(CONFIG_SYNC_FILE) += sync_file.o
|
|
||||||
-obj-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o
|
|
||||||
-obj-$(CONFIG_UDMABUF) += udmabuf.o
|
|
||||||
-obj-$(CONFIG_DMABUF_SYSFS_STATS) += dma-buf-sysfs-stats.o
|
|
||||||
+dma-buf-objs-$(CONFIG_DMABUF_HEAPS) += dma-heap.o
|
|
||||||
+obj-$(CONFIG_DMABUF_HEAPS) += heaps/
|
|
||||||
+dma-buf-objs-$(CONFIG_SYNC_FILE) += sync_file.o
|
|
||||||
+dma-buf-objs-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o
|
|
||||||
+dma-buf-objs-$(CONFIG_UDMABUF) += udmabuf.o
|
|
||||||
+dma-buf-objs-$(CONFIG_DMABUF_SYSFS_STATS) += dma-buf-sysfs-stats.o
|
|
||||||
|
|
||||||
dmabuf_selftests-y := \
|
|
||||||
selftest.o \
|
|
||||||
@@ -15,4 +17,6 @@ dmabuf_selftests-y := \
|
|
||||||
st-dma-fence-unwrap.o \
|
|
||||||
st-dma-resv.o
|
|
||||||
|
|
||||||
-obj-$(CONFIG_DMABUF_SELFTESTS) += dmabuf_selftests.o
|
|
||||||
+dma-buf-objs-$(CONFIG_DMABUF_SELFTESTS) += dmabuf_selftests.o
|
|
||||||
+
|
|
||||||
+dma-shared-buffer-objs := $(dma-buf-objs-y)
|
|
||||||
--- a/drivers/dma-buf/dma-buf.c
|
|
||||||
+++ b/drivers/dma-buf/dma-buf.c
|
|
||||||
@@ -1636,4 +1636,5 @@ static void __exit dma_buf_deinit(void)
|
|
||||||
kern_unmount(dma_buf_mnt);
|
|
||||||
dma_buf_uninit_sysfs_statistics();
|
|
||||||
}
|
|
||||||
-__exitcall(dma_buf_deinit);
|
|
||||||
+module_exit(dma_buf_deinit);
|
|
||||||
+MODULE_LICENSE("GPL");
|
|
||||||
--- a/kernel/sched/core.c
|
|
||||||
+++ b/kernel/sched/core.c
|
|
||||||
@@ -4363,6 +4363,7 @@ int wake_up_state(struct task_struct *p,
|
|
||||||
{
|
|
||||||
return try_to_wake_up(p, state, 0);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(wake_up_state);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Perform scheduler related setup for a newly forked process p.
|
|
||||||
--- a/fs/d_path.c
|
|
||||||
+++ b/fs/d_path.c
|
|
||||||
@@ -313,6 +313,7 @@ char *dynamic_dname(char *buffer, int bu
|
|
||||||
buffer += buflen - sz;
|
|
||||||
return memcpy(buffer, temp, sz);
|
|
||||||
}
|
|
||||||
+EXPORT_SYMBOL_GPL(dynamic_dname);
|
|
||||||
|
|
||||||
char *simple_dname(struct dentry *dentry, char *buffer, int buflen)
|
|
||||||
{
|
|
|
@ -1,32 +0,0 @@
|
||||||
From 0d37e6edc09c99e683dd91ca0e83bbc0df8477b3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Sun, 16 Jul 2017 16:56:10 +0200
|
|
||||||
Subject: lib: add uevent_next_seqnum()
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
include/linux/kobject.h | 5 +++++
|
|
||||||
lib/kobject_uevent.c | 37 +++++++++++++++++++++++++++++++++++++
|
|
||||||
2 files changed, 42 insertions(+)
|
|
||||||
|
|
||||||
--- a/lib/kobject_uevent.c
|
|
||||||
+++ b/lib/kobject_uevent.c
|
|
||||||
@@ -179,6 +179,18 @@ out:
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
+u64 uevent_next_seqnum(void)
|
|
||||||
+{
|
|
||||||
+ u64 seq;
|
|
||||||
+
|
|
||||||
+ mutex_lock(&uevent_sock_mutex);
|
|
||||||
+ seq = ++uevent_seqnum;
|
|
||||||
+ mutex_unlock(&uevent_sock_mutex);
|
|
||||||
+
|
|
||||||
+ return seq;
|
|
||||||
+}
|
|
||||||
+EXPORT_SYMBOL_GPL(uevent_next_seqnum);
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* kobject_synth_uevent - send synthetic uevent with arguments
|
|
||||||
*
|
|
|
@ -1,76 +0,0 @@
|
||||||
From 0d37e6edc09c99e683dd91ca0e83bbc0df8477b3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Fietkau <nbd@nbd.name>
|
|
||||||
Date: Sun, 16 Jul 2017 16:56:10 +0200
|
|
||||||
Subject: lib: add uevent_next_seqnum()
|
|
||||||
|
|
||||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
---
|
|
||||||
include/linux/kobject.h | 5 +++++
|
|
||||||
lib/kobject_uevent.c | 37 +++++++++++++++++++++++++++++++++++++
|
|
||||||
2 files changed, 42 insertions(+)
|
|
||||||
|
|
||||||
--- a/include/linux/kobject.h
|
|
||||||
+++ b/include/linux/kobject.h
|
|
||||||
@@ -32,6 +32,8 @@
|
|
||||||
#define UEVENT_NUM_ENVP 64 /* number of env pointers */
|
|
||||||
#define UEVENT_BUFFER_SIZE 2048 /* buffer for the variables */
|
|
||||||
|
|
||||||
+struct sk_buff;
|
|
||||||
+
|
|
||||||
#ifdef CONFIG_UEVENT_HELPER
|
|
||||||
/* path to the userspace helper executed on an event */
|
|
||||||
extern char uevent_helper[];
|
|
||||||
@@ -224,4 +226,7 @@ int kobject_synth_uevent(struct kobject
|
|
||||||
__printf(2, 3)
|
|
||||||
int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...);
|
|
||||||
|
|
||||||
+int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
|
|
||||||
+ gfp_t allocation);
|
|
||||||
+
|
|
||||||
#endif /* _KOBJECT_H_ */
|
|
||||||
--- a/lib/kobject_uevent.c
|
|
||||||
+++ b/lib/kobject_uevent.c
|
|
||||||
@@ -691,6 +691,43 @@ int add_uevent_var(struct kobj_uevent_en
|
|
||||||
EXPORT_SYMBOL_GPL(add_uevent_var);
|
|
||||||
|
|
||||||
#if defined(CONFIG_NET)
|
|
||||||
+int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
|
|
||||||
+ gfp_t allocation)
|
|
||||||
+{
|
|
||||||
+ struct uevent_sock *ue_sk;
|
|
||||||
+ int err = 0;
|
|
||||||
+
|
|
||||||
+ /* send netlink message */
|
|
||||||
+ mutex_lock(&uevent_sock_mutex);
|
|
||||||
+ list_for_each_entry(ue_sk, &uevent_sock_list, list) {
|
|
||||||
+ struct sock *uevent_sock = ue_sk->sk;
|
|
||||||
+ struct sk_buff *skb2;
|
|
||||||
+
|
|
||||||
+ skb2 = skb_clone(skb, allocation);
|
|
||||||
+ if (!skb2)
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
+ err = netlink_broadcast(uevent_sock, skb2, pid, group,
|
|
||||||
+ allocation);
|
|
||||||
+ if (err)
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ mutex_unlock(&uevent_sock_mutex);
|
|
||||||
+
|
|
||||||
+ kfree_skb(skb);
|
|
||||||
+ return err;
|
|
||||||
+}
|
|
||||||
+#else
|
|
||||||
+int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group,
|
|
||||||
+ gfp_t allocation)
|
|
||||||
+{
|
|
||||||
+ kfree_skb(skb);
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+EXPORT_SYMBOL_GPL(broadcast_uevent);
|
|
||||||
+
|
|
||||||
+#if defined(CONFIG_NET)
|
|
||||||
static int uevent_net_broadcast(struct sock *usk, struct sk_buff *skb,
|
|
||||||
struct netlink_ext_ack *extack)
|
|
||||||
{
|
|
|
@ -1,21 +0,0 @@
|
||||||
From e08bcbbaa52fcc41f02743fd2e62a33255ce52da Mon Sep 17 00:00:00 2001
|
|
||||||
From: OpenWrt community <openwrt-devel@lists.openwrt.org>
|
|
||||||
Date: Wed, 13 Jul 2022 13:52:28 +0200
|
|
||||||
Subject: [PATCH] of/ftd: add device tree cmdline
|
|
||||||
|
|
||||||
---
|
|
||||||
drivers/of/fdt.c | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/of/fdt.c
|
|
||||||
+++ b/drivers/of/fdt.c
|
|
||||||
@@ -1183,6 +1183,9 @@ int __init early_init_dt_scan_chosen(cha
|
|
||||||
p = of_get_flat_dt_prop(node, "bootargs", &l);
|
|
||||||
if (p != NULL && l > 0)
|
|
||||||
strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));
|
|
||||||
+ p = of_get_flat_dt_prop(node, "bootargs-append", &l);
|
|
||||||
+ if (p != NULL && l > 0)
|
|
||||||
+ strlcat(cmdline, p, min_t(int, strlen(cmdline) + (int)l, COMMAND_LINE_SIZE));
|
|
||||||
|
|
||||||
handle_cmdline:
|
|
||||||
/*
|
|
|
@ -1,30 +0,0 @@
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
||||||
Date: Tue, 19 Jul 2022 06:17:48 +0200
|
|
||||||
Subject: [PATCH] Revert "Revert "Revert "driver core: Set fw_devlink=on by
|
|
||||||
default"""
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
This reverts commit ea718c699055c8566eb64432388a04974c43b2ea.
|
|
||||||
|
|
||||||
With of_platform_populate() called for MTD partitions that commit breaks
|
|
||||||
probing devices which reference MTD in device tree.
|
|
||||||
|
|
||||||
Link: https://lore.kernel.org/all/696cb2da-20b9-b3dd-46d9-de4bf91a1506@gmail.com/T/#u
|
|
||||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
||||||
---
|
|
||||||
drivers/base/core.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/drivers/base/core.c
|
|
||||||
+++ b/drivers/base/core.c
|
|
||||||
@@ -1700,7 +1700,7 @@ static void device_links_purge(struct de
|
|
||||||
#define FW_DEVLINK_FLAGS_RPM (FW_DEVLINK_FLAGS_ON | \
|
|
||||||
DL_FLAG_PM_RUNTIME)
|
|
||||||
|
|
||||||
-static u32 fw_devlink_flags = FW_DEVLINK_FLAGS_ON;
|
|
||||||
+static u32 fw_devlink_flags = FW_DEVLINK_FLAGS_PERMISSIVE;
|
|
||||||
static int __init fw_devlink_setup(char *arg)
|
|
||||||
{
|
|
||||||
if (!arg)
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue